You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by lu...@apache.org on 2022/10/17 01:39:45 UTC
[skywalking-banyandb-java-client] 01/01: remove powermock and update mockito
This is an automated email from the ASF dual-hosted git repository.
lujiajing pushed a commit to branch support-java-17
in repository https://gitbox.apache.org/repos/asf/skywalking-banyandb-java-client.git
commit c6ee14a01c995659eacdf5fe42d2c0258cc2a3a6
Author: Megrez Lu <lu...@gmail.com>
AuthorDate: Mon Oct 17 09:39:30 2022 +0800
remove powermock and update mockito
---
.github/workflows/ci.yaml | 10 +++++++++-
pom.xml | 14 +-------------
.../banyandb/v1/client/AbstractBanyanDBClientTest.java | 2 +-
.../banyandb/v1/client/BanyanDBClientMeasureQueryTest.java | 7 +------
.../banyandb/v1/client/BanyanDBClientStreamQueryTest.java | 7 +------
.../banyandb/v1/client/BanyanDBClientStreamWriteTest.java | 2 +-
.../skywalking/banyandb/v1/client/grpc/ExceptionTest.java | 2 +-
.../v1/client/grpc/channel/ChannelManagerTest.java | 10 +++++-----
.../metadata/IndexRuleBindingMetadataRegistryTest.java | 5 -----
.../v1/client/metadata/IndexRuleMetadataRegistryTest.java | 5 -----
.../v1/client/metadata/MeasureMetadataRegistryTest.java | 5 -----
.../banyandb/v1/client/metadata/PropertyStoreTest.java | 7 +------
.../v1/client/metadata/StreamMetadataRegistryTest.java | 5 -----
13 files changed, 21 insertions(+), 60 deletions(-)
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index d5fe5f8..a56713e 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -43,9 +43,17 @@ jobs:
needs: [ check-license-header ]
runs-on: ubuntu-latest
timeout-minutes: 30
+ strategy:
+ matrix:
+ version: [ 8, 17 ]
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
with:
submodules: true
+ - uses: actions/setup-java@v3
+ with:
+ distribution: 'temurin'
+ java-version: ${{ matrix.version }}
+ cache: 'maven'
- name: Build and Test
run: ./mvnw -q clean verify install
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 16de166..2212dbe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,7 +76,7 @@
<powermock.version>2.0.9</powermock.version>
<checkstyle.version>6.18</checkstyle.version>
<junit.version>4.13.2</junit.version>
- <mockito-core.version>3.5.13</mockito-core.version>
+ <mockito-core.version>4.8.0</mockito-core.version>
<lombok.version>1.18.22</lombok.version>
<!-- core lib dependency -->
@@ -196,18 +196,6 @@
<version>${mockito-core.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4</artifactId>
- <version>${powermock.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito2</artifactId>
- <version>${powermock.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.projectlombok</groupId>
diff --git a/src/test/java/org/apache/skywalking/banyandb/v1/client/AbstractBanyanDBClientTest.java b/src/test/java/org/apache/skywalking/banyandb/v1/client/AbstractBanyanDBClientTest.java
index 3c19157..44b467f 100644
--- a/src/test/java/org/apache/skywalking/banyandb/v1/client/AbstractBanyanDBClientTest.java
+++ b/src/test/java/org/apache/skywalking/banyandb/v1/client/AbstractBanyanDBClientTest.java
@@ -41,7 +41,7 @@ import java.util.HashMap;
import java.util.Map;
import static org.mockito.AdditionalAnswers.delegatesTo;
-import static org.powermock.api.mockito.PowerMockito.mock;
+import static org.mockito.Mockito.mock;
public class AbstractBanyanDBClientTest {
@Rule
diff --git a/src/test/java/org/apache/skywalking/banyandb/v1/client/BanyanDBClientMeasureQueryTest.java b/src/test/java/org/apache/skywalking/banyandb/v1/client/BanyanDBClientMeasureQueryTest.java
index a37b4aa..e6150fc 100644
--- a/src/test/java/org/apache/skywalking/banyandb/v1/client/BanyanDBClientMeasureQueryTest.java
+++ b/src/test/java/org/apache/skywalking/banyandb/v1/client/BanyanDBClientMeasureQueryTest.java
@@ -33,11 +33,8 @@ import org.apache.skywalking.banyandb.v1.client.metadata.TagFamilySpec;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.mockito.ArgumentMatchers;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.modules.junit4.PowerMockRunner;
import java.io.IOException;
import java.time.Instant;
@@ -48,11 +45,9 @@ import java.util.List;
import java.util.concurrent.TimeUnit;
import static org.mockito.AdditionalAnswers.delegatesTo;
+import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
-import static org.powermock.api.mockito.PowerMockito.mock;
-@RunWith(PowerMockRunner.class)
-@PowerMockIgnore("javax.management.*")
public class BanyanDBClientMeasureQueryTest extends AbstractBanyanDBClientTest {
private final MeasureServiceGrpc.MeasureServiceImplBase measureQueryService =
mock(MeasureServiceGrpc.MeasureServiceImplBase.class, delegatesTo(
diff --git a/src/test/java/org/apache/skywalking/banyandb/v1/client/BanyanDBClientStreamQueryTest.java b/src/test/java/org/apache/skywalking/banyandb/v1/client/BanyanDBClientStreamQueryTest.java
index 9656955..992590a 100644
--- a/src/test/java/org/apache/skywalking/banyandb/v1/client/BanyanDBClientStreamQueryTest.java
+++ b/src/test/java/org/apache/skywalking/banyandb/v1/client/BanyanDBClientStreamQueryTest.java
@@ -35,11 +35,8 @@ import org.apache.skywalking.banyandb.v1.client.metadata.TagFamilySpec;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.mockito.ArgumentMatchers;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.modules.junit4.PowerMockRunner;
import java.io.IOException;
import java.time.Instant;
@@ -51,11 +48,9 @@ import java.util.List;
import java.util.concurrent.TimeUnit;
import static org.mockito.AdditionalAnswers.delegatesTo;
+import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
-import static org.powermock.api.mockito.PowerMockito.mock;
-@RunWith(PowerMockRunner.class)
-@PowerMockIgnore("javax.management.*")
public class BanyanDBClientStreamQueryTest extends AbstractBanyanDBClientTest {
// query service
private final StreamServiceGrpc.StreamServiceImplBase streamQueryServiceImpl =
diff --git a/src/test/java/org/apache/skywalking/banyandb/v1/client/BanyanDBClientStreamWriteTest.java b/src/test/java/org/apache/skywalking/banyandb/v1/client/BanyanDBClientStreamWriteTest.java
index 6db52f1..21ac83a 100644
--- a/src/test/java/org/apache/skywalking/banyandb/v1/client/BanyanDBClientStreamWriteTest.java
+++ b/src/test/java/org/apache/skywalking/banyandb/v1/client/BanyanDBClientStreamWriteTest.java
@@ -43,7 +43,7 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import static org.mockito.AdditionalAnswers.delegatesTo;
-import static org.powermock.api.mockito.PowerMockito.mock;
+import static org.mockito.Mockito.mock;
public class BanyanDBClientStreamWriteTest extends AbstractBanyanDBClientTest {
private final GroupRegistryServiceGrpc.GroupRegistryServiceImplBase groupRegistryServiceImpl =
diff --git a/src/test/java/org/apache/skywalking/banyandb/v1/client/grpc/ExceptionTest.java b/src/test/java/org/apache/skywalking/banyandb/v1/client/grpc/ExceptionTest.java
index a16a8c3..e48bf57 100644
--- a/src/test/java/org/apache/skywalking/banyandb/v1/client/grpc/ExceptionTest.java
+++ b/src/test/java/org/apache/skywalking/banyandb/v1/client/grpc/ExceptionTest.java
@@ -32,7 +32,7 @@ import org.junit.Test;
import java.io.IOException;
import static org.mockito.AdditionalAnswers.delegatesTo;
-import static org.powermock.api.mockito.PowerMockito.mock;
+import static org.mockito.Mockito.mock;
public class ExceptionTest extends AbstractBanyanDBClientTest {
@Before
diff --git a/src/test/java/org/apache/skywalking/banyandb/v1/client/grpc/channel/ChannelManagerTest.java b/src/test/java/org/apache/skywalking/banyandb/v1/client/grpc/channel/ChannelManagerTest.java
index a6a888b..ad82c83 100644
--- a/src/test/java/org/apache/skywalking/banyandb/v1/client/grpc/channel/ChannelManagerTest.java
+++ b/src/test/java/org/apache/skywalking/banyandb/v1/client/grpc/channel/ChannelManagerTest.java
@@ -43,7 +43,7 @@ import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import static org.mockito.AdditionalAnswers.delegatesTo;
-import static org.powermock.api.mockito.PowerMockito.mock;
+import static org.mockito.Mockito.mock;
public class ChannelManagerTest {
@Rule
@@ -51,7 +51,7 @@ public class ChannelManagerTest {
@Test
public void testAuthority() throws IOException {
- final ManagedChannel ch = Mockito.mock(ManagedChannel.class);
+ final ManagedChannel ch = mock(ManagedChannel.class);
Mockito.when(ch.authority()).thenReturn("myAuth");
@@ -66,12 +66,12 @@ public class ChannelManagerTest {
@Test
public void channelRefreshShouldSwapChannel() throws IOException {
- ManagedChannel underlyingChannel1 = Mockito.mock(ManagedChannel.class);
- ManagedChannel underlyingChannel2 = Mockito.mock(ManagedChannel.class);
+ ManagedChannel underlyingChannel1 = mock(ManagedChannel.class);
+ ManagedChannel underlyingChannel2 = mock(ManagedChannel.class);
// mock executor service to capture the runnable scheduled, so we can invoke it when we want to
ScheduledExecutorService scheduledExecutorService =
- Mockito.mock(ScheduledExecutorService.class);
+ mock(ScheduledExecutorService.class);
Mockito.doReturn(null)
.when(scheduledExecutorService)
diff --git a/src/test/java/org/apache/skywalking/banyandb/v1/client/metadata/IndexRuleBindingMetadataRegistryTest.java b/src/test/java/org/apache/skywalking/banyandb/v1/client/metadata/IndexRuleBindingMetadataRegistryTest.java
index 4c49ec0..940f0c9 100644
--- a/src/test/java/org/apache/skywalking/banyandb/v1/client/metadata/IndexRuleBindingMetadataRegistryTest.java
+++ b/src/test/java/org/apache/skywalking/banyandb/v1/client/metadata/IndexRuleBindingMetadataRegistryTest.java
@@ -23,17 +23,12 @@ import org.apache.skywalking.banyandb.v1.client.grpc.exception.BanyanDBException
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.modules.junit4.PowerMockRunner;
import java.io.IOException;
import java.time.ZonedDateTime;
import java.util.Arrays;
import java.util.List;
-@RunWith(PowerMockRunner.class)
-@PowerMockIgnore("javax.management.*")
public class IndexRuleBindingMetadataRegistryTest extends AbstractBanyanDBClientTest {
private IndexRuleBindingMetadataRegistry registry;
diff --git a/src/test/java/org/apache/skywalking/banyandb/v1/client/metadata/IndexRuleMetadataRegistryTest.java b/src/test/java/org/apache/skywalking/banyandb/v1/client/metadata/IndexRuleMetadataRegistryTest.java
index 5137bc3..f063b59 100644
--- a/src/test/java/org/apache/skywalking/banyandb/v1/client/metadata/IndexRuleMetadataRegistryTest.java
+++ b/src/test/java/org/apache/skywalking/banyandb/v1/client/metadata/IndexRuleMetadataRegistryTest.java
@@ -23,15 +23,10 @@ import org.apache.skywalking.banyandb.v1.client.grpc.exception.BanyanDBException
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.modules.junit4.PowerMockRunner;
import java.io.IOException;
import java.util.List;
-@RunWith(PowerMockRunner.class)
-@PowerMockIgnore("javax.management.*")
public class IndexRuleMetadataRegistryTest extends AbstractBanyanDBClientTest {
private IndexRuleMetadataRegistry registry;
diff --git a/src/test/java/org/apache/skywalking/banyandb/v1/client/metadata/MeasureMetadataRegistryTest.java b/src/test/java/org/apache/skywalking/banyandb/v1/client/metadata/MeasureMetadataRegistryTest.java
index cbb47f9..6189653 100644
--- a/src/test/java/org/apache/skywalking/banyandb/v1/client/metadata/MeasureMetadataRegistryTest.java
+++ b/src/test/java/org/apache/skywalking/banyandb/v1/client/metadata/MeasureMetadataRegistryTest.java
@@ -23,15 +23,10 @@ import org.apache.skywalking.banyandb.v1.client.grpc.exception.BanyanDBException
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.modules.junit4.PowerMockRunner;
import java.io.IOException;
import java.util.List;
-@RunWith(PowerMockRunner.class)
-@PowerMockIgnore("javax.management.*")
public class MeasureMetadataRegistryTest extends AbstractBanyanDBClientTest {
@Before
public void setUp() throws IOException {
diff --git a/src/test/java/org/apache/skywalking/banyandb/v1/client/metadata/PropertyStoreTest.java b/src/test/java/org/apache/skywalking/banyandb/v1/client/metadata/PropertyStoreTest.java
index 062c932..f8292de 100644
--- a/src/test/java/org/apache/skywalking/banyandb/v1/client/metadata/PropertyStoreTest.java
+++ b/src/test/java/org/apache/skywalking/banyandb/v1/client/metadata/PropertyStoreTest.java
@@ -28,9 +28,6 @@ import org.apache.skywalking.banyandb.v1.client.util.TimeUtils;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.modules.junit4.PowerMockRunner;
import java.io.IOException;
import java.time.ZonedDateTime;
@@ -39,10 +36,8 @@ import java.util.List;
import java.util.Map;
import static org.mockito.AdditionalAnswers.delegatesTo;
-import static org.powermock.api.mockito.PowerMockito.mock;
+import static org.mockito.Mockito.mock;
-@RunWith(PowerMockRunner.class)
-@PowerMockIgnore("javax.management.*")
public class PropertyStoreTest extends AbstractBanyanDBClientTest {
private PropertyStore store;
diff --git a/src/test/java/org/apache/skywalking/banyandb/v1/client/metadata/StreamMetadataRegistryTest.java b/src/test/java/org/apache/skywalking/banyandb/v1/client/metadata/StreamMetadataRegistryTest.java
index 7de7bcc..5007965 100644
--- a/src/test/java/org/apache/skywalking/banyandb/v1/client/metadata/StreamMetadataRegistryTest.java
+++ b/src/test/java/org/apache/skywalking/banyandb/v1/client/metadata/StreamMetadataRegistryTest.java
@@ -23,15 +23,10 @@ import org.apache.skywalking.banyandb.v1.client.grpc.exception.BanyanDBException
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.modules.junit4.PowerMockRunner;
import java.io.IOException;
import java.util.List;
-@RunWith(PowerMockRunner.class)
-@PowerMockIgnore("javax.management.*")
public class StreamMetadataRegistryTest extends AbstractBanyanDBClientTest {
@Before
public void setUp() throws IOException {