diff --git a/hutool-extra/src/test/java/cn/hutool/extra/compress/ExtractorTest.java b/hutool-extra/src/test/java/cn/hutool/extra/compress/ExtractorTest.java index b6f970d416..6fc11e3200 100644 --- a/hutool-extra/src/test/java/cn/hutool/extra/compress/ExtractorTest.java +++ b/hutool-extra/src/test/java/cn/hutool/extra/compress/ExtractorTest.java @@ -13,7 +13,7 @@ public class ExtractorTest { @Test @Ignore public void zipTest() { - Extractor extractor = CompressUtil.createExtractor( + final Extractor extractor = CompressUtil.createExtractor( CharsetUtil.defaultCharset(), FileUtil.file("d:/test/c_1344112734760931330_20201230104703032.zip")); @@ -23,7 +23,7 @@ public void zipTest() { @Test @Ignore public void sevenZTest() { - Extractor extractor = CompressUtil.createExtractor( + final Extractor extractor = CompressUtil.createExtractor( CharsetUtil.defaultCharset(), FileUtil.file("d:/test/compress/test.7z")); @@ -33,7 +33,7 @@ public void sevenZTest() { @Test @Ignore public void tgzTest() { - Extractor extractor = CompressUtil.createExtractor( + final Extractor extractor = CompressUtil.createExtractor( CharsetUtil.defaultCharset(), "tgz", FileUtil.file("d:/test/test.tgz")); @@ -44,10 +44,10 @@ public void tgzTest() { @Test @Ignore public void sevenZTest2() { - File targetDir = FileUtil.file("d:/test/sevenZ2/"); + final File targetDir = FileUtil.file("d:/test/sevenZ2/"); FileUtil.clean(targetDir); // - Extractor extractor = CompressUtil.createExtractor( + final Extractor extractor = CompressUtil.createExtractor( CharsetUtil.defaultCharset(), FileUtil.file("D:/System-Data/Downloads/apache-tomcat-10.0.27.7z")); @@ -57,10 +57,10 @@ public void sevenZTest2() { @Test @Ignore public void zipTest2() { - File targetDir = FileUtil.file("d:/test/zip2/"); + final File targetDir = FileUtil.file("d:/test/zip2/"); FileUtil.clean(targetDir); // - Extractor extractor = CompressUtil.createExtractor( + final Extractor extractor = CompressUtil.createExtractor( CharsetUtil.defaultCharset(), FileUtil.file("D:/System-Data/Downloads/apache-tomcat-10.0.27.zip")); diff --git a/hutool-extra/src/test/java/cn/hutool/extra/expression/AviatorTest.java b/hutool-extra/src/test/java/cn/hutool/extra/expression/AviatorTest.java index 8896ab4397..74307e722c 100755 --- a/hutool-extra/src/test/java/cn/hutool/extra/expression/AviatorTest.java +++ b/hutool-extra/src/test/java/cn/hutool/extra/expression/AviatorTest.java @@ -21,17 +21,17 @@ public void simpleTest(){ ExpressionEngine engine = new AviatorEngine(); String exp = "\"[foo i=\"+ foo.i + \", f=\" + foo.f + \", date.year=\" + (foo.date.year+1900) + \", date.month=\" + foo.date.month + \", bars[0].name=\" + #foo.bars[0].name + \"]\""; - String result = (String) engine.eval(exp, Dict.create().set("foo", foo)); + String result = (String) engine.eval(exp, Dict.create().set("foo", foo), null); Assert.assertEquals("[foo i=100, f=3.14, date.year=2020, date.month=10, bars[0].name=bar]", result); // Assignment. exp = "#foo.bars[0].name='hello aviator' ; #foo.bars[0].name"; - result = (String) engine.eval(exp, Dict.create().set("foo", foo)); + result = (String) engine.eval(exp, Dict.create().set("foo", foo), null); Assert.assertEquals("hello aviator", result); Assert.assertEquals("hello aviator", foo.bars[0].getName()); exp = "foo.bars[0] = nil ; foo.bars[0]"; - result = (String) engine.eval(exp, Dict.create().set("foo", foo)); + result = (String) engine.eval(exp, Dict.create().set("foo", foo), null); Console.log("Execute expression: " + exp); Assert.assertNull(result); Assert.assertNull(foo.bars[0]); diff --git a/hutool-extra/src/test/java/cn/hutool/extra/expression/ExpressionUtilTest.java b/hutool-extra/src/test/java/cn/hutool/extra/expression/ExpressionUtilTest.java index 1b04968ffc..15282a1e07 100755 --- a/hutool-extra/src/test/java/cn/hutool/extra/expression/ExpressionUtilTest.java +++ b/hutool-extra/src/test/java/cn/hutool/extra/expression/ExpressionUtilTest.java @@ -33,7 +33,7 @@ public void jexlTest(){ .set("a", 100.3) .set("b", 45) .set("c", -199.100); - final Object eval = engine.eval("a-(b-c)", dict); + final Object eval = engine.eval("a-(b-c)", dict, null); Assert.assertEquals(-143.8, (double)eval, 0); } @@ -44,7 +44,7 @@ public void jexlScriptTest(){ final String exps2="if(a>0){return 100;}"; final Map map2=new HashMap<>(); map2.put("a", 1); - final Object eval1 = engine.eval(exps2, map2); + final Object eval1 = engine.eval(exps2, map2, null); Assert.assertEquals(100, eval1); } @@ -56,7 +56,7 @@ public void mvelTest(){ .set("a", 100.3) .set("b", 45) .set("c", -199.100); - final Object eval = engine.eval("a-(b-c)", dict); + final Object eval = engine.eval("a-(b-c)", dict, null); Assert.assertEquals(-143.8, (double)eval, 0); } @@ -68,7 +68,7 @@ public void jfireELTest(){ .set("a", 100.3) .set("b", 45) .set("c", -199.100); - final Object eval = engine.eval("a-(b-c)", dict); + final Object eval = engine.eval("a-(b-c)", dict, null); Assert.assertEquals(-143.8, (double)eval, 0); } @@ -80,7 +80,7 @@ public void spELTest(){ .set("a", 100.3) .set("b", 45) .set("c", -199.100); - final Object eval = engine.eval("#a-(#b-#c)", dict); + final Object eval = engine.eval("#a-(#b-#c)", dict, null); Assert.assertEquals(-143.8, (double)eval, 0); } @@ -92,7 +92,7 @@ public void rhinoTest(){ .set("a", 100.3) .set("b", 45) .set("c", -199.100); - final Object eval = engine.eval("a-(b-c)", dict); + final Object eval = engine.eval("a-(b-c)", dict, null); Assert.assertEquals(-143.8, (double)eval, 0); } @@ -104,7 +104,7 @@ public void qlExpressTest(){ .set("a", 100.3) .set("b", 45) .set("c", -199.100); - final Object eval = engine.eval("a-(b-c)", dict); + final Object eval = engine.eval("a-(b-c)", dict, null); Assert.assertEquals(-143.8, (double)eval, 0); }