You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by fa...@apache.org on 2018/01/29 15:21:59 UTC
svn commit: r1822517 - in /poi/trunk: .classpath build.gradle build.xml
gradle/wrapper/gradle-wrapper.jar
src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextRun.java
Author: fanningpj
Date: Mon Jan 29 15:21:59 2018
New Revision: 1822517
URL: http://svn.apache.org/viewvc?rev=1822517&view=rev
Log:
[bug-62038] add mockito based unit test
Modified:
poi/trunk/.classpath
poi/trunk/build.gradle
poi/trunk/build.xml
poi/trunk/gradle/wrapper/gradle-wrapper.jar
poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextRun.java
Modified: poi/trunk/.classpath
URL: http://svn.apache.org/viewvc/poi/trunk/.classpath?rev=1822517&r1=1822516&r2=1822517&view=diff
==============================================================================
--- poi/trunk/.classpath (original)
+++ poi/trunk/.classpath Mon Jan 29 15:21:59 2018
@@ -35,5 +35,6 @@
<classpathentry exported="true" kind="lib" path="lib/commons-logging-1.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/commons-collections4-4.1.jar"/>
<classpathentry kind="lib" path="lib/commons-math3-3.6.1.jar"/>
+ <classpathentry kind="lib" path="lib/mockito-core-2.13.0.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: poi/trunk/build.gradle
URL: http://svn.apache.org/viewvc/poi/trunk/build.gradle?rev=1822517&r1=1822516&r2=1822517&view=diff
==============================================================================
--- poi/trunk/build.gradle (original)
+++ poi/trunk/build.gradle Mon Jan 29 15:21:59 2018
@@ -211,6 +211,7 @@ project('ooxml') {
compile files('../../ooxml-lib/ooxml-security-1.1.jar')
testCompile 'junit:junit:4.12'
+ testCompile 'org.mockito:mockito-core:2.13.0'
testCompile project(path: ':main', configuration: 'tests')
testCompile 'org.openjdk.jmh:jmh-core:1.19'
testCompile 'org.openjdk.jmh:jmh-generator-annprocess:1.19'
Modified: poi/trunk/build.xml
URL: http://svn.apache.org/viewvc/poi/trunk/build.xml?rev=1822517&r1=1822516&r2=1822517&view=diff
==============================================================================
--- poi/trunk/build.xml (original)
+++ poi/trunk/build.xml Mon Jan 29 15:21:59 2018
@@ -164,6 +164,8 @@ under the License.
<property name="main.hamcrest.jar" location="${main.lib}/hamcrest-core-1.3.jar"/>
<property name="main.hamcrest.url" value="${repository.m2}/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
+ <property name="main.mockito.jar" location="${main.lib}/mockito-core-2.13.0.jar"/>
+ <property name="main.mockito.url" value="${repository.m2}/maven2/org/mockito/mockito-core/2.13.0/mockito-core-2.13.0.jar"/>
<property name="main.ant.jar" location="${main.lib}/ant-1.10.1.jar"/>
<property name="main.ant.url" value="${repository.m2}/maven2/org/apache/ant/ant/1.10.1/ant-1.10.1.jar"/>
<property name="main.antlauncher.jar" location="${main.lib}/ant-launcher-1.10.1.jar"/>
@@ -317,6 +319,7 @@ under the License.
<pathelement location="${main.jmh.jar}"/>
<pathelement location="${main.jmhAnnotation.jar}"/>
<pathelement location="${main.hamcrest.jar}"/>
+ <pathelement location="${main.mockito.jar}"/>
</path>
<path id="scratchpad.classpath">
@@ -620,6 +623,7 @@ under the License.
<available file="${main.jmh.jar}"/>
<available file="${main.jmhAnnotation.jar}"/>
<available file="${main.hamcrest.jar}"/>
+ <available file="${main.mockito.jar}"/>
<available file="${main.ant.jar}"/>
<available file="${main.antlauncher.jar}"/>
<available file="${asm.jar}"/>
@@ -651,6 +655,7 @@ under the License.
<downloadfile src="${main.jmh.url}" dest="${main.jmh.jar}"/>
<downloadfile src="${main.jmhAnnotation.url}" dest="${main.jmhAnnotation.jar}"/>
<downloadfile src="${main.hamcrest.url}" dest="${main.hamcrest.jar}"/>
+ <downloadfile src="${main.mockito.url}" dest="${main.mockito.jar}"/>
<downloadfile src="${main.ant.url}" dest="${main.ant.jar}"/>
<downloadfile src="${main.antlauncher.url}" dest="${main.antlauncher.jar}"/>
<downloadfile src="${asm.url}" dest="${asm.jar}"/>
Modified: poi/trunk/gradle/wrapper/gradle-wrapper.jar
URL: http://svn.apache.org/viewvc/poi/trunk/gradle/wrapper/gradle-wrapper.jar?rev=1822517&r1=1822516&r2=1822517&view=diff
==============================================================================
Binary files - no diff available.
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextRun.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextRun.java?rev=1822517&r1=1822516&r2=1822517&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextRun.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextRun.java Mon Jan 29 15:21:59 2018
@@ -22,6 +22,8 @@ import static org.apache.poi.sl.TestComm
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
import java.awt.Color;
import java.io.IOException;
@@ -96,4 +98,17 @@ public class TestXSLFTextRun {
assertEquals(unicodeSurrogates, r.getRenderableText(unicodeSurrogates));
}
}
+
+ @Test
+ public void testCopyNullFontSize() throws IOException {
+ XMLSlideShow ppt = new XMLSlideShow();
+ XSLFSlide slide = ppt.createSlide();
+ XSLFTextShape sh = slide.createAutoShape();
+
+ XSLFTextRun r = sh.addNewTextParagraph().addNewTextRun();
+ XSLFTextRun s = mock(XSLFTextRun.class);
+ when(s.getFontSize()).thenReturn(null);
+
+ r.copy(s);
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org