Index: trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergerTest.java =================================================================== --- trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergerTest.java (revision 9529) +++ (revision ) @@ -1,77 +1,0 @@ -// License: GPL. For details, see LICENSE file. -package org.openstreetmap.josm.gui.conflict.pair.nodes; - -import java.awt.BorderLayout; - -import javax.swing.JFrame; - -import org.junit.Ignore; -import org.openstreetmap.josm.data.conflict.Conflict; -import org.openstreetmap.josm.data.osm.Node; -import org.openstreetmap.josm.data.osm.OsmPrimitive; -import org.openstreetmap.josm.data.osm.Way; - -@Ignore -public class NodeListMergerTest extends JFrame { - - - private NodeListMerger nodeListMerger; - - protected void populate() { - Way w1 = new Way(); - Node n1; - w1.addNode(n1 = new Node(1)); - for (int i = 0; i < 20; i++) { - n1.put("key" + i, "value" + i); - } - StringBuilder note = new StringBuilder(); - for (int i = 0; i < 50; i++) { - note.append(" A very long text "); - } - n1.put("note", note.toString()); - w1.addNode(new Node(2)); - w1.addNode(new Node(3)); - - Way w2 = new Way(); - w2.addNode(new Node(4)); - w2.addNode(new Node(5)); - w2.addNode(new Node(6)); - - nodeListMerger.populate(new Conflict(w1, w2)); - - } - - protected void populateLong() { - Way w1 = new Way(); - for (int i = 0; i < 100; i++) { - w1.addNode(new Node(i)); - } - - Way w2 = new Way(); - for (int i = 1; i < 200; i += 2) { - w2.addNode(new Node(i)); - } - nodeListMerger.populate(new Conflict(w1, w2)); - - } - - protected void build() { - nodeListMerger = new NodeListMerger(); - getContentPane().setLayout(new BorderLayout()); - getContentPane().add(nodeListMerger, BorderLayout.CENTER); - } - - /** - * Constructs a new {@code NodeListMergerTest}. - */ - public NodeListMergerTest() { - build(); - populate(); - } - - public static void main(String[] args) { - NodeListMergerTest test = new NodeListMergerTest(); - test.setSize(600, 600); - test.setVisible(true); - } -} Index: trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergerTestFT.java =================================================================== --- trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergerTestFT.java (revision 9546) +++ trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergerTestFT.java (revision 9546) @@ -0,0 +1,74 @@ +// License: GPL. For details, see LICENSE file. +package org.openstreetmap.josm.gui.conflict.pair.nodes; + +import java.awt.BorderLayout; + +import javax.swing.JFrame; + +import org.openstreetmap.josm.data.conflict.Conflict; +import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.Way; + +public class NodeListMergerTestFT extends JFrame { + + private NodeListMerger nodeListMerger; + + protected void populate() { + Way w1 = new Way(); + Node n1; + w1.addNode(n1 = new Node(1)); + for (int i = 0; i < 20; i++) { + n1.put("key" + i, "value" + i); + } + StringBuilder note = new StringBuilder(); + for (int i = 0; i < 50; i++) { + note.append(" A very long text "); + } + n1.put("note", note.toString()); + w1.addNode(new Node(2)); + w1.addNode(new Node(3)); + + Way w2 = new Way(); + w2.addNode(new Node(4)); + w2.addNode(new Node(5)); + w2.addNode(new Node(6)); + + nodeListMerger.populate(new Conflict(w1, w2)); + + } + + protected void populateLong() { + Way w1 = new Way(); + for (int i = 0; i < 100; i++) { + w1.addNode(new Node(i)); + } + + Way w2 = new Way(); + for (int i = 1; i < 200; i += 2) { + w2.addNode(new Node(i)); + } + nodeListMerger.populate(new Conflict(w1, w2)); + + } + + protected void build() { + nodeListMerger = new NodeListMerger(); + getContentPane().setLayout(new BorderLayout()); + getContentPane().add(nodeListMerger, BorderLayout.CENTER); + } + + /** + * Constructs a new {@code NodeListMergerTest}. + */ + public NodeListMergerTestFT() { + build(); + populate(); + } + + public static void main(String[] args) { + NodeListMergerTestFT test = new NodeListMergerTestFT(); + test.setSize(600, 600); + test.setVisible(true); + } +} Index: trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java =================================================================== --- trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java (revision 9529) +++ (revision ) @@ -1,52 +1,0 @@ -// License: GPL. For details, see LICENSE file. -package org.openstreetmap.josm.gui.conflict.pair.properties; - -import java.awt.BorderLayout; - -import javax.swing.JFrame; - -import org.junit.Ignore; -import org.openstreetmap.josm.Main; -import org.openstreetmap.josm.data.conflict.Conflict; -import org.openstreetmap.josm.data.coor.LatLon; -import org.openstreetmap.josm.data.osm.Node; -import org.openstreetmap.josm.data.osm.OsmPrimitive; -import org.openstreetmap.josm.data.projection.Projections; - -@Ignore -public class PropertiesMergerTest extends JFrame { - - private PropertiesMerger merger; - - protected void build() { - Main.setProjection(Projections.getProjectionByCode("EPSG:4326")); // WGS 84 - - setLayout(new BorderLayout()); - add(merger = new PropertiesMerger(), BorderLayout.CENTER); - } - - protected void populate() { - Node my = new Node(1); - my.setCoor(new LatLon(1, 1)); - my.setDeleted(true); - - Node their = new Node(2); - their.setCoor(new LatLon(10, 10)); - - merger.getModel().populate(new Conflict(my, their)); - } - - /** - * Constructs a new {@code PropertiesMergerTest}. - */ - public PropertiesMergerTest() { - build(); - populate(); - } - - public static void main(String[] args) { - PropertiesMergerTest app = new PropertiesMergerTest(); - app.setSize(600, 400); - app.setVisible(true); - } -} Index: trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTestFT.java =================================================================== --- trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTestFT.java (revision 9546) +++ trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTestFT.java (revision 9546) @@ -0,0 +1,50 @@ +// License: GPL. For details, see LICENSE file. +package org.openstreetmap.josm.gui.conflict.pair.properties; + +import java.awt.BorderLayout; + +import javax.swing.JFrame; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.data.conflict.Conflict; +import org.openstreetmap.josm.data.coor.LatLon; +import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.projection.Projections; + +public class PropertiesMergerTestFT extends JFrame { + + private PropertiesMerger merger; + + protected void build() { + Main.setProjection(Projections.getProjectionByCode("EPSG:4326")); // WGS 84 + + setLayout(new BorderLayout()); + add(merger = new PropertiesMerger(), BorderLayout.CENTER); + } + + protected void populate() { + Node my = new Node(1); + my.setCoor(new LatLon(1, 1)); + my.setDeleted(true); + + Node their = new Node(2); + their.setCoor(new LatLon(10, 10)); + + merger.getModel().populate(new Conflict(my, their)); + } + + /** + * Constructs a new {@code PropertiesMergerTest}. + */ + public PropertiesMergerTestFT() { + build(); + populate(); + } + + public static void main(String[] args) { + PropertiesMergerTestFT app = new PropertiesMergerTestFT(); + app.setSize(600, 400); + app.setVisible(true); + } +} Index: trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMergerTest.java =================================================================== --- trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMergerTest.java (revision 9529) +++ (revision ) @@ -1,56 +1,0 @@ -// License: GPL. For details, see LICENSE file. -package org.openstreetmap.josm.gui.conflict.pair.relation; - -import java.awt.BorderLayout; - -import javax.swing.JFrame; - -import org.junit.Ignore; -import org.openstreetmap.josm.data.conflict.Conflict; -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.RelationMember; -import org.openstreetmap.josm.data.osm.Way; - -@Ignore -public class RelationMemberMergerTest extends JFrame { - - private RelationMemberMerger merger; - - protected void populate() { - Relation r1 = new Relation(); - r1.addMember(new RelationMember("role1", new Node(1))); - r1.addMember(new RelationMember("role2", new Way(2))); - r1.addMember(new RelationMember("role3", new Relation(3))); - - - Relation r2 = new Relation(); - r2.addMember(new RelationMember("role1", new Node(1))); - r2.addMember(new RelationMember("role2", new Way(2))); - r2.addMember(new RelationMember("role3", new Relation(3))); - - merger.populate(new Conflict(r1, r2)); - - } - - protected void build() { - merger = new RelationMemberMerger(); - getContentPane().setLayout(new BorderLayout()); - getContentPane().add(merger, BorderLayout.CENTER); - } - - /** - * Constructs a new {@code RelationMemberMergerTest}. - */ - public RelationMemberMergerTest() { - build(); - populate(); - } - - public static void main(String[] args) { - RelationMemberMergerTest test = new RelationMemberMergerTest(); - test.setSize(600, 600); - test.setVisible(true); - } -} Index: trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMergerTestFT.java =================================================================== --- trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMergerTestFT.java (revision 9546) +++ trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMergerTestFT.java (revision 9546) @@ -0,0 +1,54 @@ +// License: GPL. For details, see LICENSE file. +package org.openstreetmap.josm.gui.conflict.pair.relation; + +import java.awt.BorderLayout; + +import javax.swing.JFrame; + +import org.openstreetmap.josm.data.conflict.Conflict; +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.RelationMember; +import org.openstreetmap.josm.data.osm.Way; + +public class RelationMemberMergerTestFT extends JFrame { + + private RelationMemberMerger merger; + + protected void populate() { + Relation r1 = new Relation(); + r1.addMember(new RelationMember("role1", new Node(1))); + r1.addMember(new RelationMember("role2", new Way(2))); + r1.addMember(new RelationMember("role3", new Relation(3))); + + + Relation r2 = new Relation(); + r2.addMember(new RelationMember("role1", new Node(1))); + r2.addMember(new RelationMember("role2", new Way(2))); + r2.addMember(new RelationMember("role3", new Relation(3))); + + merger.populate(new Conflict(r1, r2)); + + } + + protected void build() { + merger = new RelationMemberMerger(); + getContentPane().setLayout(new BorderLayout()); + getContentPane().add(merger, BorderLayout.CENTER); + } + + /** + * Constructs a new {@code RelationMemberMergerTest}. + */ + public RelationMemberMergerTestFT() { + build(); + populate(); + } + + public static void main(String[] args) { + RelationMemberMergerTestFT test = new RelationMemberMergerTestFT(); + test.setSize(600, 600); + test.setVisible(true); + } +} Index: trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergerTest.java =================================================================== --- trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergerTest.java (revision 9529) +++ (revision ) @@ -1,41 +1,0 @@ -// License: GPL. For details, see LICENSE file. -package org.openstreetmap.josm.gui.conflict.pair.tags; - -import java.awt.BorderLayout; - -import javax.swing.JFrame; - -import org.junit.Ignore; - -@Ignore -public class TagMergerTest extends JFrame { - - private TagMerger tagMerger; - - protected void build() { - tagMerger = new TagMerger(); - getContentPane().setLayout(new BorderLayout()); - getContentPane().add(tagMerger, BorderLayout.CENTER); - } - - /** - * Constructs a new {@code TagMergerTest}. - */ - public TagMergerTest() { - build(); - tagMerger.getModel().addItem(new TagMergeItem("key", "myvalue", "theirvalue")); - tagMerger.getModel().addItem(new TagMergeItem("key", "myvalue", null)); - tagMerger.getModel().addItem(new TagMergeItem("key", null, "theirvalue")); - tagMerger.getModel().addItem(new TagMergeItem("a very long key asdfasdf asdfasdf", "a very long value asdfasdf", - "a very long value asdfasdf")); - for (int i = 0; i < 50; i++) { - tagMerger.getModel().addItem(new TagMergeItem("key", "myvalue", "theirvalue")); - } - } - - public static void main(String[] args) { - TagMergerTest test = new TagMergerTest(); - test.setSize(600, 600); - test.setVisible(true); - } -} Index: trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergerTestFT.java =================================================================== --- trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergerTestFT.java (revision 9546) +++ trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergerTestFT.java (revision 9546) @@ -0,0 +1,38 @@ +// License: GPL. For details, see LICENSE file. +package org.openstreetmap.josm.gui.conflict.pair.tags; + +import java.awt.BorderLayout; + +import javax.swing.JFrame; + +public class TagMergerTestFT extends JFrame { + + private TagMerger tagMerger; + + protected void build() { + tagMerger = new TagMerger(); + getContentPane().setLayout(new BorderLayout()); + getContentPane().add(tagMerger, BorderLayout.CENTER); + } + + /** + * Constructs a new {@code TagMergerTest}. + */ + public TagMergerTestFT() { + build(); + tagMerger.getModel().addItem(new TagMergeItem("key", "myvalue", "theirvalue")); + tagMerger.getModel().addItem(new TagMergeItem("key", "myvalue", null)); + tagMerger.getModel().addItem(new TagMergeItem("key", null, "theirvalue")); + tagMerger.getModel().addItem(new TagMergeItem("a very long key asdfasdf asdfasdf", "a very long value asdfasdf", + "a very long value asdfasdf")); + for (int i = 0; i < 50; i++) { + tagMerger.getModel().addItem(new TagMergeItem("key", "myvalue", "theirvalue")); + } + } + + public static void main(String[] args) { + TagMergerTestFT test = new TagMergerTestFT(); + test.setSize(600, 600); + test.setVisible(true); + } +} Index: trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTest.java =================================================================== --- trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTest.java (revision 9529) +++ (revision ) @@ -1,52 +1,0 @@ -// License: GPL. For details, see LICENSE file. -package org.openstreetmap.josm.gui.dialogs; - -import javax.swing.JFrame; - -import org.junit.Ignore; -import org.openstreetmap.josm.data.conflict.Conflict; -import org.openstreetmap.josm.data.osm.Node; -import org.openstreetmap.josm.data.osm.OsmPrimitive; -import org.openstreetmap.josm.data.osm.Way; - -@Ignore -public class ConflictResolutionDialogTest extends JFrame { - - private ConflictResolutionDialog dialog; - - protected void build() { - setSize(100, 100); - dialog = new ConflictResolutionDialog(this); - dialog.setSize(600, 600); - } - - protected void populate() { - Way w1 = new Way(1); - w1.addNode(new Node(10)); - w1.addNode(new Node(11)); - - Way w2 = new Way(1); - w2.addNode(new Node(10)); - w2.addNode(new Node(11)); - - dialog.getConflictResolver().populate(new Conflict(w1, w2)); - } - - public void showDialog() { - dialog.setVisible(true); - } - - /** - * Constructs a new {@code ConflictResolutionDialogTest}. - */ - public ConflictResolutionDialogTest() { - build(); - } - - public static void main(String[] args) { - ConflictResolutionDialogTest test = new ConflictResolutionDialogTest(); - test.setVisible(true); - test.populate(); - test.showDialog(); - } -} Index: trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTestFT.java =================================================================== --- trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTestFT.java (revision 9546) +++ trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTestFT.java (revision 9546) @@ -0,0 +1,50 @@ +// License: GPL. For details, see LICENSE file. +package org.openstreetmap.josm.gui.dialogs; + +import javax.swing.JFrame; + +import org.openstreetmap.josm.data.conflict.Conflict; +import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.Way; + +public class ConflictResolutionDialogTestFT extends JFrame { + + private ConflictResolutionDialog dialog; + + protected void build() { + setSize(100, 100); + dialog = new ConflictResolutionDialog(this); + dialog.setSize(600, 600); + } + + protected void populate() { + Way w1 = new Way(1); + w1.addNode(new Node(10)); + w1.addNode(new Node(11)); + + Way w2 = new Way(1); + w2.addNode(new Node(10)); + w2.addNode(new Node(11)); + + dialog.getConflictResolver().populate(new Conflict(w1, w2)); + } + + public void showDialog() { + dialog.setVisible(true); + } + + /** + * Constructs a new {@code ConflictResolutionDialogTest}. + */ + public ConflictResolutionDialogTestFT() { + build(); + } + + public static void main(String[] args) { + ConflictResolutionDialogTestFT test = new ConflictResolutionDialogTestFT(); + test.setVisible(true); + test.populate(); + test.showDialog(); + } +} Index: trunk/test/functional/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerTest.java =================================================================== --- trunk/test/functional/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerTest.java (revision 9529) +++ (revision ) @@ -1,21 +1,0 @@ -// License: GPL. For details, see LICENSE file. -package org.openstreetmap.josm.gui.dialogs.changeset; - -import javax.swing.JFrame; - -import org.junit.Ignore; - -@Ignore -public class ChangesetCacheManagerTest extends JFrame { - - private ChangesetCacheManager manager; - - public void start() { - manager = new ChangesetCacheManager(); - manager.setVisible(true); - } - - public static void main(String[] args) { - new ChangesetCacheManagerTest().start(); - } -} Index: trunk/test/functional/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerTestFT.java =================================================================== --- trunk/test/functional/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerTestFT.java (revision 9546) +++ trunk/test/functional/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerTestFT.java (revision 9546) @@ -0,0 +1,18 @@ +// License: GPL. For details, see LICENSE file. +package org.openstreetmap.josm.gui.dialogs.changeset; + +import javax.swing.JFrame; + +public class ChangesetCacheManagerTestFT extends JFrame { + + private ChangesetCacheManager manager; + + public void start() { + manager = new ChangesetCacheManager(); + manager.setVisible(true); + } + + public static void main(String[] args) { + new ChangesetCacheManagerTestFT().start(); + } +} Index: trunk/test/functional/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialogTest.java =================================================================== --- trunk/test/functional/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialogTest.java (revision 9529) +++ (revision ) @@ -1,22 +1,0 @@ -// License: GPL. For details, see LICENSE file. -package org.openstreetmap.josm.gui.dialogs.changeset.query; - -import javax.swing.JFrame; - -import org.junit.Ignore; - -@Ignore -public class ChangesetQueryDialogTest extends JFrame { - - private ChangesetQueryDialog dialog; - - public void start() { - dialog = new ChangesetQueryDialog(this); - dialog.initForUserInput(); - dialog.setVisible(true); - } - - public static void main(String[] args) { - new ChangesetQueryDialogTest().start(); - } -} Index: trunk/test/functional/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialogTestFT.java =================================================================== --- trunk/test/functional/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialogTestFT.java (revision 9546) +++ trunk/test/functional/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialogTestFT.java (revision 9546) @@ -0,0 +1,19 @@ +// License: GPL. For details, see LICENSE file. +package org.openstreetmap.josm.gui.dialogs.changeset.query; + +import javax.swing.JFrame; + +public class ChangesetQueryDialogTestFT extends JFrame { + + private ChangesetQueryDialog dialog; + + public void start() { + dialog = new ChangesetQueryDialog(this); + dialog.initForUserInput(); + dialog.setVisible(true); + } + + public static void main(String[] args) { + new ChangesetQueryDialogTestFT().start(); + } +} Index: trunk/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTest.java =================================================================== --- trunk/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTest.java (revision 9529) +++ (revision ) @@ -1,65 +1,0 @@ -// License: GPL. For details, see LICENSE file. -package org.openstreetmap.josm.gui.history; - -import java.awt.BorderLayout; - -import javax.swing.JFrame; - -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.openstreetmap.josm.JOSMFixture; -import org.openstreetmap.josm.Main; -import org.openstreetmap.josm.data.osm.OsmPrimitiveType; -import org.openstreetmap.josm.data.osm.SimplePrimitiveId; -import org.openstreetmap.josm.data.osm.history.History; -import org.openstreetmap.josm.data.osm.history.HistoryDataSet; -import org.openstreetmap.josm.gui.progress.NullProgressMonitor; -import org.openstreetmap.josm.io.OsmServerHistoryReader; -import org.openstreetmap.josm.io.OsmTransferException; - -@Ignore -public class HistoryBrowserTest extends JFrame { - - @BeforeClass - public static void init() { - JOSMFixture.createFunctionalTestFixture().init(); - } - - private HistoryBrowser browser; - - protected void build() { - setSize(500, 500); - getContentPane().setLayout(new BorderLayout()); - browser = new HistoryBrowser(); - getContentPane().add(browser, BorderLayout.CENTER); - } - - protected void populate(OsmPrimitiveType type, long id) { - OsmServerHistoryReader reader = new OsmServerHistoryReader(type, id); - HistoryDataSet ds = null; - try { - ds = reader.parseHistory(NullProgressMonitor.INSTANCE); - } catch (OsmTransferException e) { - Main.error(e); - return; - } - History h = ds.getHistory(new SimplePrimitiveId(id, type)); - browser.populate(h); - } - - /** - * Constructs a new {@code HistoryBrowserTest}. - */ - public HistoryBrowserTest() { - build(); - //populate(OsmPrimitiveType.NODE,354117); - //populate(OsmPrimitiveType.WAY,37951); - populate(OsmPrimitiveType.RELATION, 5055); - - } - - public static void main(String[] args) { - HistoryBrowserTest.init(); - new HistoryBrowserTest().setVisible(true); - } -} Index: trunk/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTestFT.java =================================================================== --- trunk/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTestFT.java (revision 9546) +++ trunk/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTestFT.java (revision 9546) @@ -0,0 +1,64 @@ +// License: GPL. For details, see LICENSE file. +package org.openstreetmap.josm.gui.history; + +import java.awt.BorderLayout; + +import javax.swing.JFrame; + +import org.junit.BeforeClass; +import org.junit.Ignore; +import org.openstreetmap.josm.JOSMFixture; +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.data.osm.OsmPrimitiveType; +import org.openstreetmap.josm.data.osm.SimplePrimitiveId; +import org.openstreetmap.josm.data.osm.history.History; +import org.openstreetmap.josm.data.osm.history.HistoryDataSet; +import org.openstreetmap.josm.gui.progress.NullProgressMonitor; +import org.openstreetmap.josm.io.OsmServerHistoryReader; +import org.openstreetmap.josm.io.OsmTransferException; + +public class HistoryBrowserTestFT extends JFrame { + + @BeforeClass + public static void init() { + JOSMFixture.createFunctionalTestFixture().init(); + } + + private HistoryBrowser browser; + + protected void build() { + setSize(500, 500); + getContentPane().setLayout(new BorderLayout()); + browser = new HistoryBrowser(); + getContentPane().add(browser, BorderLayout.CENTER); + } + + protected void populate(OsmPrimitiveType type, long id) { + OsmServerHistoryReader reader = new OsmServerHistoryReader(type, id); + HistoryDataSet ds = null; + try { + ds = reader.parseHistory(NullProgressMonitor.INSTANCE); + } catch (OsmTransferException e) { + Main.error(e); + return; + } + History h = ds.getHistory(new SimplePrimitiveId(id, type)); + browser.populate(h); + } + + /** + * Constructs a new {@code HistoryBrowserTest}. + */ + public HistoryBrowserTestFT() { + build(); + //populate(OsmPrimitiveType.NODE,354117); + //populate(OsmPrimitiveType.WAY,37951); + populate(OsmPrimitiveType.RELATION, 5055); + + } + + public static void main(String[] args) { + HistoryBrowserTestFT.init(); + new HistoryBrowserTestFT().setVisible(true); + } +}