Changeset 9546 in josm for trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair

Timestamp:

2016-01-20T01:10:10+01:00 (9 years ago)

Author:

Don-vip

Message:

add more unit tests, fix packages, rename manual functional unit tests (with a main() method) to *TestFT.java

Location:

trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair

Files:

• . (added)
• nodes (moved) (moved from trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes )
• nodes/NodeListMergeModelTest.java (modified) (1 diff)
• nodes/NodeListMergerTest.java (added)
• properties (moved) (moved from trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties )
• properties/PropertiesMergeModelTest.java (modified) (1 diff)
• properties/PropertiesMergerTest.java (added)
• relation (added)
• relation/RelationMemberMergerTest.java (added)
• tags (added)
• tags/TagMergeItemTest.java (moved) (moved from trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeItemTest.java ) (1 diff)
• tags/TagMergeModelTest.java (moved) (moved from trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java ) (1 diff)
• tags/TagMergerTest.java (added)

trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModelTest.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.conflict.nodes;
+package org.openstreetmap.josm.gui.conflict.pair.nodes;
 
 import static org.fest.reflect.core.Reflection.field;

trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModelTest.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.conflict.properties;
+package org.openstreetmap.josm.gui.conflict.pair.properties;
 
 import static org.junit.Assert.assertEquals;

trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItemTest.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.conflict.tags;
+package org.openstreetmap.josm.gui.conflict.pair.tags;
 
 import static org.junit.Assert.assertEquals;

trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModelTest.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.conflict.tags;
+package org.openstreetmap.josm.gui.conflict.pair.tags;
 
 import static org.fest.reflect.core.Reflection.field;