Author: fanningpj
Date: Thu Dec 15 12:06:39 2022
New Revision: 1906012
URL: http://svn.apache.org/viewvc?rev=1906012&view=rev
Log:
upgrade mockito and byte-buddy
Modified:
poi/trunk/build.gradle
poi/trunk/build.xml
poi/trunk/poi-ooxml-lite-agent/build.gradle
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/eval/TwoOperandNumericOperation.java
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestNumericFunction.java
Modified: poi/trunk/build.gradle
URL:
http://svn.apache.org/viewvc/poi/trunk/build.gradle?rev=1906012&r1=1906011&r2=1906012&view=diff
==============================================================================
--- poi/trunk/build.gradle (original)
+++ poi/trunk/build.gradle Thu Dec 15 12:06:39 2022
@@ -121,7 +121,7 @@ subprojects {
commonsMathVersion = '3.6.1'
junitVersion = '5.9.0'
log4jVersion = '2.19.0'
- mockitoVersion = '4.9.0'
+ mockitoVersion = '4.10.0'
hamcrestVersion = '2.2'
xmlbeansVersion = '5.1.1'
batikVersion = '1.16'
Modified: poi/trunk/build.xml
URL:
http://svn.apache.org/viewvc/poi/trunk/build.xml?rev=1906012&r1=1906011&r2=1906012&view=diff
==============================================================================
--- poi/trunk/build.xml (original)
+++ poi/trunk/build.xml Thu Dec 15 12:06:39 2022
@@ -284,9 +284,9 @@ under the License.
<dependency prefix="main.jmhAnnotation"
artifact="org.openjdk.jmh:jmh-generator-annprocess:1.35" usage="main-tests"/>
<dependency prefix="main.hamcrest" artifact="org.hamcrest:hamcrest:2.2"
usage="main-tests"/>
<dependency prefix="main.xmlunit"
artifact="org.xmlunit:xmlunit-core:2.9.0" usage="main-tests"/>
- <dependency prefix="main.mockito"
artifact="org.mockito:mockito-core:4.9.0" usage="main-tests"/>
- <dependency prefix="main.byte-buddy"
artifact="net.bytebuddy:byte-buddy:1.12.19" usage="main-tests"/>
- <dependency prefix="main.byte-buddy-agent"
artifact="net.bytebuddy:byte-buddy-agent:1.12.19" usage="main-tests"/>
+ <dependency prefix="main.mockito"
artifact="org.mockito:mockito-core:4.10.0" usage="main-tests"/>
+ <dependency prefix="main.byte-buddy"
artifact="net.bytebuddy:byte-buddy:1.12.20" usage="main-tests"/>
+ <dependency prefix="main.byte-buddy-agent"
artifact="net.bytebuddy:byte-buddy-agent:1.12.20" usage="main-tests"/>
<dependency prefix="main.objenesis" artifact="org.objenesis:objenesis:3.1"
usage="main-tests"/>
<dependency prefix="main.log4j-core"
artifact="org.apache.logging.log4j:log4j-core:2.19.0" usage="main-tests"/>
<dependency prefix="main.commons-logging"
artifact="commons-logging:commons-logging:1.2" usage="main-tests"/>
Modified: poi/trunk/poi-ooxml-lite-agent/build.gradle
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml-lite-agent/build.gradle?rev=1906012&r1=1906011&r2=1906012&view=diff
==============================================================================
--- poi/trunk/poi-ooxml-lite-agent/build.gradle (original)
+++ poi/trunk/poi-ooxml-lite-agent/build.gradle Thu Dec 15 12:06:39 2022
@@ -24,8 +24,8 @@ sourceSets {
}
dependencies {
- api 'net.bytebuddy:byte-buddy:1.12.19'
- api 'net.bytebuddy:byte-buddy-agent:1.12.19'
+ api 'net.bytebuddy:byte-buddy:1.12.20'
+ api 'net.bytebuddy:byte-buddy-agent:1.12.20'
api "org.apache.xmlbeans:xmlbeans:${xmlbeansVersion}"
}
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/eval/TwoOperandNumericOperation.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/eval/TwoOperandNumericOperation.java?rev=1906012&r1=1906011&r2=1906012&view=diff
==============================================================================
---
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/eval/TwoOperandNumericOperation.java
(original)
+++
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/eval/TwoOperandNumericOperation.java
Thu Dec 15 12:06:39 2022
@@ -89,17 +89,19 @@ public abstract class TwoOperandNumericO
if (d1 == 0.0) {
throw new EvaluationException(ErrorEval.DIV_ZERO);
}
- BigDecimal bd0 = new BigDecimal(NumberToTextConverter.toText(d0));
- BigDecimal bd1 = new BigDecimal(NumberToTextConverter.toText(d1));
- return bd0.divide(bd1, MathContext.DECIMAL128).doubleValue();
+ BigDecimal bd0 = new BigDecimal(d0);
+ BigDecimal bd1 = new BigDecimal(d1);
+ BigDecimal result = bd0.divide(bd1, MathContext.DECIMAL128);
+ return
Double.parseDouble(NumberToTextConverter.toText(result.doubleValue()));
}
};
public static final Function MultiplyEval = new
TwoOperandNumericOperation() {
@Override
protected double evaluate(double d0, double d1) {
- BigDecimal bd0 = new BigDecimal(NumberToTextConverter.toText(d0));
- BigDecimal bd1 = new BigDecimal(NumberToTextConverter.toText(d1));
- return bd0.multiply(bd1).doubleValue();
+ BigDecimal bd0 = new BigDecimal(d0);
+ BigDecimal bd1 = new BigDecimal(d1);
+ BigDecimal result = bd0.multiply(bd1);
+ return
Double.parseDouble(NumberToTextConverter.toText(result.doubleValue()));
}
};
public static final Function PowerEval = new TwoOperandNumericOperation() {
Modified:
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestNumericFunction.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestNumericFunction.java?rev=1906012&r1=1906011&r2=1906012&view=diff
==============================================================================
---
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestNumericFunction.java
(original)
+++
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestNumericFunction.java
Thu Dec 15 12:06:39 2022
@@ -23,6 +23,7 @@ import org.apache.poi.util.LocaleUtil;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
+import java.io.IOException;
import java.util.Locale;
import static org.apache.poi.ss.util.Utils.assertDouble;
@@ -45,6 +46,15 @@ final class TestNumericFunction {
}
@Test
+ void testMultiply() throws IOException {
+ try (HSSFWorkbook wb = new HSSFWorkbook()) {
+ HSSFCell cell = wb.createSheet().createRow(0).createCell(0);
+ HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
+ assertDouble(fe, cell, "1.2*SQRT(5.678)", 2.85942651592937, 0);
+ }
+ }
+
+ @Test
void testSIGN() {
HSSFWorkbook wb = new HSSFWorkbook();
HSSFCell cell = wb.createSheet().createRow(0).createCell(0);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
