Changeset 10113 in josm for trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/actions

Timestamp:

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

Author:

Don-vip

Message:

refactor relation editor to allow unit tests in headless mode

File:

• trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/actions/RelationEditorActionsTest.java (modified) (2 diffs)

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);