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

Timestamp:

2010-10-08T23:54:18+02:00 (14 years ago)

Author:

guggis

Message:

cosmetics (documentation etc.)
fixing unit tests

Location:

applications/editors/josm/plugins/turnrestrictions/test

Files:

• README (added)
• config (added)
• config/test-unit-env.properties (added)
• data (moved) (moved from applications/editors/josm/plugins/turnrestrictions/data )
• josm.home (added)
• josm.home/preferences (added)
• src (added)
• src/org (moved) (moved from applications/editors/josm/plugins/turnrestrictions/test/org )
• src/org/openstreetmap/josm/plugins/turnrestrictions/AllUnitTests.java (added)
• src/org/openstreetmap/josm/plugins/turnrestrictions/editor/AllEditorTests.java (added)
• src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionListModelTest.groovy (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditorModelUnitTest.groovy (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditorUnitTest.groovy (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionTypeRendererTest.groovy (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionTypeTest.groovy (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/turnrestrictions/fixtures (added)
• src/org/openstreetmap/josm/plugins/turnrestrictions/fixtures/JOSMFixture.java (added)
• test.xml (added)

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

@@ -1 +1 @@
 package org.openstreetmap.josm.plugins.turnrestrictions.editor;
-import org.openstreetmap.josm.fixtures.JOSMFixture;
+
+import groovy.util.GroovyTestCase;
+
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -7 +9 @@
 import org.openstreetmap.josm.data.coor.*;
 
+import org.openstreetmap.josm.plugins.turnrestrictions.fixtures.JOSMFixture;
+
 import static org.junit.Assert.*;
 import org.junit.*;
 import javax.swing.JFrame;
 
+import junit.framework.TestCase;
+import junit.framework.TestResult;
+
 /**
  * Unit test for {@see JosmSelctionListModel}
  */
-class JosmSelectionListModelTest {
+class JosmSelectionListModelTest extends GroovyTestCase {
         final shouldFail = new GroovyTestCase().&shouldFail
+        
+        @Before
+        public void setUp() {
+                JOSMFixture.createUnitTestFixture().init()
+        }
         
         @Test
@@ -62 +74 @@
                 model.setJOSMSelection(objects)
                 model.setSelected(objects[0..1])
-                assert model.getSelected().asList() == objects[0..1]
+                assert model.getSelected().asList() as Set == objects[0..1] as Set
                 
                 // set new selection which includes one object which is currently
@@ -90 +102 @@
                 // select two elements
                 selectionModel.setSelectionInterval(1,2)
-                assert model.getSelected().asList() == [model.getElementAt(1),model.getElementAt(2)];
+                assert model.getSelected().asList() as Set == [model.getElementAt(1),model.getElementAt(2)] as Set;
         }
         

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

@@ -1 +1 @@
 package org.openstreetmap.josm.plugins.turnrestrictions.editor;
+import groovy.util.GroovyTestCase;
 
 import static org.junit.Assert.*;
@@ -12 +13 @@
 import org.openstreetmap.josm.data.osm.DataSet
 import org.openstreetmap.josm.data.coor.*
+import org.openstreetmap.josm.fixtures.JOSMFixture;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 
+import org.openstreetmap.josm.plugins.turnrestrictions.fixtures.JOSMFixture;
+
 /**
- * This is a unit test for {@see TurnRestrictionEditorModel}
+ * This is a unit test for {@link TurnRestrictionEditorModel}
  *
  */
-class TurnRestrictionEditorModelUnitTest {
+class TurnRestrictionEditorModelUnitTest extends GroovyTestCase{
 
         final shouldFail = new GroovyTestCase().&shouldFail
@@ -92 +96 @@
         @Before
         public void setUp() {
+                JOSMFixture.createUnitTestFixture().init()
+                        
                 ds = new DataSet()
                 layer = new OsmDataLayer(ds, "test", null)              

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

@@ -1 +1 @@
 package org.openstreetmap.josm.plugins.turnrestrictions.editor;
+
+import groovy.util.GroovyTestCase;
+
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+
+import org.openstreetmap.josm.plugins.turnrestrictions.fixtures.JOSMFixture;
 
 import static org.junit.Assert.*;
 import org.junit.*;
 /**
- * Unit test for the {@see TurnRestrictionLegEditor}
+ * Unit test for the {@link TurnRestrictionLegEditor}
  * 
  */
-class TurnRestrictionLegEditorUnitTest {
+class TurnRestrictionLegEditorUnitTest extends GroovyTestCase {
         final shouldFail = new GroovyTestCase().&shouldFail
         
@@ -23 +28 @@
         @Before
         public void setUp() {
+                JOSMFixture.createUnitTestFixture().init()
+                
                 ds = new DataSet()
                 layer = new OsmDataLayer(ds, "test", null)              

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

@@ -3 +3 @@
 import static org.junit.Assert.*;
 import org.junit.*;
+
+import groovy.util.GroovyTestCase;
+
 import java.awt.Component
+import org.openstreetmap.josm.plugins.turnrestrictions.fixtures.JOSMFixture;
 
-class TurnRestrictionTypeRendererTest {
+class TurnRestrictionTypeRendererTest extends GroovyTestCase{
 
+        @Before
+        public void setUp() {
+                JOSMFixture.createUnitTestFixture().init()                      
+        }
+        
         @Test
         public void test_Constructor() {

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

@@ -1 +1 @@
 package org.openstreetmap.josm.plugins.turnrestrictions.editor;
+import groovy.util.GroovyTestCase;
 
 import static org.junit.Assert.*;
 import org.junit.*
-class TurnRestrictionTypeTest {
+class TurnRestrictionTypeTest extends GroovyTestCase{
         
         @Test
@@ -17 +18 @@
                 assert type == null
         }
-
 }