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

Merge pull request #2076 from GGGGeorge-gao/v5-dev

Browse Source 
fix Calculator.conversion EmptyStackException bug
This commit is contained in:
Golden Looly 2022-01-07 19:40:58 +08:00 committed by GitHub
commit 2d2cb4590d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hutool-core/src/main/java/cn/hutool/core/math/Calculator.java
View File

@ -191,7 +191,7 @@ public class Calculator {
}
}
}
if (arr[0] == '~' || (arr.length > 1 && arr[1] == '(')) {
if (arr[0] == '~' && (arr.length > 1 && arr[1] == '(')) {
arr[0] = '-';
return "0" + new String(arr);
} else {

9
hutool-core/src/test/java/cn/hutool/core/math/CalculatorTest.java
View File

@ -31,10 +31,15 @@ public class CalculatorTest {
}
@Test
@Ignore
public void conversationTest5(){
// https://github.com/dromara/hutool/issues/1984
final double conversion = Calculator.conversion("((1/1) / (1/1) -1) * 100");
Assert.assertEquals((88D * 66 / 23) % 26, conversion, 2);
Assert.assertEquals(0, conversion, 2);
}
@Test
public void conversationTest6() {
final double conversion = Calculator.conversion("-((2.12-2) * 100)");
Assert.assertEquals(-1D * (2.12 - 2) * 100, conversion, 2);
}
}