Context Navigation

← Previous Change
Next Change →

Changeset 2041 in josm for trunk/test/functional/org

Timestamp:

2009-09-03T18:51:56+02:00 (15 years ago)

Author:

Gubaer

Message:

Update of test classes

Location:

trunk/test/functional/org/openstreetmap/josm

Files:

: 1 added
: 2 edited
: 4 copied
: 4 moved

gui/conflict/pair (added)
gui/conflict/pair/nodes (moved) (moved from trunk/test/functional/org/openstreetmap/josm/gui/conflict/nodes )
gui/conflict/pair/nodes/NodeListMergerTest.java (copied) (copied from trunk/test/functional/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergerTest.java ) (1 diff)
gui/conflict/pair/properties (moved) (moved from trunk/test/functional/org/openstreetmap/josm/gui/conflict/properties )
gui/conflict/pair/properties/PropertiesMergerTest.java (copied) (copied from trunk/test/functional/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergerTest.java ) (1 diff)
gui/conflict/pair/relation (moved) (moved from trunk/test/functional/org/openstreetmap/josm/gui/conflict/relation )
gui/conflict/pair/relation/RelationMemberMergerTest.java (copied) (copied from trunk/test/functional/org/openstreetmap/josm/gui/conflict/relation/RelationMemberMergerTest.java ) (1 diff)
gui/conflict/pair/tags (copied) (copied from trunk/test/functional/org/openstreetmap/josm/gui/conflict/tags )
gui/conflict/pair/tags/TagMergerTest.java (moved) (moved from trunk/test/functional/org/openstreetmap/josm/gui/conflict/tags/TagMergerTest.java ) (1 diff)
io/MultiFetchServerObjectReaderTest.java (modified) (1 diff)
io/OsmServerBackreferenceReaderTest.java (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergerTest.java

r1954	r2041
1	1	// License: GPL. For details, see LICENSE file.
2		package org.openstreetmap.josm.gui.conflict.nodes;
	2	package org.openstreetmap.josm.gui.conflict.pair.nodes;
3	3
4	4	import java.awt.BorderLayout;

trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java

r1954	r2041
1	1	// License: GPL. For details, see LICENSE file.
2		package org.openstreetmap.josm.gui.conflict.properties;
	2	package org.openstreetmap.josm.gui.conflict.pair.properties;
3	3
4	4	import java.awt.BorderLayout;

trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMergerTest.java

r1954	r2041
1	1	// License: GPL. For details, see LICENSE file.
2		package org.openstreetmap.josm.gui.conflict.relation;
	2	package org.openstreetmap.josm.gui.conflict.pair.relation;
3	3
4	4	import java.awt.BorderLayout;

trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergerTest.java

r1954	r2041
1	1	// License: GPL. For details, see LICENSE file.
2		package org.openstreetmap.josm.gui.conflict.tags;
	2	package org.openstreetmap.josm.gui.conflict.pair.tags;
3	3
4	4	import java.awt.BorderLayout;

trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java

r1951	r2041
127	127
128	128	OsmServerWriter writer = new OsmServerWriter();
129		writer.uploadOsm("0.6", primitives, NullProgressMonitor.INSTANCE);
	129	writer.uploadOsm("0.6", primitives, null,null, NullProgressMonitor.INSTANCE);
130	130	}
131	131

trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java

r1951	r2041
129	129	primitives.addAll(ds.relations);
130	130	OsmServerWriter writer = new OsmServerWriter();
131		writer.uploadOsm("0.6", primitives, NullProgressMonitor.INSTANCE);
	131	writer.uploadOsm("0.6", primitives, null, null, NullProgressMonitor.INSTANCE);
132	132	}
133	133

Note: See TracChangeset for help on using the changeset viewer.

Download in other formats: