Changeset 8391 in josm for trunk/test/unit

Timestamp:

2015-05-18T02:30:54+02:00 (9 years ago)

Author:

Don-vip

Message:

fix unit tests

Location:

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

Files:

• nodes/NodeListMergeModelTest.java (modified) (3 diffs)
• tags/TagMergeModelTest.java (modified) (3 diffs)

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

@@ -13 +13 @@
 import java.util.Arrays;
 import java.util.List;
+import java.util.Set;
 
 import javax.swing.DefaultListSelectionModel;
@@ -655 +656 @@
         model.addPropertyChangeListener(listener);
 
-        List<PropertyChangeListener> listeners = field("listeners")
-        .ofType(List.class)
+        Set<PropertyChangeListener> listeners = field("listeners")
+        .ofType(Set.class)
         .in(model)
         .get();
 
         assertEquals(1, listeners.size());
-        assertEquals(listener, listeners.get(0));
+        assertEquals(listener, listeners.iterator().next());
     }
 
@@ -678 +679 @@
         model.removePropertyChangeListener(listener);
 
-        List<PropertyChangeListener> listeners = field("listeners")
-        .ofType(List.class)
+        Set<PropertyChangeListener> listeners = field("listeners")
+        .ofType(Set.class)
         .in(model)
         .get();

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

@@ -9 +9 @@
 import java.beans.PropertyChangeListener;
 import java.util.List;
+import java.util.Set;
 
 import org.junit.BeforeClass;
@@ -36 +37 @@
         model.addPropertyChangeListener(listener);
 
-        List<?> list = field("listeners").ofType(List.class)
-        .in(model)
-        .get();
-
-        assertEquals(1, list.size());
-        assertEquals(listener, list.get(0));
+        Set<?> list = field("listeners").ofType(Set.class)
+        .in(model)
+        .get();
+
+        assertEquals(1, list.size());
+        assertEquals(listener, list.iterator().next());
     }
 
@@ -55 +56 @@
         model.removePropertyChangeListener(listener);
 
-        List<?> list = field("listeners")
-        .ofType(List.class)
+        Set<?> list = field("listeners")
+        .ofType(Set.class)
         .in(model)
         .get();