Convert tests to JUnit 5, move samples to sample folder

Author: Marcono1234

pom.xml

@@ -201,6 +201,11 @@
 					<artifactId>maven-compiler-plugin</artifactId>
 					<version>3.8.1</version>
 				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-surefire-plugin</artifactId>
+					<version>3.0.0-M5</version>
+				</plugin>
 
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
@@ -284,16 +289,9 @@
 
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter-api</artifactId>
-			<version>5.5.1</version>
+			<artifactId>junit-jupiter</artifactId>
+			<version>5.7.0</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.junit.vintage</groupId>
-			<artifactId>junit-vintage-engine</artifactId>
-			<version>5.5.1</version>
-			<scope>test</scope>
-		</dependency>
-
 	</dependencies>
 </project>

…/java/ca/weblite/objc/LoadNibSample.java …/weblite/objc/samples/LoadNibSample.javasrc/test/java/ca/weblite/objc/LoadNibSample.java renamed to src/sample/java/ca/weblite/objc/samples/LoadNibSample.java src/test/java/ca/weblite/objc/LoadNibSample.java renamed to src/sample/java/ca/weblite/objc/samples/LoadNibSample.java

@@ -1,8 +1,8 @@
 package ca.weblite.objc;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  *

…a/ca/weblite/objc/NSOpenPanelSample.java …lite/objc/samples/NSOpenPanelSample.javasrc/test/java/ca/weblite/objc/NSOpenPanelSample.java renamed to src/sample/java/ca/weblite/objc/samples/NSOpenPanelSample.java src/test/java/ca/weblite/objc/NSOpenPanelSample.java renamed to src/sample/java/ca/weblite/objc/samples/NSOpenPanelSample.java

@@ -1,11 +1,11 @@
 package ca.weblite.objc;
 
 import static ca.weblite.objc.RuntimeUtils.*;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.util.List;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import com.sun.jna.Pointer;
 import com.sun.jna.Structure;
