Changeset 13765 in josm

Timestamp:

2018-05-14T03:49:36+02:00 (7 years ago)

Author:

Don-vip

Message:

fix unit tests, PMD violation

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/osm/DataSet.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/osm/QuadBucketsTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -515 +515 @@
     }
 
-    protected void removePrimitive(OsmPrimitive primitive) {
+    void removePrimitive(OsmPrimitive primitive) {
         checkModifiable();
         beginUpdate();

trunk/test/unit/org/openstreetmap/josm/data/osm/QuadBucketsTest.java

@@ -43 +43 @@
         List<Relation> allRelations = new ArrayList<>(ds.getRelations());
 
-        QuadBuckets<Node> nodes = Reflection.field("nodes").ofType(new TypeRef<QuadBuckets<Node>>() {}).in(ds).get();
-        QuadBuckets<Way> ways = Reflection.field("ways").ofType(new TypeRef<QuadBuckets<Way>>() {}).in(ds).get();
-        Collection<Relation> relations = Reflection.field("relations").ofType(new TypeRef<Collection<Relation>>() {}).in(ds).get();
+        QuadBucketPrimitiveStore<Node, Way, Relation> s = Reflection.field("store").ofType(
+                new TypeRef<QuadBucketPrimitiveStore<Node, Way, Relation>>() {}).in(ds).get();
+        QuadBuckets<Node> nodes = Reflection.field("nodes").ofType(new TypeRef<QuadBuckets<Node>>() {}).in(s).get();
+        QuadBuckets<Way> ways = Reflection.field("ways").ofType(new TypeRef<QuadBuckets<Way>>() {}).in(s).get();
+        Collection<Relation> relations = Reflection.field("relations").ofType(new TypeRef<Collection<Relation>>() {}).in(s).get();
 
         int expectedCount = allNodes.size();