Merge 4ac7ee0 into 97086d8

paulcwarren · Feb 12, 2020 · f033453 · f033453
2 parents 97086d8 + 4ac7ee0
commit f033453
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 16 deletions.
diff --git a/spring-content-cmis/pom.xml b/spring-content-cmis/pom.xml
@@ -153,7 +153,7 @@
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-core</artifactId>
-			<version>2.8.47</version>
+			<version>3.2.4</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

diff --git a/spring-content-commons/pom.xml b/spring-content-commons/pom.xml
@@ -56,7 +56,7 @@
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-core</artifactId>
-			<version>2.8.47</version>
+			<version>3.2.4</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

diff --git a/spring-content-fs/pom.xml b/spring-content-fs/pom.xml
@@ -57,7 +57,7 @@
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-core</artifactId>
-			<version>2.8.47</version>
+			<version>3.2.4</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

diff --git a/spring-content-jpa/pom.xml b/spring-content-jpa/pom.xml
@@ -59,7 +59,7 @@
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-core</artifactId>
-			<version>2.8.47</version>
+			<version>3.2.4</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

diff --git a/spring-content-mongo/pom.xml b/spring-content-mongo/pom.xml
@@ -38,7 +38,7 @@
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-core</artifactId>
-			<version>2.8.47</version>
+			<version>3.2.4</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

diff --git a/spring-content-renditions/pom.xml b/spring-content-renditions/pom.xml
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>2.8.47</version>
+            <version>3.2.4</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/...rc/test/java/org/springframework/content/renditions/renderers/WordToJpegRendererTest.java b/...rc/test/java/org/springframework/content/renditions/renderers/WordToJpegRendererTest.java
@@ -1,30 +1,36 @@
 package org.springframework.content.renditions.renderers;
 
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
 import com.github.paulcwarren.ginkgo4j.Ginkgo4jConfiguration;
 import com.github.paulcwarren.ginkgo4j.Ginkgo4jRunner;
+import org.apache.poi.POIXMLException;
 import org.apache.poi.POIXMLProperties;
 import org.apache.poi.openxml4j.exceptions.NotOfficeXmlFileException;
 import org.apache.poi.xwpf.usermodel.XWPFDocument;
 import org.junit.runner.RunWith;
+
 import org.springframework.content.commons.renditions.RenditionProvider;
 import org.springframework.content.renditions.RenditionException;
 import org.springframework.renditions.poi.POIService;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import static com.github.paulcwarren.ginkgo4j.Ginkgo4jDSL.*;
-import static org.hamcrest.CoreMatchers.hasItem;
+import static com.github.paulcwarren.ginkgo4j.Ginkgo4jDSL.BeforeEach;
+import static com.github.paulcwarren.ginkgo4j.Ginkgo4jDSL.Context;
+import static com.github.paulcwarren.ginkgo4j.Ginkgo4jDSL.Describe;
+import static com.github.paulcwarren.ginkgo4j.Ginkgo4jDSL.It;
+import static com.github.paulcwarren.ginkgo4j.Ginkgo4jDSL.JustBeforeEach;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.hasItemInArray;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.nullValue;
 import static org.hamcrest.core.IsInstanceOf.instanceOf;
 import static org.mockito.Matchers.anyObject;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 @RunWith(Ginkgo4jRunner.class)
@@ -97,7 +103,7 @@ public class WordToJpegRendererTest {
 							doc = mock(XWPFDocument.class);
 							when(poi.xwpfDocument(anyObject())).thenReturn(doc);
 							props = mock(POIXMLProperties.class);
-							doThrow(Exception.class).when(doc).getProperties();
+								doThrow(POIXMLException.class).when(doc).getProperties();
 						});
 						It("should throw a RenditionException", () -> {
 							assertThat(e, is(not(nullValue())));

diff --git a/spring-content-s3/pom.xml b/spring-content-s3/pom.xml
@@ -45,7 +45,7 @@
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-core</artifactId>
-			<version>2.8.47</version>
+			<version>3.2.4</version>
 			<scope>test</scope>
 		</dependency>
         <dependency>

diff --git a/spring-content-solr/pom.xml b/spring-content-solr/pom.xml
@@ -60,7 +60,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>2.8.47</version>
+            <version>3.2.4</version>
             <scope>test</scope>
         </dependency>
         <dependency>