Changeset 4059 in josm for trunk/src/org/openstreetmap

Timestamp:

2011-04-23T20:12:16+02:00 (14 years ago)

Author:

stoecker

Message:

fix #6241 - add checks to breaking long running tests

Location:

trunk/src/org/openstreetmap/josm/data/validation

Files:

• Test.java (modified) (1 diff)
• tests/UnconnectedWays.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/data/validation/Test.java

@@ -216 +216 @@
         return name;
     }
+
+    public boolean isCancelled() {
+        return progressMonitor.isCancelled();
+    }
 }

trunk/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java

@@ -79 +79 @@
     @Override
     public void endTest() {
-        //Area a = Main.ds.getDataSourceArea();
         Map<Node, Way> map = new HashMap<Node, Way>();
-        //long last = -1;
         for (int iter = 0; iter < 1; iter++) {
-            //last = System.currentTimeMillis();
-            long last_print = -1;
-            int nr = 0;
             Collection<MyWaySegment> tmp_ways = ways;
             for (MyWaySegment s : tmp_ways) {
-                nr++;
-                long now = System.currentTimeMillis();
-                if (now - last_print > 200) {
-                    //System.err.println("processing segment nr: " + nr + " of " + ways.size());
-                    last_print = now;
-                }
                 Collection<Node> nearbyNodes = s.nearbyNodes(mindist);
                 for (Node en : nearbyNodes) {
@@ -113 +102 @@
                     map.put(en, s.w);
                 }
-            }
-            //System.out.println("p1 elapsed: " + (System.currentTimeMillis()-last));
-            //last = System.currentTimeMillis();
+                if(isCancelled())
+                    return;
+            }
         }
         for (Map.Entry<Node, Way> error : map.entrySet()) {
@@ -125 +114 @@
         map.clear();
         for (MyWaySegment s : ways) {
+            if(isCancelled())
+                return;
             for (Node en : s.nearbyNodes(mindist)) {
                 if (endnodes_highway.contains(en) && !s.highway && !s.isArea()) {
@@ -133 +124 @@
             }
         }
-        //System.out.println("p2 elapsed: " + (System.currentTimeMillis()-last));
-        //last = System.currentTimeMillis();
         for (Map.Entry<Node, Way> error : map.entrySet()) {
             errors.add(new TestError(this, Severity.WARNING,
@@ -145 +134 @@
             map.clear();
             for (MyWaySegment s : ways) {
+                if(isCancelled())
+                    return;
                 for (Node en : s.nearbyNodes(minmiddledist)) {
                     if (!middlenodes.contains(en)) {
@@ -163 +154 @@
             for (MyWaySegment s : ways) {
                 for (Node en : s.nearbyNodes(minmiddledist)) {
+                    if(isCancelled())
+                        return;
                     if (!othernodes.contains(en)) {
                         continue;