Changeset 14092 in josm for trunk/test/unit/org/openstreetmap/josm/data/osm/QuadBucketsTest.java

Timestamp:

2018-08-05T20:53:19+02:00 (6 years ago)

Author:

Don-vip

Message:

drop FEST library. This project seems to have vanished years ago, and we don't use it a lot

File:

• trunk/test/unit/org/openstreetmap/josm/data/osm/QuadBucketsTest.java (modified) (5 diffs)

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.osm;
+
+import static org.openstreetmap.josm.TestUtils.getPrivateField;
 
 import java.io.FileInputStream;
@@ -12 +14 @@
 import java.util.Random;
 
-import org.fest.reflect.core.Reflection;
-import org.fest.reflect.reference.TypeRef;
 import org.junit.Assert;
 import org.junit.Rule;
@@ -38 +38 @@
     public JOSMTestRules test = new JOSMTestRules();
 
-    private void removeAllTest(DataSet ds) {
+    @SuppressWarnings("unchecked")
+    private void removeAllTest(DataSet ds) throws ReflectiveOperationException {
         List<Node> allNodes = new ArrayList<>(ds.getNodes());
         List<Way> allWays = new ArrayList<>(ds.getWays());
         List<Relation> allRelations = new ArrayList<>(ds.getRelations());
 
-        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();
+        QuadBucketPrimitiveStore<Node, Way, Relation> s = (QuadBucketPrimitiveStore<Node, Way, Relation>) getPrivateField(ds, "store");
+        QuadBuckets<Node> nodes = (QuadBuckets<Node>) getPrivateField(s, "nodes");
+        QuadBuckets<Way> ways = (QuadBuckets<Way>) getPrivateField(s, "ways");
+        Collection<Relation> relations = (Collection<Relation>) getPrivateField(s, "relations");
 
         int expectedCount = allNodes.size();
@@ -77 +77 @@
     }
 
+    /**
+     * Test that all primitives can be removed from the Quad Buckets.
+     * @throws Exception never
+     */
     @Test
     public void testRemove() throws Exception {
@@ -86 +90 @@
     }
 
+    /**
+     * Test that all primitives can be removed from the Quad Buckets, even if moved before.
+     * @throws Exception never
+     */
     @Test
     public void testMove() throws Exception {