Ticket #13199: patch-fix-relation-member-transferable-test.patch

test/unit/org/openstreetmap/josm/gui/datatransfer/RelationMemberTransferableTest.java

@@ -3 +3 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.openstreetmap.josm.gui.datatransfer.RelationMemberTransferable.RELATION_MEMBER_DATA;
 
@@ -16 +15 @@
 import org.junit.Test;
 import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.PrimitiveData;
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.RelationMemberData;
+import org.openstreetmap.josm.gui.datatransfer.data.PrimitiveTransferData;
 
 /**
  * Unit tests of {@link RelationMemberTransferable} class.
@@ -38 +39 @@
     @Test
     public void testGetTransferDataFlavors() {
         DataFlavor[] flavors = new RelationMemberTransferable(Collections.<RelationMember>emptyList()).getTransferDataFlavors();
-        assertEquals(2, flavors.length);
+        assertEquals(3, flavors.length);
         assertEquals(RELATION_MEMBER_DATA, flavors[0]);
-        assertEquals(DataFlavor.stringFlavor, flavors[1]);
+        assertEquals(PrimitiveTransferData.DATA_FLAVOR, flavors[1]);
+        assertEquals(DataFlavor.stringFlavor, flavors[2]);
     }
 
     /**
@@ -50 +52 @@
     public void testIsDataFlavorSupported() {
         RelationMemberTransferable transferable = new RelationMemberTransferable(Collections.<RelationMember>emptyList());
         assertTrue(transferable.isDataFlavorSupported(RELATION_MEMBER_DATA));
+        assertTrue(transferable.isDataFlavorSupported(PrimitiveTransferData.DATA_FLAVOR));
         assertFalse(transferable.isDataFlavorSupported(null));
     }
 
@@ -64 +67 @@
         Collection<RelationMemberData> td = ((RelationMemberTransferable.Data) rmt.getTransferData(RELATION_MEMBER_DATA))
                 .getRelationMemberData();
         assertEquals(1, td.size());
-        assertNotNull(td.iterator().next());
+        assertEquals(1, td.iterator().next().getMemberId());
+        assertEquals("test", td.iterator().next().getRole());
+
+        Collection<PrimitiveData> primitives = ((PrimitiveTransferData) rmt.getTransferData(PrimitiveTransferData.DATA_FLAVOR))
+                .getDirectlyAdded();
+        assertEquals(1, primitives.size());
+        assertEquals(1, primitives.iterator().next().getId());
     }
 
     /**