Changeset 10113 in josm for trunk/test/unit/org/openstreetmap/josm

Timestamp:

2016-04-06T23:06:38+02:00 (8 years ago)

Author:

Don-vip

Message:

refactor relation editor to allow unit tests in headless mode

Location:

trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation

Files:

• GenericRelationEditorTest.java (modified) (3 diffs)
• actions/RelationEditorActionsTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditorTest.java

@@ -7 +7 @@
 import java.util.Collections;
 
+import javax.swing.JPanel;
+
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.dialogs.relation.GenericRelationEditor.LeftButtonToolbar;
+import org.openstreetmap.josm.gui.dialogs.relation.actions.ApplyAction;
+import org.openstreetmap.josm.gui.dialogs.relation.actions.CancelAction;
+import org.openstreetmap.josm.gui.dialogs.relation.actions.DeleteCurrentRelationAction;
+import org.openstreetmap.josm.gui.dialogs.relation.actions.DuplicateRelationAction;
+import org.openstreetmap.josm.gui.dialogs.relation.actions.OKAction;
+import org.openstreetmap.josm.gui.dialogs.relation.actions.RefreshAction;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.tagging.TagEditorModel;
+import org.openstreetmap.josm.gui.tagging.TagEditorPanel;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
 
 /**
@@ -25 +39 @@
     @BeforeClass
     public static void setUpBeforeClass() {
-        JOSMFixture.createUnitTestFixture().init();
+        JOSMFixture.createUnitTestFixture().init(true);
+    }
+
+    /**
+     * Returns a new relation editor for unit tests.
+     * @param orig relation
+     * @param layer data layer
+     * @return new relation editor for unit tests
+     */
+    public static IRelationEditor newRelationEditor(final Relation orig, final OsmDataLayer layer) {
+        return new IRelationEditor() {
+            private Relation r = orig;
+
+            @Override
+            public void setRelation(Relation relation) {
+                r = relation;
+            }
+
+            @Override
+            public boolean isDirtyRelation() {
+                return false;
+            }
+
+            @Override
+            public Relation getRelationSnapshot() {
+                return r;
+            }
+
+            @Override
+            public Relation getRelation() {
+                return r;
+            }
+
+            @Override
+            public void reloadDataFromRelation() {
+                // Do nothing
+            }
+
+            @Override
+            public OsmDataLayer getLayer() {
+                return layer;
+            }
+        };
     }
 
@@ -41 +97 @@
     }
 
+    /**
+     * Unit test of {@code GenericRelationEditor#build*} methods.
+     */
+    @Test
+    public void testBuild() {
+        DataSet ds = new DataSet();
+        Relation relation = new Relation(1);
+        ds.addPrimitive(relation);
+        OsmDataLayer layer = new OsmDataLayer(ds, "test", null);
+        IRelationEditor re = newRelationEditor(relation, layer);
+
+        MemberTableModel memberTableModel = new MemberTableModel(relation, layer, null);
+        MemberTable memberTable = new MemberTable(layer, relation, memberTableModel);
+
+        SelectionTableModel selectionTableModel = new SelectionTableModel(layer);
+        SelectionTable selectionTable = new SelectionTable(selectionTableModel, memberTableModel);
+
+        LeftButtonToolbar leftButtonToolbar = new LeftButtonToolbar(memberTable, memberTableModel, re);
+        assertNotNull(leftButtonToolbar.sortBelowButton);
+
+        AutoCompletingTextField tfRole = GenericRelationEditor.buildRoleTextField(re);
+        assertNotNull(tfRole);
+
+        TagEditorPanel tagEditorPanel = new TagEditorPanel(relation, null);
+
+        JPanel top = GenericRelationEditor.buildTagEditorPanel(tagEditorPanel);
+        JPanel bottom = GenericRelationEditor.buildMemberEditorPanel(
+                memberTable, memberTableModel, selectionTable, selectionTableModel, re, leftButtonToolbar, tfRole);
+        assertNotNull(top);
+        assertNotNull(bottom);
+        assertNotNull(GenericRelationEditor.buildSplitPane(top, bottom, re));
+
+        TagEditorModel tagModel = tagEditorPanel.getModel();
+
+        assertNotNull(GenericRelationEditor.buildOkCancelButtonPanel(
+                new OKAction(memberTable, memberTableModel, tagModel, layer, re, tfRole),
+                new CancelAction(memberTable, memberTableModel, tagModel, layer, re, tfRole)));
+        assertNotNull(GenericRelationEditor.buildSelectionControlButtonToolbar(memberTable, memberTableModel, selectionTableModel, re));
+        assertNotNull(GenericRelationEditor.buildSelectionTablePanel(selectionTable));
+
+        assertNotNull(GenericRelationEditor.buildToolBar(
+                new RefreshAction(memberTable, memberTableModel, tagModel, layer, re),
+                new ApplyAction(memberTable, memberTableModel, tagModel, layer, re),
+                new DuplicateRelationAction(memberTableModel, tagModel, layer),
+                new DeleteCurrentRelationAction(layer, re)));
+    }
 }

trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/actions/RelationEditorActionsTest.java

@@ -7 +7 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.gui.dialogs.relation.GenericRelationEditorTest;
 import org.openstreetmap.josm.gui.dialogs.relation.IRelationEditor;
 import org.openstreetmap.josm.gui.dialogs.relation.MemberTable;
@@ -36 +37 @@
         final Relation orig = new Relation(1);
         ds.addPrimitive(orig);
-        OsmDataLayer layer = new OsmDataLayer(new DataSet(), "test", null);
+        final OsmDataLayer layer = new OsmDataLayer(ds, "test", null);
         MemberTableModel memberTableModel = new MemberTableModel(orig, layer, null);
         SelectionTableModel selectionTableModel = new SelectionTableModel(layer);
 
-        IRelationEditor editor = new IRelationEditor() {
-            private Relation r = orig;
-
-            @Override
-            public void setRelation(Relation relation) {
-                r = relation;
-            }
-
-            @Override
-            public boolean isDirtyRelation() {
-                return false;
-            }
-
-            @Override
-            public Relation getRelationSnapshot() {
-                return r;
-            }
-
-            @Override
-            public Relation getRelation() {
-                return r;
-            }
-
-            @Override
-            public void reloadDataFromRelation() {
-                // Do nothing
-            }
-        };
+        IRelationEditor editor = GenericRelationEditorTest.newRelationEditor(orig, layer);
 
         MemberTable memberTable = new MemberTable(layer, editor.getRelation(), memberTableModel);