Skip to content

Commit 1c3ea4d

Browse files
stoeckerstoecker
committed
fix tests
1 parent 55a139f commit 1c3ea4d

File tree

6 files changed

+129
-8
lines changed

6 files changed

+129
-8
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ failed.png
99
test/config/unit-josm.home
1010
checkstyle-josm-markseen.xml
1111
javadoc
12+
target

‎pom.xml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,48 @@
2424
<plugin.link>https://github.com/JOSM/markseen</plugin.link>
2525
<plugin.canloadatruntime>true</plugin.canloadatruntime>
2626
</properties>
27+
<dependencies>
28+
<dependency>
29+
<groupId>org.jmockit</groupId>
30+
<artifactId>jmockit</artifactId>
31+
<scope>test</scope>
32+
</dependency>
33+
<dependency>
34+
<groupId>org.junit.platform</groupId>
35+
<artifactId>junit-platform-launcher</artifactId>
36+
<scope>test</scope>
37+
</dependency>
38+
<dependency>
39+
<groupId>org.junit.platform</groupId>
40+
<artifactId>junit-platform-suite</artifactId>
41+
<scope>test</scope>
42+
</dependency>
43+
<dependency>
44+
<groupId>org.junit.vintage</groupId>
45+
<artifactId>junit-vintage-engine</artifactId>
46+
<scope>test</scope>
47+
</dependency>
48+
<dependency>
49+
<groupId>org.junit.jupiter</groupId>
50+
<artifactId>junit-jupiter-params</artifactId>
51+
<scope>test</scope>
52+
</dependency>
53+
<dependency>
54+
<groupId>org.awaitility</groupId>
55+
<artifactId>awaitility</artifactId>
56+
<scope>test</scope>
57+
</dependency>
58+
<dependency>
59+
<groupId>jakarta.xml.bind</groupId>
60+
<artifactId>jakarta.xml.bind-api</artifactId>
61+
<version>4.0.2</version>
62+
<scope>test</scope>
63+
</dependency>
64+
<dependency>
65+
<groupId>org.wiremock</groupId>
66+
<artifactId>wiremock</artifactId>
67+
</dependency>
68+
</dependencies>
2769
<build>
2870
<plugins>
2971
<plugin>

‎test/unit/org/openstreetmap/josm/plugins/markseen/BaseQuadTreeMetaTest.java‎

Lines changed: 81 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,28 @@
44
import static java.util.concurrent.TimeUnit.MILLISECONDS;
55

66
import java.awt.Color;
7+
import java.awt.Point;
78
import java.awt.image.DataBufferByte;
89
import java.io.IOException;
910
import java.lang.reflect.Field;
1011
import java.util.ArrayList;
1112
import java.util.List;
13+
import java.util.Map;
1214
import java.util.concurrent.Future;
1315
import java.util.concurrent.ExecutorService;
1416
import java.util.concurrent.RejectedExecutionException;
1517
import java.util.concurrent.ThreadPoolExecutor;
1618

19+
import org.openstreetmap.gui.jmapviewer.Coordinate;
20+
import org.openstreetmap.gui.jmapviewer.Projected;
1721
import org.openstreetmap.gui.jmapviewer.Tile;
22+
import org.openstreetmap.gui.jmapviewer.TileRange;
23+
import org.openstreetmap.gui.jmapviewer.TileXY;
24+
import org.openstreetmap.gui.jmapviewer.interfaces.ICoordinate;
25+
import org.openstreetmap.gui.jmapviewer.interfaces.IProjected;
1826
import org.openstreetmap.gui.jmapviewer.interfaces.TileSource;
27+
import org.openstreetmap.gui.jmapviewer.tilesources.AbstractTMSTileSource;
28+
import org.openstreetmap.gui.jmapviewer.tilesources.TileSourceInfo;
1929
import org.openstreetmap.josm.TestUtils;
2030
import org.openstreetmap.josm.data.Bounds;
2131

@@ -53,12 +63,80 @@ public static QuadTreeNodeDynamicReference[] createDynamicReferences(QuadTreeMet
5363
};
5464
QuadTreeNodeDynamicReference[] refs = new QuadTreeNodeDynamicReference[referenceTiles_.length];
5565
for (int i = 0; i < referenceTiles_.length; i++) {
56-
Tile mockTile = new Tile(null, (int) referenceTiles_[i][1], (int) referenceTiles_[i][2], (int) referenceTiles_[i][0]);
66+
Tile mockTile = new Tile(new TileStubSource(), (int) referenceTiles_[i][1],
67+
(int) referenceTiles_[i][2], (int) referenceTiles_[i][0]);
5768
refs[i] = new QuadTreeNodeDynamicReference(quadTreeMeta, mockTile);
5869
}
5970
return refs;
6071
}
6172

