You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2024/06/01 13:56:15 UTC
(commons-jexl) branch master updated (d215564b -> b50094a2)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jexl.git
from d215564b Port from JUnit 4 to 5
new d5ceb440 Port from JUnit 4 to 5
new 80538dbd Port from JUnit 4 to 5
new b50094a2 Complete port from JUnit 4 to 5
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 4 +-
.../org/apache/commons/jexl3/AnnotationTest.java | 2 +-
.../org/apache/commons/jexl3/AntishCallTest.java | 2 +-
.../commons/jexl3/ArithmeticOperatorTest.java | 6 +-
.../org/apache/commons/jexl3/ArithmeticTest.java | 6 +-
.../org/apache/commons/jexl3/ArrayAccessTest.java | 6 +-
.../org/apache/commons/jexl3/ArrayLiteralTest.java | 2 +-
.../org/apache/commons/jexl3/ArrayTypeTest.java | 2 +-
.../java/org/apache/commons/jexl3/AssignTest.java | 2 +-
.../apache/commons/jexl3/BitwiseOperatorTest.java | 6 +-
.../java/org/apache/commons/jexl3/BlockTest.java | 2 +-
.../java/org/apache/commons/jexl3/BuilderTest.java | 2 +-
.../apache/commons/jexl3/CachePerformanceTest.java | 2 +-
.../java/org/apache/commons/jexl3/CacheTest.java | 10 +-
.../org/apache/commons/jexl3/ClassCreatorTest.java | 10 +-
.../commons/jexl3/CollectionLiteralTest.java | 2 +-
.../commons/jexl3/ComposePermissionsTest.java | 21 +-
.../apache/commons/jexl3/ContextNamespaceTest.java | 2 +-
.../java/org/apache/commons/jexl3/DoWhileTest.java | 2 +-
.../org/apache/commons/jexl3/ExceptionTest.java | 2 +-
.../org/apache/commons/jexl3/FeaturesTest.java | 2 +-
.../java/org/apache/commons/jexl3/ForEachTest.java | 2 +-
src/test/java/org/apache/commons/jexl3/IfTest.java | 2 +-
.../org/apache/commons/jexl3/Issues100Test.java | 6 +-
.../org/apache/commons/jexl3/Issues200Test.java | 6 +-
.../org/apache/commons/jexl3/Issues300Test.java | 2 +-
.../org/apache/commons/jexl3/Issues400Test.java | 2 +-
.../java/org/apache/commons/jexl3/IssuesTest.java | 7 +-
.../java/org/apache/commons/jexl3/JXLTTest.java | 380 ++++++++++++++-------
.../java/org/apache/commons/jexl3/JexlTest.java | 2 +-
.../org/apache/commons/jexl3/JexlTestCase.java | 4 +-
.../java/org/apache/commons/jexl3/LambdaTest.java | 2 +-
.../java/org/apache/commons/jexl3/LexicalTest.java | 2 +-
.../org/apache/commons/jexl3/MapLiteralTest.java | 2 +-
.../java/org/apache/commons/jexl3/MethodTest.java | 6 +-
.../apache/commons/jexl3/ParseFailuresTest.java | 2 +-
.../java/org/apache/commons/jexl3/PragmaTest.java | 2 +-
.../apache/commons/jexl3/PropertyAccessTest.java | 6 +-
.../org/apache/commons/jexl3/PublicFieldsTest.java | 6 +-
.../java/org/apache/commons/jexl3/RangeTest.java | 2 +-
.../apache/commons/jexl3/ScriptCallableTest.java | 2 +-
.../java/org/apache/commons/jexl3/ScriptTest.java | 2 +-
.../org/apache/commons/jexl3/SetLiteralTest.java | 2 +-
.../apache/commons/jexl3/ShiftOperatorsTest.java | 2 +-
.../org/apache/commons/jexl3/SideEffectTest.java | 6 +-
.../org/apache/commons/jexl3/StrategyTest.java | 2 +-
.../commons/jexl3/SynchronizedOverloadsTest.java | 6 +-
.../apache/commons/jexl3/TryCatchFinallyTest.java | 6 +-
.../java/org/apache/commons/jexl3/VarTest.java | 2 +-
.../java/org/apache/commons/jexl3/WhileTest.java | 2 +-
.../apache/commons/jexl3/examples/ArrayTest.java | 2 +-
.../commons/jexl3/examples/MethodPropertyTest.java | 2 +-
.../apache/commons/jexl3/examples/StreamTest.java | 2 +-
.../apache/commons/jexl3/internal/RangeTest.java | 10 +-
.../internal/introspection/DiscoveryTest.java | 2 +-
.../internal/introspection/MethodKeyTest.java | 2 +-
.../introspection/MiscIntrospectionTest.java | 2 +-
.../jexl3/internal/introspection/NoJexlTest.java | 2 +-
.../internal/introspection/PermissionsTest.java | 2 +-
.../commons/jexl3/introspection/SandboxTest.java | 2 +-
.../apache/commons/jexl3/jexl342/OptionalTest.java | 2 +-
.../org/apache/commons/jexl3/junit/Asserter.java | 25 +-
.../apache/commons/jexl3/junit/AsserterTest.java | 2 +-
.../jexl3/parser/FeatureControllerTest.java | 2 +-
.../apache/commons/jexl3/parser/ParserTest.java | 2 +-
.../scripting/JexlScriptEngineOptionalTest.java | 2 +-
.../jexl3/scripting/JexlScriptEngineTest.java | 10 +-
src/test/java/org/example/SomeTest.java | 2 +-
68 files changed, 381 insertions(+), 264 deletions(-)
(commons-jexl) 01/03: Port from JUnit 4 to 5
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jexl.git
commit d5ceb4402e9fd057836612804193135166a65925
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jun 1 09:30:13 2024 -0400
Port from JUnit 4 to 5
---
.../commons/jexl3/ComposePermissionsTest.java | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/test/java/org/apache/commons/jexl3/ComposePermissionsTest.java b/src/test/java/org/apache/commons/jexl3/ComposePermissionsTest.java
index c0ca0112..fba993f8 100644
--- a/src/test/java/org/apache/commons/jexl3/ComposePermissionsTest.java
+++ b/src/test/java/org/apache/commons/jexl3/ComposePermissionsTest.java
@@ -16,13 +16,16 @@
*/
package org.apache.commons.jexl3;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
+
import java.io.File;
import java.io.FileReader;
import java.util.Collections;
import org.apache.commons.jexl3.introspection.JexlPermissions;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import com.google.gson.Gson;
@@ -43,22 +46,22 @@ public class ComposePermissionsTest extends JexlTestCase {
final File jsonFile = new File(SAMPLE_JSON);
final Gson gson = new Gson();
final Object json = gson.fromJson(new FileReader(jsonFile), Object.class);
- Assert.assertNotNull(json);
+ assertNotNull(json);
// will succeed because java.util.Map is allowed and gson LinkedTreeMap is one
final JexlEngine j0 = createEngine(false, p);
final JexlScript s0 = j0.createScript("json.pageInfo.pagePic", "json");
final Object r0 = s0.execute(null, json);
- Assert.assertEquals(check, r0);
+ assertEquals(check, r0);
// will fail if gson package is denied
JexlEngine j1 = createEngine(false, p.compose("com.google.gson.internal {}"));
JexlScript s1 = j1.createScript("json.pageInfo.pagePic", "json");
try {
final Object r1 = s1.execute(null, json);
- Assert.fail("gson restricted");
+ fail("gson restricted");
} catch (final JexlException.Property xproperty) {
- Assert.assertEquals("pageInfo", xproperty.getProperty());
+ assertEquals("pageInfo", xproperty.getProperty());
}
// will fail since gson package is denied
@@ -66,16 +69,16 @@ public class ComposePermissionsTest extends JexlTestCase {
s1 = j1.createScript("json.pageInfo.pagePic", "json");
try {
final Object r1 = s1.execute(null, json);
- Assert.fail("gson LinkTreeMap restricted");
+ fail("gson LinkTreeMap restricted");
} catch (final JexlException.Property xproperty) {
- Assert.assertEquals("pageInfo", xproperty.getProperty());
+ assertEquals("pageInfo", xproperty.getProperty());
}
// will not fail since gson objects
j1 = createEngine(false, JexlPermissions.RESTRICTED);
s1 = j1.createScript("json.pageInfo.pagePic", "json");
final Object r1 = s1.execute(null, json);
- Assert.assertEquals(check, r0);
+ assertEquals(check, r0);
}
@Test
(commons-jexl) 03/03: Complete port from JUnit 4 to 5
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jexl.git
commit b50094a2659581dc5892ecdee7dab1f57f2b3ab1
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jun 1 09:56:07 2024 -0400
Complete port from JUnit 4 to 5
---
pom.xml | 4 +-
.../org/apache/commons/jexl3/AnnotationTest.java | 2 +-
.../org/apache/commons/jexl3/AntishCallTest.java | 2 +-
.../commons/jexl3/ArithmeticOperatorTest.java | 6 +-
.../org/apache/commons/jexl3/ArithmeticTest.java | 6 +-
.../org/apache/commons/jexl3/ArrayAccessTest.java | 6 +-
.../org/apache/commons/jexl3/ArrayLiteralTest.java | 2 +-
.../org/apache/commons/jexl3/ArrayTypeTest.java | 2 +-
.../java/org/apache/commons/jexl3/AssignTest.java | 2 +-
.../apache/commons/jexl3/BitwiseOperatorTest.java | 6 +-
.../java/org/apache/commons/jexl3/BlockTest.java | 2 +-
.../java/org/apache/commons/jexl3/BuilderTest.java | 2 +-
.../apache/commons/jexl3/CachePerformanceTest.java | 2 +-
.../java/org/apache/commons/jexl3/CacheTest.java | 10 +-
.../org/apache/commons/jexl3/ClassCreatorTest.java | 10 +-
.../commons/jexl3/CollectionLiteralTest.java | 2 +-
.../apache/commons/jexl3/ContextNamespaceTest.java | 2 +-
.../java/org/apache/commons/jexl3/DoWhileTest.java | 2 +-
.../org/apache/commons/jexl3/ExceptionTest.java | 2 +-
.../org/apache/commons/jexl3/FeaturesTest.java | 2 +-
.../java/org/apache/commons/jexl3/ForEachTest.java | 2 +-
src/test/java/org/apache/commons/jexl3/IfTest.java | 2 +-
.../org/apache/commons/jexl3/Issues100Test.java | 6 +-
.../org/apache/commons/jexl3/Issues200Test.java | 6 +-
.../org/apache/commons/jexl3/Issues300Test.java | 2 +-
.../org/apache/commons/jexl3/Issues400Test.java | 2 +-
.../java/org/apache/commons/jexl3/IssuesTest.java | 7 +-
.../java/org/apache/commons/jexl3/JXLTTest.java | 380 ++++++++++++++-------
.../java/org/apache/commons/jexl3/JexlTest.java | 2 +-
.../org/apache/commons/jexl3/JexlTestCase.java | 4 +-
.../java/org/apache/commons/jexl3/LambdaTest.java | 2 +-
.../java/org/apache/commons/jexl3/LexicalTest.java | 2 +-
.../org/apache/commons/jexl3/MapLiteralTest.java | 2 +-
.../java/org/apache/commons/jexl3/MethodTest.java | 6 +-
.../apache/commons/jexl3/ParseFailuresTest.java | 2 +-
.../java/org/apache/commons/jexl3/PragmaTest.java | 2 +-
.../apache/commons/jexl3/PropertyAccessTest.java | 6 +-
.../org/apache/commons/jexl3/PublicFieldsTest.java | 6 +-
.../java/org/apache/commons/jexl3/RangeTest.java | 2 +-
.../apache/commons/jexl3/ScriptCallableTest.java | 2 +-
.../java/org/apache/commons/jexl3/ScriptTest.java | 2 +-
.../org/apache/commons/jexl3/SetLiteralTest.java | 2 +-
.../apache/commons/jexl3/ShiftOperatorsTest.java | 2 +-
.../org/apache/commons/jexl3/SideEffectTest.java | 6 +-
.../org/apache/commons/jexl3/StrategyTest.java | 2 +-
.../commons/jexl3/SynchronizedOverloadsTest.java | 6 +-
.../apache/commons/jexl3/TryCatchFinallyTest.java | 6 +-
.../java/org/apache/commons/jexl3/VarTest.java | 2 +-
.../java/org/apache/commons/jexl3/WhileTest.java | 2 +-
.../apache/commons/jexl3/examples/ArrayTest.java | 2 +-
.../commons/jexl3/examples/MethodPropertyTest.java | 2 +-
.../apache/commons/jexl3/examples/StreamTest.java | 2 +-
.../apache/commons/jexl3/internal/RangeTest.java | 10 +-
.../internal/introspection/DiscoveryTest.java | 2 +-
.../internal/introspection/MethodKeyTest.java | 2 +-
.../introspection/MiscIntrospectionTest.java | 2 +-
.../jexl3/internal/introspection/NoJexlTest.java | 2 +-
.../internal/introspection/PermissionsTest.java | 2 +-
.../commons/jexl3/introspection/SandboxTest.java | 2 +-
.../apache/commons/jexl3/jexl342/OptionalTest.java | 2 +-
.../apache/commons/jexl3/junit/AsserterTest.java | 2 +-
.../jexl3/parser/FeatureControllerTest.java | 2 +-
.../apache/commons/jexl3/parser/ParserTest.java | 2 +-
.../scripting/JexlScriptEngineOptionalTest.java | 2 +-
.../jexl3/scripting/JexlScriptEngineTest.java | 10 +-
src/test/java/org/example/SomeTest.java | 2 +-
66 files changed, 358 insertions(+), 241 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2ba65ae6..539959d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,8 +115,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-params</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/src/test/java/org/apache/commons/jexl3/AnnotationTest.java b/src/test/java/org/apache/commons/jexl3/AnnotationTest.java
index 93e58206..e4bd5628 100644
--- a/src/test/java/org/apache/commons/jexl3/AnnotationTest.java
+++ b/src/test/java/org/apache/commons/jexl3/AnnotationTest.java
@@ -30,7 +30,7 @@ import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import org.apache.commons.jexl3.internal.Interpreter;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test cases for annotations.
diff --git a/src/test/java/org/apache/commons/jexl3/AntishCallTest.java b/src/test/java/org/apache/commons/jexl3/AntishCallTest.java
index e32c34de..c786a2d6 100644
--- a/src/test/java/org/apache/commons/jexl3/AntishCallTest.java
+++ b/src/test/java/org/apache/commons/jexl3/AntishCallTest.java
@@ -25,7 +25,7 @@ import java.math.BigInteger;
import java.util.Map;
import java.util.TreeMap;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test cases for calling antish variables as method names (JEXL-240);
diff --git a/src/test/java/org/apache/commons/jexl3/ArithmeticOperatorTest.java b/src/test/java/org/apache/commons/jexl3/ArithmeticOperatorTest.java
index 34c0d21c..ecaf7e30 100644
--- a/src/test/java/org/apache/commons/jexl3/ArithmeticOperatorTest.java
+++ b/src/test/java/org/apache/commons/jexl3/ArithmeticOperatorTest.java
@@ -41,8 +41,8 @@ import java.util.TimeZone;
import java.util.TreeSet;
import org.apache.commons.jexl3.junit.Asserter;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Tests for the startsWith, endsWith, match and range operators.
@@ -227,7 +227,7 @@ public class ArithmeticOperatorTest extends JexlTestCase {
super("ArithmeticOperatorTest");
}
- @Before
+ @BeforeEach
@Override
public void setUp() {
asserter = new Asserter(JEXL);
diff --git a/src/test/java/org/apache/commons/jexl3/ArithmeticTest.java b/src/test/java/org/apache/commons/jexl3/ArithmeticTest.java
index ccc48e61..3bc4462a 100644
--- a/src/test/java/org/apache/commons/jexl3/ArithmeticTest.java
+++ b/src/test/java/org/apache/commons/jexl3/ArithmeticTest.java
@@ -42,8 +42,8 @@ import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.commons.jexl3.junit.Asserter;
import org.apache.commons.lang3.SystemProperties;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
@@ -765,7 +765,7 @@ public class ArithmeticTest extends JexlTestCase {
}
}
- @Before
+ @BeforeEach
@Override
public void setUp() {
}
diff --git a/src/test/java/org/apache/commons/jexl3/ArrayAccessTest.java b/src/test/java/org/apache/commons/jexl3/ArrayAccessTest.java
index ab145ff3..a0e83396 100644
--- a/src/test/java/org/apache/commons/jexl3/ArrayAccessTest.java
+++ b/src/test/java/org/apache/commons/jexl3/ArrayAccessTest.java
@@ -22,8 +22,8 @@ import java.util.List;
import java.util.Map;
import org.apache.commons.jexl3.junit.Asserter;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Tests for array access operator []
@@ -58,7 +58,7 @@ public class ArrayAccessTest extends JexlTestCase {
}
@Override
- @Before
+ @BeforeEach
public void setUp() {
asserter = new Asserter(JEXL);
}
diff --git a/src/test/java/org/apache/commons/jexl3/ArrayLiteralTest.java b/src/test/java/org/apache/commons/jexl3/ArrayLiteralTest.java
index 6d88cdfe..1a920a52 100644
--- a/src/test/java/org/apache/commons/jexl3/ArrayLiteralTest.java
+++ b/src/test/java/org/apache/commons/jexl3/ArrayLiteralTest.java
@@ -26,7 +26,7 @@ import static org.junit.jupiter.api.Assertions.fail;
import java.util.Arrays;
import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for array literals.
diff --git a/src/test/java/org/apache/commons/jexl3/ArrayTypeTest.java b/src/test/java/org/apache/commons/jexl3/ArrayTypeTest.java
index afafc937..1026b0ee 100644
--- a/src/test/java/org/apache/commons/jexl3/ArrayTypeTest.java
+++ b/src/test/java/org/apache/commons/jexl3/ArrayTypeTest.java
@@ -33,7 +33,7 @@ import java.util.Set;
import org.apache.commons.jexl3.internal.ArrayBuilder;
import org.apache.commons.jexl3.internal.introspection.ClassMisc;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Ensure ArrayBuilder types its output by finding some common ancestor class or interface (besides Object.class)
diff --git a/src/test/java/org/apache/commons/jexl3/AssignTest.java b/src/test/java/org/apache/commons/jexl3/AssignTest.java
index bd72c46a..409bab67 100644
--- a/src/test/java/org/apache/commons/jexl3/AssignTest.java
+++ b/src/test/java/org/apache/commons/jexl3/AssignTest.java
@@ -24,7 +24,7 @@ import static org.junit.jupiter.api.Assertions.fail;
import java.util.Arrays;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test cases for assignment.
diff --git a/src/test/java/org/apache/commons/jexl3/BitwiseOperatorTest.java b/src/test/java/org/apache/commons/jexl3/BitwiseOperatorTest.java
index 1fba4eed..d6179ce9 100644
--- a/src/test/java/org/apache/commons/jexl3/BitwiseOperatorTest.java
+++ b/src/test/java/org/apache/commons/jexl3/BitwiseOperatorTest.java
@@ -17,8 +17,8 @@
package org.apache.commons.jexl3;
import org.apache.commons.jexl3.junit.Asserter;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Tests for the bitwise operators.
@@ -35,7 +35,7 @@ public class BitwiseOperatorTest extends JexlTestCase {
}
@Override
- @Before
+ @BeforeEach
public void setUp() {
asserter = new Asserter(JEXL);
asserter.setStrict(false, false);
diff --git a/src/test/java/org/apache/commons/jexl3/BlockTest.java b/src/test/java/org/apache/commons/jexl3/BlockTest.java
index f636efb8..38398a96 100644
--- a/src/test/java/org/apache/commons/jexl3/BlockTest.java
+++ b/src/test/java/org/apache/commons/jexl3/BlockTest.java
@@ -19,7 +19,7 @@ package org.apache.commons.jexl3;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for blocks
diff --git a/src/test/java/org/apache/commons/jexl3/BuilderTest.java b/src/test/java/org/apache/commons/jexl3/BuilderTest.java
index 2356c9dc..465b584e 100644
--- a/src/test/java/org/apache/commons/jexl3/BuilderTest.java
+++ b/src/test/java/org/apache/commons/jexl3/BuilderTest.java
@@ -26,7 +26,7 @@ import java.nio.charset.StandardCharsets;
import org.apache.commons.jexl3.internal.introspection.SandboxUberspect;
import org.apache.commons.jexl3.introspection.JexlSandbox;
import org.apache.commons.jexl3.introspection.JexlUberspect;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Checking the builder basics.
diff --git a/src/test/java/org/apache/commons/jexl3/CachePerformanceTest.java b/src/test/java/org/apache/commons/jexl3/CachePerformanceTest.java
index 6578a7d2..b72b7c8b 100644
--- a/src/test/java/org/apache/commons/jexl3/CachePerformanceTest.java
+++ b/src/test/java/org/apache/commons/jexl3/CachePerformanceTest.java
@@ -33,7 +33,7 @@ import java.util.concurrent.Future;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Testing JEXL caching performance.
diff --git a/src/test/java/org/apache/commons/jexl3/CacheTest.java b/src/test/java/org/apache/commons/jexl3/CacheTest.java
index f3cee611..c92d3745 100644
--- a/src/test/java/org/apache/commons/jexl3/CacheTest.java
+++ b/src/test/java/org/apache/commons/jexl3/CacheTest.java
@@ -28,9 +28,9 @@ import java.util.concurrent.Callable;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Verifies cache & tryExecute
@@ -629,14 +629,14 @@ public class CacheTest extends JexlTestCase {
}
}
- @Before
+ @BeforeEach
@Override
public void setUp() throws Exception {
// ensure jul logging is only error to avoid warning in silent mode
java.util.logging.Logger.getLogger(JexlEngine.class.getName()).setLevel(java.util.logging.Level.SEVERE);
}
- @After
+ @AfterEach
@Override
public void tearDown() throws Exception {
debuggerCheck(jexl);
diff --git a/src/test/java/org/apache/commons/jexl3/ClassCreatorTest.java b/src/test/java/org/apache/commons/jexl3/ClassCreatorTest.java
index d0accd09..d62fdba0 100644
--- a/src/test/java/org/apache/commons/jexl3/ClassCreatorTest.java
+++ b/src/test/java/org/apache/commons/jexl3/ClassCreatorTest.java
@@ -35,9 +35,9 @@ import java.util.Map;
import org.apache.commons.lang3.SystemProperties;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Basic check on automated class creation
@@ -182,7 +182,7 @@ public class ClassCreatorTest extends JexlTestCase {
assertEquals(1099, result);
}
- @Before
+ @BeforeEach
@Override
public void setUp() throws Exception {
base = new File(SystemProperties.getJavaIoTmpdir(), "jexl" + System.currentTimeMillis());
@@ -190,7 +190,7 @@ public class ClassCreatorTest extends JexlTestCase {
}
- @After
+ @AfterEach
@Override
public void tearDown() throws Exception {
deleteDirectory(base);
diff --git a/src/test/java/org/apache/commons/jexl3/CollectionLiteralTest.java b/src/test/java/org/apache/commons/jexl3/CollectionLiteralTest.java
index 12e56d05..aa689d83 100644
--- a/src/test/java/org/apache/commons/jexl3/CollectionLiteralTest.java
+++ b/src/test/java/org/apache/commons/jexl3/CollectionLiteralTest.java
@@ -27,7 +27,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.commons.jexl3.internal.ArrayBuilder;
import org.apache.commons.jexl3.internal.MapBuilder;
import org.apache.commons.jexl3.internal.SetBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Counting the number of times map,sets,array literals are created.
* <p>
diff --git a/src/test/java/org/apache/commons/jexl3/ContextNamespaceTest.java b/src/test/java/org/apache/commons/jexl3/ContextNamespaceTest.java
index 9dd91b11..4d8be585 100644
--- a/src/test/java/org/apache/commons/jexl3/ContextNamespaceTest.java
+++ b/src/test/java/org/apache/commons/jexl3/ContextNamespaceTest.java
@@ -24,7 +24,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests JexlContext (advanced) features.
diff --git a/src/test/java/org/apache/commons/jexl3/DoWhileTest.java b/src/test/java/org/apache/commons/jexl3/DoWhileTest.java
index 798b4c7b..54e03d5f 100644
--- a/src/test/java/org/apache/commons/jexl3/DoWhileTest.java
+++ b/src/test/java/org/apache/commons/jexl3/DoWhileTest.java
@@ -26,7 +26,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests do while statement.
diff --git a/src/test/java/org/apache/commons/jexl3/ExceptionTest.java b/src/test/java/org/apache/commons/jexl3/ExceptionTest.java
index e7efc309..0852927c 100644
--- a/src/test/java/org/apache/commons/jexl3/ExceptionTest.java
+++ b/src/test/java/org/apache/commons/jexl3/ExceptionTest.java
@@ -23,7 +23,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
import org.apache.commons.jexl3.internal.Engine;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Checks various exception handling cases.
diff --git a/src/test/java/org/apache/commons/jexl3/FeaturesTest.java b/src/test/java/org/apache/commons/jexl3/FeaturesTest.java
index 04743c2b..c45d0003 100644
--- a/src/test/java/org/apache/commons/jexl3/FeaturesTest.java
+++ b/src/test/java/org/apache/commons/jexl3/FeaturesTest.java
@@ -27,7 +27,7 @@ import static org.junit.jupiter.api.Assertions.fail;
import java.util.Arrays;
import java.util.Collection;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for blocks
diff --git a/src/test/java/org/apache/commons/jexl3/ForEachTest.java b/src/test/java/org/apache/commons/jexl3/ForEachTest.java
index dc683f70..b4a3adcf 100644
--- a/src/test/java/org/apache/commons/jexl3/ForEachTest.java
+++ b/src/test/java/org/apache/commons/jexl3/ForEachTest.java
@@ -29,7 +29,7 @@ import java.util.List;
import java.util.Map;
import java.util.StringTokenizer;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for the foreach statement
diff --git a/src/test/java/org/apache/commons/jexl3/IfTest.java b/src/test/java/org/apache/commons/jexl3/IfTest.java
index 924a0a83..ce4e4047 100644
--- a/src/test/java/org/apache/commons/jexl3/IfTest.java
+++ b/src/test/java/org/apache/commons/jexl3/IfTest.java
@@ -21,7 +21,7 @@ import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test cases for the if statement.
diff --git a/src/test/java/org/apache/commons/jexl3/Issues100Test.java b/src/test/java/org/apache/commons/jexl3/Issues100Test.java
index fa3ca93d..72afc5ab 100644
--- a/src/test/java/org/apache/commons/jexl3/Issues100Test.java
+++ b/src/test/java/org/apache/commons/jexl3/Issues100Test.java
@@ -36,8 +36,8 @@ import java.util.Map;
import java.util.Set;
import org.apache.commons.jexl3.internal.Engine;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test cases for reported issue between JEXL-100 and JEXL-199.
@@ -205,7 +205,7 @@ public static class Foo125 {
super("Issues100Test", null);
}
- @Before
+ @BeforeEach
@Override
public void setUp() throws Exception {
// ensure jul logging is only error to avoid warning in silent mode
diff --git a/src/test/java/org/apache/commons/jexl3/Issues200Test.java b/src/test/java/org/apache/commons/jexl3/Issues200Test.java
index 8d75b074..6ca63cce 100644
--- a/src/test/java/org/apache/commons/jexl3/Issues200Test.java
+++ b/src/test/java/org/apache/commons/jexl3/Issues200Test.java
@@ -41,8 +41,8 @@ import java.util.concurrent.Executors;
import org.apache.commons.jexl3.internal.TemplateDebugger;
import org.apache.commons.jexl3.introspection.JexlSandbox;
import org.apache.commons.logging.Log;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test cases for reported issue between JEXL-200 and JEXL-299.
@@ -254,7 +254,7 @@ public class Issues200Test extends JexlTestCase {
super("Issues200Test", null);
}
- @Before
+ @BeforeEach
@Override
public void setUp() throws Exception {
// ensure jul logging is only error to avoid warning in silent mode
diff --git a/src/test/java/org/apache/commons/jexl3/Issues300Test.java b/src/test/java/org/apache/commons/jexl3/Issues300Test.java
index 8a6662b8..0bb1d605 100644
--- a/src/test/java/org/apache/commons/jexl3/Issues300Test.java
+++ b/src/test/java/org/apache/commons/jexl3/Issues300Test.java
@@ -46,7 +46,7 @@ import java.util.stream.Stream;
import org.apache.commons.jexl3.internal.Engine32;
import org.apache.commons.jexl3.internal.OptionsContext;
import org.apache.commons.jexl3.introspection.JexlSandbox;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test cases for reported issue between JEXL-300 and JEXL-399.
diff --git a/src/test/java/org/apache/commons/jexl3/Issues400Test.java b/src/test/java/org/apache/commons/jexl3/Issues400Test.java
index 6d888c66..e411c684 100644
--- a/src/test/java/org/apache/commons/jexl3/Issues400Test.java
+++ b/src/test/java/org/apache/commons/jexl3/Issues400Test.java
@@ -36,7 +36,7 @@ import java.util.Objects;
import java.util.concurrent.atomic.AtomicLong;
import org.apache.commons.jexl3.introspection.JexlPermissions;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test cases for reported issue between JEXL-300 and JEXL-399.
diff --git a/src/test/java/org/apache/commons/jexl3/IssuesTest.java b/src/test/java/org/apache/commons/jexl3/IssuesTest.java
index 80168dbb..a24ffa7a 100644
--- a/src/test/java/org/apache/commons/jexl3/IssuesTest.java
+++ b/src/test/java/org/apache/commons/jexl3/IssuesTest.java
@@ -27,9 +27,8 @@ import java.util.Map;
import org.apache.commons.jexl3.internal.Engine;
import org.apache.commons.jexl3.internal.introspection.Uberspect;
-import org.junit.Before;
-import org.junit.Test;
-//import org.apache.commons.beanutils.LazyDynaMap;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test cases for reported issue between JEXL-1 and JEXL-100.
@@ -85,7 +84,7 @@ public class IssuesTest extends JexlTestCase {
super("IssuesTest", null);
}
- @Before
+ @BeforeEach
@Override
public void setUp() throws Exception {
// ensure jul logging is only error to avoid warning in silent mode
diff --git a/src/test/java/org/apache/commons/jexl3/JXLTTest.java b/src/test/java/org/apache/commons/jexl3/JXLTTest.java
index 4ade9f13..810ae32d 100644
--- a/src/test/java/org/apache/commons/jexl3/JXLTTest.java
+++ b/src/test/java/org/apache/commons/jexl3/JXLTTest.java
@@ -41,17 +41,15 @@ import org.apache.commons.jexl3.internal.introspection.Permissions;
import org.apache.commons.jexl3.internal.introspection.Uberspect;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
/**
* Test cases for the UnifiedEL.
*/
@SuppressWarnings({"UnnecessaryBoxing", "AssertEqualsBetweenInconvertibleTypes"})
-@RunWith(Parameterized.class)
public class JXLTTest extends JexlTestCase {
public static class Context311 extends MapContext
implements JexlContext.OptionsHandle, JexlContext.ThreadLocal {
@@ -139,7 +137,6 @@ public class JXLTTest extends JexlTestCase {
}
};
- @Parameterized.Parameters
public static List<JexlBuilder> engines() {
final JexlFeatures f = new JexlFeatures();
f.lexical(true).lexicalShade(true);
@@ -161,14 +158,17 @@ public class JXLTTest extends JexlTestCase {
private JexlEvalContext context;
- private final JexlBuilder BUILDER;
+ private JexlBuilder BUILDER;
- private final JexlEngine ENGINE;
+ private JexlEngine ENGINE;
- private final JxltEngine JXLT;
+ private JxltEngine JXLT;
- public JXLTTest(final JexlBuilder builder) {
+ public JXLTTest() {
super("JXLTTest");
+ }
+
+ private void init(final JexlBuilder builder) {
BUILDER = builder;
ENGINE = BUILDER.create();
JXLT = ENGINE.createJxltEngine();
@@ -207,7 +207,7 @@ public class JXLTTest extends JexlTestCase {
return options.isLexicalShade();
}
- @Before
+ @BeforeEach
@Override
public void setUp() throws Exception {
// ensure jul logging is only error
@@ -215,15 +215,17 @@ public class JXLTTest extends JexlTestCase {
context = new JexlEvalContext(vars);
}
- @After
+ @AfterEach
@Override
public void tearDown() throws Exception {
debuggerCheck(ENGINE);
super.tearDown();
}
- @Test
- public void test311a() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void test311a(final JexlBuilder builder) throws Exception {
+ init(builder);
final JexlContext ctx = null;
final String rpt
= "$$((a)->{\n"
@@ -236,8 +238,10 @@ public class JXLTTest extends JexlTestCase {
assertEquals("<p>Universe 42</p>\n", output);
}
- @Test
- public void test311b() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void test311b(final JexlBuilder builder) throws Exception {
+ init(builder);
final JexlContext ctx311 = new Context311();
final String rpt
= "$$ exec('42').execute(()->{\n"
@@ -250,8 +254,10 @@ public class JXLTTest extends JexlTestCase {
assertEquals("<p>Universe 42</p>\n", output);
}
- @Test
- public void test311c() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void test311c(final JexlBuilder builder) throws Exception {
+ init(builder);
final Context311 ctx311 = new Context311();
ctx311.newOptions().setLexical(true);
final String rpt
@@ -265,8 +271,10 @@ public class JXLTTest extends JexlTestCase {
assertEquals("<p>Universe 42</p>\n", output);
}
- @Test
- public void test311d() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void test311d(final JexlBuilder builder) throws Exception {
+ init(builder);
final Context311 ctx311 = new Context311();
ctx311.newOptions().setLexical(true);
final String rpt
@@ -280,8 +288,10 @@ public class JXLTTest extends JexlTestCase {
assertEquals("<p>Universe 42</p>\n", output);
}
- @Test
- public void test311e() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void test311e(final JexlBuilder builder) throws Exception {
+ init(builder);
final Context311 ctx311 = new Context311();
ctx311.newOptions().setLexical(true);
final String rpt
@@ -293,8 +303,10 @@ public class JXLTTest extends JexlTestCase {
assertEquals("<p>Universe 42</p>", output);
}
- @Test
- public void test311f() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void test311f(final JexlBuilder builder) throws Exception {
+ init(builder);
final Context311 ctx311 = new Context311();
ctx311.newOptions().setLexical(true);
final String rpt
@@ -306,8 +318,10 @@ public class JXLTTest extends JexlTestCase {
assertEquals("<p>Universe 42</p>", output);
}
- @Test
- public void test311g() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void test311g(final JexlBuilder builder) throws Exception {
+ init(builder);
final Context311 ctx311 = new Context311();
ctx311.newOptions().setLexical(true);
final String rpt
@@ -319,8 +333,10 @@ public class JXLTTest extends JexlTestCase {
assertEquals("<p>Universe 42</p>", output);
}
- @Test
- public void test311h() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void test311h(final JexlBuilder builder) throws Exception {
+ init(builder);
final Context311 ctx311 = new Context311();
ctx311.newOptions().setLexical(true);
final String rpt= " `<p>Universe ${a}${b}</p>`";
@@ -329,8 +345,10 @@ public class JXLTTest extends JexlTestCase {
assertEquals("<p>Universe 42</p>", output);
}
- @Test
- public void test311i() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void test311i(final JexlBuilder builder) throws Exception {
+ init(builder);
final JexlContext ctx311 = new Context311();
final String rpt
= "$$var u = 'Universe'; exec('4').execute((a, b)->{"
@@ -343,8 +361,10 @@ public class JXLTTest extends JexlTestCase {
assertEquals("<p>Universe 42</p>\n", output);
}
- @Test
- public void test315() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void test315(final JexlBuilder builder) throws Exception {
+ init(builder);
String s315;
StringWriter strw;
JxltEngine.Template t315;
@@ -372,8 +392,10 @@ public class JXLTTest extends JexlTestCase {
assertEquals(s315, output);
}
- @Test
- public void test42() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void test42(final JexlBuilder builder) throws Exception {
+ init(builder);
final String test42
= "$$ for(var x : list) {\n"
+ "$$ if (x == 42) {\n"
@@ -406,8 +428,10 @@ public class JXLTTest extends JexlTestCase {
assertEquals(test42, refactored);
}
- @Test
- public void testAssign() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void testAssign(final JexlBuilder builder) throws Exception {
+ init(builder);
final Froboz froboz = new Froboz(32);
context.set("froboz", froboz);
final JxltEngine.Expression assign = JXLT.createExpression("${froboz.value = 42}");
@@ -418,8 +442,10 @@ public class JXLTTest extends JexlTestCase {
assertEquals(Integer.valueOf(42), o);
}
- @Test
- public void testBadContextNested() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void testBadContextNested(final JexlBuilder builder) throws Exception {
+ init(builder);
try {
final JxltEngine.Expression expr = JXLT.createExpression("#{${hi}+'.world'}");
final JexlContext none = null;
@@ -432,8 +458,10 @@ public class JXLTTest extends JexlTestCase {
}
}
- @Test
- public void testCharAtBug() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void testCharAtBug(final JexlBuilder builder) throws Exception {
+ init(builder);
context.set("foo", "abcdef");
final JexlOptions options = context.getEngineOptions();
JxltEngine.Expression expr = JXLT.createExpression("${foo.substring(2,4)/*comment*/}");
@@ -453,8 +481,10 @@ public class JXLTTest extends JexlTestCase {
}
- @Test
- public void testCommentedTemplate0() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void testCommentedTemplate0(final JexlBuilder builder) throws Exception {
+ init(builder);
final JexlContext ctxt = new MapContext();
final JexlEngine jexl = new JexlBuilder().create();
final JxltEngine jxlt = jexl.createJxltEngine();
@@ -469,8 +499,10 @@ public class JXLTTest extends JexlTestCase {
assertTrue(strw.toString().isEmpty());
}
- @Test
- public void testCommentedTemplate1() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void testCommentedTemplate1(final JexlBuilder builder) throws Exception {
+ init(builder);
final JexlContext ctxt = new MapContext();
final JexlEngine jexl = new JexlBuilder().create();
final JxltEngine jxlt = jexl.createJxltEngine();
@@ -489,8 +521,10 @@ public class JXLTTest extends JexlTestCase {
assertEquals("42\n", strw.toString());
}
- @Test
- public void testComposite() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void testComposite(final JexlBuilder builder) throws Exception {
+ init(builder);
final String source = "Dear ${p} ${name};";
final JxltEngine.Expression expr = JXLT.createExpression(source);
context.set("p", "Mr");
@@ -505,8 +539,10 @@ public class JXLTTest extends JexlTestCase {
assertEquals(source, getSource(expr.toString()));
}
- @Test
- public void testConstant0() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void testConstant0(final JexlBuilder builder) throws Exception {
+ init(builder);
final JexlContext none = null;
final String source = "Hello World!";
final JxltEngine.Expression expr = JXLT.createExpression(source);
@@ -518,8 +554,10 @@ public class JXLTTest extends JexlTestCase {
assertEquals(source, getSource(expr.toString()));
}
- @Test
- public void testConstant2() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void testConstant2(final JexlBuilder builder) throws Exception {
+ init(builder);
final JexlContext none = null;
final String source = "${size({'map':123,'map2':456})}";
final JxltEngine.Expression expr = JXLT.createExpression(source);
@@ -531,8 +569,10 @@ public class JXLTTest extends JexlTestCase {
assertEquals(source, getSource(expr.toString()));
}
- @Test
- public void testConstant3() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void testConstant3(final JexlBuilder builder) throws Exception {
+ init(builder);
final JexlContext none = null;
final String source = "#{size({'map':123,'map2':456})}";
final JxltEngine.Expression expr = JXLT.createExpression(source);
@@ -544,8 +584,10 @@ public class JXLTTest extends JexlTestCase {
assertEquals(source, getSource(expr.toString()));
}
- @Test
- public void testConstant4() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void testConstant4(final JexlBuilder builder) throws Exception {
+ init(builder);
final JexlContext none = null;
final String source = "#{ ${size({'1':2,'2': 3})} }";
final JxltEngine.Expression expr = JXLT.createExpression(source);
@@ -557,8 +599,10 @@ public class JXLTTest extends JexlTestCase {
assertEquals(source, getSource(expr.toString()));
}
- @Test
- public void testConstantTemplate() {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void testConstantTemplate(final JexlBuilder builder) {
+ init(builder);
final String src = "<script>\n" +
" function test(src){\n" +
" var res = src.replace(/\\n\\t\\s/g, '\\n');\n" +
@@ -577,8 +621,10 @@ public class JXLTTest extends JexlTestCase {
assertEquals(src, result);
}
- @Test
- public void testDbgEscapes() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void testDbgEscapes(final JexlBuilder builder) throws Exception {
+ init(builder);
final String[] srcs = {
"jexl:print('hello\\'\\nworld')",
"'hello\\tworld'",
@@ -595,8 +641,10 @@ public class JXLTTest extends JexlTestCase {
}
}
- @Test
- public void testDeferred() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void testDeferred(final JexlBuilder builder) throws Exception {
+ init(builder);
final JexlContext none = null;
final String source = "#{'world'}";
final JxltEngine.Expression expr = JXLT.createExpression(source);
@@ -609,8 +657,10 @@ public class JXLTTest extends JexlTestCase {
assertEquals(source, getSource(expr.toString()));
}
- @Test
- public void testEscape() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void testEscape(final JexlBuilder builder) throws Exception {
+ init(builder);
final JexlContext none = null;
JxltEngine.Expression expr;
Object o;
@@ -623,16 +673,20 @@ public class JXLTTest extends JexlTestCase {
assertEquals("${'world'}", o);
}
- @Test
- public void testEscapeString() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void testEscapeString(final JexlBuilder builder) throws Exception {
+ init(builder);
final JxltEngine.Expression expr = JXLT.createExpression("\\\"${'world\\'s finest'}\\\"");
final JexlContext none = null;
final Object o = expr.evaluate(none);
assertEquals("\"world's finest\"", o);
}
- @Test
- public void testImmediate() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void testImmediate(final JexlBuilder builder) throws Exception {
+ init(builder);
final JexlContext none = null;
final String source = "${'Hello ' + 'World!'}";
final JxltEngine.Expression expr = JXLT.createExpression(source);
@@ -645,8 +699,10 @@ public class JXLTTest extends JexlTestCase {
assertEquals(source, getSource(expr.toString()));
}
- @Test
- public void testImmediateTemplate() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void testImmediateTemplate(final JexlBuilder builder) throws Exception {
+ init(builder);
context.set("tables", new String[]{"table1", "table2"});
context.set("w" ,"x=1");
final JxltEngine.Template t = JXLT.createTemplate("$$", new StringReader(
@@ -664,8 +720,10 @@ public class JXLTTest extends JexlTestCase {
final String output = strw.toString();
assertTrue(output.contains("table1") && output.contains("table2"));
}
- @Test
- public void testInheritedDebugger() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void testInheritedDebugger(final JexlBuilder builder) throws Exception {
+ init(builder);
final String src = "if ($A) { $B + 1; } else { $C - 2 }";
final JexlEngine jexl = JXLT.getEngine();
final JexlScript script = jexl.createScript(src);
@@ -680,8 +738,10 @@ public class JXLTTest extends JexlTestCase {
assertEquals(refactored, rscript);
}
- @Test
- public void testInterpolation() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void testInterpolation(final JexlBuilder builder) throws Exception {
+ init(builder);
final String expr = "`Hello \n${user}`";
final JexlScript script = ENGINE.createScript(expr);
context.set("user", "Dimitri");
@@ -692,8 +752,10 @@ public class JXLTTest extends JexlTestCase {
assertEquals("Hello \nRahul", value, expr);
}
- @Test
- public void testInterpolationGlobal() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void testInterpolationGlobal(final JexlBuilder builder) throws Exception {
+ init(builder);
if (isLexicalShade()) {
context.set("user", null);
}
@@ -702,15 +764,19 @@ public class JXLTTest extends JexlTestCase {
assertEquals("Hello \nDimitri", value, expr);
}
- @Test
- public void testInterpolationLocal() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void testInterpolationLocal(final JexlBuilder builder) throws Exception {
+ init(builder);
final String expr = "var user='Henrib'; `Hello \n${user}`";
final Object value = ENGINE.createScript(expr).execute(context);
assertEquals("Hello \nHenrib", value, expr);
}
- @Test
- public void testInterpolationLvsG() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void testInterpolationLvsG(final JexlBuilder builder) throws Exception {
+ init(builder);
if (isLexicalShade()) {
context.set("user", null);
}
@@ -719,8 +785,10 @@ public class JXLTTest extends JexlTestCase {
assertEquals("H\"ello \nHenrib", value, expr);
}
- @Test
- public void testInterpolationLvsG2() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void testInterpolationLvsG2(final JexlBuilder builder) throws Exception {
+ init(builder);
if (isLexicalShade()) {
context.set("user", null);
}
@@ -729,8 +797,10 @@ public class JXLTTest extends JexlTestCase {
assertEquals("H`ello \nHenrib", value, expr);
}
- @Test
- public void testInterpolationParameter() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void testInterpolationParameter(final JexlBuilder builder) throws Exception {
+ init(builder);
final String expr = "(user)->{`Hello \n${user}`}";
final JexlScript script = ENGINE.createScript(expr);
Object value = script.execute(context, "Henrib");
@@ -739,8 +809,10 @@ public class JXLTTest extends JexlTestCase {
assertEquals("Hello \nDimitri", value, expr);
}
- @Test
- public void testLexicalTemplate() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void testLexicalTemplate(final JexlBuilder builder) throws Exception {
+ init(builder);
final JexlOptions opts = new JexlOptions();
final JexlContext ctxt = new PragmaticContext(opts);
opts.setCancellable(false);
@@ -774,8 +846,10 @@ public class JXLTTest extends JexlTestCase {
assertEquals("+strict +cancellable +lexical +lexicalShade -safe", output);
}
- @Test
- public void testMalformed() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void testMalformed(final JexlBuilder builder) throws Exception {
+ init(builder);
try {
final JxltEngine.Expression expr = JXLT.createExpression("${'world'");
final JexlContext none = null;
@@ -788,8 +862,10 @@ public class JXLTTest extends JexlTestCase {
}
}
- @Test
- public void testMalformedNested() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void testMalformedNested(final JexlBuilder builder) throws Exception {
+ init(builder);
try {
final JxltEngine.Expression expr = JXLT.createExpression("#{${hi} world}");
final JexlContext none = null;
@@ -802,8 +878,10 @@ public class JXLTTest extends JexlTestCase {
}
}
- @Test
- public void testMalformedNested2() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void testMalformedNested2(final JexlBuilder builder) throws Exception {
+ init(builder);
try {
final JxltEngine.Expression expr = JXLT.createExpression("#{${hi} world}");
final JexlContext ctxt = new MapContext();
@@ -817,8 +895,10 @@ public class JXLTTest extends JexlTestCase {
}
}
- @Test
- public void testNested() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void testNested(final JexlBuilder builder) throws Exception {
+ init(builder);
final String source = "#{${hi}+'.world'}";
final JxltEngine.Expression expr = JXLT.createExpression(source);
@@ -835,8 +915,10 @@ public class JXLTTest extends JexlTestCase {
assertEquals(source, getSource(expr.toString()));
}
- @Test
- public void testNestedTemplate() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void testNestedTemplate(final JexlBuilder builder) throws Exception {
+ init(builder);
final String source = "#{${hi}+'.world'}";
final JxltEngine.Template expr = JXLT.createTemplate(source, "hi");
@@ -849,16 +931,20 @@ public class JXLTTest extends JexlTestCase {
assertEquals(source, getSource(expr.toString()));
}
- @Test
- public void testNonEscapeString() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void testNonEscapeString(final JexlBuilder builder) throws Exception {
+ init(builder);
final JxltEngine.Expression expr = JXLT.createExpression("c:\\some\\windows\\path");
final JexlContext none = null;
final Object o = expr.evaluate(none);
assertEquals("c:\\some\\windows\\path", o);
}
- @Test
- public void testOneLiner() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void testOneLiner(final JexlBuilder builder) throws Exception {
+ init(builder);
final JxltEngine.Template t = JXLT.createTemplate("$$", new StringReader("fourty-two"));
final StringWriter strw = new StringWriter();
t.evaluate(context, strw);
@@ -866,8 +952,10 @@ public class JXLTTest extends JexlTestCase {
assertEquals("fourty-two", output);
}
- @Test
- public void testOneLinerVar() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void testOneLinerVar(final JexlBuilder builder) throws Exception {
+ init(builder);
final JxltEngine.Template t = JXLT.createTemplate("$$", new StringReader("fourty-${x}"));
final StringWriter strw = new StringWriter();
context.set("x", "two");
@@ -876,8 +964,10 @@ public class JXLTTest extends JexlTestCase {
assertEquals("fourty-two", output);
}
- @Test
- public void testPrepareEvaluate() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void testPrepareEvaluate(final JexlBuilder builder) throws Exception {
+ init(builder);
final String source = "Dear #{p} ${name};";
final JxltEngine.Expression expr = JXLT.createExpression("Dear #{p} ${name};");
assertTrue(expr.isDeferred(), "expression should be deferred");
@@ -903,8 +993,10 @@ public class JXLTTest extends JexlTestCase {
assertEquals(source, getSource(expr.toString()));
}
- @Test
- public void testPrepareTemplate() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void testPrepareTemplate(final JexlBuilder builder) throws Exception {
+ init(builder);
final String source
= "$$ for(var x : list) {\n"
+ "${l10n}=#{x}\n"
@@ -934,8 +1026,10 @@ public class JXLTTest extends JexlTestCase {
assertEquals("value=42\n", outEN);
}
- @Test
- public void testReport() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void testReport(final JexlBuilder builder) throws Exception {
+ init(builder);
final String rpt
= "<report>\n"
+ "\n"
@@ -959,8 +1053,10 @@ public class JXLTTest extends JexlTestCase {
assertEquals(rpt, refactored);
}
- @Test
- public void testReport1() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void testReport1(final JexlBuilder builder) throws Exception {
+ init(builder);
final String rpt
= "<report>\n"
+ "this is ${x}\n"
@@ -987,8 +1083,10 @@ public class JXLTTest extends JexlTestCase {
assertTrue(output.indexOf("45") > 0);
}
- @Test
- public void testReport2() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void testReport2(final JexlBuilder builder) throws Exception {
+ init(builder);
final String rpt
= "<report>\n"
+ "this is ${x}\n"
@@ -1019,8 +1117,10 @@ public class JXLTTest extends JexlTestCase {
assertEquals(rpt, xxx);
}
- @Test
- public void testSanboxed311i() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void testSanboxed311i(final JexlBuilder builder) throws Exception {
+ init(builder);
/// this uberspect can not access jexl3 classes (besides test)
final Uberspect uberspect = new Uberspect(LogFactory.getLog(JXLTTest.class), null, NOJEXL3);
final Method method = uberspect.getMethod(TemplateInterpreter.class, "print", new Object[]{Integer.TYPE});
@@ -1038,8 +1138,10 @@ public class JXLTTest extends JexlTestCase {
assertEquals("<p>Universe 42</p>\n", output);
}
- @Test
- public void testSanboxedTemplate() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void testSanboxedTemplate(final JexlBuilder builder) throws Exception {
+ init(builder);
final String src = "Hello ${user}";
final JexlContext ctxt = new MapContext();
ctxt.set("user", "Francesco");
@@ -1058,8 +1160,10 @@ public class JXLTTest extends JexlTestCase {
assertEquals("Hello Francesco", result);
}
- @Test
- public void testStatement() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void testStatement(final JexlBuilder builder) throws Exception {
+ init(builder);
final Froboz froboz = new Froboz(32);
context.set("froboz", froboz);
final JxltEngine.Expression check = JXLT.createExpression("${ froboz.plus10() }");
@@ -1070,8 +1174,10 @@ public class JXLTTest extends JexlTestCase {
assertEquals(1, evars.size());
}
- @Test
- public void testTemplate0() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void testTemplate0(final JexlBuilder builder) throws Exception {
+ init(builder);
final String source = " $$ if(x) {\nx is ${x}\n $$ } else {\n${'no x'}\n$$ }\n";
StringWriter strw;
String output;
@@ -1094,8 +1200,10 @@ public class JXLTTest extends JexlTestCase {
assertNotNull(dstr);
}
- @Test
- public void testTemplate1() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void testTemplate1(final JexlBuilder builder) throws Exception {
+ init(builder);
final String source = "$$ if(x) {\nx is ${x}\n$$ } else {\n${'no x'}\n$$ }\n";
StringWriter strw;
String output;
@@ -1115,8 +1223,10 @@ public class JXLTTest extends JexlTestCase {
assertEquals("no x\n", output);
}
- @Test
- public void testTemplate10() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void testTemplate10(final JexlBuilder builder) throws Exception {
+ init(builder);
final String source = "$$(x)->{ if(x) {\nx is ${x}\n$$ } else {\n${'no x'}\n$$ } }\n";
StringWriter strw;
String output;
@@ -1134,8 +1244,10 @@ public class JXLTTest extends JexlTestCase {
assertEquals("x is 42\n", output);
}
- @Test
- public void testTemplate2() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void testTemplate2(final JexlBuilder builder) throws Exception {
+ init(builder);
final String source = "The answer: ${x}";
StringWriter strw;
String output;
@@ -1150,8 +1262,10 @@ public class JXLTTest extends JexlTestCase {
assertEquals("The answer: 42", output);
}
- @Test
- public void testTemplateOutOfScope() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void testTemplateOutOfScope(final JexlBuilder builder) throws Exception {
+ init(builder);
final JexlOptions opts = new JexlOptions();
opts.setCancellable(false);
opts.setStrict(false);
@@ -1192,8 +1306,10 @@ public class JXLTTest extends JexlTestCase {
}
}
- @Test
- public void testTemplatePragmaPro50() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void testTemplatePragmaPro50(final JexlBuilder builder) throws Exception {
+ init(builder);
final JexlOptions opts = new JexlOptions();
opts.setCancellable(false);
opts.setStrict(false);
@@ -1216,8 +1332,10 @@ public class JXLTTest extends JexlTestCase {
}
}
- @Test
- public void testWriter() throws Exception {
+ @ParameterizedTest
+ @MethodSource("engines")
+ public void testWriter(final JexlBuilder builder) throws Exception {
+ init(builder);
final Froboz froboz = new Froboz(42);
final Writer writer = new FrobozWriter(new StringWriter());
final JxltEngine.Template t = JXLT.createTemplate("$$", new StringReader("$$$jexl.print(froboz)"), "froboz");
diff --git a/src/test/java/org/apache/commons/jexl3/JexlTest.java b/src/test/java/org/apache/commons/jexl3/JexlTest.java
index e64e2626..902aec46 100644
--- a/src/test/java/org/apache/commons/jexl3/JexlTest.java
+++ b/src/test/java/org/apache/commons/jexl3/JexlTest.java
@@ -36,7 +36,7 @@ import java.util.Map;
import java.util.Set;
import org.apache.commons.jexl3.parser.Parser;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Simple test cases.
diff --git a/src/test/java/org/apache/commons/jexl3/JexlTestCase.java b/src/test/java/org/apache/commons/jexl3/JexlTestCase.java
index 954448c4..4ad4e035 100644
--- a/src/test/java/org/apache/commons/jexl3/JexlTestCase.java
+++ b/src/test/java/org/apache/commons/jexl3/JexlTestCase.java
@@ -28,7 +28,7 @@ import org.apache.commons.jexl3.internal.OptionsContext;
import org.apache.commons.jexl3.internal.Util;
import org.apache.commons.jexl3.internal.introspection.Uberspect;
import org.apache.commons.jexl3.introspection.JexlPermissions;
-import org.junit.After;
+import org.junit.jupiter.api.AfterEach;
/**
* Implements runTest methods to dynamically instantiate and invoke a test,
@@ -235,7 +235,7 @@ public class JexlTestCase {
return arg.trim().replaceAll("\\s+", " ");
}
- @After
+ @AfterEach
public void tearDown() throws Exception {
debuggerCheck(JEXL);
}
diff --git a/src/test/java/org/apache/commons/jexl3/LambdaTest.java b/src/test/java/org/apache/commons/jexl3/LambdaTest.java
index f28c46e9..1898d0fd 100644
--- a/src/test/java/org/apache/commons/jexl3/LambdaTest.java
+++ b/src/test/java/org/apache/commons/jexl3/LambdaTest.java
@@ -29,7 +29,7 @@ import java.util.concurrent.Callable;
import org.apache.commons.jexl3.internal.Closure;
import org.apache.commons.jexl3.internal.Script;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests function/lambda/closure features.
diff --git a/src/test/java/org/apache/commons/jexl3/LexicalTest.java b/src/test/java/org/apache/commons/jexl3/LexicalTest.java
index 3ef383e6..1fb7f01c 100644
--- a/src/test/java/org/apache/commons/jexl3/LexicalTest.java
+++ b/src/test/java/org/apache/commons/jexl3/LexicalTest.java
@@ -37,7 +37,7 @@ import java.util.concurrent.Callable;
import org.apache.commons.jexl3.internal.LexicalScope;
import org.apache.commons.jexl3.internal.Script;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test cases for lexical option and feature.
diff --git a/src/test/java/org/apache/commons/jexl3/MapLiteralTest.java b/src/test/java/org/apache/commons/jexl3/MapLiteralTest.java
index aaa5ed32..cd9a9b30 100644
--- a/src/test/java/org/apache/commons/jexl3/MapLiteralTest.java
+++ b/src/test/java/org/apache/commons/jexl3/MapLiteralTest.java
@@ -28,7 +28,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for map literals
diff --git a/src/test/java/org/apache/commons/jexl3/MethodTest.java b/src/test/java/org/apache/commons/jexl3/MethodTest.java
index d4e13c7a..46d56f3e 100644
--- a/src/test/java/org/apache/commons/jexl3/MethodTest.java
+++ b/src/test/java/org/apache/commons/jexl3/MethodTest.java
@@ -32,8 +32,8 @@ import org.apache.commons.jexl3.introspection.JexlPropertyGet;
import org.apache.commons.jexl3.introspection.JexlPropertySet;
import org.apache.commons.jexl3.introspection.JexlUberspect;
import org.apache.commons.jexl3.junit.Asserter;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Tests for calling methods on objects
@@ -326,7 +326,7 @@ public class MethodTest extends JexlTestCase {
return false;
}
- @Before
+ @BeforeEach
@Override
public void setUp() {
asserter = new Asserter(JEXL);
diff --git a/src/test/java/org/apache/commons/jexl3/ParseFailuresTest.java b/src/test/java/org/apache/commons/jexl3/ParseFailuresTest.java
index befa0b8c..37a1115f 100644
--- a/src/test/java/org/apache/commons/jexl3/ParseFailuresTest.java
+++ b/src/test/java/org/apache/commons/jexl3/ParseFailuresTest.java
@@ -20,7 +20,7 @@ import static org.junit.jupiter.api.Assertions.fail;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for malformed expressions and scripts.
diff --git a/src/test/java/org/apache/commons/jexl3/PragmaTest.java b/src/test/java/org/apache/commons/jexl3/PragmaTest.java
index 5cc41781..3de6607f 100644
--- a/src/test/java/org/apache/commons/jexl3/PragmaTest.java
+++ b/src/test/java/org/apache/commons/jexl3/PragmaTest.java
@@ -32,7 +32,7 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.atomic.AtomicInteger;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for pragmas
diff --git a/src/test/java/org/apache/commons/jexl3/PropertyAccessTest.java b/src/test/java/org/apache/commons/jexl3/PropertyAccessTest.java
index 8685f5b2..5a0a9480 100644
--- a/src/test/java/org/apache/commons/jexl3/PropertyAccessTest.java
+++ b/src/test/java/org/apache/commons/jexl3/PropertyAccessTest.java
@@ -29,8 +29,8 @@ import org.apache.commons.jexl3.internal.introspection.IndexedType;
import org.apache.commons.jexl3.internal.introspection.Uberspect;
import org.apache.commons.jexl3.introspection.JexlPermissions;
import org.apache.commons.jexl3.junit.Asserter;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Tests for property access operator '.'
@@ -181,7 +181,7 @@ public class PropertyAccessTest extends JexlTestCase {
super("PropertyAccessTest");
}
- @Before
+ @BeforeEach
@Override
public void setUp() {
asserter = new Asserter(JEXL);
diff --git a/src/test/java/org/apache/commons/jexl3/PublicFieldsTest.java b/src/test/java/org/apache/commons/jexl3/PublicFieldsTest.java
index 57669245..edf01487 100644
--- a/src/test/java/org/apache/commons/jexl3/PublicFieldsTest.java
+++ b/src/test/java/org/apache/commons/jexl3/PublicFieldsTest.java
@@ -20,8 +20,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Tests public field set/get.
@@ -59,7 +59,7 @@ public class PublicFieldsTest extends JexlTestCase {
super("PublicFieldsTest");
}
- @Before
+ @BeforeEach
@Override
public void setUp() {
pub = new Struct();
diff --git a/src/test/java/org/apache/commons/jexl3/RangeTest.java b/src/test/java/org/apache/commons/jexl3/RangeTest.java
index 610f508c..49175238 100644
--- a/src/test/java/org/apache/commons/jexl3/RangeTest.java
+++ b/src/test/java/org/apache/commons/jexl3/RangeTest.java
@@ -23,7 +23,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.Collection;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for ranges.
diff --git a/src/test/java/org/apache/commons/jexl3/ScriptCallableTest.java b/src/test/java/org/apache/commons/jexl3/ScriptCallableTest.java
index 217355a7..49c7951a 100644
--- a/src/test/java/org/apache/commons/jexl3/ScriptCallableTest.java
+++ b/src/test/java/org/apache/commons/jexl3/ScriptCallableTest.java
@@ -37,7 +37,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.commons.jexl3.internal.Script;
import org.apache.commons.lang3.ThreadUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests around asynchronous script execution and interrupts.
diff --git a/src/test/java/org/apache/commons/jexl3/ScriptTest.java b/src/test/java/org/apache/commons/jexl3/ScriptTest.java
index 175a8868..dc5e3bc3 100644
--- a/src/test/java/org/apache/commons/jexl3/ScriptTest.java
+++ b/src/test/java/org/apache/commons/jexl3/ScriptTest.java
@@ -34,7 +34,7 @@ import java.util.concurrent.Executors;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.function.Function;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import com.sun.net.httpserver.HttpExchange;
import com.sun.net.httpserver.HttpServer;
diff --git a/src/test/java/org/apache/commons/jexl3/SetLiteralTest.java b/src/test/java/org/apache/commons/jexl3/SetLiteralTest.java
index ade86cb5..b6ba6c80 100644
--- a/src/test/java/org/apache/commons/jexl3/SetLiteralTest.java
+++ b/src/test/java/org/apache/commons/jexl3/SetLiteralTest.java
@@ -27,7 +27,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for set literals
diff --git a/src/test/java/org/apache/commons/jexl3/ShiftOperatorsTest.java b/src/test/java/org/apache/commons/jexl3/ShiftOperatorsTest.java
index b7ecce19..905dd574 100644
--- a/src/test/java/org/apache/commons/jexl3/ShiftOperatorsTest.java
+++ b/src/test/java/org/apache/commons/jexl3/ShiftOperatorsTest.java
@@ -21,7 +21,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import java.math.BigInteger;
import org.apache.commons.jexl3.junit.Asserter;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests shift operators.
diff --git a/src/test/java/org/apache/commons/jexl3/SideEffectTest.java b/src/test/java/org/apache/commons/jexl3/SideEffectTest.java
index 31d12599..2bf76813 100644
--- a/src/test/java/org/apache/commons/jexl3/SideEffectTest.java
+++ b/src/test/java/org/apache/commons/jexl3/SideEffectTest.java
@@ -34,8 +34,8 @@ import org.apache.commons.jexl3.jexl342.OptionalArithmetic;
import org.apache.commons.jexl3.junit.Asserter;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Tests for array access operator []
@@ -456,7 +456,7 @@ public class SideEffectTest extends JexlTestCase {
}
@Override
- @Before
+ @BeforeEach
public void setUp() {
asserter = new Asserter(JEXL);
}
diff --git a/src/test/java/org/apache/commons/jexl3/StrategyTest.java b/src/test/java/org/apache/commons/jexl3/StrategyTest.java
index 73e963aa..4036eb00 100644
--- a/src/test/java/org/apache/commons/jexl3/StrategyTest.java
+++ b/src/test/java/org/apache/commons/jexl3/StrategyTest.java
@@ -29,7 +29,7 @@ import org.apache.commons.jexl3.internal.Engine;
import org.apache.commons.jexl3.introspection.JexlPropertyGet;
import org.apache.commons.jexl3.introspection.JexlPropertySet;
import org.apache.commons.jexl3.introspection.JexlUberspect;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test cases for the if statement.
diff --git a/src/test/java/org/apache/commons/jexl3/SynchronizedOverloadsTest.java b/src/test/java/org/apache/commons/jexl3/SynchronizedOverloadsTest.java
index 6d2e7717..f4356ca6 100644
--- a/src/test/java/org/apache/commons/jexl3/SynchronizedOverloadsTest.java
+++ b/src/test/java/org/apache/commons/jexl3/SynchronizedOverloadsTest.java
@@ -22,8 +22,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.Map;
import java.util.TreeMap;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test cases for synchronized calls.
@@ -35,7 +35,7 @@ public class SynchronizedOverloadsTest extends JexlTestCase {
super("SynchronizedOverloadsTest", null);
}
- @Before
+ @BeforeEach
@Override
public void setUp() throws Exception {
// ensure jul logging is only error to avoid warning in silent mode
diff --git a/src/test/java/org/apache/commons/jexl3/TryCatchFinallyTest.java b/src/test/java/org/apache/commons/jexl3/TryCatchFinallyTest.java
index 1874ab60..6c5399e0 100644
--- a/src/test/java/org/apache/commons/jexl3/TryCatchFinallyTest.java
+++ b/src/test/java/org/apache/commons/jexl3/TryCatchFinallyTest.java
@@ -24,8 +24,8 @@ import static org.junit.jupiter.api.Assertions.fail;
import java.io.IOException;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
public class TryCatchFinallyTest extends JexlTestCase {
public static class Circuit implements AutoCloseable {
@@ -71,7 +71,7 @@ public class TryCatchFinallyTest extends JexlTestCase {
assertFalse(circuit.isOpened());
}
- @Ignore
+ @Disabled
public void testEdgeTry() throws Exception {
int i = 0;
while (i++ < 5) {
diff --git a/src/test/java/org/apache/commons/jexl3/VarTest.java b/src/test/java/org/apache/commons/jexl3/VarTest.java
index 740d6798..210b3ae3 100644
--- a/src/test/java/org/apache/commons/jexl3/VarTest.java
+++ b/src/test/java/org/apache/commons/jexl3/VarTest.java
@@ -36,7 +36,7 @@ import java.util.TimeZone;
import org.apache.commons.jexl3.parser.StringParser;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests local variables.
diff --git a/src/test/java/org/apache/commons/jexl3/WhileTest.java b/src/test/java/org/apache/commons/jexl3/WhileTest.java
index a1bbe378..ed5bbddd 100644
--- a/src/test/java/org/apache/commons/jexl3/WhileTest.java
+++ b/src/test/java/org/apache/commons/jexl3/WhileTest.java
@@ -19,7 +19,7 @@ package org.apache.commons.jexl3;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for while statement.
diff --git a/src/test/java/org/apache/commons/jexl3/examples/ArrayTest.java b/src/test/java/org/apache/commons/jexl3/examples/ArrayTest.java
index b77f2a12..7bd555e9 100644
--- a/src/test/java/org/apache/commons/jexl3/examples/ArrayTest.java
+++ b/src/test/java/org/apache/commons/jexl3/examples/ArrayTest.java
@@ -25,7 +25,7 @@ import org.apache.commons.jexl3.JexlContext;
import org.apache.commons.jexl3.JexlEngine;
import org.apache.commons.jexl3.JexlExpression;
import org.apache.commons.jexl3.MapContext;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Simple example to show how to access arrays.
diff --git a/src/test/java/org/apache/commons/jexl3/examples/MethodPropertyTest.java b/src/test/java/org/apache/commons/jexl3/examples/MethodPropertyTest.java
index 8e8e402d..de01c89b 100644
--- a/src/test/java/org/apache/commons/jexl3/examples/MethodPropertyTest.java
+++ b/src/test/java/org/apache/commons/jexl3/examples/MethodPropertyTest.java
@@ -22,7 +22,7 @@ import org.apache.commons.jexl3.JexlContext;
import org.apache.commons.jexl3.JexlEngine;
import org.apache.commons.jexl3.JexlExpression;
import org.apache.commons.jexl3.MapContext;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Simple example to show how to access method and properties.
diff --git a/src/test/java/org/apache/commons/jexl3/examples/StreamTest.java b/src/test/java/org/apache/commons/jexl3/examples/StreamTest.java
index 82c5b740..6fab60d0 100644
--- a/src/test/java/org/apache/commons/jexl3/examples/StreamTest.java
+++ b/src/test/java/org/apache/commons/jexl3/examples/StreamTest.java
@@ -37,7 +37,7 @@ import org.apache.commons.jexl3.JexlScript;
import org.apache.commons.jexl3.MapContext;
import org.apache.commons.jexl3.introspection.JexlPermissions;
import org.apache.commons.jexl3.introspection.JexlPermissions.ClassPermissions;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* A test around scripting streams.
diff --git a/src/test/java/org/apache/commons/jexl3/internal/RangeTest.java b/src/test/java/org/apache/commons/jexl3/internal/RangeTest.java
index 21cb09a0..80ade003 100644
--- a/src/test/java/org/apache/commons/jexl3/internal/RangeTest.java
+++ b/src/test/java/org/apache/commons/jexl3/internal/RangeTest.java
@@ -29,9 +29,9 @@ import java.util.NoSuchElementException;
import org.apache.commons.jexl3.JexlFeatures;
import org.apache.commons.jexl3.JexlTestCase;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Basic checks on ranges.
@@ -71,14 +71,14 @@ public class RangeTest extends JexlTestCase {
}
}
- @Before
+ @BeforeEach
@Override
public void setUp() throws Exception {
// ensure jul logging is only error
java.util.logging.Logger.getLogger(org.apache.commons.jexl3.JexlEngine.class.getName()).setLevel(java.util.logging.Level.SEVERE);
}
- @After
+ @AfterEach
@Override
public void tearDown() throws Exception {
super.tearDown();
diff --git a/src/test/java/org/apache/commons/jexl3/internal/introspection/DiscoveryTest.java b/src/test/java/org/apache/commons/jexl3/internal/introspection/DiscoveryTest.java
index 3383993d..00b63729 100644
--- a/src/test/java/org/apache/commons/jexl3/internal/introspection/DiscoveryTest.java
+++ b/src/test/java/org/apache/commons/jexl3/internal/introspection/DiscoveryTest.java
@@ -32,7 +32,7 @@ import org.apache.commons.jexl3.internal.Engine;
import org.apache.commons.jexl3.introspection.JexlMethod;
import org.apache.commons.jexl3.introspection.JexlPropertyGet;
import org.apache.commons.jexl3.introspection.JexlPropertySet;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for checking introspection discovery.
diff --git a/src/test/java/org/apache/commons/jexl3/internal/introspection/MethodKeyTest.java b/src/test/java/org/apache/commons/jexl3/internal/introspection/MethodKeyTest.java
index 3d7bd238..d3bd1472 100644
--- a/src/test/java/org/apache/commons/jexl3/internal/introspection/MethodKeyTest.java
+++ b/src/test/java/org/apache/commons/jexl3/internal/introspection/MethodKeyTest.java
@@ -19,7 +19,7 @@ package org.apache.commons.jexl3.internal.introspection;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Checks the CacheMap.MethodKey implementation
diff --git a/src/test/java/org/apache/commons/jexl3/internal/introspection/MiscIntrospectionTest.java b/src/test/java/org/apache/commons/jexl3/internal/introspection/MiscIntrospectionTest.java
index 99990c61..fc62035f 100644
--- a/src/test/java/org/apache/commons/jexl3/internal/introspection/MiscIntrospectionTest.java
+++ b/src/test/java/org/apache/commons/jexl3/internal/introspection/MiscIntrospectionTest.java
@@ -26,7 +26,7 @@ import java.util.ArrayList;
import java.util.NoSuchElementException;
import org.apache.commons.jexl3.JexlEngine;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Checks the CacheMap.MethodKey implementation
diff --git a/src/test/java/org/apache/commons/jexl3/internal/introspection/NoJexlTest.java b/src/test/java/org/apache/commons/jexl3/internal/introspection/NoJexlTest.java
index 592f49a7..459233a2 100644
--- a/src/test/java/org/apache/commons/jexl3/internal/introspection/NoJexlTest.java
+++ b/src/test/java/org/apache/commons/jexl3/internal/introspection/NoJexlTest.java
@@ -25,7 +25,7 @@ import java.lang.reflect.Field;
import java.lang.reflect.Method;
import org.apache.commons.jexl3.annotations.NoJexl;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Checks the CacheMap.MethodKey implementation
diff --git a/src/test/java/org/apache/commons/jexl3/internal/introspection/PermissionsTest.java b/src/test/java/org/apache/commons/jexl3/internal/introspection/PermissionsTest.java
index f3f3f0a6..5d180c1f 100644
--- a/src/test/java/org/apache/commons/jexl3/internal/introspection/PermissionsTest.java
+++ b/src/test/java/org/apache/commons/jexl3/internal/introspection/PermissionsTest.java
@@ -46,7 +46,7 @@ import org.apache.commons.jexl3.MapContext;
import org.apache.commons.jexl3.internal.introspection.nojexlpackage.Invisible;
import org.apache.commons.jexl3.introspection.JexlPermissions;
import org.apache.commons.jexl3.introspection.JexlUberspect;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Checks the CacheMap.MethodKey implementation
diff --git a/src/test/java/org/apache/commons/jexl3/introspection/SandboxTest.java b/src/test/java/org/apache/commons/jexl3/introspection/SandboxTest.java
index e45c6bf3..a6492181 100644
--- a/src/test/java/org/apache/commons/jexl3/introspection/SandboxTest.java
+++ b/src/test/java/org/apache/commons/jexl3/introspection/SandboxTest.java
@@ -38,7 +38,7 @@ import org.apache.commons.jexl3.MapContext;
import org.apache.commons.jexl3.annotations.NoJexl;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests sandbox features.
diff --git a/src/test/java/org/apache/commons/jexl3/jexl342/OptionalTest.java b/src/test/java/org/apache/commons/jexl3/jexl342/OptionalTest.java
index 6b447e77..40e75d16 100644
--- a/src/test/java/org/apache/commons/jexl3/jexl342/OptionalTest.java
+++ b/src/test/java/org/apache/commons/jexl3/jexl342/OptionalTest.java
@@ -37,7 +37,7 @@ import org.apache.commons.jexl3.JexlInfo;
import org.apache.commons.jexl3.JexlScript;
import org.apache.commons.jexl3.MapContext;
import org.apache.commons.jexl3.introspection.JexlUberspect;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class OptionalTest {
diff --git a/src/test/java/org/apache/commons/jexl3/junit/AsserterTest.java b/src/test/java/org/apache/commons/jexl3/junit/AsserterTest.java
index c36d13c8..b1b8d276 100644
--- a/src/test/java/org/apache/commons/jexl3/junit/AsserterTest.java
+++ b/src/test/java/org/apache/commons/jexl3/junit/AsserterTest.java
@@ -21,7 +21,7 @@ import static org.junit.jupiter.api.Assertions.fail;
import org.apache.commons.jexl3.Foo;
import org.apache.commons.jexl3.JexlTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Simple tests
diff --git a/src/test/java/org/apache/commons/jexl3/parser/FeatureControllerTest.java b/src/test/java/org/apache/commons/jexl3/parser/FeatureControllerTest.java
index 7b3a9fd9..d804b93b 100644
--- a/src/test/java/org/apache/commons/jexl3/parser/FeatureControllerTest.java
+++ b/src/test/java/org/apache/commons/jexl3/parser/FeatureControllerTest.java
@@ -21,7 +21,7 @@ import org.apache.commons.jexl3.JexlEngine;
import org.apache.commons.jexl3.JexlFeatures;
import org.apache.commons.jexl3.JexlTestCase;
import org.apache.commons.jexl3.junit.Asserter;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class FeatureControllerTest extends JexlTestCase {
diff --git a/src/test/java/org/apache/commons/jexl3/parser/ParserTest.java b/src/test/java/org/apache/commons/jexl3/parser/ParserTest.java
index bb01341b..44c780fc 100644
--- a/src/test/java/org/apache/commons/jexl3/parser/ParserTest.java
+++ b/src/test/java/org/apache/commons/jexl3/parser/ParserTest.java
@@ -23,7 +23,7 @@ import static org.junit.jupiter.api.Assertions.fail;
import org.apache.commons.jexl3.JexlException;
import org.apache.commons.jexl3.JexlFeatures;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*/
diff --git a/src/test/java/org/apache/commons/jexl3/scripting/JexlScriptEngineOptionalTest.java b/src/test/java/org/apache/commons/jexl3/scripting/JexlScriptEngineOptionalTest.java
index 855d319a..47a53c88 100644
--- a/src/test/java/org/apache/commons/jexl3/scripting/JexlScriptEngineOptionalTest.java
+++ b/src/test/java/org/apache/commons/jexl3/scripting/JexlScriptEngineOptionalTest.java
@@ -27,7 +27,7 @@ import javax.script.CompiledScript;
import javax.script.ScriptEngine;
import javax.script.ScriptEngineManager;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class JexlScriptEngineOptionalTest {
private final JexlScriptEngineFactory factory = new JexlScriptEngineFactory();
diff --git a/src/test/java/org/apache/commons/jexl3/scripting/JexlScriptEngineTest.java b/src/test/java/org/apache/commons/jexl3/scripting/JexlScriptEngineTest.java
index 154adcc6..f3d01a21 100644
--- a/src/test/java/org/apache/commons/jexl3/scripting/JexlScriptEngineTest.java
+++ b/src/test/java/org/apache/commons/jexl3/scripting/JexlScriptEngineTest.java
@@ -38,9 +38,9 @@ import javax.script.ScriptException;
import org.apache.commons.jexl3.JexlBuilder;
import org.apache.commons.jexl3.JexlException;
import org.apache.commons.jexl3.introspection.JexlPermissions;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class JexlScriptEngineTest {
public static class Errors {
@@ -60,11 +60,11 @@ public class JexlScriptEngineTest {
"application/x-jexl2",
"application/x-jexl3");
- @Before
+ @BeforeEach
public void setUp() {
}
- @After
+ @AfterEach
public void tearDown() {
JexlBuilder.setDefaultPermissions(null);
JexlScriptEngine.setInstance(null);
diff --git a/src/test/java/org/example/SomeTest.java b/src/test/java/org/example/SomeTest.java
index e6a2fbaa..58401485 100644
--- a/src/test/java/org/example/SomeTest.java
+++ b/src/test/java/org/example/SomeTest.java
@@ -32,7 +32,7 @@ import org.apache.commons.jexl3.internal.Engine;
import org.apache.commons.jexl3.internal.TemplateInterpreter;
import org.apache.commons.jexl3.introspection.JexlPermissions;
import org.apache.commons.jexl3.parser.JexlNode;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class SomeTest {
(commons-jexl) 02/03: Port from JUnit 4 to 5
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jexl.git
commit 80538dbdc9d8125ad5466a6368c2738b5e793716
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jun 1 09:30:14 2024 -0400
Port from JUnit 4 to 5
---
.../org/apache/commons/jexl3/junit/Asserter.java | 25 ++++++++++------------
1 file changed, 11 insertions(+), 14 deletions(-)
diff --git a/src/test/java/org/apache/commons/jexl3/junit/Asserter.java b/src/test/java/org/apache/commons/jexl3/junit/Asserter.java
index 5badfd7c..0b293bb9 100644
--- a/src/test/java/org/apache/commons/jexl3/junit/Asserter.java
+++ b/src/test/java/org/apache/commons/jexl3/junit/Asserter.java
@@ -16,6 +16,9 @@
*/
package org.apache.commons.jexl3.junit;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
import java.lang.reflect.Array;
import java.math.BigDecimal;
import java.math.BigInteger;
@@ -29,7 +32,6 @@ import org.apache.commons.jexl3.JexlEngine;
import org.apache.commons.jexl3.JexlEvalContext;
import org.apache.commons.jexl3.JexlException;
import org.apache.commons.jexl3.JexlScript;
-import org.junit.Assert;
/**
* A utility class for performing JUnit based assertions using Jexl
@@ -38,7 +40,7 @@ import org.junit.Assert;
*
* @since 1.0
*/
-public class Asserter extends Assert {
+public class Asserter {
/** Variables used during asserts. */
private final Map<String, Object> variables = new HashMap<>();
/** Context to use during asserts. */
@@ -69,30 +71,25 @@ public class Asserter extends Assert {
final Object value = exp.execute(context, args);
if (expected instanceof BigDecimal) {
final JexlArithmetic jexla = engine.getArithmetic();
- assertEquals("expression: " + expression, 0,
- ((BigDecimal) expected).compareTo(jexla.toBigDecimal(value)));
+ assertEquals(0, ((BigDecimal) expected).compareTo(jexla.toBigDecimal(value)), () -> "expression: " + expression);
} else if (expected instanceof BigInteger) {
final JexlArithmetic jexla = engine.getArithmetic();
- assertEquals("expression: " + expression, 0,
- ((BigInteger) expected).compareTo(jexla.toBigInteger(value)));
+ assertEquals(0, ((BigInteger) expected).compareTo(jexla.toBigInteger(value)), () -> "expression: " + expression);
} else if (expected != null && value != null) {
if (expected.getClass().isArray() && value.getClass().isArray()) {
final int esz = Array.getLength(expected);
final int vsz = Array.getLength(value);
final String report = "expression: " + expression;
- assertEquals(report + ", array size", esz, vsz);
+ assertEquals(esz, vsz, () -> report + ", array size");
for (int i = 0; i < vsz; ++i) {
- assertEquals(report + ", value@[]" + i, Array.get(expected, i), Array.get(value, i));
+ assertEquals(Array.get(expected, i), Array.get(value, i), report + ", value@[]" + i);
}
} else {
- assertEquals("expression: " + expression + ", "
- + expected.getClass().getSimpleName()
- + " ?= "
- + value.getClass().getSimpleName(),
- expected, value);
+ assertEquals(expected, value,
+ () -> "expression: " + expression + ", " + expected.getClass().getSimpleName() + " ?= " + value.getClass().getSimpleName());
}
} else {
- assertEquals("expression: " + expression, expected, value);
+ assertEquals(expected, value, () -> "expression: " + expression);
}
}