Ignore:
Timestamp:
2016-01-28T09:29:14+01:00 (8 years ago)
Author:
Don-vip
Message:

fix/cleanup unit tests

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r9660 r9661  
    4242            assertTrue(reader.parse(true));
    4343            GpxLayer gpxLayer = new GpxLayer(reader.getGpxData());
    44             Main.main.addLayer(gpxLayer);
    45             assertEquals(1, Main.map.mapView.getNumLayers());
    46             new Loader(
    47                     Collections.singleton(new File(TestUtils.getRegressionDataFile(12255, "G0016941.JPG"))),
    48                     gpxLayer).run();
    49             assertEquals(2, Main.map.mapView.getNumLayers());
    50             GeoImageLayer layer = Main.map.mapView.getLayersOfType(GeoImageLayer.class).iterator().next();
    51             assertEquals(gpxLayer, layer.getGpxLayer());
    52             List<ImageEntry> images = layer.getImages();
    53             assertEquals(1, images.size());
    54             assertEquals("<html>1 image loaded. 0 were found to be GPS tagged.</html>", layer.getInfoComponent());
    55             assertEquals("<html>1 image loaded. 0 were found to be GPS tagged.</html>", layer.getToolTipText());
     44            try {
     45                Main.main.addLayer(gpxLayer);
     46                assertEquals(1, Main.map.mapView.getNumLayers());
     47                new Loader(
     48                        Collections.singleton(new File(TestUtils.getRegressionDataFile(12255, "G0016941.JPG"))),
     49                        gpxLayer).run();
     50                assertEquals(2, Main.map.mapView.getNumLayers());
     51                GeoImageLayer layer = Main.map.mapView.getLayersOfType(GeoImageLayer.class).iterator().next();
     52                try {
     53                    assertEquals(gpxLayer, layer.getGpxLayer());
     54                    List<ImageEntry> images = layer.getImages();
     55                    assertEquals(1, images.size());
     56                    assertEquals("<html>1 image loaded. 0 were found to be GPS tagged.</html>", layer.getInfoComponent());
     57                    assertEquals("<html>1 image loaded. 0 were found to be GPS tagged.</html>", layer.getToolTipText());
     58                } finally {
     59                    // Ensure we clean the place before leaving, even if test fails.
     60                    Main.map.mapView.removeLayer(layer);
     61                }
     62            } finally {
     63                // Ensure we clean the place before leaving, even if test fails.
     64                Main.main.removeLayer(gpxLayer);
     65            }
    5666        }
    5767    }
Note: See TracChangeset for help on using the changeset viewer.