Index: test/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java
===================================================================
--- test/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java	(revision 176)
+++ test/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java	(revision 187)
@@ -28,4 +28,31 @@
 		n = DataSetTestCaseHelper.createNode(null);
 	}
+
+
+	private Segment createSegment(DataSet ds, boolean incomplete, boolean deleted, int id) {
+    	Node n1 = DataSetTestCaseHelper.createNode(ds);
+    	Node n2 = DataSetTestCaseHelper.createNode(ds);
+    	Segment s = DataSetTestCaseHelper.createSegment(ds, n1, n2);
+    	s.incomplete = incomplete;
+    	s.id = id;
+    	s.deleted = deleted;
+    	s.timestamp = new Date();
+    	return s;
+    }
+
+
+	/**
+     * Create that amount of nodes and add them to the dataset. The id will be 1,2,3,4...
+     * @param amount Number of nodes to create.
+     * @return The created nodes.
+     */
+    private Node[] createNodes(DataSet ds, int amount) {
+    	Node[] nodes = new Node[amount];
+    	for (int i = 0; i < amount; ++i) {
+    		nodes[i] = DataSetTestCaseHelper.createNode(ds);
+    		nodes[i].id = i+1;
+    	}
+    	return nodes;
+    }
 
 
@@ -279,29 +306,4 @@
 		assertEquals(1, v.conflicts.size());
 	}
-
-
-	private Segment createSegment(DataSet ds, boolean incomplete, boolean deleted, int id) {
-		Node n1 = DataSetTestCaseHelper.createNode(ds);
-		Node n2 = DataSetTestCaseHelper.createNode(ds);
-		Segment s = DataSetTestCaseHelper.createSegment(ds, n1, n2);
-		s.incomplete = incomplete;
-		s.id = id;
-		s.deleted = deleted;
-		s.timestamp = new Date();
-		return s;
-	}
 	
-	/**
-	 * Create that amount of nodes and add them to the dataset. The id will be 1,2,3,4...
-	 * @param amount Number of nodes to create.
-	 * @return The created nodes.
-	 */
-	private Node[] createNodes(DataSet ds, int amount) {
-		Node[] nodes = new Node[amount];
-		for (int i = 0; i < amount; ++i) {
-			nodes[i] = DataSetTestCaseHelper.createNode(ds);
-			nodes[i].id = i+1;
-		}
-		return nodes;
-	}
 }