Changeset 23571 in osm for applications/editors/josm/plugins/turnrestrictions/test

Timestamp:

2010-10-12T16:31:47+02:00 (14 years ago)

Author:

guggis

Message:

Fixing #4855 - turnrestrictions plugin: some issues
Reorganized test cases

Location:

applications/editors/josm/plugins/turnrestrictions/test/src/org/openstreetmap/josm/plugins/turnrestrictions

Files:

• AllUnitTests.java (modified) (1 diff)
• TurnRestrictionBuilderTest.groovy (added)
• editor/AllEditorTests.java (modified) (1 diff)
• editor/ExceptValueModelTest.groovy (added)
• editor/JosmSelectionListModelTest.groovy (modified) (7 diffs)

applications/editors/josm/plugins/turnrestrictions/test/src/org/openstreetmap/josm/plugins/turnrestrictions/AllUnitTests.java

@@ -1 +1 @@
 package org.openstreetmap.josm.plugins.turnrestrictions;
 
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
 import org.openstreetmap.josm.plugins.turnrestrictions.editor.AllEditorTests;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllUnitTests {
-        public static Test suite() throws Exception {
-                TestSuite suite = new TestSuite(AllUnitTests.class.getName());
-                suite.addTest(AllEditorTests.suite());
-                return suite;
-        }
-}
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+        AllEditorTests.class,
+        TurnRestrictionBuilderTest.class
+})
+public class AllUnitTests {}

applications/editors/josm/plugins/turnrestrictions/test/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/AllEditorTests.java

@@ -1 +1 @@
 package org.openstreetmap.josm.plugins.turnrestrictions.editor;
 
-import groovy.util.GroovyTestSuite;
-import junit.framework.Test;
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
-public class AllEditorTests extends TestCase{
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
 
-        private static final String TEST_ROOT = "test/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/";
-        private static final GroovyTestSuite gsuite = new GroovyTestSuite();
-        
-        private static <T extends TestCase> Class<T> groovyts(String className) throws Exception {
-                return gsuite.compile(TEST_ROOT + className + ".groovy");
-        }
-        
-        public static Test suite() throws Exception {
-                TestSuite suite = new TestSuite(AllEditorTests.class.getName());
-                suite.addTestSuite(groovyts("JosmSelectionListModelTest"));
-                suite.addTestSuite(groovyts("TurnRestrictionEditorModelUnitTest"));
-                suite.addTestSuite(groovyts("TurnRestrictionLegEditorUnitTest"));
-                suite.addTestSuite(groovyts("TurnRestrictionTypeRendererTest"));
-                suite.addTestSuite(groovyts("TurnRestrictionTypeTest"));
-                return suite;
-        }
-}
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+        JosmSelectionListModelTest.class,
+        TurnRestrictionEditorModelUnitTest.class,
+        TurnRestrictionLegEditorUnitTest.class,
+        TurnRestrictionTypeRendererTest.class,
+        TurnRestrictionTypeTest.class,
+        ExceptValueModelTest.class
+})
+public class AllEditorTests extends TestCase{}

applications/editors/josm/plugins/turnrestrictions/test/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionListModelTest.groovy

@@ -33 +33 @@
                 DataSet ds = new DataSet()
                 OsmDataLayer layer = new OsmDataLayer(ds, "test", null)
-                JosmSelectionListModel model = new JosmSelectionListModel(layer, new DefaultListSelectionModel());              
+                JosmSelectionListModel model = new JosmSelectionListModel(layer);               
                 
                 shouldFail(IllegalArgumentException){
-                        model = new JosmSelectionListModel(layer, null)
-                }
-                
-                shouldFail(IllegalArgumentException){
-                        model = new JosmSelectionListModel(null, new DefaultListSelectionModel())
+                        model = new JosmSelectionListModel(null)
                 }
         }
@@ -48 +44 @@
                 DataSet ds = new DataSet()
                 OsmDataLayer layer = new OsmDataLayer(ds, "test", null)
-                JosmSelectionListModel model = new JosmSelectionListModel(layer, new DefaultListSelectionModel());
+                JosmSelectionListModel model = new JosmSelectionListModel(layer);
                 
                 // set a selection with three objects 
@@ -70 +66 @@
                 DataSet ds = new DataSet()
                 OsmDataLayer layer = new OsmDataLayer(ds, "test", null)
-                JosmSelectionListModel model = new JosmSelectionListModel(layer, new DefaultListSelectionModel());
+                JosmSelectionListModel model = new JosmSelectionListModel(layer);
                 def objects = [new Node(new LatLon(1,1)), new Way(), new Relation()]    
                 model.setJOSMSelection(objects)
@@ -88 +84 @@
                 DataSet ds = new DataSet()
                 OsmDataLayer layer = new OsmDataLayer(ds, "test", null)
-                DefaultListSelectionModel selectionModel = new DefaultListSelectionModel();
                 
-                JosmSelectionListModel model = new JosmSelectionListModel(layer, selectionModel);
+                JosmSelectionListModel model = new JosmSelectionListModel(layer);
+                DefaultListSelectionModel selectionModel = model.getListSelectionModel()
+                
                 assert model.getSelected() != null
                 assert model.getSelected().isEmpty()
@@ -109 +106 @@
                 DataSet ds = new DataSet()
                 OsmDataLayer layer = new OsmDataLayer(ds, "test", null)
-                DefaultListSelectionModel selectionModel = new DefaultListSelectionModel();
                 
                 // set selected with null is OK - nothing selected thereafter
-                JosmSelectionListModel model = new JosmSelectionListModel(layer, selectionModel);
+                JosmSelectionListModel model = new JosmSelectionListModel(layer);
+                DefaultListSelectionModel selectionModel = model.getListSelectionModel()
                 model.setSelected(null)
                 assert model.getSelected().isEmpty()
@@ -135 +132 @@
         public void test_editLayerChanged() {
                 DataSet ds = new DataSet()
-                DefaultListSelectionModel selectionModel = new DefaultListSelectionModel();             
+                        
                 def objects = [new Node(new LatLon(1,1)), new Way(), new Relation()]    
                 objects.each {ds.addPrimitive(it)}
@@ -142 +139 @@
                 OsmDataLayer layer2 = new OsmDataLayer(new DataSet(),"layer2", null)
                 
-                JosmSelectionListModel model = new JosmSelectionListModel(layer1, selectionModel);
-                
+                JosmSelectionListModel model = new JosmSelectionListModel(layer1);
+                DefaultListSelectionModel selectionModel = model.getListSelectionModel()
                 // switch from edit layer1 to edit layer2. content of the JOSM selection 
                 // should be empty thereafter