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

Timestamp:

2016-07-08T15:30:53+02:00 (8 years ago)

Author:

darya

Message:

Checks for adjacent ways

Location:

applications/editors/josm/plugins/pt_assistant/test

Files:

• data/oneway-wrong-direction2.osm (added)
• unit/org/openstreetmap/josm/plugins/pt_assistant/AbstractTest.java (modified) (1 diff)
• unit/org/openstreetmap/josm/plugins/pt_assistant/validation/AdjacentWaysTest.java (added)
• unit/org/openstreetmap/josm/plugins/pt_assistant/validation/DirecionTestTest.java (modified) (5 diffs)

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

@@ -40 +40 @@
  public static final String PATH_TO_ROAD_TYPE_ERROR = "test/data/road-type.osm";
  
+ public static final String PATH_TO_ONEWAY_BAD_MEMBER_SORTING = "test/data/oneway-bad-member-sorting.osm";
  
+ 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";
+
   /**
    * Initiates the basic parts of JOSM.

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

@@ -19 +19 @@
     
     @Test
-    public void test() {
+    public void testOnewayTrue() {
         
-        File file = new File(AbstractTest.PATH_TO_ROUNDABOUT_ONEWAY);
+        File file = new File(AbstractTest.PATH_TO_ONEWAY_WRONG_DIRECTION);
         DataSet ds = ImportUtils.importOsmFile(file, "testLayer");
         
@@ -33 +33 @@
         }
         
-        assertEquals(route.getMembersCount(), 213);
-                
+             
         List<TestError> errors = new ArrayList<>();
         
@@ -43 +42 @@
         }
         
-        assertEquals(errors.size(), 1);
+        assertEquals(errors.size(), 2);
         int onewayErrorCaught = 0;
         for (TestError e: errors ) {
@@ -51 +50 @@
         }
         
-        assertEquals(onewayErrorCaught, 1);
+        assertEquals(onewayErrorCaught, 2);
         
         // fix the direction errors:
@@ -60 +59 @@
                 @SuppressWarnings("unchecked")
                 List<OsmPrimitive> highlighted = (List<OsmPrimitive>) e.getHighlighted();
-                if (highlighted.get(0).getId() != 26130630 && highlighted.get(0).getId() != 151278290)  {
+                if (highlighted.get(0).getId() != 225732678 && highlighted.get(0).getId() != 24215210)  {
                     detectedErrorsAreCorrect = false;
                 }