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

Timestamp:

2016-08-23T03:38:46+02:00 (8 years ago)

Author:

darya

Message:

preference settings added

Location:

applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant

Files:

• AbstractTest.java (modified) (1 diff)
• validation/SegmentCheckerTest.java (modified) (2 diffs)

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

@@ -54 +54 @@
  public static final String PATH_TO_STOP_AREA_MANY_PLATFORMS = "test/data/stop-area-many-platforms.osm";
 
- 
  public static final String PATH_TO_SEGMENT_TEST = "test/data/segment-test.osm";
+ public static final String PATH_TO_REPEAT_FIX = "test/data/repeat-fix.osm";
 
   /**

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

@@ -13 +13 @@
 
 public class SegmentCheckerTest extends AbstractTest {
-        
+
         @Test
-        public void test() {
-                
-                
+        public void testStopByStopTest() {
+
                 File file = new File(AbstractTest.PATH_TO_SEGMENT_TEST);
                 DataSet ds = ImportUtils.importOsmFile(file, "testLayer");
                 PTAssistantValidatorTest test = new PTAssistantValidatorTest();
-                
+
                 Relation route = null;
-                
-                for (Relation r: ds.getRelations()) {
+
+                for (Relation r : ds.getRelations()) {
                         if (RouteUtils.isTwoDirectionRoute(r)) {
                                 route = r;
@@ -30 +29 @@
                         }
                 }
-                
+
+                SegmentChecker.reset();
                 SegmentChecker segmentChecker = new SegmentChecker(route, test);
                 segmentChecker.performStopByStopTest();
                 assertEquals(SegmentChecker.getCorrectSegmentCount(), 27);
                 assertEquals(segmentChecker.getErrors().size(), 0);
-                
-                
-                
-                
+        }
+
+        /**
+         * Tests the stop-by-stop test
+         */
+        @Test
+        public void testRepeatLastFix() {
+                File file = new File(AbstractTest.PATH_TO_REPEAT_FIX);
+                DataSet ds = ImportUtils.importOsmFile(file, "testLayer");
+                PTAssistantValidatorTest test = new PTAssistantValidatorTest();
+
+                Relation route123 = null;
+                Relation route130 = null;
+                Relation route168 = null;
+                Relation route184 = null;
+
+                for (Relation r : ds.getRelations()) {
+                        if (r.getId() == 5379737) {
+                                route123 = r;
+                        } else if (r.getId() == 5379738) {
+                                route130 = r;
+                        } else if (r.getId() == 5379739) {
+                                route168 = r;
+                        } else if (r.getId() == 5379740) {
+                                route184 = r;
+                        }
+                }
+
+                SegmentChecker.reset();
+                SegmentChecker segmentChecker123 = new SegmentChecker(route123, test);
+                SegmentChecker segmentChecker130 = new SegmentChecker(route130, test);
+                SegmentChecker segmentChecker168 = new SegmentChecker(route168, test);
+                SegmentChecker segmentChecker184 = new SegmentChecker(route184, test);
+                segmentChecker123.performStopByStopTest();
+//              TestError error123 = segmentChecker123.getErrors().get(0);
+//              PTRouteSegment wrongSegment123 = SegmentChecker.getWrongSegment(error123);
+                segmentChecker130.performStopByStopTest();
+                segmentChecker168.performStopByStopTest();
+                segmentChecker184.performStopByStopTest();
+
+                // Check the error number:
+                assertEquals(segmentChecker123.getErrors().size(), 1);
+                assertEquals(segmentChecker130.getErrors().size(), 1);
+                assertEquals(segmentChecker168.getErrors().size(), 1);
+                assertEquals(segmentChecker184.getErrors().size(), 0);
         }
 }