ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-05-09 23:51:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix test

Browse Source
This commit is contained in:
Looly 2023-07-29 14:01:49 +08:00
parent 0eee7eadc7
commit 5889435e09
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hutool-extra/src/test/java/cn/hutool/extra/compress/ExtractorTest.java
View File

@ -13,7 +13,7 @@ public class ExtractorTest {
@Test @Test
@Ignore @Ignore
public void zipTest() { public void zipTest() {
Extractor extractor = CompressUtil.createExtractor( final Extractor extractor = CompressUtil.createExtractor(
CharsetUtil.defaultCharset(), CharsetUtil.defaultCharset(),
FileUtil.file("d:/test/c_1344112734760931330_20201230104703032.zip")); FileUtil.file("d:/test/c_1344112734760931330_20201230104703032.zip"));
@ -23,7 +23,7 @@ public class ExtractorTest {
@Test @Test
@Ignore @Ignore
public void sevenZTest() { public void sevenZTest() {
Extractor extractor = CompressUtil.createExtractor( final Extractor extractor = CompressUtil.createExtractor(
CharsetUtil.defaultCharset(), CharsetUtil.defaultCharset(),
FileUtil.file("d:/test/compress/test.7z")); FileUtil.file("d:/test/compress/test.7z"));
@ -33,7 +33,7 @@ public class ExtractorTest {
@Test @Test
@Ignore @Ignore
public void tgzTest() { public void tgzTest() {
Extractor extractor = CompressUtil.createExtractor( final Extractor extractor = CompressUtil.createExtractor(
CharsetUtil.defaultCharset(), CharsetUtil.defaultCharset(),
"tgz", "tgz",
FileUtil.file("d:/test/test.tgz")); FileUtil.file("d:/test/test.tgz"));
@ -44,10 +44,10 @@ public class ExtractorTest {
@Test @Test
@Ignore @Ignore
public void sevenZTest2() { public void sevenZTest2() {
File targetDir = FileUtil.file("d:/test/sevenZ2/"); final File targetDir = FileUtil.file("d:/test/sevenZ2/");
FileUtil.clean(targetDir); FileUtil.clean(targetDir);
// //
Extractor extractor = CompressUtil.createExtractor( final Extractor extractor = CompressUtil.createExtractor(
CharsetUtil.defaultCharset(), CharsetUtil.defaultCharset(),
FileUtil.file("D:/System-Data/Downloads/apache-tomcat-10.0.27.7z")); FileUtil.file("D:/System-Data/Downloads/apache-tomcat-10.0.27.7z"));
@ -57,10 +57,10 @@ public class ExtractorTest {
@Test @Test
@Ignore @Ignore
public void zipTest2() { public void zipTest2() {
File targetDir = FileUtil.file("d:/test/zip2/"); final File targetDir = FileUtil.file("d:/test/zip2/");
FileUtil.clean(targetDir); FileUtil.clean(targetDir);
// //
Extractor extractor = CompressUtil.createExtractor( final Extractor extractor = CompressUtil.createExtractor(
CharsetUtil.defaultCharset(), CharsetUtil.defaultCharset(),
FileUtil.file("D:/System-Data/Downloads/apache-tomcat-10.0.27.zip")); FileUtil.file("D:/System-Data/Downloads/apache-tomcat-10.0.27.zip"));

6
hutool-extra/src/test/java/cn/hutool/extra/expression/AviatorTest.java
View File

@ -21,17 +21,17 @@ public class AviatorTest {
ExpressionEngine engine = new AviatorEngine(); ExpressionEngine engine = new AviatorEngine();
String exp = 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 + \"]\""; "\"[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); Assert.assertEquals("[foo i=100, f=3.14, date.year=2020, date.month=10, bars[0].name=bar]", result);
// Assignment. // Assignment.
exp = "#foo.bars[0].name='hello aviator' ; #foo.bars[0].name"; 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", result);
Assert.assertEquals("hello aviator", foo.bars[0].getName()); Assert.assertEquals("hello aviator", foo.bars[0].getName());
exp = "foo.bars[0] = nil ; foo.bars[0]"; 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); Console.log("Execute expression: " + exp);
Assert.assertNull(result); Assert.assertNull(result);
Assert.assertNull(foo.bars[0]); Assert.assertNull(foo.bars[0]);

14
hutool-extra/src/test/java/cn/hutool/extra/expression/ExpressionUtilTest.java
View File

@ -33,7 +33,7 @@ public class ExpressionUtilTest {
.set("a", 100.3) .set("a", 100.3)
.set("b", 45) .set("b", 45)
.set("c", -199.100); .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); Assert.assertEquals(-143.8, (double)eval, 0);
} }
@ -44,7 +44,7 @@ public class ExpressionUtilTest {
final String exps2="if(a>0){return 100;}"; final String exps2="if(a>0){return 100;}";
final Map<String,Object> map2=new HashMap<>(); final Map<String,Object> map2=new HashMap<>();
map2.put("a", 1); map2.put("a", 1);
final Object eval1 = engine.eval(exps2, map2); final Object eval1 = engine.eval(exps2, map2, null);
Assert.assertEquals(100, eval1); Assert.assertEquals(100, eval1);
} }
@ -56,7 +56,7 @@ public class ExpressionUtilTest {
.set("a", 100.3) .set("a", 100.3)
.set("b", 45) .set("b", 45)
.set("c", -199.100); .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); Assert.assertEquals(-143.8, (double)eval, 0);
} }
@ -68,7 +68,7 @@ public class ExpressionUtilTest {
.set("a", 100.3) .set("a", 100.3)
.set("b", 45) .set("b", 45)
.set("c", -199.100); .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); Assert.assertEquals(-143.8, (double)eval, 0);
} }
@ -80,7 +80,7 @@ public class ExpressionUtilTest {
.set("a", 100.3) .set("a", 100.3)
.set("b", 45) .set("b", 45)
.set("c", -199.100); .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); Assert.assertEquals(-143.8, (double)eval, 0);
} }
@ -92,7 +92,7 @@ public class ExpressionUtilTest {
.set("a", 100.3) .set("a", 100.3)
.set("b", 45) .set("b", 45)
.set("c", -199.100); .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); Assert.assertEquals(-143.8, (double)eval, 0);
} }
@ -104,7 +104,7 @@ public class ExpressionUtilTest {
.set("a", 100.3) .set("a", 100.3)
.set("b", 45) .set("b", 45)
.set("c", -199.100); .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); Assert.assertEquals(-143.8, (double)eval, 0);
} }