Changeset 17275 in josm for trunk/test/unit/org/openstreetmap/josm/gui/datatransfer/RelationMemberTransferableTest.java

Timestamp:

2020-10-28T20:41:00+01:00 (4 years ago)

Author:

Don-vip

Message:

see #16567 - upgrade almost all tests to JUnit 5, except those depending on WiremockRule

See ​https://github.com/tomakehurst/wiremock/issues/684

File:

• trunk/test/unit/org/openstreetmap/josm/gui/datatransfer/RelationMemberTransferableTest.java (modified) (7 diffs)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.datatransfer;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.openstreetmap.josm.gui.datatransfer.RelationMemberTransferable.RELATION_MEMBER_DATA;
 
@@ -12 +13 @@
 import java.util.Collections;
 
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.PrimitiveData;
@@ -26 +27 @@
  * Unit tests of {@link RelationMemberTransferable} class.
  */
-public class RelationMemberTransferableTest {
+class RelationMemberTransferableTest {
 
     /**
      * Setup tests
      */
-    @Rule
+    @RegisterExtension
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public JOSMTestRules test = new JOSMTestRules();
@@ -39 +40 @@
      */
     @Test
-    public void testGetTransferDataFlavors() {
+    void testGetTransferDataFlavors() {
         DataFlavor[] flavors = new RelationMemberTransferable(Collections.<RelationMember>emptyList()).getTransferDataFlavors();
         assertEquals(3, flavors.length);
@@ -51 +52 @@
      */
     @Test
-    public void testIsDataFlavorSupported() {
+    void testIsDataFlavorSupported() {
         RelationMemberTransferable transferable = new RelationMemberTransferable(Collections.<RelationMember>emptyList());
         assertTrue(transferable.isDataFlavorSupported(RELATION_MEMBER_DATA));
@@ -63 +64 @@
      */
     @Test
-    public void testGetTransferDataNominal() throws UnsupportedFlavorException {
+    void testGetTransferDataNominal() throws UnsupportedFlavorException {
         RelationMemberTransferable rmt = new RelationMemberTransferable(Collections.singleton(new RelationMember("test", new Node(1))));
         assertEquals("node 1 test # incomplete\n", rmt.getTransferData(DataFlavor.stringFlavor));
@@ -80 +81 @@
     /**
      * Test of {@link RelationMemberTransferable#getTransferData} method - error case.
-     * @throws UnsupportedFlavorException always
      */
-    @Test(expected = UnsupportedFlavorException.class)
-    public void testGetTransferDataError() throws UnsupportedFlavorException {
-        new RelationMemberTransferable(Collections.singleton(new RelationMember(null, new Node(1)))).getTransferData(null);
+    @Test
+    void testGetTransferDataError() {
+        assertThrows(UnsupportedFlavorException.class,
+                () -> new RelationMemberTransferable(Collections.singleton(new RelationMember(null, new Node(1)))).getTransferData(null));
     }
 }