fix unit test after updating mockito and powermock version

aws · Jul 1, 2019 · 46774ac · 46774ac
1 parent 13df126
commit 46774ac
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/aws-xray-recorder-sdk-core/pom.xml b/aws-xray-recorder-sdk-core/pom.xml
@@ -60,20 +60,20 @@
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <version>1.10.19</version>
+      <artifactId>mockito-core</artifactId>
+      <version>2.23.4</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.powermock</groupId>
       <artifactId>powermock-module-junit4</artifactId>
-      <version>1.6.6</version>
+      <version>2.0.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.powermock</groupId>
-      <artifactId>powermock-api-mockito</artifactId>
-      <version>1.6.6</version>
+      <artifactId>powermock-api-mockito2</artifactId>
+      <version>2.0.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/...der-sdk-core/src/test/java/com/amazonaws/xray/javax/servlet/AWSXRayServletFilterTest.java b/...der-sdk-core/src/test/java/com/amazonaws/xray/javax/servlet/AWSXRayServletFilterTest.java
@@ -24,7 +24,7 @@
 import org.junit.runners.MethodSorters;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mockito;
-import org.mockito.internal.util.reflection.Whitebox;
+import org.powermock.reflect.Whitebox;
 
 import com.amazonaws.xray.AWSXRay;
 import com.amazonaws.xray.AWSXRayRecorderBuilder;

diff --git a/...ore/src/test/java/com/amazonaws/xray/strategy/sampling/LocalizedSamplingStrategyTest.java b/...ore/src/test/java/com/amazonaws/xray/strategy/sampling/LocalizedSamplingStrategyTest.java
@@ -8,7 +8,7 @@
 import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runners.MethodSorters;
-import org.mockito.internal.util.reflection.Whitebox;
+import org.powermock.reflect.Whitebox;
 
 @FixMethodOrder(MethodSorters.JVM)
 public class LocalizedSamplingStrategyTest {

diff --git a/...r-sdk-core/src/test/java/com/amazonaws/xray/strategy/sampling/pollers/RulePollerTest.java b/...r-sdk-core/src/test/java/com/amazonaws/xray/strategy/sampling/pollers/RulePollerTest.java
@@ -5,7 +5,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.mockito.internal.util.reflection.Whitebox;
+import org.powermock.reflect.Whitebox;
 
 import java.time.Clock;
 import java.util.concurrent.ScheduledExecutorService;

diff --git a/...sdk-core/src/test/java/com/amazonaws/xray/strategy/sampling/pollers/TargetPollerTest.java b/...sdk-core/src/test/java/com/amazonaws/xray/strategy/sampling/pollers/TargetPollerTest.java
@@ -5,7 +5,7 @@
 import org.junit.Test;
 import org.junit.Assert;
 import org.mockito.Mockito;
-import org.mockito.internal.util.reflection.Whitebox;
+import org.powermock.reflect.Whitebox;
 
 import java.time.Clock;
 import java.util.concurrent.ScheduledExecutorService;

diff --git a/...sdk-core/src/test/java/com/amazonaws/xray/strategy/sampling/rule/CentralizedRuleTest.java b/...sdk-core/src/test/java/com/amazonaws/xray/strategy/sampling/rule/CentralizedRuleTest.java
@@ -12,7 +12,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.powermock.reflect.Whitebox;
 
 import java.time.Clock;

diff --git a/pom.xml b/pom.xml
@@ -121,7 +121,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.10.4</version>
+        <version>3.0.1</version>
         <configuration>
          <footer> <![CDATA[
                 <script src="/SdkStatic/sdk-priv.js" async="true"></script>