This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 2584cab replace ApolloDynamicConfigurationTest junit4 to junit5
(#7433)
2584cab is described below
commit 2584cab79252904f81096871e041d82fd93b6e6a
Author: xiaoheng1 <[email protected]>
AuthorDate: Wed Mar 24 15:28:05 2021 +0800
replace ApolloDynamicConfigurationTest junit4 to junit5 (#7433)
* fix #7432 replace ApolloDynamicConfigurationTest junit4 to junit5
* modify description
---
.../apollo/ApolloDynamicConfigurationTest.java | 17 +-
.../support/apollo/EmbeddedApolloJunit5.java | 194 +++++++++++++++++++++
2 files changed, 202 insertions(+), 9 deletions(-)
diff --git
a/dubbo-configcenter/dubbo-configcenter-apollo/src/test/java/org/apache/dubbo/configcenter/support/apollo/ApolloDynamicConfigurationTest.java
b/dubbo-configcenter/dubbo-configcenter-apollo/src/test/java/org/apache/dubbo/configcenter/support/apollo/ApolloDynamicConfigurationTest.java
index ca48bd6..b14f172 100644
---
a/dubbo-configcenter/dubbo-configcenter-apollo/src/test/java/org/apache/dubbo/configcenter/support/apollo/ApolloDynamicConfigurationTest.java
+++
b/dubbo-configcenter/dubbo-configcenter-apollo/src/test/java/org/apache/dubbo/configcenter/support/apollo/ApolloDynamicConfigurationTest.java
@@ -20,12 +20,11 @@ import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.config.configcenter.ConfigChangeType;
import org.apache.dubbo.common.config.configcenter.ConfigurationListener;
-import com.ctrip.framework.apollo.mockserver.EmbeddedApollo;
import com.google.common.util.concurrent.SettableFuture;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -51,13 +50,13 @@ public class ApolloDynamicConfigurationTest {
/**
* The constant embeddedApollo.
*/
- @ClassRule
- public static EmbeddedApollo embeddedApollo = new EmbeddedApollo();
+ @RegisterExtension
+ public static EmbeddedApolloJunit5 embeddedApollo = new
EmbeddedApolloJunit5();
/**
* Sets up.
*/
- @Before
+ @BeforeEach
public void setUp() {
String apolloUrl = System.getProperty("apollo.configService");
String urlForDubbo = "apollo://" +
apolloUrl.substring(apolloUrl.lastIndexOf("/") + 1) +
"/org.apache.dubbo.apollo.testService?namespace=dubbo&check=true";
@@ -183,7 +182,7 @@ public class ApolloDynamicConfigurationTest {
/**
* Tear down.
*/
- @After
+ @AfterEach
public void tearDown() {
}
diff --git
a/dubbo-configcenter/dubbo-configcenter-apollo/src/test/java/org/apache/dubbo/configcenter/support/apollo/EmbeddedApolloJunit5.java
b/dubbo-configcenter/dubbo-configcenter-apollo/src/test/java/org/apache/dubbo/configcenter/support/apollo/EmbeddedApolloJunit5.java
new file mode 100644
index 0000000..425399a
--- /dev/null
+++
b/dubbo-configcenter/dubbo-configcenter-apollo/src/test/java/org/apache/dubbo/configcenter/support/apollo/EmbeddedApolloJunit5.java
@@ -0,0 +1,194 @@
+/*
+ * 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.
+ */
+
+package org.apache.dubbo.configcenter.support.apollo;
+
+import com.ctrip.framework.apollo.build.ApolloInjector;
+import com.ctrip.framework.apollo.core.dto.ApolloConfig;
+import com.ctrip.framework.apollo.core.dto.ApolloConfigNotification;
+import com.ctrip.framework.apollo.core.utils.ResourceUtils;
+import com.ctrip.framework.apollo.internals.ConfigServiceLocator;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+
+import okhttp3.mockwebserver.Dispatcher;
+import okhttp3.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockWebServer;
+import okhttp3.mockwebserver.RecordedRequest;
+import org.junit.jupiter.api.extension.AfterAllCallback;
+import org.junit.jupiter.api.extension.BeforeAllCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class EmbeddedApolloJunit5 implements BeforeAllCallback,
AfterAllCallback {
+ private static final Logger logger =
LoggerFactory.getLogger(EmbeddedApolloJunit5.class);
+ private static final Type notificationType = new
TypeToken<List<ApolloConfigNotification>>() {
+ }.getType();
+
+ private static Method CONFIG_SERVICE_LOCATOR_CLEAR;
+ private static ConfigServiceLocator CONFIG_SERVICE_LOCATOR;
+
+ private static final Gson GSON = new Gson();
+ private final Map<String, Map<String, String>>
addedOrModifiedPropertiesOfNamespace = Maps.newConcurrentMap();
+ private final Map<String, Set<String>> deletedKeysOfNamespace =
Maps.newConcurrentMap();
+
+ private MockWebServer server;
+
+ static {
+ try {
+ System.setProperty("apollo.longPollingInitialDelayInMills", "0");
+ CONFIG_SERVICE_LOCATOR =
ApolloInjector.getInstance(ConfigServiceLocator.class);
+ CONFIG_SERVICE_LOCATOR_CLEAR =
ConfigServiceLocator.class.getDeclaredMethod("initConfigServices");
+ CONFIG_SERVICE_LOCATOR_CLEAR.setAccessible(true);
+ } catch (NoSuchMethodException e) {
+ e.printStackTrace();
+ }
+ }
+
+ private void clear() throws Exception {
+ resetOverriddenProperties();
+ }
+
+ private void mockConfigServiceUrl(String url) throws Exception {
+ System.setProperty("apollo.configService", url);
+
+ CONFIG_SERVICE_LOCATOR_CLEAR.invoke(CONFIG_SERVICE_LOCATOR);
+ }
+
+ private String loadConfigFor(String namespace) {
+ String filename = String.format("mockdata-%s.properties", namespace);
+ final Properties prop = ResourceUtils.readConfigFile(filename, new
Properties());
+ Map<String, String> configurations = Maps.newHashMap();
+ for (String propertyName : prop.stringPropertyNames()) {
+ configurations.put(propertyName, prop.getProperty(propertyName));
+ }
+ ApolloConfig apolloConfig = new ApolloConfig("someAppId",
"someCluster", namespace, "someReleaseKey");
+
+ Map<String, String> mergedConfigurations =
mergeOverriddenProperties(namespace, configurations);
+ apolloConfig.setConfigurations(mergedConfigurations);
+ return GSON.toJson(apolloConfig);
+ }
+
+ private String mockLongPollBody(String notificationsStr) {
+ List<ApolloConfigNotification> oldNotifications =
GSON.fromJson(notificationsStr, notificationType);
+ List<ApolloConfigNotification> newNotifications = new ArrayList<>();
+ for (ApolloConfigNotification notification : oldNotifications) {
+ newNotifications
+ .add(new
ApolloConfigNotification(notification.getNamespaceName(),
notification.getNotificationId() + 1));
+ }
+ return GSON.toJson(newNotifications);
+ }
+
+ /**
+ * Incorporate user modifications to namespace
+ */
+ private Map<String, String> mergeOverriddenProperties(String namespace,
Map<String, String> configurations) {
+ if (addedOrModifiedPropertiesOfNamespace.containsKey(namespace)) {
+
configurations.putAll(addedOrModifiedPropertiesOfNamespace.get(namespace));
+ }
+ if (deletedKeysOfNamespace.containsKey(namespace)) {
+ for (String k : deletedKeysOfNamespace.get(namespace)) {
+ configurations.remove(k);
+ }
+ }
+ return configurations;
+ }
+
+ /**
+ * Add new property or update existed property
+ */
+ public void addOrModifyProperty(String namespace, String someKey, String
someValue) {
+ if (addedOrModifiedPropertiesOfNamespace.containsKey(namespace)) {
+ addedOrModifiedPropertiesOfNamespace.get(namespace).put(someKey,
someValue);
+ } else {
+ Map<String, String> m = Maps.newConcurrentMap();
+ m.put(someKey, someValue);
+ addedOrModifiedPropertiesOfNamespace.put(namespace, m);
+ }
+ }
+
+ /**
+ * Delete existed property
+ */
+ public void deleteProperty(String namespace, String someKey) {
+ if (deletedKeysOfNamespace.containsKey(namespace)) {
+ deletedKeysOfNamespace.get(namespace).add(someKey);
+ } else {
+ Set<String> m = Sets.newConcurrentHashSet();
+ m.add(someKey);
+ deletedKeysOfNamespace.put(namespace, m);
+ }
+ }
+
+ /**
+ * reset overridden properties
+ */
+ public void resetOverriddenProperties() {
+ addedOrModifiedPropertiesOfNamespace.clear();
+ deletedKeysOfNamespace.clear();
+ }
+
+ @Override
+ public void afterAll(ExtensionContext extensionContext) throws Exception {
+ try {
+ clear();
+ server.close();
+ } catch (Exception e) {
+ logger.error("stop apollo server error", e);
+ }
+ }
+
+ @Override
+ public void beforeAll(ExtensionContext extensionContext) throws Exception {
+ clear();
+ server = new MockWebServer();
+ final Dispatcher dispatcher = new Dispatcher() {
+ @Override
+ public MockResponse dispatch(RecordedRequest request) throws
InterruptedException {
+ if (request.getPath().startsWith("/notifications/v2")) {
+ String notifications =
request.getRequestUrl().queryParameter("notifications");
+ return new
MockResponse().setResponseCode(200).setBody(mockLongPollBody(notifications));
+ }
+ if (request.getPath().startsWith("/configs")) {
+ List<String> pathSegments =
request.getRequestUrl().pathSegments();
+ // appId and cluster might be used in the future
+ String appId = pathSegments.get(1);
+ String cluster = pathSegments.get(2);
+ String namespace = pathSegments.get(3);
+ return new
MockResponse().setResponseCode(200).setBody(loadConfigFor(namespace));
+ }
+ return new MockResponse().setResponseCode(404);
+ }
+ };
+
+ server.setDispatcher(dispatcher);
+ server.start();
+
+ mockConfigServiceUrl("http://localhost:"; + server.getPort());
+ }
+}