@@ -20,8 +20,11 @@ public class NSObjectTest {
 
     public static class NSRange extends Structure {
 
-        public static class ByReference extends NSRange implements Structure.ByReference{}
-        public static class ByValue extends NSRange implements Structure.ByValue{}
+        public static class ByReference extends NSRange implements Structure.ByReference{
+        }
+        public static class ByValue extends NSRange implements Structure.ByValue {
+        }
+        
         public long location;
         public int length;
 
@@ -99,9 +102,7 @@ public void testCustomClass(){
 
         String res = (String)cls.send("myCustomString");
         assertEquals("My custom string", res);
-        System.out.println("Before");
         cls.send("setMyCustomString:", "Changed String");
-        System.out.println("Here now");
         res = (String)cls.send("myCustomString");
         assertEquals("Changed String", res);
 
@@ -112,27 +113,22 @@ public void testCustomClass(){
         assertEquals(12, cls.sendInt("getCustomInt"));
 
         double dRes = cls.sendDouble("getMyDouble");
-        System.out.println("The double val is "+dRes);
 
-        assertTrue(1.5==dRes);
+        assertEquals(1.5, dRes);
 
         cls.send("setMyDouble:", 3.0);
         dRes = cls.sendDouble("getMyDouble");
-        //System.out.println("Double is now "+dRes);
-        //System.out.println("Double is (in java) "+cls.dNum);
-        assertTrue(3.0==dRes);
+        assertEquals(3.0, dRes);
+        assertEquals(3.0, cls.dNum);
 
         Proxy myObj = (Proxy)cls.send("getMyObj");
-        assertEquals(null, myObj);
+        assertNull(myObj);
 
         Proxy array = Client.getInstance().sendProxy("NSMutableArray", "array");
         cls.send("setMyObj:", array);
 
         myObj = cls.sendProxy("getMyObj");
         assertEquals(array, myObj);
-        
-        
-        
     }
 
     public static class TestCustomClass extends NSObject {

…a/ca/weblite/objc/NSSavePanelSample.java …lite/objc/samples/NSSavePanelSample.javasrc/test/java/ca/weblite/objc/NSSavePanelSample.java renamed to src/sample/java/ca/weblite/objc/samples/NSSavePanelSample.java src/test/java/ca/weblite/objc/NSSavePanelSample.java renamed to src/sample/java/ca/weblite/objc/samples/NSSavePanelSample.java

@@ -1,11 +1,11 @@
 package ca.weblite.objc;
 
 import static ca.weblite.objc.RuntimeUtils.*;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.util.List;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import com.sun.jna.Pointer;
 import com.sun.jna.Structure;
@@ -18,8 +18,11 @@ public class ProxyTest {
 
     public static class NSRange extends Structure {
 
-        public static class ByReference extends NSRange implements Structure.ByReference{}
-        public static class ByValue extends NSRange implements Structure.ByValue{}
+        public static class ByReference extends NSRange implements Structure.ByReference {
+        }
+        public static class ByValue extends NSRange implements Structure.ByValue {
+        }
+        
         public long location;
         public int length;
 
@@ -77,14 +80,11 @@ public void testNSArray() {
         Proxy enumerator = o.sendProxy("objectEnumerator");
 
         String placeHolder = (String)enumerator.send("nextObject");
-        assertEquals(aString, placeHolder);    
+        assertEquals(aString, placeHolder);
 
         Proxy newArray = o.sendProxy("arrayByAddingObject:", "Another String");
 
         assertEquals(2, newArray.sendInt("count"));
-        
-        
-        
     }
 
 }

…st/java/ca/weblite/objc/TestWebView.java …ca/weblite/objc/samples/TestWebView.javasrc/test/java/ca/weblite/objc/TestWebView.java renamed to src/sample/java/ca/weblite/objc/samples/TestWebView.java src/test/java/ca/weblite/objc/TestWebView.java renamed to src/sample/java/ca/weblite/objc/samples/TestWebView.java

@@ -1,8 +1,8 @@
 package ca.weblite.objc;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import com.sun.jna.Pointer;
 
@@ -51,7 +51,6 @@ public void testObjc_lookUpClass() {
         Pointer stringPtr = new Pointer(string);
 
 
-        
         long outStringPtr = Runtime.INSTANCE.objc_msgSend(stringPtr, utf8StringSelector);
 
         //outStringPtr is a pointer to a CString, so let's convert it into 
@@ -60,9 +59,6 @@ public void testObjc_lookUpClass() {
 
         String outString = new Pointer(outStringPtr).getString(0);
         assertEquals("Test String", outString);
-        
-        
     }
 
-    
 }

src/test/java/ca/weblite/objc/ClientTest.java

@@ -1,9 +1,9 @@
 package ca.weblite.objc;
 
 import static ca.weblite.objc.RuntimeUtils.*;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import com.sun.jna.Pointer;
 
@@ -59,14 +59,10 @@ public void testObjc_lookUpClass() {
 
         String outString = new Pointer(outStringPtr).getString(0);
         assertEquals("Test String", outString);
-        
-        
     }
 
     @Test
     public void testObjc_lookUpClass2() {
-        
-        
         // Create a new string with the stringWithUTF8String: message
         // We are sending the message directly to the NSString class.
         long string = msg("NSString", "stringWithUTF8String:", "Test String");
@@ -79,14 +75,10 @@ public void testObjc_lookUpClass2() {
 
         String outString = new Pointer(outStringPtr).getString(0);
         assertEquals("Test String", outString);
-        
-        
     }
 
     @Test
     public void testObjc_lookUpClass3() {
-        
-        
         // Create a new string with the stringWithUTF8String: message
         // We are sending the message directly to the NSString class.
         // Because we are asking to coerce outputs, this will simply
@@ -136,7 +128,7 @@ public void testObjc_lookUpClass3() {
                 true,
                 cls("NSMutableArray"),
                 sel("array")
-                );
+        );
 
 
         // Add out test string to the array
@@ -155,9 +147,6 @@ public void testObjc_lookUpClass3() {
         // directly and have it return a string.
         String firstItem = array.sendString("objectAtIndex:", 0);
         assertEquals(outString, firstItem);
-        
-        
-        
     }
 
 }