Changeset 11772 in josm for trunk/test/unit/org/openstreetmap

Timestamp:

2017-03-23T00:01:04+01:00 (8 years ago)

Author:

Don-vip

Message:

fix #14475 - Deadlock while starting unit tests: remove the need to construct a CombinePrimitiveDialog to detect conflicts

Location:

trunk/test/unit/org/openstreetmap/josm/gui/widgets

Files:

• . (added)
• AutoAdjustingSplitPaneTest.java (moved) (moved from trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialogTest.java ) (4 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/widgets/AutoAdjustingSplitPaneTest.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.conflict.tags;
+package org.openstreetmap.josm.gui.widgets;
 
 import static org.junit.Assert.assertEquals;
@@ -10 +10 @@
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.gui.conflict.tags.CombinePrimitiveResolverDialog.AutoAdjustingSplitPane;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -16 +15 @@
 
 /**
- * Unit tests of {@link CombinePrimitiveResolverDialog} class.
+ * Unit tests of {@link AutoAdjustingSplitPane} class.
  */
-public class CombinePrimitiveResolverDialogTest {
+public class AutoAdjustingSplitPaneTest {
 
     /**
@@ -28 +27 @@
 
     /**
-     * Unit test of {@link CombinePrimitiveResolverDialog.AutoAdjustingSplitPane} class.
+     * Unit test of {@link AutoAdjustingSplitPane} class.
      */
     @Test
     public void testAutoAdjustingSplitPane() {
-        AutoAdjustingSplitPane pane = new CombinePrimitiveResolverDialog.AutoAdjustingSplitPane(JSplitPane.VERTICAL_SPLIT);
+        AutoAdjustingSplitPane pane = new AutoAdjustingSplitPane(JSplitPane.VERTICAL_SPLIT);
         assertEquals(-1, pane.getDividerLocation());
         assertEquals(0, pane.getHeight());