Skip to content

Commit 8aaa4d9

Browse files
committed
#470: rename all test names to postfix-convention
1 parent c72800c commit 8aaa4d9

28 files changed

+58
-60
lines changed

oshdb-api-ignite/src/test/java/org/heigit/ohsome/oshdb/api/tests/TestMapReduceOSHDBIgnite.java renamed to oshdb-api-ignite/src/test/java/org/heigit/ohsome/oshdb/api/tests/MapReduceTestOSHDBIgnite.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.heigit.ohsome.oshdb.util.CellId;
3030
import org.heigit.ohsome.oshdb.util.TableNames;
3131

32-
abstract class TestMapReduceOSHDBIgnite extends TestMapReduce {
32+
abstract class MapReduceTestOSHDBIgnite extends MapReduceTest {
3333
static final Ignite ignite;
3434

3535
static {
@@ -98,7 +98,7 @@ private static OSHDBDatabase initOshdb(Consumer<OSHDBIgnite> computeMode) {
9898
return oshdb;
9999
}
100100

101-
TestMapReduceOSHDBIgnite(Consumer<OSHDBIgnite> computeMode) throws Exception {
101+
MapReduceTestOSHDBIgnite(Consumer<OSHDBIgnite> computeMode) throws Exception {
102102
super(initOshdb(computeMode));
103103
}
104104
}
+2-2
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
*
1414
* <p>Runs the tests using the "affinity call" Ignite backend.</p>
1515
*/
16-
class TestMapReduceOSHDBIgniteAffinityCall extends TestMapReduceOSHDBIgnite {
16+
class MapReduceTestOSHDBIgniteAffinityCall extends MapReduceTestOSHDBIgnite {
1717
/**
1818
* Creates the test runner using the ignite affinitycall backend.
1919
*
2020
* @throws Exception if something goes wrong
2121
*/
22-
TestMapReduceOSHDBIgniteAffinityCall() throws Exception {
22+
MapReduceTestOSHDBIgniteAffinityCall() throws Exception {
2323
super(oshdb -> oshdb.computeMode(OSHDBIgnite.ComputeMode.AFFINITY_CALL));
2424
}
2525

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
*
88
* <p>Runs the tests using the "local peek" Ignite backend.</p>
99
*/
10-
class TestMapReduceOSHDBIgniteLocalPeek extends TestMapReduceOSHDBIgnite {
10+
class MapReduceTestOSHDBIgniteLocalPeek extends MapReduceTestOSHDBIgnite {
1111
/**
1212
* Creates the test runner using the ignite localpeak backend.
1313
*
1414
* @throws Exception if something goes wrong
1515
*/
16-
TestMapReduceOSHDBIgniteLocalPeek() throws Exception {
16+
MapReduceTestOSHDBIgniteLocalPeek() throws Exception {
1717
super(oshdb -> oshdb.computeMode(OSHDBIgnite.ComputeMode.LOCAL_PEEK));
1818
}
1919
}
+2-2
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
/**
99
* Tests for proper error messages is caches are not pnt on ignite.
1010
*/
11-
class TestMapReduceOSHDBIgniteMissingCache extends TestMapReduceOSHDBIgnite {
11+
class MapReduceTestOSHDBIgniteMissingCache extends MapReduceTestOSHDBIgnite {
1212
/**
1313
* Creates the test runner using an Ignite backend.
1414
*
1515
* @throws Exception if something goes wrong
1616
*/
17-
TestMapReduceOSHDBIgniteMissingCache() throws Exception {
17+
MapReduceTestOSHDBIgniteMissingCache() throws Exception {
1818
super(oshdb -> {});
1919
this.oshdb.prefix("<test caches not present>");
2020
}
+2-2
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
*
1111
* <p>Runs the tests using the "scan query" Ignite backend.</p>
1212
*/
13-
class TestMapReduceOSHDBIgniteScanQuery extends TestMapReduceOSHDBIgnite {
13+
class MapReduceTestOSHDBIgniteScanQuery extends MapReduceTestOSHDBIgnite {
1414
/**
1515
* Creates the test runner using the ignite scanquery backend.
1616
*
1717
* @throws Exception if something goes wrong
1818
*/
19-
TestMapReduceOSHDBIgniteScanQuery() throws Exception {
19+
MapReduceTestOSHDBIgniteScanQuery() throws Exception {
2020
super(oshdb -> oshdb.computeMode(OSHDBIgnite.ComputeMode.SCAN_QUERY));
2121
}
2222

oshdb-api/src/test/java/org/heigit/ohsome/oshdb/api/tests/TestCollect.java renamed to oshdb-api/src/test/java/org/heigit/ohsome/oshdb/api/tests/CollectTest.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import static org.junit.jupiter.api.Assertions.assertEquals;
44

55
import com.google.common.collect.Iterables;
6-
import java.nio.file.Path;
76
import java.util.Collections;
87
import java.util.List;
98
import java.util.SortedMap;
@@ -21,15 +20,15 @@
2120
/**
2221
* Tests the collect method of the OSHDB API.
2322
*/
24-
class TestCollect {
23+
class CollectTest {
2524
private final OSHDBDatabase oshdb;
2625

2726
private final OSHDBBoundingBox bbox =
2827
OSHDBBoundingBox.bboxWgs84Coordinates(8.651133, 49.387611, 8.6561, 49.390513);
2928
private final OSHDBTimestamps timestamps72 = new OSHDBTimestamps("2010-01-01", "2015-12-01",
3029
OSHDBTimestamps.Interval.MONTHLY);
3130

32-
TestCollect() {
31+
CollectTest() {
3332
oshdb = new OSHDBH2("../data/test-data");
3433
}
3534

oshdb-api/src/test/java/org/heigit/ohsome/oshdb/api/tests/TestFlatMapAggregateGroupedByEntity.java renamed to oshdb-api/src/test/java/org/heigit/ohsome/oshdb/api/tests/FlatMapAggregateGroupedByEntityTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
/**
2222
* Test flat map method with groupByEntity of the MapAggregator class of the OSHDB API.
2323
*/
24-
class TestFlatMapAggregateGroupedByEntity {
24+
class FlatMapAggregateGroupedByEntityTest {
2525
private final OSHDBDatabase oshdb;
2626

2727
private final OSHDBBoundingBox bbox = bboxWgs84Coordinates(8.0, 49.0, 9.0, 50.0);
@@ -30,7 +30,7 @@ class TestFlatMapAggregateGroupedByEntity {
3030

3131
private static final double DELTA = 1e-8;
3232

33-
TestFlatMapAggregateGroupedByEntity() throws Exception {
33+
FlatMapAggregateGroupedByEntityTest() throws Exception {
3434
oshdb = new OSHDBH2("../data/test-data");
3535
}
3636

oshdb-api/src/test/java/org/heigit/ohsome/oshdb/api/tests/TestFlatMapAggregate.java renamed to oshdb-api/src/test/java/org/heigit/ohsome/oshdb/api/tests/FlatMapAggregateTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
/**
2424
* Test flat map method of the MapAggregator class of the OSHDB API.
2525
*/
26-
class TestFlatMapAggregate {
26+
class FlatMapAggregateTest {
2727
private final OSHDBDatabase oshdb;
2828

2929
private final OSHDBBoundingBox bbox = bboxWgs84Coordinates(8.0, 49.0, 9.0, 50.0);
@@ -32,7 +32,7 @@ class TestFlatMapAggregate {
3232

3333
private static final double DELTA = 1e-8;
3434

35-
TestFlatMapAggregate() throws Exception {
35+
FlatMapAggregateTest() throws Exception {
3636
oshdb = new OSHDBH2("../data/test-data");
3737
}
3838

Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
*
88
* <p>Runs the tests using the multithreaded H2 backend.</p>
99
*/
10-
class TestFlatMapReduceGroupedByEntityOSHDBH2Multithread extends
11-
TestFlatMapReduceGroupedByEntity {
10+
class FlatMapReduceGroupedByEntityOSHDBH2MultithreadTest extends
11+
FlatMapReduceGroupedByEntityTest {
1212
/**
1313
* Creates the test runner using the multithreaded H2 backend.
1414
*
1515
* @throws Exception if something goes wrong
1616
*/
17-
TestFlatMapReduceGroupedByEntityOSHDBH2Multithread() throws Exception {
17+
FlatMapReduceGroupedByEntityOSHDBH2MultithreadTest() throws Exception {
1818
super(
1919
(new OSHDBH2("../data/test-data")).multithreading(true)
2020
);
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
*
88
* <p>Runs the tests using the singlethreaded H2 backend.</p>
99
*/
10-
class TestFlatMapReduceGroupedByEntityOSHDBH2Singlethread extends
11-
TestFlatMapReduceGroupedByEntity {
10+
class FlatMapReduceGroupedByEntityOSHDBH2SinglethreadTest extends
11+
FlatMapReduceGroupedByEntityTest {
1212
/**
1313
* Creates the test runner using the singlethreaded "dummy" H2 backend.
1414
*
1515
* @throws Exception if something goes wrong
1616
*/
17-
TestFlatMapReduceGroupedByEntityOSHDBH2Singlethread() throws Exception {
17+
FlatMapReduceGroupedByEntityOSHDBH2SinglethreadTest() throws Exception {
1818
super(
1919
(new OSHDBH2("../data/test-data")).multithreading(false)
2020
);

oshdb-api/src/test/java/org/heigit/ohsome/oshdb/api/tests/TestFlatMapReduceGroupedByEntity.java renamed to oshdb-api/src/test/java/org/heigit/ohsome/oshdb/api/tests/FlatMapReduceGroupedByEntityTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
/**
2020
* Test flatMap method with groupByEntity of the MapReducer class of the OSHDB API.
2121
*/
22-
abstract class TestFlatMapReduceGroupedByEntity {
22+
abstract class FlatMapReduceGroupedByEntityTest {
2323
private final OSHDBDatabase oshdb;
2424

2525
private final OSHDBBoundingBox bbox = bboxWgs84Coordinates(8.0, 49.0, 9.0, 50.0);
@@ -28,7 +28,7 @@ abstract class TestFlatMapReduceGroupedByEntity {
2828
private final OSHDBTimestamps timestamps72 = new OSHDBTimestamps("2010-01-01", "2015-12-01",
2929
OSHDBTimestamps.Interval.MONTHLY);
3030

31-
TestFlatMapReduceGroupedByEntity(OSHDBDatabase oshdb) throws Exception {
31+
FlatMapReduceGroupedByEntityTest(OSHDBDatabase oshdb) throws Exception {
3232
this.oshdb = oshdb;
3333
}
3434

oshdb-api/src/test/java/org/heigit/ohsome/oshdb/api/tests/TestFlatMapReduce.java renamed to oshdb-api/src/test/java/org/heigit/ohsome/oshdb/api/tests/FlatMapReduceTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@
2323
/**
2424
* Test flat map method of the MapReducer class of the OSHDB API.
2525
*/
26-
class TestFlatMapReduce {
26+
class FlatMapReduceTest {
2727
private final OSHDBDatabase oshdb;
2828

2929
private final OSHDBBoundingBox bbox = bboxWgs84Coordinates(8.0, 49.0, 9.0, 50.0);
3030
private final OSHDBTimestamps timestamps72 = new OSHDBTimestamps("2010-01-01", "2015-12-01",
3131
OSHDBTimestamps.Interval.MONTHLY);
3232

33-
TestFlatMapReduce() throws Exception {
33+
FlatMapReduceTest() throws Exception {
3434
oshdb = new OSHDBH2("../data/test-data");
3535
}
3636

oshdb-api/src/test/java/org/heigit/ohsome/oshdb/api/tests/TestForEach.java renamed to oshdb-api/src/test/java/org/heigit/ohsome/oshdb/api/tests/ForEachTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
/**
1616
* Test forEach method of the OSHDB API.
1717
*/
18-
class TestForEach {
18+
class ForEachTest {
1919
private final OSHDBDatabase oshdb;
2020

2121
private final OSHDBBoundingBox bbox =
2222
OSHDBBoundingBox.bboxWgs84Coordinates(8.651133, 49.387611, 8.6561, 49.390513);
2323
private final OSHDBTimestamps timestamps72 = new OSHDBTimestamps("2010-01-01", "2015-12-01",
2424
OSHDBTimestamps.Interval.MONTHLY);
2525

26-
TestForEach() throws Exception {
26+
ForEachTest() throws Exception {
2727
oshdb = new OSHDBH2("../data/test-data");
2828
}
2929

oshdb-api/src/test/java/org/heigit/ohsome/oshdb/api/tests/TestHelpersOSMContributionView.java renamed to oshdb-api/src/test/java/org/heigit/ohsome/oshdb/api/tests/HelpersOSMContributionViewTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
/**
2222
* Test special reducers of the OSHDB API when using the contribution view.
2323
*/
24-
class TestHelpersOSMContributionView {
24+
class HelpersOSMContributionViewTest {
2525
private final OSHDBDatabase oshdb;
2626

2727
private final OSHDBBoundingBox bbox =
@@ -32,7 +32,7 @@ class TestHelpersOSMContributionView {
3232

3333
private static final double DELTA = 1e-8;
3434

35-
TestHelpersOSMContributionView() throws Exception {
35+
HelpersOSMContributionViewTest() throws Exception {
3636
oshdb = new OSHDBH2("../data/test-data");
3737
}
3838

oshdb-api/src/test/java/org/heigit/ohsome/oshdb/api/tests/TestHelpersOSMEntitySnapshotView.java renamed to oshdb-api/src/test/java/org/heigit/ohsome/oshdb/api/tests/HelpersOSMEntitySnapshotViewTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
/**
1919
* Test special reducers of the OSHDB API when using the contribution view.
2020
*/
21-
class TestHelpersOSMEntitySnapshotView {
21+
class HelpersOSMEntitySnapshotViewTest {
2222
private final OSHDBDatabase oshdb;
2323

2424
private final OSHDBBoundingBox bbox =
@@ -29,7 +29,7 @@ class TestHelpersOSMEntitySnapshotView {
2929

3030
private static final double DELTA = 1e-8;
3131

32-
TestHelpersOSMEntitySnapshotView() throws Exception {
32+
HelpersOSMEntitySnapshotViewTest() throws Exception {
3333
oshdb = new OSHDBH2("../data/test-data");
3434
}
3535

oshdb-api/src/test/java/org/heigit/ohsome/oshdb/api/tests/TestLambdaFilter.java renamed to oshdb-api/src/test/java/org/heigit/ohsome/oshdb/api/tests/LambdaFilterTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
/**
1919
* Tests lambda functions as filters.
2020
*/
21-
class TestLambdaFilter {
21+
class LambdaFilterTest {
2222
private final OSHDBDatabase oshdb;
2323

2424
private final OSHDBBoundingBox bbox = bboxWgs84Coordinates(8.0, 49.0, 9.0, 50.0);
@@ -27,7 +27,7 @@ class TestLambdaFilter {
2727

2828
private static final double DELTA = 1e-8;
2929

30-
TestLambdaFilter() throws Exception {
30+
LambdaFilterTest() throws Exception {
3131
oshdb = new OSHDBH2("../data/test-data");
3232
}
3333

oshdb-api/src/test/java/org/heigit/ohsome/oshdb/api/tests/TestMapAggregateByGeometry.java renamed to oshdb-api/src/test/java/org/heigit/ohsome/oshdb/api/tests/MapAggregateByGeometryTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
/**
3131
* Test aggregateByGeometry method of the OSHDB API.
3232
*/
33-
class TestMapAggregateByGeometry {
33+
class MapAggregateByGeometryTest {
3434
private final OSHDBDatabase oshdb;
3535

3636
private final OSHDBBoundingBox bbox = bboxWgs84Coordinates(8.0, 49.0, 9.0, 50.0);
@@ -39,7 +39,7 @@ class TestMapAggregateByGeometry {
3939

4040
private static final double DELTA = 1e-4;
4141

42-
TestMapAggregateByGeometry() throws Exception {
42+
MapAggregateByGeometryTest() throws Exception {
4343
oshdb = new OSHDBH2("../data/test-data");
4444
}
4545

oshdb-api/src/test/java/org/heigit/ohsome/oshdb/api/tests/TestMapAggregateByIndex.java renamed to oshdb-api/src/test/java/org/heigit/ohsome/oshdb/api/tests/MapAggregateByIndexTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
/**
2424
* Test aggregate by custom index method of the OSHDB API.
2525
*/
26-
class TestMapAggregateByIndex {
26+
class MapAggregateByIndexTest {
2727
private final OSHDBDatabase oshdb;
2828

2929
private final OSHDBBoundingBox bbox = bboxWgs84Coordinates(8.0, 49.0, 9.0, 50.0);
@@ -34,7 +34,7 @@ class TestMapAggregateByIndex {
3434

3535
private static final double DELTA = 1e-8;
3636

37-
TestMapAggregateByIndex() throws Exception {
37+
MapAggregateByIndexTest() throws Exception {
3838
oshdb = new OSHDBH2("../data/test-data");
3939
}
4040

oshdb-api/src/test/java/org/heigit/ohsome/oshdb/api/tests/TestMapAggregateByTimestamp.java renamed to oshdb-api/src/test/java/org/heigit/ohsome/oshdb/api/tests/MapAggregateByTimestampTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
/**
2525
* Test aggregateByTimestamp method of the OSHDB API.
2626
*/
27-
class TestMapAggregateByTimestamp {
27+
class MapAggregateByTimestampTest {
2828
private final OSHDBDatabase oshdb;
2929

3030
private final OSHDBBoundingBox bbox =
@@ -34,7 +34,7 @@ class TestMapAggregateByTimestamp {
3434
private final OSHDBTimestamps timestamps72 = new OSHDBTimestamps("2010-01-01", "2015-12-01",
3535
OSHDBTimestamps.Interval.MONTHLY);
3636

37-
TestMapAggregateByTimestamp() throws Exception {
37+
MapAggregateByTimestampTest() throws Exception {
3838
oshdb = new OSHDBH2("../data/test-data");
3939
}
4040

oshdb-api/src/test/java/org/heigit/ohsome/oshdb/api/tests/TestMapReduceOSHDBH2Multithread.java renamed to oshdb-api/src/test/java/org/heigit/ohsome/oshdb/api/tests/MapReduceOSHDBH2MultithreadTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
*
88
* <p>Runs the tests using the multithreaded H2 backend.</p>
99
*/
10-
class TestMapReduceOSHDBH2Multithread extends TestMapReduce {
10+
class MapReduceOSHDBH2MultithreadTest extends MapReduceTest {
1111
/**
1212
* Creates the test runner using the multithreaded H2 backend.
1313
*
1414
* @throws Exception if something goes wrong
1515
*/
16-
TestMapReduceOSHDBH2Multithread() throws Exception {
16+
MapReduceOSHDBH2MultithreadTest() throws Exception {
1717
super(
1818
(new OSHDBH2("../data/test-data")).multithreading(true)
1919
);

oshdb-api/src/test/java/org/heigit/ohsome/oshdb/api/tests/TestMapReduceOSHDBH2Singlethread.java renamed to oshdb-api/src/test/java/org/heigit/ohsome/oshdb/api/tests/MapReduceOSHDBH2SinglethreadTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
*
88
* <p>Runs the tests using the singlethreaded H2 backend.</p>
99
*/
10-
class TestMapReduceOSHDBH2Singlethread extends TestMapReduce {
10+
class MapReduceOSHDBH2SinglethreadTest extends MapReduceTest {
1111
/**
1212
* Creates the test runner using the singlethreaded "dummy" H2 backend.
1313
*
1414
* @throws Exception if something goes wrong
1515
*/
16-
TestMapReduceOSHDBH2Singlethread() throws Exception {
16+
MapReduceOSHDBH2SinglethreadTest() throws Exception {
1717
super(
1818
(new OSHDBH2("../data/test-data")).multithreading(false)
1919
);

oshdb-api/src/test/java/org/heigit/ohsome/oshdb/api/tests/TestMapReduceOSHDBJdbcMissingTables.java renamed to oshdb-api/src/test/java/org/heigit/ohsome/oshdb/api/tests/MapReduceOSHDBJdbcMissingTablesTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
/**
1010
* Tests for proper error messages if tables are not present on H2.
1111
*/
12-
class TestMapReduceOSHDBJdbcMissingTables extends TestMapReduce {
12+
class MapReduceOSHDBJdbcMissingTablesTest extends MapReduceTest {
1313
/**
1414
* Creates the test runner using an H2 backend.
1515
*
1616
* @throws Exception if something goes wrong
1717
*/
18-
TestMapReduceOSHDBJdbcMissingTables() throws Exception {
18+
MapReduceOSHDBJdbcMissingTablesTest() throws Exception {
1919
super((new OSHDBH2("../data/test-data"))
2020
.prefix("<test tables not present>")
2121
);

0 commit comments

Comments
 (0)