Skip to content

Commit bc257ff

Browse files
easbareasbar
committed
Reduce code duplication in AbstractGraphStorageTester
1 parent 4cbba82 commit bc257ff

File tree

2 files changed

+88
-80
lines changed

2 files changed

+88
-80
lines changed

‎core/src/main/java/com/graphhopper/routing/ch/PrepareCHGraph.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
package com.graphhopper.routing.ch;
2020

2121
import com.graphhopper.routing.util.AllCHEdgesIterator;
22-
import com.graphhopper.routing.util.FlagEncoder;
2322
import com.graphhopper.routing.weighting.TurnWeighting;
2423
import com.graphhopper.routing.weighting.Weighting;
2524
import com.graphhopper.storage.CHGraph;
@@ -33,7 +32,6 @@ public class PrepareCHGraph {
3332
private final CHGraph chGraph;
3433
private final Weighting weighting;
3534
private final TurnWeighting turnWeighting;
36-
private final FlagEncoder encoder;
3735

3836
public static PrepareCHGraph nodeBased(CHGraph chGraph, Weighting weighting) {
3937
if (chGraph.getCHProfile().isEdgeBased()) {
@@ -51,7 +49,6 @@ public static PrepareCHGraph edgeBased(CHGraph chGraph, Weighting weighting, Tur
5149

5250
private PrepareCHGraph(CHGraph chGraph, Weighting weighting, TurnWeighting turnWeighting) {
5351
this.chGraph = chGraph;
54-
this.encoder = weighting.getFlagEncoder();
5552
this.weighting = weighting;
5653
this.turnWeighting = turnWeighting;
5754
}

‎core/src/test/java/com/graphhopper/storage/AbstractGraphStorageTester.java

Lines changed: 88 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@
2929
import java.io.Closeable;
3030
import java.io.File;
3131
import java.util.ArrayList;
32-
import java.util.Arrays;
33-
import java.util.Collections;
3432
import java.util.List;
3533

3634
import static com.graphhopper.routing.util.EncodingManager.getKey;
@@ -137,7 +135,7 @@ public void testSetNodes() {
137135
}
138136
graph.edge(defaultSize + 1, defaultSize + 2, 10, true);
139137
graph.edge(defaultSize + 1, defaultSize + 3, 10, true);
140-
assertEquals(2, GHUtility.count(carAllExplorer.setBaseNode(defaultSize + 1)));
138+
assertEquals(2, getCountAll(defaultSize + 1));
141139
}
142140

143141
@Test
@@ -151,22 +149,22 @@ public void testPropertiesWithNoInit() {
151149
public void testCreateLocation() {
152150
graph = createGHStorage();
153151
graph.edge(3, 1, 50, true);
154-
assertEquals(1, count(carOutExplorer.setBaseNode(1)));
152+
assertEquals(1, getCountOut(1));
155153

156154
graph.edge(1, 2, 100, true);
157-
assertEquals(2, count(carOutExplorer.setBaseNode(1)));
155+
assertEquals(2, getCountOut(1));
158156
}
159157

160158
@Test
161159
public void testEdges() {
162160
graph = createGHStorage();
163161
graph.edge(2, 1, 12, true);
164-
assertEquals(1, count(carOutExplorer.setBaseNode(2)));
162+
assertEquals(1, getCountOut(2));
165163

166164
graph.edge(2, 3, 12, true);
167-
assertEquals(1, count(carOutExplorer.setBaseNode(1)));
168-
assertEquals(2, count(carOutExplorer.setBaseNode(2)));
169-
assertEquals(1, count(carOutExplorer.setBaseNode(3)));
165+
assertEquals(1, getCountOut(1));
166+
assertEquals(2, getCountOut(2));
167+
assertEquals(1, getCountOut(3));
170168
}
171169

172170
@Test
@@ -181,13 +179,13 @@ public void testUnidirectional() {
181179
EdgeIterator i = carOutExplorer.setBaseNode(2);
182180
assertFalse(i.next());
183181

184-
assertEquals(1, GHUtility.count(carInExplorer.setBaseNode(1)));
185-
assertEquals(2, GHUtility.count(carInExplorer.setBaseNode(2)));
186-
assertEquals(0, GHUtility.count(carInExplorer.setBaseNode(3)));
182+
assertEquals(1, getCountIn(1));
183+
assertEquals(2, getCountIn(2));
184+
assertEquals(0, getCountIn(3));
187185

188-
assertEquals(3, GHUtility.count(carOutExplorer.setBaseNode(1)));
189-
assertEquals(0, GHUtility.count(carOutExplorer.setBaseNode(2)));
190-
assertEquals(1, GHUtility.count(carOutExplorer.setBaseNode(3)));
186+
assertEquals(3, getCountOut(1));
187+
assertEquals(0, getCountOut(2));
188+
assertEquals(1, getCountOut(3));
191189
i = carOutExplorer.setBaseNode(3);
192190
i.next();
193191
assertEquals(2, i.getAdjNode());
@@ -214,15 +212,15 @@ public void testUnidirectionalEdgeFilter() {
214212
EdgeIterator i = carOutExplorer.setBaseNode(2);
215213
assertFalse(i.next());
216214

217-
assertEquals(4, GHUtility.count(carAllExplorer.setBaseNode(1)));
215+
assertEquals(4, getCountAll(1));
218216

219-
assertEquals(1, GHUtility.count(carInExplorer.setBaseNode(1)));
220-
assertEquals(2, GHUtility.count(carInExplorer.setBaseNode(2)));
221-
assertEquals(0, GHUtility.count(carInExplorer.setBaseNode(3)));
217+
assertEquals(1, getCountIn(1));
218+
assertEquals(2, getCountIn(2));
219+
assertEquals(0, getCountIn(3));
222220

223-
assertEquals(3, GHUtility.count(carOutExplorer.setBaseNode(1)));
224-
assertEquals(0, GHUtility.count(carOutExplorer.setBaseNode(2)));
225-
assertEquals(1, GHUtility.count(carOutExplorer.setBaseNode(3)));
221+
assertEquals(3, getCountOut(1));
222+
assertEquals(0, getCountOut(2));
223+
assertEquals(1, getCountOut(3));
226224
i = carOutExplorer.setBaseNode(3);
227225
i.next();
228226
assertEquals(2, i.getAdjNode());
@@ -273,7 +271,7 @@ public void testClone() {
273271

274272
Graph cloneGraph = graph.copyTo(AbstractGraphStorageTester.this.createGHStorage(locationParent + "/clone", false));
275273
assertEquals(graph.getNodes(), cloneGraph.getNodes());
276-
assertEquals(count(carOutExplorer.setBaseNode(1)), count(cloneGraph.createEdgeExplorer(carOutFilter).setBaseNode(1)));
274+
assertEquals(getCountOut(1), count(cloneGraph.createEdgeExplorer(carOutFilter).setBaseNode(1)));
277275
cloneGraph.edge(1, 4, 10, true);
278276
assertEquals(3, count(cloneGraph.createEdgeExplorer(carOutFilter).setBaseNode(1)));
279277
assertEquals(graph.getBounds(), cloneGraph.getBounds());
@@ -306,7 +304,7 @@ public void testGetLocations() {
306304

307305
graph.edge(0, 2, 10, true);
308306
assertEquals(3, graph.getNodes());
309-
Helper.close((Closeable) graph);
307+
Helper.close(graph);
310308

311309
graph = createGHStorage();
312310
assertEquals(0, graph.getNodes());
@@ -366,7 +364,7 @@ private void checkExampleGraph(Graph graph) {
366364
assertEquals(GHUtility.asSet(0), GHUtility.getNeighbors(carOutExplorer.setBaseNode((1))));
367365
assertEquals(GHUtility.asSet(5, 4, 3, 2, 1), GHUtility.getNeighbors(carOutExplorer.setBaseNode(0)));
368366
try {
369-
assertEquals(0, count(carOutExplorer.setBaseNode(6)));
367+
assertEquals(0, getCountOut(6));
370368
// for now return empty iterator
371369
// assertFalse(true);
372370
} catch (Exception ex) {
@@ -382,66 +380,67 @@ public void testDirectional() {
382380
graph.edge(3, 5, 12, true);
383381
graph.edge(6, 3, 12, false);
384382

385-
assertEquals(1, count(carAllExplorer.setBaseNode(1)));
386-
assertEquals(1, count(carInExplorer.setBaseNode(1)));
387-
assertEquals(1, count(carOutExplorer.setBaseNode(1)));
383+
assertEquals(1, getCountAll(1));
384+
assertEquals(1, getCountIn(1));
385+
assertEquals(1, getCountOut(1));
388386

389-
assertEquals(2, count(carAllExplorer.setBaseNode(2)));
390-
assertEquals(1, count(carInExplorer.setBaseNode(2)));
391-
assertEquals(2, count(carOutExplorer.setBaseNode(2)));
387+
assertEquals(2, getCountAll(2));
388+
assertEquals(1, getCountIn(2));
389+
assertEquals(2, getCountOut(2));
392390

393-
assertEquals(4, count(carAllExplorer.setBaseNode(3)));
394-
assertEquals(3, count(carInExplorer.setBaseNode(3)));
395-
assertEquals(2, count(carOutExplorer.setBaseNode(3)));
391+
assertEquals(4, getCountAll(3));
392+
assertEquals(3, getCountIn(3));
393+
assertEquals(2, getCountOut(3));
396394

397-
assertEquals(1, count(carAllExplorer.setBaseNode(4)));
398-
assertEquals(1, count(carInExplorer.setBaseNode(4)));
399-
assertEquals(0, count(carOutExplorer.setBaseNode(4)));
395+
assertEquals(1, getCountAll(4));
396+
assertEquals(1, getCountIn(4));
397+
assertEquals(0, getCountOut(4));
400398

401-
assertEquals(1, count(carAllExplorer.setBaseNode(5)));
402-
assertEquals(1, count(carInExplorer.setBaseNode(5)));
403-
assertEquals(1, count(carOutExplorer.setBaseNode(5)));
399+
assertEquals(1, getCountAll(5));
400+
assertEquals(1, getCountIn(5));
401+
assertEquals(1, getCountOut(5));
404402
}
405403

406404
@Test
407405
public void testDozendEdges() {
408406
graph = createGHStorage();
409407
graph.edge(1, 2, 12, true);
410-
assertEquals(1, count(carAllExplorer.setBaseNode(1)));
408+
int nn = 1;
409+
assertEquals(1, getCountAll(nn));
411410

412411
graph.edge(1, 3, 13, false);
413-
assertEquals(2, count(carAllExplorer.setBaseNode(1)));
412+
assertEquals(2, getCountAll(1));
414413

415414
graph.edge(1, 4, 14, false);
416-
assertEquals(3, count(carAllExplorer.setBaseNode(1)));
415+
assertEquals(3, getCountAll(1));
417416

418417
graph.edge(1, 5, 15, false);
419-
assertEquals(4, count(carAllExplorer.setBaseNode(1)));
418+
assertEquals(4, getCountAll(1));
420419

421420
graph.edge(1, 6, 16, false);
422-
assertEquals(5, count(carAllExplorer.setBaseNode(1)));
421+
assertEquals(5, getCountAll(1));
423422

424423
graph.edge(1, 7, 16, false);
425-
assertEquals(6, count(carAllExplorer.setBaseNode(1)));
424+
assertEquals(6, getCountAll(1));
426425

427426
graph.edge(1, 8, 16, false);
428-
assertEquals(7, count(carAllExplorer.setBaseNode(1)));
427+
assertEquals(7, getCountAll(1));
429428

430429
graph.edge(1, 9, 16, false);
431-
assertEquals(8, count(carAllExplorer.setBaseNode(1)));
432-
assertEquals(8, count(carOutExplorer.setBaseNode(1)));
430+
assertEquals(8, getCountAll(1));
431+
assertEquals(8, getCountOut(1));
433432

434-
assertEquals(1, count(carInExplorer.setBaseNode(1)));
435-
assertEquals(1, count(carInExplorer.setBaseNode(2)));
433+
assertEquals(1, getCountIn(1));
434+
assertEquals(1, getCountIn(2));
436435
}
437436

438437
@Test
439438
public void testCheckFirstNode() {
440439
graph = createGHStorage();
441440

442-
assertEquals(0, count(carAllExplorer.setBaseNode(1)));
441+
assertEquals(0, getCountAll(1));
443442
graph.edge(0, 1, 12, true);
444-
assertEquals(1, count(carAllExplorer.setBaseNode(1)));
443+
assertEquals(1, getCountAll(1));
445444
}
446445

447446
@Test
@@ -462,17 +461,17 @@ public void testDeleteNodeForUnidir() {
462461
graph.optimize();
463462
assertEquals(20, graph.getNodes());
464463

465-
assertEquals(1, GHUtility.count(carInExplorer.setBaseNode(getIdOf(graph, 20))));
466-
assertEquals(0, GHUtility.count(carOutExplorer.setBaseNode(getIdOf(graph, 20))));
464+
assertEquals(1, getCountIn(getIdOf(graph, 20)));
465+
assertEquals(0, getCountOut(getIdOf(graph, 20)));
467466

468-
assertEquals(1, GHUtility.count(carOutExplorer.setBaseNode(getIdOf(graph, 10))));
469-
assertEquals(0, GHUtility.count(carInExplorer.setBaseNode(getIdOf(graph, 10))));
467+
assertEquals(1, getCountOut(getIdOf(graph, 10)));
468+
assertEquals(0, getCountIn(getIdOf(graph, 10)));
470469

471-
assertEquals(1, GHUtility.count(carInExplorer.setBaseNode(getIdOf(graph, 6))));
472-
assertEquals(0, GHUtility.count(carOutExplorer.setBaseNode(getIdOf(graph, 6))));
470+
assertEquals(1, getCountIn(getIdOf(graph, 6)));
471+
assertEquals(0, getCountOut(getIdOf(graph, 6)));
473472

474-
assertEquals(1, GHUtility.count(carOutExplorer.setBaseNode(getIdOf(graph, 21))));
475-
assertEquals(0, GHUtility.count(carInExplorer.setBaseNode(getIdOf(graph, 21))));
473+
assertEquals(1, getCountOut(getIdOf(graph, 21)));
474+
assertEquals(0, getCountIn(getIdOf(graph, 21)));
476475
}
477476

478477
@Test
@@ -522,12 +521,12 @@ public void testDeleteNodes(int fillToSize) {
522521
// no deletion happend
523522
assertEquals(fillToSize, graph.getNodes());
524523

525-
assertEquals(Collections.<String>emptyList(), GHUtility.getProblems(graph));
524+
assertTrue(GHUtility.getProblems(graph).isEmpty());
526525

527526
// now actually perform deletion
528527
graph.optimize();
529528

530-
assertEquals(Collections.<String>emptyList(), GHUtility.getProblems(graph));
529+
assertTrue(GHUtility.getProblems(graph).isEmpty());
531530

532531
assertEquals(fillToSize - deleted, graph.getNodes());
533532
int id1 = getIdOf(graph, 38.33f);
@@ -567,17 +566,17 @@ public void testSimpleDelete() {
567566
graph.markNodeRemoved(3);
568567

569568
assertEquals(6, graph.getNodes());
570-
assertEquals(Collections.<String>emptyList(), GHUtility.getProblems(graph));
569+
assertTrue(GHUtility.getProblems(graph).isEmpty());
571570

572571
// now actually perform deletion
573572
graph.optimize();
574573

575574
assertEquals(4, graph.getNodes());
576-
assertEquals(Collections.<String>emptyList(), GHUtility.getProblems(graph));
575+
assertTrue(GHUtility.getProblems(graph).isEmpty());
577576
// shouldn't change anything
578577
graph.optimize();
579578
assertEquals(4, graph.getNodes());
580-
assertEquals(Collections.<String>emptyList(), GHUtility.getProblems(graph));
579+
assertTrue(GHUtility.getProblems(graph).isEmpty());
581580
}
582581

583582
@Test
@@ -603,13 +602,13 @@ public void testSimpleDelete2() {
603602
graph.edge(9, 12, 912, true).setWayGeometry(pl);
604603

605604
assertEquals(13, graph.getNodes());
606-
assertEquals(Collections.<String>emptyList(), GHUtility.getProblems(graph));
605+
assertTrue(GHUtility.getProblems(graph).isEmpty());
607606

608607
// perform deletion
609608
graph.optimize();
610609

611610
assertEquals(11, graph.getNodes());
612-
assertEquals(Collections.<String>emptyList(), GHUtility.getProblems(graph));
611+
assertTrue(GHUtility.getProblems(graph).isEmpty());
613612

614613
int id11 = getIdOf(graph, 11); // is now 10
615614
int id12 = getIdOf(graph, 12); // is now 5
@@ -651,12 +650,12 @@ public void testSimpleDelete3() {
651650
// perform deletion
652651
graph.optimize();
653652

654-
assertEquals(Arrays.<String>asList(), GHUtility.getProblems(graph));
653+
assertTrue(GHUtility.getProblems(graph).isEmpty());
655654

656-
assertEquals(3, GHUtility.count(carAllExplorer.setBaseNode(getIdOf(graph, 9))));
657-
assertEquals(1, GHUtility.count(carAllExplorer.setBaseNode(getIdOf(graph, 7))));
658-
assertEquals(1, GHUtility.count(carAllExplorer.setBaseNode(getIdOf(graph, 8))));
659-
assertEquals(1, GHUtility.count(carAllExplorer.setBaseNode(getIdOf(graph, 11))));
655+
assertEquals(3, getCountAll(getIdOf(graph, 9)));
656+
assertEquals(1, getCountAll(getIdOf(graph, 7)));
657+
assertEquals(1, getCountAll(getIdOf(graph, 8)));
658+
assertEquals(1, getCountAll(getIdOf(graph, 11)));
660659
}
661660

662661
@Test
@@ -759,7 +758,7 @@ public void testCreateDuplicateEdges() {
759758
graph.edge(2, 1, 12, true);
760759
graph.edge(2, 3, 12, true);
761760
graph.edge(2, 3, 13, false);
762-
assertEquals(3, GHUtility.count(carOutExplorer.setBaseNode(2)));
761+
assertEquals(3, getCountOut(2));
763762

764763
// no exception
765764
graph.getEdgeIteratorState(1, 3);
@@ -791,22 +790,22 @@ public void testCreateDuplicateEdges() {
791790
assertTrue(oneIter.getReverse(carAccessEnc));
792791

793792
graph.edge(3, 2, 14, true);
794-
assertEquals(4, GHUtility.count(carOutExplorer.setBaseNode(2)));
793+
assertEquals(4, getCountOut(2));
795794
}
796795

797796
@Test
798797
public void testIdenticalNodes() {
799798
graph = createGHStorage();
800799
graph.edge(0, 0, 100, true);
801-
assertEquals(1, GHUtility.count(carAllExplorer.setBaseNode(0)));
800+
assertEquals(1, getCountAll(0));
802801
}
803802

804803
@Test
805804
public void testIdenticalNodes2() {
806805
graph = createGHStorage();
807806
graph.edge(0, 0, 100, false);
808807
graph.edge(0, 0, 100, false);
809-
assertEquals(2, GHUtility.count(carAllExplorer.setBaseNode(0)));
808+
assertEquals(2, getCountAll(0));
810809
}
811810

812811
@Test
@@ -1123,6 +1122,18 @@ public void testDetachEdge() {
11231122
assertEquals(edgeState20.getFlags(), edgeState33.detach(true).getFlags());
11241123
}
11251124

1125+
private int getCountOut(int node) {
1126+
return GHUtility.count(carOutExplorer.setBaseNode(node));
1127+
}
1128+
1129+
private int getCountIn(int node) {
1130+
return GHUtility.count(carInExplorer.setBaseNode(node));
1131+
}
1132+
1133+
private int getCountAll(int node) {
1134+
return GHUtility.count(carAllExplorer.setBaseNode(node));
1135+
}
1136+
11261137
static class TmpCarFlagEncoder extends CarFlagEncoder {
11271138
public TmpCarFlagEncoder(int speedBits, double speedFactor, int maxTurnCosts) {
11281139
super(speedBits, speedFactor, maxTurnCosts);

0 commit comments

Comments
 (0)