[dubbo] branch master updated: add Apollo config center mock test (#4948)

[il...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

iluo 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 597cda8  add Apollo config center mock test (#4948)
597cda8 is described below

commit 597cda8fa1e5e397ab73b159cdfb16f9a14e888f
Author: jimin <sl...@163.com>
AuthorDate: Thu Sep 5 15:45:29 2019 +0800

    add Apollo config center mock test (#4948)
    
    * add Apollo config center mock test
    
    Signed-off-by: slievrly <sl...@163.com>
    
    * add license header
    
    Signed-off-by: slievrly <sl...@163.com>
    
    * optimize
    
    Signed-off-by: slievrly <sl...@163.com>
    
    * move apollo-mockserver dependency to apollo module
    
    Signed-off-by: slievrly <sl...@163.com>
---
 .../dubbo-configcenter-apollo/pom.xml              |   7 +
 .../apollo/ApolloDynamicConfigurationTest.java     | 169 +++++++++++++++++++++
 .../src/test/resources/META-INF/app.properties     |   1 +
 .../src/test/resources/mockdata-dubbo.properties   |   2 +
 4 files changed, 179 insertions(+)

diff --git a/dubbo-configcenter/dubbo-configcenter-apollo/pom.xml b/dubbo-configcenter/dubbo-configcenter-apollo/pom.xml
index 26d2e88..dbbc4d6 100644
--- a/dubbo-configcenter/dubbo-configcenter-apollo/pom.xml
+++ b/dubbo-configcenter/dubbo-configcenter-apollo/pom.xml
@@ -27,6 +27,7 @@
     <description>The Apollo implementation of the configcenter api</description>
     <properties>
         <skip_maven_deploy>false</skip_maven_deploy>
+        <apollo_mock_server_version>1.1.1</apollo_mock_server_version>
     </properties>
 
     <dependencies>
@@ -39,5 +40,11 @@
             <groupId>com.ctrip.framework.apollo</groupId>
             <artifactId>apollo-client</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.ctrip.framework.apollo</groupId>
+            <artifactId>apollo-mockserver</artifactId>
+            <version>${apollo_mock_server_version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file
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
new file mode 100644
index 0000000..c004899
--- /dev/null
+++ b/dubbo-configcenter/dubbo-configcenter-apollo/src/test/java/org/apache/dubbo/configcenter/support/apollo/ApolloDynamicConfigurationTest.java
@@ -0,0 +1,169 @@
+/*
+ * 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 java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Properties;
+import java.util.Random;
+import java.util.concurrent.TimeUnit;
+
+import com.ctrip.framework.apollo.mockserver.EmbeddedApollo;
+import com.google.common.util.concurrent.SettableFuture;
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.configcenter.ConfigChangeType;
+import org.apache.dubbo.configcenter.ConfigurationListener;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.fail;
+
+/**
+ * Apollo dynamic configuration mock test.
+ * Notice: EmbeddedApollo(apollo mock server) only support < junit5, please not upgrade the junit version in this UT,
+ * the junit version in this UT is junit4, and the dependency comes from apollo-mockserver.
+ */
+public class ApolloDynamicConfigurationTest {
+    private static final String SESSION_TIMEOUT_KEY = "session";
+    private static final String DEFAULT_NAMESPACE = "dubbo";
+    private static ApolloDynamicConfiguration apolloDynamicConfiguration;
+    private static URL url;
+
+    /**
+     * The constant embeddedApollo.
+     */
+    @ClassRule
+    public static EmbeddedApollo embeddedApollo = new EmbeddedApollo();
+
+    /**
+     * Sets up.
+     */
+    @Before
+    public void setUp() {
+        String apolloUrl = System.getProperty("apollo.configService");
+        String urlForDubbo = "apollo://" + apolloUrl.substring(apolloUrl.lastIndexOf("/") + 1) + "/org.apache.dubbo.apollo.testService?config.namespace=dubbo";
+        url = URL.valueOf(urlForDubbo).addParameter(SESSION_TIMEOUT_KEY, 15000);
+    }
+
+    /**
+     * Test get rule.
+     */
+    @Test
+    public void testGetRule() {
+        String mockKey = "mockKey1";
+        String mockValue = String.valueOf(new Random().nextInt());
+        putMockRuleData(mockKey, mockValue, DEFAULT_NAMESPACE);
+        apolloDynamicConfiguration = new ApolloDynamicConfiguration(url);
+        assertEquals(mockValue, apolloDynamicConfiguration.getRule(mockKey, DEFAULT_NAMESPACE, 3000L));
+
+        mockKey = "notExistKey";
+        assertNull(apolloDynamicConfiguration.getRule(mockKey, DEFAULT_NAMESPACE, 3000L));
+    }
+
+    /**
+     * Test get internal property.
+     *
+     * @throws InterruptedException the interrupted exception
+     */
+    @Test
+    public void testGetInternalProperty() throws InterruptedException {
+        String mockKey = "mockKey2";
+        String mockValue = String.valueOf(new Random().nextInt());
+        putMockRuleData(mockKey, mockValue, DEFAULT_NAMESPACE);
+        TimeUnit.MILLISECONDS.sleep(1000);
+        apolloDynamicConfiguration = new ApolloDynamicConfiguration(url);
+        assertEquals(mockValue, apolloDynamicConfiguration.getInternalProperty(mockKey));
+
+        mockValue = "mockValue2";
+        System.setProperty(mockKey, mockValue);
+        assertEquals(mockValue, apolloDynamicConfiguration.getInternalProperty(mockKey));
+
+        mockKey = "notExistKey";
+        assertNull(apolloDynamicConfiguration.getInternalProperty(mockKey));
+    }
+
+    /**
+     * Test add listener.
+     *
+     * @throws Exception the exception
+     */
+    @Test
+    public void testAddListener() throws Exception {
+        String mockKey = "mockKey3";
+        String mockValue = String.valueOf(new Random().nextInt());
+
+        final SettableFuture<org.apache.dubbo.configcenter.ConfigChangeEvent> future = SettableFuture.create();
+
+        apolloDynamicConfiguration = new ApolloDynamicConfiguration(url);
+
+        apolloDynamicConfiguration.addListener(mockKey, DEFAULT_NAMESPACE, new ConfigurationListener() {
+            @Override
+            public void process(org.apache.dubbo.configcenter.ConfigChangeEvent event) {
+                future.set(event);
+            }
+        });
+
+        putData(mockKey, mockValue);
+        org.apache.dubbo.configcenter.ConfigChangeEvent result = future.get(3000, TimeUnit.MILLISECONDS);
+        assertEquals(mockValue, result.getValue());
+        assertEquals(mockKey, result.getKey());
+        assertEquals(ConfigChangeType.MODIFIED, result.getChangeType());
+    }
+
+    private static void putData(String key, String value) {
+        embeddedApollo.addOrModifyProperty(DEFAULT_NAMESPACE, key, value);
+    }
+
+    private static void putMockRuleData(String key, String value, String group) {
+        String fileName = ApolloDynamicConfigurationTest.class.getResource("/").getPath() + "mockdata-" + group + ".properties";
+        putMockData(key, value, fileName);
+    }
+
+    private static void putMockData(String key, String value, String fileName) {
+        Properties pro = new Properties();
+        FileOutputStream oFile = null;
+        try {
+            oFile = new FileOutputStream(fileName);
+            pro.setProperty(key, value);
+            pro.store(oFile, "put mock data");
+        } catch (IOException exx) {
+            fail(exx.getMessage());
+
+        } finally {
+            if (null != oFile) {
+                try {
+                    oFile.close();
+                } catch (IOException e) {
+                    fail(e.getMessage());
+                }
+            }
+        }
+    }
+
+    /**
+     * Tear down.
+     */
+    @After
+    public void tearDown() {
+
+    }
+
+}
\ No newline at end of file
diff --git a/dubbo-configcenter/dubbo-configcenter-apollo/src/test/resources/META-INF/app.properties b/dubbo-configcenter/dubbo-configcenter-apollo/src/test/resources/META-INF/app.properties
new file mode 100644
index 0000000..4d963e2
--- /dev/null
+++ b/dubbo-configcenter/dubbo-configcenter-apollo/src/test/resources/META-INF/app.properties
@@ -0,0 +1 @@
+app.id=someAppId
\ No newline at end of file
diff --git a/dubbo-configcenter/dubbo-configcenter-apollo/src/test/resources/mockdata-dubbo.properties b/dubbo-configcenter/dubbo-configcenter-apollo/src/test/resources/mockdata-dubbo.properties
new file mode 100644
index 0000000..f995a3b
--- /dev/null
+++ b/dubbo-configcenter/dubbo-configcenter-apollo/src/test/resources/mockdata-dubbo.properties
@@ -0,0 +1,2 @@
+key1=value1
+key2=value2
\ No newline at end of file