replaced all junit 3 and 4 with junit 5 stuff

Author: wumpz

pom.xml

@@ -38,14 +38,14 @@
         	<scope>test</scope>
         </dependency>
         <dependency>
-        	<groupId>org.junit.vintage</groupId>
-        	<artifactId>junit-vintage-engine</artifactId>
-        	<version>5.8.1</version>
-        	<scope>test</scope>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>3.12.4</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
+            <artifactId>mockito-junit-jupiter</artifactId>
             <version>3.12.4</version>
             <scope>test</scope>
         </dependency>
@@ -67,7 +67,12 @@
             <version>1.4.200</version>
             <scope>test</scope>
         </dependency>
-		
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-all</artifactId>
+            <version>1.3</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <developers>

src/test/java/net/sf/jsqlparser/expression/CastExpressionTest.java

@@ -12,7 +12,7 @@
 
 import net.sf.jsqlparser.JSQLParserException;
 import net.sf.jsqlparser.test.TestUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  *

src/test/java/net/sf/jsqlparser/expression/ExpressionPrecedenceTest.java

@@ -13,8 +13,9 @@
 import net.sf.jsqlparser.expression.operators.arithmetic.BitwiseAnd;
 import net.sf.jsqlparser.expression.operators.arithmetic.Concat;
 import net.sf.jsqlparser.parser.CCJSqlParserUtil;
