Changeset 11772 in josm for trunk/test/unit


Ignore:
Timestamp:
2017-03-23T00:01:04+01:00 (3 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:
1 added
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/test/unit/org/openstreetmap/josm/gui/widgets/AutoAdjustingSplitPaneTest.java

    r11770 r11772  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.gui.conflict.tags;
     2package org.openstreetmap.josm.gui.widgets;
    33
    44import static org.junit.Assert.assertEquals;
     
    1010import org.junit.Rule;
    1111import org.junit.Test;
    12 import org.openstreetmap.josm.gui.conflict.tags.CombinePrimitiveResolverDialog.AutoAdjustingSplitPane;
    1312import org.openstreetmap.josm.testutils.JOSMTestRules;
    1413
     
    1615
    1716/**
    18  * Unit tests of {@link CombinePrimitiveResolverDialog} class.
     17 * Unit tests of {@link AutoAdjustingSplitPane} class.
    1918 */
    20 public class CombinePrimitiveResolverDialogTest {
     19public class AutoAdjustingSplitPaneTest {
    2120
    2221    /**
     
    2827
    2928    /**
    30      * Unit test of {@link CombinePrimitiveResolverDialog.AutoAdjustingSplitPane} class.
     29     * Unit test of {@link AutoAdjustingSplitPane} class.
    3130     */
    3231    @Test
    3332    public void testAutoAdjustingSplitPane() {
    34         AutoAdjustingSplitPane pane = new CombinePrimitiveResolverDialog.AutoAdjustingSplitPane(JSplitPane.VERTICAL_SPLIT);
     33        AutoAdjustingSplitPane pane = new AutoAdjustingSplitPane(JSplitPane.VERTICAL_SPLIT);
    3534        assertEquals(-1, pane.getDividerLocation());
    3635        assertEquals(0, pane.getHeight());
Note: See TracChangeset for help on using the changeset viewer.