73+
private static final class TileStubSource extends AbstractTMSTileSource {
74+
private TileStubSource() {
75+
super(new TileSourceInfo());
76+
}
77+
78+
@Override
79+
public Map<String, String> getMetadata(Map<String, List<String>> headers) {
80+
// TODO Auto-generated method stub
81+
return null;
82+
}
83+
84+
@Override
85+
public double getDistance(double la1, double lo1, double la2, double lo2) {
86+
// TODO Auto-generated method stub
87+
return 0;
88+
}
89+
90+
@Override
91+
public Point latLonToXY(double lat, double lon, int zoom) {
92+
// TODO Auto-generated method stub
93+
return null;
94+
}
95+
96+
@Override
97+
public ICoordinate xyToLatLon(int x, int y, int zoom) {
98+
// TODO Auto-generated method stub
99+
return null;
100+
}
101+
102+
@Override
103+
public TileXY latLonToTileXY(double lat, double lon, int zoom) {
104+
return new TileXY(lon / 2, lat / 2);
105+
}
106+
107+
@Override
108+
public ICoordinate tileXYToLatLon(int x, int y, int zoom) {
109+
return new Coordinate(2*y, 2*x);
110+
}
111+
112+
@Override
113+
public IProjected tileXYtoProjected(int x, int y, int zoom) {
114+
return new Projected(2*x, 2*y);
115+
}
116+
117+
@Override
118+
public TileXY projectedToTileXY(IProjected p, int zoom) {
119+
return new TileXY(p.getEast() / 2, p.getNorth() / 2);
120+
}
121+
122+
@Override
123+
public boolean isInside(Tile inner, Tile outer) {
124+
// TODO Auto-generated method stub
125+
return false;
126+
}
127+
128+
@Override
129+
public TileRange getCoveringTileRange(Tile tile, int newZoom) {
130+
// TODO Auto-generated method stub
131+
return null;
132+
}
133+
134+
@Override
135+
public String getServerCRS() {
136+
return "EPSG:3857";
137+
}
138+
}
139+
62140
protected QuadTreeMeta quadTreeMeta;
63141

64142
public BaseQuadTreeMetaTest(int scenarioIndex_, Integer seenRectOrderSeed_, Integer referenceTileOrderSeed_)
@@ -189,8 +267,8 @@ protected void inspectReferenceTiles(
189267
} catch (final AssertionError e) {
190268
System.out.format("assertArrayEquals failed on reference tile %d\n", j);
191269
System.out.println(
192-
"ref = " + javax.xml.bind.DatatypeConverter.printHexBinary(refMaskBytes) +
193-
", result = " + javax.xml.bind.DatatypeConverter.printHexBinary(resultMaskBytes)
270+
"ref = " + jakarta.xml.bind.DatatypeConverter.printHexBinary(refMaskBytes) +
271+
", result = " + jakarta.xml.bind.DatatypeConverter.printHexBinary(resultMaskBytes)
194272
);
195273
throw e;
196274
}

‎test/unit/org/openstreetmap/josm/plugins/markseen/BaseQuadTreeNodeTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,8 @@ protected void inspectReferenceTiles(
172172
} catch (final AssertionError e) {
173173
System.out.format("assertArrayEquals failed on reference tile %d\n", j);
174174
System.out.println(
175-
"ref = " + javax.xml.bind.DatatypeConverter.printHexBinary(refMaskBytes) +
176-
", result = " + javax.xml.bind.DatatypeConverter.printHexBinary(resultMaskBytes)
175+
"ref = " + jakarta.xml.bind.DatatypeConverter.printHexBinary(refMaskBytes) +
176+
", result = " + jakarta.xml.bind.DatatypeConverter.printHexBinary(resultMaskBytes)
177177
);
178178
throw e;
179179
}

‎test/unit/org/openstreetmap/josm/plugins/markseen/QuadTreeMetaClearOrderTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public void testClearUnseen()
9898
);
9999
} catch (final AssertionError e) {
100100
System.out.format("assertArrayEquals failed on reference tile %d\n", i);
101-
System.out.println(javax.xml.bind.DatatypeConverter.printHexBinary(resultMaskBytes));
101+
System.out.println(jakarta.xml.bind.DatatypeConverter.printHexBinary(resultMaskBytes));
102102
throw e;
103103
}
104104
}

‎test/unit/org/openstreetmap/josm/plugins/markseen/QuadTreeMetaReferenceTileOrderTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,9 @@ public void test()
105105
} catch (final AssertionError e) {
106106
System.out.format("assertArrayEquals failed on reference tile %d\n", i);
107107
System.out.println("First read:");
108-
System.out.println(javax.xml.bind.DatatypeConverter.printHexBinary(originalMasks[i]));
108+
System.out.println(jakarta.xml.bind.DatatypeConverter.printHexBinary(originalMasks[i]));
109109
System.out.println("Second read:");
110-
System.out.println(javax.xml.bind.DatatypeConverter.printHexBinary(secondMask));
110+
System.out.println(jakarta.xml.bind.DatatypeConverter.printHexBinary(secondMask));
111111
throw e;
112112
}
113113
}

0 commit comments

Comments
 (0)