This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a commit to branch feature/GEODE-6143-10 in repository https://gitbox.apache.org/repos/asf/geode.git
commit e26a1e5244981c20abc1e2b4436770112a921c9b Author: zhouxh <[email protected]> AuthorDate: Tue Dec 18 15:41:06 2018 -0800 GEODE-6143: remove PowerMock from import --- .../geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java | 2 +- .../apache/geode/management/internal/beans/ManagementAdapterTest.java | 2 +- .../internal/cache/persistence/PersistenceInitialImageAdvisorTest.java | 1 - .../geode/management/internal/cli/commands/ListGatewayCommandTest.java | 2 +- .../test/java/org/apache/geode/pdx/internal/PdxInstanceImplTest.java | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java index 0c3afb8..27d2b1f 100644 --- a/geode-core/src/integrationTest/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java +++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java @@ -24,7 +24,7 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.isA; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -import static org.powermock.api.mockito.PowerMockito.when; +import static org.mockito.Mockito.when; import java.io.IOException; import java.net.ConnectException; diff --git a/geode-core/src/integrationTest/java/org/apache/geode/management/internal/beans/ManagementAdapterTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/beans/ManagementAdapterTest.java index 40a4157..677cc9b 100644 --- a/geode-core/src/integrationTest/java/org/apache/geode/management/internal/beans/ManagementAdapterTest.java +++ b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/beans/ManagementAdapterTest.java @@ -14,8 +14,8 @@ */ package org.apache.geode.management.internal.beans; +import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; -import static org.powermock.api.mockito.PowerMockito.doReturn; import java.io.File; import java.io.FileNotFoundException; diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistenceInitialImageAdvisorTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistenceInitialImageAdvisorTest.java index f976fd3..82a45cf 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistenceInitialImageAdvisorTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistenceInitialImageAdvisorTest.java @@ -32,7 +32,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static org.powermock.api.mockito.PowerMockito.doThrow; import java.time.Duration; import java.util.HashSet; diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListGatewayCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListGatewayCommandTest.java index 5d0c31f..5a7d0a7 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListGatewayCommandTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListGatewayCommandTest.java @@ -17,9 +17,9 @@ package org.apache.geode.management.internal.cli.commands; import static java.util.stream.Collectors.toSet; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; -import static org.powermock.api.mockito.PowerMockito.doReturn; import java.util.Collections; import java.util.HashMap; diff --git a/geode-core/src/test/java/org/apache/geode/pdx/internal/PdxInstanceImplTest.java b/geode-core/src/test/java/org/apache/geode/pdx/internal/PdxInstanceImplTest.java index b0de788..c1b148f 100644 --- a/geode-core/src/test/java/org/apache/geode/pdx/internal/PdxInstanceImplTest.java +++ b/geode-core/src/test/java/org/apache/geode/pdx/internal/PdxInstanceImplTest.java @@ -20,9 +20,9 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; import static org.mockito.Mockito.any; +import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static org.powermock.api.mockito.PowerMockito.doNothing; import java.io.IOException; import java.io.Serializable;
