Skip to content

Commit 6e37d8c

Browse files
stoeckerstoecker
committed
silence tests
1 parent a3078ec commit 6e37d8c

7 files changed

Lines changed: 34 additions & 22 deletions

File tree

‎src/org/openstreetmap/josm/plugins/markseen/QuadTreeMeta.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public class QuadTreeMeta {
2424
// to do is catch potential bugs where something attempts to write to a mask that is intended to be shared &
2525
// constant
2626
private static class WriteInhibitedBufferedImage extends BufferedImage {
27-
public boolean inhibitWrites = false;
27+
private boolean inhibitWrites = false;
2828

2929
WriteInhibitedBufferedImage(int width, int height, int imageType, IndexColorModel cm, Color constColor) {
3030
super(width, height, imageType, cm);

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

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@
4444

4545
@Ignore
4646
public class BaseQuadTreeMetaTest extends BaseRectTest {
47+
/* change to true to get debug output in commandline */
48+
Boolean debug = false;
49+
4750
public static QuadTreeNodeDynamicReference[] createDynamicReferences(QuadTreeMeta quadTreeMeta, Object[][] referenceTiles_) {
4851
new MockUp<Tile>() {
4952
@Mock void $init(Invocation invocation, TileSource source, int xtile, int ytile, int zoom) {
@@ -139,14 +142,10 @@ public String getServerCRS() {
139142

140143
protected QuadTreeMeta quadTreeMeta;
141144

142-
public BaseQuadTreeMetaTest(int scenarioIndex_, Integer seenRectOrderSeed_, Integer referenceTileOrderSeed_)
145+
public BaseQuadTreeMetaTest(int scenarioIndex_, Integer seenRectOrderSeed_, Integer referenceTileOrderSeed_, boolean autoOptimize)
143146
throws IOException {
144147
super(scenarioIndex_, seenRectOrderSeed_, referenceTileOrderSeed_);
145-
this.initQuadTreeMeta();
146-
}
147-
148-
protected void initQuadTreeMeta() {
149-
this.quadTreeMeta = new QuadTreeMeta(this.tileSize, Color.PINK, 0.5, false);
148+
this.quadTreeMeta = new QuadTreeMeta(this.tileSize, Color.PINK, 0.5, autoOptimize);
150149
}
151150

152151
@After
@@ -168,7 +167,8 @@ protected void markRectsAsync(QuadTreeMeta quadTreeMeta, Object[][] seenRects_,
168167
for (int i = 0; i < seenRects_.length; i++) {
169168
int j = remapping.get(i);
170169
Object[] seenRectInfo = seenRects_[j];
171-
System.out.format("(%d of %d) Requesting seen rect mark %d\n", i, seenRects_.length, j);
170+
if (debug)
171+
System.out.format("(%d of %d) Requesting seen rect mark %d\n", i, seenRects_.length, j);
172172
Bounds bounds = (Bounds) seenRectInfo[0];
173173
double minTilesAcross = (double) seenRectInfo[1];
174174

@@ -181,6 +181,7 @@ protected void markRectsAsync(QuadTreeMeta quadTreeMeta, Object[][] seenRects_,
181181
try {
182182
Thread.sleep(10);
183183
} catch (InterruptedException e2) {
184+
System.out.format("interrupted\n");
184185
}
185186
// then retry
186187
}
@@ -249,7 +250,8 @@ protected void inspectReferenceTiles(
249250
for (int i = 0; i < referenceTiles_.length; i++) {
250251
final int j = remapping.get(i);
251252
Object[] referenceTileInfo = referenceTiles_[j];
252-
System.out.format("(%d of %d) Checking reference tile %d\n", i, referenceTiles_.length, j);
253+
if (debug)
254+
System.out.format("(%d of %d) Checking reference tile %d\n", i, referenceTiles_.length, j);
253255
Object refMask = constReferenceMask != null ? constReferenceMask : referenceTileInfo[3];
254256
byte[] refMaskBytes = getRefMaskBytes(quadTreeMeta, refMask);
255257
boolean refMaskOptAliasable = referenceTileInfo.length >= 5 ? (boolean) referenceTileInfo[4] : false;
@@ -301,7 +303,8 @@ protected List<Future<Object>> fetchTileMasksAsync(
301303

302304
for (int i = 0; i < dynamicReferences.length; i++) {
303305
final int j = remapping.get(i);
304-
System.out.format("(%d of %d) Requesting tile mask %d\n", i, dynamicReferences.length, j);
306+
if (debug)
307+
System.out.format("(%d of %d) Requesting tile mask %d\n", i, dynamicReferences.length, j);
305308

306309
maskFutures.set(j, executor.submit(() -> dynamicReferences[j].maskReadOperation(
307310
mask -> {

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616

1717
@Ignore
1818
public class BaseQuadTreeNodeTest extends BaseRectTest {
19+
/* change to true to get debug output in commandline */
20+
Boolean debug = false;
21+
1922
public BaseQuadTreeNodeTest(int scenarioIndex_, Integer seenRectOrderSeed_, Integer referenceTileOrderSeed_)
2023
throws IOException {
2124
super(scenarioIndex_, seenRectOrderSeed_, referenceTileOrderSeed_);
@@ -55,7 +58,8 @@ protected void markRects(
5558
for (int i = 0; i < seenRects_.length; i++) {
5659
int j = remapping.get(i);
5760
Object[] seenRectInfo = seenRects_[j];
58-
System.out.format("(%d of %d) Marking seen rect %d\n", i, seenRects_.length, j);
61+
if (debug)
62+
System.out.format("(%d of %d) Marking seen rect %d\n", i, seenRects_.length, j);
5963
Bounds bounds = (Bounds) seenRectInfo[0];
6064
double minTilesAcross = (double) seenRectInfo[1];
6165

@@ -139,7 +143,8 @@ protected void inspectReferenceTiles(
139143
for (int i = 0; i < referenceTiles_.length; i++) {
140144
int j = remapping.get(i);
141145
Object[] referenceTileInfo = referenceTiles_[j];
142-
System.out.format("(%d of %d) Checking reference tile %d\n", i, referenceTiles_.length, j);
146+
if (debug)
147+
System.out.format("(%d of %d) Checking reference tile %d\n", i, referenceTiles_.length, j);
143148
int zoom = (int) referenceTileInfo[0];
144149
int tilex = (int) referenceTileInfo[1];
145150
int tiley = (int) referenceTileInfo[2];

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,9 @@ public static Collection<Object[]> getParameters() throws IOException {
5353

5454
@Rule public JOSMTestRules test = new JOSMTestRules().main().preferences().timeout(20000);
5555

56-
protected void initQuadTreeMeta() {
57-
this.quadTreeMeta = new QuadTreeMeta(this.tileSize, Color.PINK, 0.5, true);
58-
}
59-
6056
public QuadTreeMetaAutoOptimizeTest(int scenarioIndex_, int batchSize_, int pauseMS_)
6157
throws IOException {
62-
super(scenarioIndex_, null, null);
58+
super(scenarioIndex_, null, null, true);
6359
this.batchSize = batchSize_;
6460
this.pauseMS = pauseMS_;
6561
}

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919

2020
@RunWith(Parameterized.class)
2121
public class QuadTreeMetaClearOrderTest extends BaseQuadTreeMetaTest {
22+
/* change to true to get debug output in commandline */
23+
Boolean debug = false;
2224
private static final int seenRectVariants = 8;
2325
private static final int referenceTileVariants = 2;
2426

@@ -53,7 +55,7 @@ public static Collection<Object[]> getParameters() throws IOException {
5355

5456
public QuadTreeMetaClearOrderTest(int scenarioIndex_, Integer seenRectOrderSeed_, Integer referenceTileOrderSeed_)
5557
throws IOException {
56-
super(scenarioIndex_, seenRectOrderSeed_, referenceTileOrderSeed_);
58+
super(scenarioIndex_, seenRectOrderSeed_, referenceTileOrderSeed_, false);
5759
}
5860

5961
@Test(timeout = 10000)
@@ -71,6 +73,7 @@ public void testClearUnseen()
7173
try {
7274
Thread.sleep(10);
7375
} catch (InterruptedException e2) {
76+
System.out.format("interrupted\n");
7477
}
7578
// then retry
7679
}
@@ -89,7 +92,8 @@ public void testClearUnseen()
8992

9093
byte[] blankMaskBytes = getRefMaskBytes(this.quadTreeMeta, false);
9194
for (int i = 0; i < maskFutures.size(); i++) {
92-
System.out.format("(%d of %d) Checking reference tile %d\n", i, this.referenceTiles.length, i);
95+
if (debug)
96+
System.out.format("(%d of %d) Checking reference tile %d\n", i, this.referenceTiles.length, i);
9397
byte[] resultMaskBytes = getRefMaskBytes(this.quadTreeMeta, maskFutures.get(i).get());
9498
try {
9599
assertArrayEquals(

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818

1919
@RunWith(Parameterized.class)
2020
public class QuadTreeMetaReferenceTileOrderTest extends BaseQuadTreeMetaTest {
21+
/* change to true to get debug output in commandline */
22+
Boolean debug = false;
23+
2124
private static final int seenRectVariants = 8;
2225
private static final int referenceTileVariants = 2;
2326

@@ -52,7 +55,7 @@ public static Collection<Object[]> getParameters() throws IOException {
5255

5356
public QuadTreeMetaReferenceTileOrderTest(int scenarioIndex_, Integer seenRectOrderSeed_, Integer referenceTileOrderSeed_)
5457
throws IOException {
55-
super(scenarioIndex_, seenRectOrderSeed_, referenceTileOrderSeed_);
58+
super(scenarioIndex_, seenRectOrderSeed_, referenceTileOrderSeed_, false);
5659
}
5760

5861
@Test(timeout = 10000)
@@ -95,7 +98,8 @@ public void test()
9598
);
9699

97100
for (int i = 0; i < maskFutures2.size(); i++) {
98-
System.out.format("(%d of %d) Cross-checking reference tile %d\n", i, this.referenceTiles.length, i);
101+
if (debug)
102+
System.out.format("(%d of %d) Cross-checking reference tile %d\n", i, this.referenceTiles.length, i);
99103
byte[] secondMask = getRefMaskBytes(this.quadTreeMeta, maskFutures2.get(i).get());
100104
try {
101105
assertArrayEquals(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public static Collection<Object[]> getParameters() throws IOException {
3636

3737
public QuadTreeMetaSeenRectOrderTest(int scenarioIndex_, Integer seenRectOrderSeed_, Integer referenceTileOrderSeed_)
3838
throws IOException {
39-
super(scenarioIndex_, seenRectOrderSeed_, referenceTileOrderSeed_);
39+
super(scenarioIndex_, seenRectOrderSeed_, referenceTileOrderSeed_, false);
4040
}
4141

4242
@Test(timeout = 10000)

0 commit comments

Comments
 (0)