Changeset 32616 in osm for applications/editors/josm/plugins/pt_assistant/test

Timestamp:

2016-07-08T22:37:38+02:00 (9 years ago)

Author:

darya

Message:

Solitary stop position test

Location:

applications/editors/josm/plugins/pt_assistant/test

Files:

• data/solitary-stop-position.osm (added)
• unit/org/openstreetmap/josm/plugins/pt_assistant/AbstractTest.java (modified) (1 diff)
• unit/org/openstreetmap/josm/plugins/pt_assistant/validation/DirecionTestTest.java (modified) (1 diff)
• unit/org/openstreetmap/josm/plugins/pt_assistant/validation/SolitaryStopPositionTest.java (added)

applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/AbstractTest.java

@@ -44 +44 @@
  public static final String PATH_TO_ONEWAY_WRONG_DIRECTION = "test/data/oneway-wrong-direction.osm";
  public static final String PATH_TO_ONEWAY_WRONG_DIRECTION2 = "test/data/oneway-wrong-direction2.osm";
+ 
+ public static final String PATH_TO_SOLITARY_STOP_POSITION = "test/data/solitary-stop-position.osm";
 
   /**

applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/DirecionTestTest.java

@@ -17 +17 @@
 
 public class DirecionTestTest extends AbstractTest {
-    
-    @Test
-    public void testOnewayTrue() {
-        
-        File file = new File(AbstractTest.PATH_TO_ONEWAY_WRONG_DIRECTION);
-        DataSet ds = ImportUtils.importOsmFile(file, "testLayer");
-        
-        PTAssistantValidatorTest test = new PTAssistantValidatorTest();
-        
-        Relation route = null;
-        for (Relation r: ds.getRelations()) {
-            if (r.hasKey("route")) {
-                route = r;
-            }
-        }
-        
-             
-        List<TestError> errors = new ArrayList<>();
-        
-        for (Relation r: ds.getRelations()) {
-                WayChecker wayChecker = new WayChecker(r, test);
-                wayChecker.performDirectionTest();
-                errors.addAll(wayChecker.getErrors());
-        }
-        
-        assertEquals(errors.size(), 2);
-        int onewayErrorCaught = 0;
-        for (TestError e: errors ) {
-            if (e.getCode() == PTAssistantValidatorTest.ERROR_CODE_DIRECTION) {
-                onewayErrorCaught++;
-            }
-        }
-        
-        assertEquals(onewayErrorCaught, 2);
-        
-        // fix the direction errors:
-        
-        boolean detectedErrorsAreCorrect = true;
-        for (TestError e: errors) {
-            if (e.getCode() == PTAssistantValidatorTest.ERROR_CODE_DIRECTION) {
-                @SuppressWarnings("unchecked")
-                List<OsmPrimitive> highlighted = (List<OsmPrimitive>) e.getHighlighted();
-                if (highlighted.get(0).getId() != 225732678 && highlighted.get(0).getId() != 24215210)  {
-                    detectedErrorsAreCorrect = false;
-                }
-            }
-        }
-        
-        assertTrue(detectedErrorsAreCorrect);
-    }
+
+        @Test
+        public void testOnewayTrue() {
+
+                File file = new File(AbstractTest.PATH_TO_ONEWAY_WRONG_DIRECTION);
+                DataSet ds = ImportUtils.importOsmFile(file, "testLayer");
+
+                PTAssistantValidatorTest test = new PTAssistantValidatorTest();
+
+                List<TestError> errors = new ArrayList<>();
+
+                for (Relation r : ds.getRelations()) {
+                        WayChecker wayChecker = new WayChecker(r, test);
+                        wayChecker.performDirectionTest();
+                        errors.addAll(wayChecker.getErrors());
+                }
+
+                assertEquals(errors.size(), 2);
+                int onewayErrorCaught = 0;
+                for (TestError e : errors) {
+                        if (e.getCode() == PTAssistantValidatorTest.ERROR_CODE_DIRECTION) {
+                                onewayErrorCaught++;
+                        }
+                }
+
+                assertEquals(onewayErrorCaught, 2);
+
+                // fix the direction errors:
+
+                boolean detectedErrorsAreCorrect = true;
+                for (TestError e : errors) {
+                        if (e.getCode() == PTAssistantValidatorTest.ERROR_CODE_DIRECTION) {
+                                @SuppressWarnings("unchecked")
+                                List<OsmPrimitive> highlighted = (List<OsmPrimitive>) e.getHighlighted();
+                                if (highlighted.get(0).getId() != 225732678 && highlighted.get(0).getId() != 24215210) {
+                                        detectedErrorsAreCorrect = false;
+                                }
+                        }
+                }
+
+                assertTrue(detectedErrorsAreCorrect);
+        }
 }