Ignore:
Timestamp:
2016-06-24T00:30:42+02:00 (8 years ago)
Author:
Don-vip
Message:

fix #13037 - Small fixes for unit tests (patch by michael2402) - gsoc-core

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/test/unit/org/openstreetmap/josm/gui/layer/LayerManagerTest.java

    r10397 r10467  
    1111import static org.junit.Assert.fail;
    1212
     13import java.awt.Component;
     14import java.awt.Graphics;
    1315import java.awt.Graphics2D;
    1416import java.lang.reflect.InvocationTargetException;
    … …  
    4143public class LayerManagerTest {
    4244
    43     protected static class AbstractTestLayer extends Layer {
    44         protected AbstractTestLayer() {
     45    /**
     46     * This is a layer that can be used in tests. It does not do anything and provides a simple, fake implementation.
     47     * @author Michael Zangl
     48     */
     49    public static class TestLayer extends Layer {
     50        /**
     51         * Create a new test layer.
     52         */
     53        public TestLayer() {
    4554            super("Test Layer");
    4655        }
    … …  
    7079        @Override
    7180        public Action[] getMenuEntries() {
    72             return null;
     81            return new Action[0];
    7382        }
    7483
    … …  
    8089        @Override
    8190        public Icon getIcon() {
    82             return null;
     91            return new Icon() {
     92                @Override
     93                public void paintIcon(Component c, Graphics g, int x, int y) {
     94                    // nop
     95                }
     96
     97                @Override
     98                public int getIconWidth() {
     99                    return 10;
     100                }
     101
     102                @Override
     103                public int getIconHeight() {
     104                    return 10;
     105                }
     106            };
    83107        }
    84108
    … …  
    89113    }
    90114
    91     protected static class AbstractTestLayer2 extends AbstractTestLayer {}
     115    protected static class TestLayer2 extends TestLayer {}
    92116
    93117    /**
    … …  
    147171    @Test
    148172    public void testAddLayer() {
    149         Layer layer1 = new AbstractTestLayer() {
     173        Layer layer1 = new TestLayer() {
    150174            @Override
    151175            public LayerPositionStrategy getDefaultLayerPosition() {
    … …  
    158182            }
    159183        };
    160         Layer layer2 = new AbstractTestLayer() {
     184        Layer layer2 = new TestLayer() {
    161185            @Override
    162186            public LayerPositionStrategy getDefaultLayerPosition() {
    … …  
    164188            }
    165189        };
    166         Layer layer3 = new AbstractTestLayer() {
     190        Layer layer3 = new TestLayer() {
    167191            @Override
    168192            public LayerPositionStrategy getDefaultLayerPosition() {
    … …  
    179203
    180204        // event
    181         AbstractTestLayer layer4 = new AbstractTestLayer();
     205        TestLayer layer4 = new TestLayer();
    182206        CapturingLayerChangeListener l = new CapturingLayerChangeListener();
    183207        layerManager.addLayerChangeListener(l);
    … …  
    198222        thrown.expectRootCause(any(IllegalArgumentException.class));
    199223
    200         AbstractTestLayer layer1 = new AbstractTestLayer();
     224        TestLayer layer1 = new TestLayer();
    201225        layerManager.addLayer(layer1);
    202226        layerManager.addLayer(layer1);
    … …  
    212236        thrown.expectRootCause(any(IndexOutOfBoundsException.class));
    213237
    214         AbstractTestLayer layer1 = new AbstractTestLayer() {
     238        TestLayer layer1 = new TestLayer() {
    215239            @Override
    216240            public LayerPositionStrategy getDefaultLayerPosition() {
    … …  
    231255    @Test
    232256    public void testRemoveLayer() {
    233         AbstractTestLayer layer1 = new AbstractTestLayer();
    234         AbstractTestLayer layer2 = new AbstractTestLayer();
     257        TestLayer layer1 = new TestLayer();
     258        TestLayer layer2 = new TestLayer();
    235259        layerManager.addLayer(layer1);
    236260        layerManager.addLayer(layer2);
    … …  
    252276    @Test
    253277    public void testMoveLayer() {
    254         AbstractTestLayer layer1 = new AbstractTestLayer();
    255         AbstractTestLayer layer2 = new AbstractTestLayer();
     278        TestLayer layer1 = new TestLayer();
     279        TestLayer layer2 = new TestLayer();
    256280        layerManager.addLayer(layer1);
    257281        layerManager.addLayer(layer2);
    … …  
    284308        thrown.expectRootCause(any(IndexOutOfBoundsException.class));
    285309
    286         AbstractTestLayer layer1 = new AbstractTestLayer();
    287         AbstractTestLayer layer2 = new AbstractTestLayer();
     310        TestLayer layer1 = new TestLayer();
     311        TestLayer layer2 = new TestLayer();
    288312        layerManager.addLayer(layer1);
    289313        layerManager.addLayer(layer2);
    … …  
    300324        thrown.expectRootCause(any(IllegalArgumentException.class));
    301325
    302         AbstractTestLayer layer1 = new AbstractTestLayer();
    303         AbstractTestLayer layer2 = new AbstractTestLayer();
     326        TestLayer layer1 = new TestLayer();
     327        TestLayer layer2 = new TestLayer();
    304328        layerManager.addLayer(layer1);
    305329        layerManager.moveLayer(layer2, 0);
    … …  
    312336    public void testGetLayers() {
    313337        // list should be immutable
    314         AbstractTestLayer layer1 = new AbstractTestLayer();
    315         AbstractTestLayer layer2 = new AbstractTestLayer();
     338        TestLayer layer1 = new TestLayer();
     339        TestLayer layer2 = new TestLayer();
    316340        layerManager.addLayer(layer1);
    317341        layerManager.addLayer(layer2);
    … …  
    324348    @Test
    325349    public void testGetLayersOfType() {
    326         AbstractTestLayer2 layer1 = new AbstractTestLayer2();
    327         AbstractTestLayer2 layer2 = new AbstractTestLayer2();
    328         layerManager.addLayer(layer1);
    329         layerManager.addLayer(new AbstractTestLayer());
    330         layerManager.addLayer(layer2);
    331 
    332         assertEquals(layerManager.getLayersOfType(AbstractTestLayer2.class), Arrays.asList(layer1, layer2));
     350        TestLayer2 layer1 = new TestLayer2();
     351        TestLayer2 layer2 = new TestLayer2();
     352        layerManager.addLayer(layer1);
     353        layerManager.addLayer(new TestLayer());
     354        layerManager.addLayer(layer2);
     355
     356        assertEquals(layerManager.getLayersOfType(TestLayer2.class), Arrays.asList(layer1, layer2));
    333357    }
    334358
    … …  
    338362    @Test
    339363    public void testContainsLayer() {
    340         AbstractTestLayer layer = new AbstractTestLayer();
     364        TestLayer layer = new TestLayer();
    341365        layerManager.addLayer(layer);
    342         layerManager.addLayer(new AbstractTestLayer());
     366        layerManager.addLayer(new TestLayer());
    343367
    344368        assertTrue(layerManager.containsLayer(layer));
    345         assertFalse(layerManager.containsLayer(new AbstractTestLayer()));
     369        assertFalse(layerManager.containsLayer(new TestLayer()));
    346370    }
    347371
    … …  
    374398    public void testAddLayerChangeListenerFire() {
    375399        final ArrayList<Layer> fired = new ArrayList<>();
    376         AbstractTestLayer layer1 = new AbstractTestLayer();
    377         AbstractTestLayer layer2 = new AbstractTestLayer();
     400        TestLayer layer1 = new TestLayer();
     401        TestLayer layer2 = new TestLayer();
    378402        layerManager.addLayer(layer1);
    379403        layerManager.addLayer(layer2);
    … …  
    405429        CapturingLayerChangeListener l = new CapturingLayerChangeListener();
    406430        layerManager.addLayerChangeListener(l);
    407         layerManager.addLayer(new AbstractTestLayer());
     431        layerManager.addLayer(new TestLayer());
    408432        layerManager.removeLayerChangeListener(l);
    409         layerManager.addLayer(new AbstractTestLayer());
     433        layerManager.addLayer(new TestLayer());
    410434        // threw exception when fired twice.
    411435        assertNotNull(l.layerAdded);
    … …  
    429453    public void testRemoveLayerChangeListenerFire() {
    430454        final ArrayList<Layer> fired = new ArrayList<>();
    431         AbstractTestLayer layer1 = new AbstractTestLayer();
    432         AbstractTestLayer layer2 = new AbstractTestLayer();
     455        TestLayer layer1 = new TestLayer();
     456        TestLayer layer2 = new TestLayer();
    433457        layerManager.addLayer(layer1);
    434458        layerManager.addLayer(layer2);
Note: See TracChangeset for help on using the changeset viewer.