Changeset 32822 in osm for applications/editors/josm/plugins/pt_assistant/test/unit

Timestamp:

2016-08-16T14:03:50+02:00 (9 years ago)

Author:

xamanu

Message:

Allowing multiple stop positions and platforms in stop area checks

File:

• applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/StopCheckerTest.java (modified) (6 diffs)

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

@@ -33 +33 @@
                 Assert.assertEquals(nodeChecker.getErrors().size(), 1);
                 Assert.assertEquals(nodeChecker.getErrors().get(0).getCode(),
-                                PTAssistantValidatorTest.ERROR_CODE_NODE_PART_OF_STOP_AREA);
+                                PTAssistantValidatorTest.ERROR_CODE_NOT_PART_OF_STOP_AREA);
         }
         
@@ -39 +39 @@
 
         @Test
-        public void stopPositionComparePlatformRelations() {
+        public void stopAreaRelationsTest() {
                 
                 // Check if stop positions belong the same routes as related platform(s)
@@ -46 +46 @@
                 DataSet ds = ImportUtils.importOsmFile(file, "testLayer");
                 PTAssistantValidatorTest test = new PTAssistantValidatorTest();
-                Node node = null;
+                Relation stopArea = null;
                 
-                for (Node n : ds.getNodes()) {
-                        if (n.hasTag("public_transport", "stop_position")) {
-                                node = n;
+                for (Relation r : ds.getRelations()) {
+                        if (r.hasTag("public_transport", "stop_area")) {
+                                stopArea = r;
                         }
                 }
                 
-                NodeChecker nodeChecker = new NodeChecker(node, test);
-                nodeChecker.performStopPositionComparePlatformRelations();
-                Assert.assertEquals(nodeChecker.getErrors().size(), 1);
-                Assert.assertEquals(nodeChecker.getErrors().get(0).getCode(),
-                                PTAssistantValidatorTest.ERROR_CODE_STOP_POSITION_COMPARE_RELATIONS);
-                        
+                StopChecker stopChecker = new StopChecker(stopArea, test);
+                stopChecker.performStopAreaRelationsTest();
+                Assert.assertEquals(stopChecker.getErrors().size(), 1);
+                Assert.assertEquals(stopChecker.getErrors().get(0).getCode(),
+                                PTAssistantValidatorTest.ERROR_CODE_STOP_AREA_COMPARE_RELATIONS);               
         }
         
@@ -66 +65 @@
         public void stopAreaStopPositionTest() {
                 
-                // Check if stop area relation has one stop position. 
+                // Check if stop area relation has at least one stop position. 
                 
                 File file = new File(AbstractTest.PATH_TO_STOP_AREA_NO_STOPS);
@@ -87 +86 @@
         }
         
-        @Test
-        public void stopAreaMultiStopPositionTest() {
-                
-                // Check if stop area relation has more than one stop position. 
-                
-                File file = new File(AbstractTest.PATH_TO_STOP_AREA_MANY_STOPS);
-                DataSet ds = ImportUtils.importOsmFile(file, "testLayer");
-                PTAssistantValidatorTest test = new PTAssistantValidatorTest();
-                Relation stopArea = null;
-
-                for (Relation r : ds.getRelations()) {
-                        if (r.hasTag("public_transport", "stop_area")) {
-                                stopArea = r;
-                        }
-                }
-
-                StopChecker stopChecker = new StopChecker(stopArea, test);
-                stopChecker.performStopAreaMultiStopPositionTest();
-                Assert.assertEquals(stopChecker.getErrors().size(), 1);
-                Assert.assertEquals(stopChecker.getErrors().get(0).getCode(),
-                                PTAssistantValidatorTest.ERROR_CODE_STOP_AREA_MANY_STOPS);
-
-        }
-        
 
         @Test
         public void stopAreaPlatformTest() {
                 
-                // Check if stop area relation has one platform. 
+                // Check if stop area relation has at least one platform. 
                 
                 File file = new File(AbstractTest.PATH_TO_STOP_AREA_NO_PLATFORMS);
@@ -135 +110 @@
 
         }
-        
-        @Test
-        public void stopAreaMultiPlatformTest() {
-                
-                // Check if stop area relation has more than one stop position. 
-                
-                File file = new File(AbstractTest.PATH_TO_STOP_AREA_MANY_PLATFORMS);
-                DataSet ds = ImportUtils.importOsmFile(file, "testLayer");
-                PTAssistantValidatorTest test = new PTAssistantValidatorTest();
-                Relation stopArea = null;
-
-                for (Relation r : ds.getRelations()) {
-                        if (r.hasTag("public_transport", "stop_area")) {
-                                stopArea = r;
-                        }
-                }
-
-                StopChecker stopChecker = new StopChecker(stopArea, test);
-                stopChecker.performStopAreaMultiPlatformTest();
-                Assert.assertEquals(stopChecker.getErrors().size(), 1);
-                Assert.assertEquals(stopChecker.getErrors().get(0).getCode(),
-                                PTAssistantValidatorTest.ERROR_CODE_STOP_AREA_MANY_PLATFORMS);
-
-        }
 
 }