-import static org.junit.Assert.assertTrue;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
 
 /**
  *

src/test/java/net/sf/jsqlparser/expression/ExpressionVisitorAdapterTest.java

@@ -15,47 +15,31 @@
 import net.sf.jsqlparser.expression.operators.conditional.XorExpression;
 import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
 import net.sf.jsqlparser.statement.select.SubSelect;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+
+
+
+
+import org.junit.jupiter.api.Test;
+
+
+
+
 import net.sf.jsqlparser.JSQLParserException;
 import net.sf.jsqlparser.expression.operators.relational.InExpression;
 import net.sf.jsqlparser.parser.CCJSqlParserUtil;
 import net.sf.jsqlparser.schema.Column;
 import net.sf.jsqlparser.statement.select.PlainSelect;
 import net.sf.jsqlparser.statement.select.Select;
 import net.sf.jsqlparser.statement.select.SelectVisitorAdapter;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * @author tw
  */
 public class ExpressionVisitorAdapterTest {
-
-    public ExpressionVisitorAdapterTest() {
-    }
-
-    @BeforeClass
-    public static void setUpClass() {
-    }
-
-    @AfterClass
-    public static void tearDownClass() {
-    }
-
-    @Before
-    public void setUp() {
-    }
-
-    @After
-    public void tearDown() {
-    }
-
     @Test
     public void testInExpressionProblem() throws JSQLParserException {
         final List<Object> exprList = new ArrayList<>();

src/test/java/net/sf/jsqlparser/expression/FunctionWithBooleanParameterTest.java

@@ -10,8 +10,9 @@
 package net.sf.jsqlparser.expression;
 
 import net.sf.jsqlparser.parser.CCJSqlParserUtil;
-import static org.junit.Assert.assertEquals;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
 
 /**
  * Test some cases linked to a boolean (condition) argument as function parameter.

src/test/java/net/sf/jsqlparser/expression/JsonFunctionTest.java

@@ -11,12 +11,15 @@
 package net.sf.jsqlparser.expression;
 
 import java.util.Objects;
-import junit.framework.Assert;
 import net.sf.jsqlparser.JSQLParserException;
 import net.sf.jsqlparser.parser.CCJSqlParserUtil;
 import net.sf.jsqlparser.test.TestUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Assertions;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  *
@@ -66,17 +69,17 @@ public void testObjectBuilder() throws JSQLParserException {
       JsonKeyValuePair keyValuePair2 = new JsonKeyValuePair("foo", "bar", false, false).withUsingKeyKeyword(true).withUsingValueKeyword(true).withUsingFormatJson(false);
 
       // this should work because we compare based on KEY only
-      Assert.assertEquals(keyValuePair1, keyValuePair2);
+      assertEquals(keyValuePair1, keyValuePair2);
 
       // this must fail because all the properties are considered
-      Assert.assertFalse(Objects.equals(keyValuePair1.toString(), keyValuePair2.toString()));
+      assertFalse(Objects.equals(keyValuePair1.toString(), keyValuePair2.toString()));
 
       JsonKeyValuePair keyValuePair3 = new JsonKeyValuePair("foo", "bar", false, false).withUsingKeyKeyword(false).withUsingValueKeyword(false).withUsingFormatJson(false);
-      Assert.assertNotNull(keyValuePair3 );
-      Assert.assertEquals(keyValuePair3, keyValuePair3);
-      Assert.assertFalse(Objects.equals( keyValuePair3, f));
+      assertNotNull(keyValuePair3 );
+      assertEquals(keyValuePair3, keyValuePair3);
+      assertFalse(Objects.equals( keyValuePair3, f));
 
-      Assert.assertTrue(keyValuePair3.hashCode()!=0);
+      assertTrue(keyValuePair3.hashCode()!=0);
 
       f.add(keyValuePair2);
     }
@@ -92,7 +95,7 @@ public void testArrayBuilder() throws JSQLParserException {
       JsonFunctionExpression expression2 = new JsonFunctionExpression(new NullValue()).withUsingFormatJson(
           true);
 
-      Assert.assertTrue(Objects.equals(expression1.toString(), expression2.toString()));
+      assertTrue(Objects.equals(expression1.toString(), expression2.toString()));
 
       f.add(expression1);
       f.add(expression2);

src/test/java/net/sf/jsqlparser/expression/LikeExpressionTest.java

@@ -12,7 +12,7 @@
 
 import net.sf.jsqlparser.JSQLParserException;
 import net.sf.jsqlparser.test.TestUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  *

src/test/java/net/sf/jsqlparser/expression/LimitExpressionTest.java

@@ -14,7 +14,7 @@
 import net.sf.jsqlparser.statement.select.PlainSelect;
 import net.sf.jsqlparser.statement.select.Select;
 import net.sf.jsqlparser.test.TestUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Assertions;
 
 /**

src/test/java/net/sf/jsqlparser/expression/LongValueTest.java

@@ -10,38 +10,20 @@
 package net.sf.jsqlparser.expression;
 
 import java.math.BigInteger;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
-/**
- * 
- * @author tw
- */
-public class LongValueTest {
-
-    public LongValueTest() {
-    }
 
-    @BeforeClass
-    public static void setUpClass() {
-    }
 
-    @AfterClass
-    public static void tearDownClass() {
-    }
 
-    @Before
-    public void setUp() {
-    }
+import org.junit.jupiter.api.Test;
 
-    @After
-    public void tearDown() {
-    }
 
+/**
+ * 
+ * @author tw
+ */
+public class LongValueTest {
     @Test
     public void testSimpleNumber() {
         LongValue value = new LongValue("123");

src/test/java/net/sf/jsqlparser/expression/OracleNamedFunctionParameterTest.java

@@ -19,8 +19,11 @@
 import net.sf.jsqlparser.util.TablesNamesFinder;
 import net.sf.jsqlparser.util.validation.ValidationTestAsserts;
 import net.sf.jsqlparser.util.validation.feature.DatabaseType;
-import org.junit.Assert;
-import org.junit.Test;
+import net.sf.jsqlparser.util.validation.validator.ExpressionValidator;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
 
 /**
  *
@@ -81,8 +84,8 @@ public void testTableNamesFinder() throws JSQLParserException {
 
     Statement statement = CCJSqlParserUtil.parse(sqlStr);
     List<String> tables = new TablesNamesFinder().getTableList(statement);
-    Assert.assertEquals(1, tables.size());
-    Assert.assertTrue(tables.contains("test_table"));
+    assertEquals(1, tables.size());
+    assertTrue(tables.contains("test_table"));
   }
 
   /**