Changeset 10221 in josm for trunk/test


Ignore:
Timestamp:
2016-05-15T19:56:21+02:00 (9 years ago)
Author:
Don-vip
Message:

cleanup unit tests

Location:
trunk/test/unit/org/openstreetmap/josm/data/imagery
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/test/unit/org/openstreetmap/josm/data/imagery/ImageryInfoTest.java

    r9756 r10221  
    6767        assertEquals(info.noTileHeaders, expect);
    6868        final Set<String> eTag = info.noTileHeaders.get("ETag");
    69         assertEquals(eTag, new HashSet<String>(Arrays.asList("foo", "bar")));
     69        assertEquals(eTag, new HashSet<>(Arrays.asList("foo", "bar")));
    7070    }
    7171

  • trunk/test/unit/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSourceTest.java

    r9767 r10221  
    1616import org.openstreetmap.josm.data.coor.LatLon;
    1717import org.openstreetmap.josm.data.projection.CustomProjection;
    18 import org.openstreetmap.josm.data.projection.Projection;
    1918import org.openstreetmap.josm.data.projection.Projections;
    2019
    … …  
    3534    }
    3635
     36    /**
     37     * Test EPSG:3857
     38     */
    3739    @Test
    3840    public void testEPSG3857() {
    … …  
    5658    }
    5759
     60    /**
     61     * Test EPSG:4326
     62     */
    5863    @Test
    5964    public void testEPSG4326() {
    … …  
    6873    }
    6974
     75    /**
     76     * Test EPSG:4326 - wide bounds
     77     */
    7078    @Test
    7179    public void testEPSG4326_widebounds() {
    … …  
    7785    }
    7886
     87    /**
     88     * Test EPSG:4326 - narrow bounds
     89     */
    7990    @Test
    8091    public void testEPSG4326_narrowbounds() {
    … …  
    8697    }
    8798
     99    /**
     100     * Test EPSG:2180
     101     */
    88102    @Test
    89103    public void testEPSG2180() {
    … …  
    99113    }
    100114
     115    /**
     116     * Test EPSG:3006 with bounds
     117     */
    101118    @Test
    102119    public void testEPSG3006_withbounds() {
    … …  
    111128    }
    112129
     130    /**
     131     * Test EPSG:3006 without bounds
     132     */
    113133    @Test
    114134    public void testEPSG3006_withoutbounds() {
    … …  
    188208
    189209    private void verifyTileSquarness(TemplatedWMSTileSource source, int x, int y, int z) {
    190         Projection proj = Main.getProjection();
    191210        /**
    192211         * t1 | t2
    … …  
    217236
    218237    private TemplatedWMSTileSource getSource() {
    219         TemplatedWMSTileSource source = new TemplatedWMSTileSource(testImageryWMS);
    220         return source;
     238        return new TemplatedWMSTileSource(testImageryWMS);
    221239    }
    222240}

  • trunk/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java

    r9973 r10221  
    5858
    5959    @Test
    60     public void testPseudoMercator() throws MalformedURLException, IOException {
     60    public void testPseudoMercator() throws IOException {
    6161        Main.setProjection(Projections.getProjectionByCode("EPSG:3857"));
    6262        WMTSTileSource testSource = new WMTSTileSource(testImageryPSEUDO_MERCATOR);
    … …  
    8888
    8989    @Test
    90     public void testWALLONIE() throws MalformedURLException, IOException {
     90    public void testWALLONIE() throws IOException {
    9191        Main.setProjection(Projections.getProjectionByCode("EPSG:31370"));
    9292        WMTSTileSource testSource = new WMTSTileSource(testImageryWALLONIE);
    … …  
    108108    @Test
    109109    @Ignore("disable this test, needs further working") // XXX
    110     public void testWALLONIENoMatrixDimension() throws MalformedURLException, IOException {
     110    public void testWALLONIENoMatrixDimension() throws IOException {
    111111        Main.setProjection(Projections.getProjectionByCode("EPSG:31370"));
    112112        WMTSTileSource testSource = new WMTSTileSource(getImagery("test/data/wmts/WMTSCapabilities-Wallonie-nomatrixdimension.xml"));
    … …  
    132132
    133133    @Test
    134     public void testWIEN() throws MalformedURLException, IOException {
     134    public void testWIEN() throws IOException {
    135135        Main.setProjection(Projections.getProjectionByCode("EPSG:3857"));
    136136        WMTSTileSource testSource = new WMTSTileSource(testImageryWIEN);
Note: See TracChangeset for help on using the changeset viewer.