Changeset 7087 in josm for trunk/test/functional

Timestamp:

2014-05-09T11:42:57+02:00 (11 years ago)

Author:

simon04

Message:

ignore (non-working) functional GUI functional tests without assertions from JUnit, fix another test

Location:

trunk/test/functional/org/openstreetmap/josm/gui

Files:

• conflict/pair/nodes/NodeListMergerTest.java (modified) (2 diffs)
• conflict/pair/properties/PropertiesMergerTest.java (modified) (2 diffs)
• conflict/pair/relation/RelationMemberMergerTest.java (modified) (2 diffs)
• conflict/pair/tags/TagMergerTest.java (modified) (2 diffs)
• dialogs/ConflictResolutionDialogTest.java (modified) (2 diffs)
• dialogs/changeset/ChangesetCacheManagerTest.java (modified) (1 diff)
• dialogs/changeset/query/ChangesetQueryDialogTest.java (modified) (1 diff)
• history/HistoryBrowserTest.java (modified) (2 diffs)

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

@@ -6 +6 @@
 import javax.swing.JFrame;
 
+import org.junit.Ignore;
 import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.osm.Node;
@@ -11 +12 @@
 import org.openstreetmap.josm.data.osm.Way;
 
+@Ignore
 public class NodeListMergerTest extends JFrame {
 

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

@@ -6 +6 @@
 import javax.swing.JFrame;
 
+import org.junit.Ignore;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.conflict.Conflict;
@@ -13 +14 @@
 import org.openstreetmap.josm.data.projection.Projections;
 
+@Ignore
 public class PropertiesMergerTest extends JFrame{
 

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

@@ -6 +6 @@
 import javax.swing.JFrame;
 
+import org.junit.Ignore;
 import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.osm.Node;
@@ -13 +14 @@
 import org.openstreetmap.josm.data.osm.Way;
 
+@Ignore
 public class RelationMemberMergerTest extends JFrame {
 

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.conflict.pair.tags;
+
+import org.junit.Ignore;
 
 import java.awt.BorderLayout;
@@ -6 +8 @@
 import javax.swing.JFrame;
 
+@Ignore
 public class TagMergerTest extends JFrame {
 

trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTest.java

@@ -4 +4 @@
 import javax.swing.JFrame;
 
+import org.junit.Ignore;
 import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.osm.Node;
@@ -9 +10 @@
 import org.openstreetmap.josm.data.osm.Way;
 
+@Ignore
 public class ConflictResolutionDialogTest extends JFrame {
 

trunk/test/functional/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.dialogs.changeset;
 
+import org.junit.Ignore;
+
 import javax.swing.JFrame;
 
+@Ignore
 public class ChangesetCacheManagerTest extends JFrame {
 

trunk/test/functional/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialogTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.dialogs.changeset.query;
 
+import org.junit.Ignore;
+
 import javax.swing.JFrame;
 
+@Ignore
 public class ChangesetQueryDialogTest extends JFrame {
 

trunk/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTest.java

@@ -8 +8 @@
 
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.Main;
@@ -18 +19 @@
 import org.openstreetmap.josm.io.OsmTransferException;
 
+@Ignore
 public class HistoryBrowserTest extends JFrame {