You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by sh...@apache.org on 2022/05/18 23:24:17 UTC
[servicecomb-java-chassis] branch master updated: [SCB-2475] migrate to junit5 huawei cloud part1 (#2928)
This is an automated email from the ASF dual-hosted git repository.
shoothzj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/master by this push:
new d54385336 [SCB-2475] migrate to junit5 huawei cloud part1 (#2928)
d54385336 is described below
commit d5438533604ffc80c11311945330697aa7ac8bcc
Author: TingTing Wang <19...@qq.com>
AuthorDate: Thu May 19 07:24:12 2022 +0800
[SCB-2475] migrate to junit5 huawei cloud part1 (#2928)
---
.../dashboard/monitor/AddressManagerTest.java | 18 +++++++-------
huawei-cloud/servicestage/pom.xml | 5 ++++
.../servicestage/TestAKSKAuthHeaderProvider.java | 6 ++---
.../huaweicloud/servicestage/TestCasEnvConfig.java | 9 +++----
.../servicestage/TestEnvVariablesAdapter.java | 9 +++----
.../servicestage/src/test/resources/log4j2.xml | 29 ++++++++++++++++++++++
.../tracing/zipkin/ZipkinTracingAdviserTest.java | 3 +--
7 files changed, 55 insertions(+), 24 deletions(-)
diff --git a/huawei-cloud/dashboard/src/test/java/org/apache/servicecomb/huaweicloud/dashboard/monitor/AddressManagerTest.java b/huawei-cloud/dashboard/src/test/java/org/apache/servicecomb/huaweicloud/dashboard/monitor/AddressManagerTest.java
index 34b5454f3..585367949 100644
--- a/huawei-cloud/dashboard/src/test/java/org/apache/servicecomb/huaweicloud/dashboard/monitor/AddressManagerTest.java
+++ b/huawei-cloud/dashboard/src/test/java/org/apache/servicecomb/huaweicloud/dashboard/monitor/AddressManagerTest.java
@@ -23,7 +23,7 @@ import java.util.List;
import java.util.Map;
import org.apache.servicecomb.http.client.event.RefreshEndpointEvent;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import com.google.common.eventbus.EventBus;
@@ -42,14 +42,14 @@ class AddressManagerTest {
addresses.add("https://127.0.0.2:30103");
addressManager1 = new AddressManager(addresses, new EventBus());
- Assert.assertNotNull(addressManager1);
+ Assertions.assertNotNull(addressManager1);
List<String> addresses = Deencapsulation.getField(addressManager1, "addresses");
- Assert.assertEquals(2, addresses.size());
- Assert.assertEquals("http://127.0.0.1:30103", addresses.get(0));
+ Assertions.assertEquals(2, addresses.size());
+ Assertions.assertEquals("http://127.0.0.1:30103", addresses.get(0));
- Assert.assertEquals("https://127.0.0.2:30103", addressManager1.address());
- Assert.assertEquals("http://127.0.0.1:30103", addressManager1.address());
+ Assertions.assertEquals("https://127.0.0.2:30103", addressManager1.address());
+ Assertions.assertEquals("http://127.0.0.1:30103", addressManager1.address());
}
@@ -67,9 +67,9 @@ class AddressManagerTest {
addressManager1.refreshEndpoint(event, "CseMonitoring");
List<String> availableZone = Deencapsulation.getField(addressManager1, "availableZone");
- Assert.assertEquals("http://127.0.0.3:30100", availableZone.get(0));
+ Assertions.assertEquals("http://127.0.0.3:30100", availableZone.get(0));
List<String> availableRegion = Deencapsulation.getField(addressManager1, "availableRegion");
- Assert.assertEquals("http://127.0.0.4:30100", availableRegion.get(0));
+ Assertions.assertEquals("http://127.0.0.4:30100", availableRegion.get(0));
}
-}
\ No newline at end of file
+}
diff --git a/huawei-cloud/servicestage/pom.xml b/huawei-cloud/servicestage/pom.xml
index 796367127..98ca3bd62 100644
--- a/huawei-cloud/servicestage/pom.xml
+++ b/huawei-cloud/servicestage/pom.xml
@@ -40,6 +40,11 @@
<groupId>org.apache.servicecomb</groupId>
<artifactId>foundation-test-scaffolding</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/huawei-cloud/servicestage/src/test/java/org/apache/servicecomb/huaweicloud/servicestage/TestAKSKAuthHeaderProvider.java b/huawei-cloud/servicestage/src/test/java/org/apache/servicecomb/huaweicloud/servicestage/TestAKSKAuthHeaderProvider.java
index 72935a5e0..298240374 100644
--- a/huawei-cloud/servicestage/src/test/java/org/apache/servicecomb/huaweicloud/servicestage/TestAKSKAuthHeaderProvider.java
+++ b/huawei-cloud/servicestage/src/test/java/org/apache/servicecomb/huaweicloud/servicestage/TestAKSKAuthHeaderProvider.java
@@ -17,7 +17,7 @@
package org.apache.servicecomb.huaweicloud.servicestage;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.Test;
import org.mockito.Mockito;
@@ -34,7 +34,7 @@ public class TestAKSKAuthHeaderProvider {
Mockito.when(configuration.getString("servicecomb.credentials.akskCustomCipher", "default")).thenReturn("default");
AKSKAuthHeaderProvider provider = new AKSKAuthHeaderProvider(configuration);
- Assert.assertEquals("hello", provider.authHeaders().get("X-Service-Project"), "hello");
+ Assertions.assertEquals("hello", provider.authHeaders().get("X-Service-Project"));
}
@Test
@@ -47,6 +47,6 @@ public class TestAKSKAuthHeaderProvider {
Mockito.when(configuration.getString("servicecomb.credentials.akskCustomCipher", "default")).thenReturn("default");
AKSKAuthHeaderProvider provider = new AKSKAuthHeaderProvider(configuration);
- Assert.assertEquals("hello", provider.authHeaders().get("X-Service-Project"), "%E6%B5%8B%E8%AF%95");
+ Assertions.assertEquals("%E6%B5%8B%E8%AF%95", provider.authHeaders().get("X-Service-Project"));
}
}
diff --git a/huawei-cloud/servicestage/src/test/java/org/apache/servicecomb/huaweicloud/servicestage/TestCasEnvConfig.java b/huawei-cloud/servicestage/src/test/java/org/apache/servicecomb/huaweicloud/servicestage/TestCasEnvConfig.java
index a525d4941..e21186c6a 100644
--- a/huawei-cloud/servicestage/src/test/java/org/apache/servicecomb/huaweicloud/servicestage/TestCasEnvConfig.java
+++ b/huawei-cloud/servicestage/src/test/java/org/apache/servicecomb/huaweicloud/servicestage/TestCasEnvConfig.java
@@ -16,11 +16,10 @@
*/
package org.apache.servicecomb.huaweicloud.servicestage;
-import static org.junit.Assert.assertEquals;
-
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
public class TestCasEnvConfig {
@@ -33,9 +32,9 @@ public class TestCasEnvConfig {
@Test
public void testConfig() {
CasEnvConfig instance = CasEnvConfig.INSTANCE;
- assertEquals(2, instance.getNonEmptyProperties().size());
- assertEquals("application-id", instance.getNonEmptyProperties().get("CAS_APPLICATION_ID"));
- assertEquals("env-id", instance.getNonEmptyProperties().get("CAS_ENVIRONMENT_ID"));
+ Assertions.assertEquals(2, instance.getNonEmptyProperties().size());
+ Assertions.assertEquals("application-id", instance.getNonEmptyProperties().get("CAS_APPLICATION_ID"));
+ Assertions.assertEquals("env-id", instance.getNonEmptyProperties().get("CAS_ENVIRONMENT_ID"));
}
@AfterClass
diff --git a/huawei-cloud/servicestage/src/test/java/org/apache/servicecomb/huaweicloud/servicestage/TestEnvVariablesAdapter.java b/huawei-cloud/servicestage/src/test/java/org/apache/servicecomb/huaweicloud/servicestage/TestEnvVariablesAdapter.java
index a43751e42..46e8649f7 100644
--- a/huawei-cloud/servicestage/src/test/java/org/apache/servicecomb/huaweicloud/servicestage/TestEnvVariablesAdapter.java
+++ b/huawei-cloud/servicestage/src/test/java/org/apache/servicecomb/huaweicloud/servicestage/TestEnvVariablesAdapter.java
@@ -16,12 +16,11 @@
*/
package org.apache.servicecomb.huaweicloud.servicestage;
-import static org.junit.Assert.assertEquals;
-
import org.apache.servicecomb.registry.api.registry.MicroserviceInstance;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
public class TestEnvVariablesAdapter {
@@ -37,9 +36,9 @@ public class TestEnvVariablesAdapter {
MicroserviceInstance instance = new MicroserviceInstance();
adapter.beforeRegisterInstance(instance);
- assertEquals(2, instance.getProperties().size());
- assertEquals("application-id", instance.getProperties().get("CAS_APPLICATION_ID"));
- assertEquals("env-id", instance.getProperties().get("CAS_ENVIRONMENT_ID"));
+ Assertions.assertEquals(2, instance.getProperties().size());
+ Assertions.assertEquals("application-id", instance.getProperties().get("CAS_APPLICATION_ID"));
+ Assertions.assertEquals("env-id", instance.getProperties().get("CAS_ENVIRONMENT_ID"));
}
@AfterClass
diff --git a/huawei-cloud/servicestage/src/test/resources/log4j2.xml b/huawei-cloud/servicestage/src/test/resources/log4j2.xml
new file mode 100644
index 000000000..8cee07220
--- /dev/null
+++ b/huawei-cloud/servicestage/src/test/resources/log4j2.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<Configuration status="INFO">
+ <Appenders>
+ <Console name="Console" target="SYSTEM_OUT">
+ <PatternLayout pattern="[%d][%t][%p][%c:%L] %m%n" />
+ </Console>
+ </Appenders>
+ <Loggers>
+ <Root level="INFO">
+ <AppenderRef ref="Console" />
+ </Root>
+ </Loggers>
+</Configuration>
diff --git a/tracing/tracing-zipkin/src/test/java/org/apache/servicecomb/tracing/zipkin/ZipkinTracingAdviserTest.java b/tracing/tracing-zipkin/src/test/java/org/apache/servicecomb/tracing/zipkin/ZipkinTracingAdviserTest.java
index f294f3ede..604abc1c2 100644
--- a/tracing/tracing-zipkin/src/test/java/org/apache/servicecomb/tracing/zipkin/ZipkinTracingAdviserTest.java
+++ b/tracing/tracing-zipkin/src/test/java/org/apache/servicecomb/tracing/zipkin/ZipkinTracingAdviserTest.java
@@ -40,7 +40,6 @@ import java.util.stream.Collectors;
import org.apache.servicecomb.tracing.zipkin.ZipkinTracingAdviser.ThrowableSupplier;
import org.hamcrest.MatcherAssert;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Test;
import brave.Span;
@@ -105,7 +104,7 @@ public class ZipkinTracingAdviserTest {
await().atMost(2, SECONDS).until(() -> !traces.isEmpty());
zipkin2.Span span = traces.values().iterator().next().poll();
- MatcherAssert.assertThat(span.name(), is(spanName));
+ Assertions.assertEquals(spanName, span.name());
MatcherAssert.assertThat(tracedValues(span), containsInAnyOrder(this.getClass().getCanonicalName(), "RuntimeException: oops"));
}