Merge pull request #1403 from nobodyiam/refactor-mock-server

refactor a little bit

apollo-mockserver/pom.xml

@@ -11,27 +11,38 @@
 
   <artifactId>apollo-mockserver</artifactId>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>com.squareup.okhttp3</groupId>
+        <artifactId>mockwebserver</artifactId>
+        <version>3.11.0</version>
+      </dependency>
+      <dependency>
+        <groupId>com.squareup.okhttp3</groupId>
+        <artifactId>okhttp</artifactId>
+        <version>3.11.0</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
     <dependency>
       <groupId>com.ctrip.framework.apollo</groupId>
       <artifactId>apollo-client</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
       <artifactId>mockwebserver</artifactId>
-      <version>3.11.0</version>
     </dependency>
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
       <artifactId>okhttp</artifactId>
-      <version>3.11.0</version>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter</artifactId>
-      <version>1.3.8.RELEASE</version>
-      <scope>provided</scope>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 

apollo-mockserver/src/main/java/com/ctrip/framework/apollo/mockserver/MockedMetaServerProvider.java

-package com.ctrip.framework.apollo.mockserver;
-
-import com.ctrip.framework.apollo.core.enums.Env;
-import com.ctrip.framework.apollo.core.spi.MetaServerProvider;
-
-/**
- * Create by zhangzheng on 8/23/18
- * Email:zhangzheng@youzan.com
- */
-public class MockedMetaServerProvider implements MetaServerProvider{
-
-  private static String address;
-
-  public static void setAddress(String addr){
-    address = addr;
-  }
-
-  @Override
-  public String getMetaServerAddress(Env targetEnv) {
-    return address;
-  }
-
-  @Override
-  public int getOrder() {
-    return HIGHEST_PRECEDENCE;
-  }
-}

apollo-mockserver/src/main/resources/META-INF/services/com.ctrip.framework.apollo.core.spi.MetaServerProvider

-com.ctrip.framework.apollo.mockserver.MockedMetaServerProvider

apollo-mockserver/src/test/java/com/ctrip/framework/apollo/mockserver/ApolloMockServerApiTest.java

+package com.ctrip.framework.apollo.mockserver;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import com.ctrip.framework.apollo.Config;
+import com.ctrip.framework.apollo.ConfigService;
+import com.ctrip.framework.apollo.model.ConfigChangeEvent;
+import com.google.common.util.concurrent.SettableFuture;
+import java.util.concurrent.TimeUnit;
+import org.junit.ClassRule;
+import org.junit.Test;
+
+public class ApolloMockServerApiTest {
+
+  private static final String otherNamespace = "otherNamespace";
+
+  @ClassRule
+  public static EmbeddedApollo embeddedApollo = new EmbeddedApollo();
+
+  @Test
+  public void testGetProperty() throws Exception {
+    Config applicationConfig = ConfigService.getAppConfig();
+
+    assertEquals("value1", applicationConfig.getProperty("key1", null));
+    assertEquals("value2", applicationConfig.getProperty("key2", null));
+  }
+
+  @Test
+  public void testUpdateProperties() throws Exception {
+    String someNewValue = "someNewValue";
+
+    Config otherConfig = ConfigService.getConfig(otherNamespace);
+
+    SettableFuture<ConfigChangeEvent> future = SettableFuture.create();
+
+    otherConfig.addChangeListener(future::set);
+
+    assertEquals("otherValue1", otherConfig.getProperty("key1", null));
+    assertEquals("otherValue2", otherConfig.getProperty("key2", null));
+
+    embeddedApollo.addOrModifyProperty(otherNamespace, "key1", someNewValue);
+
+    ConfigChangeEvent changeEvent = future.get(5, TimeUnit.SECONDS);
+
+    assertEquals(someNewValue, otherConfig.getProperty("key1", null));
+    assertEquals("otherValue2", otherConfig.getProperty("key2", null));
+
+    assertTrue(changeEvent.isChanged("key1"));
+  }
+}

apollo-mockserver/src/test/java/com/ctrip/framework/apollo/mockserver/SpringIntegrationTest.java → apollo-mockserver/src/test/java/com/ctrip/framework/apollo/mockserver/ApolloMockServerSpringIntegrationTest.java

 package com.ctrip.framework.apollo.mockserver;
 
+import static org.junit.Assert.assertEquals;
+
 import com.ctrip.framework.apollo.enums.PropertyChangeType;
-import com.ctrip.framework.apollo.mockserver.SpringIntegrationTest.TestConfiguration;
+import com.ctrip.framework.apollo.mockserver.ApolloMockServerSpringIntegrationTest.TestConfiguration;
 import com.ctrip.framework.apollo.model.ConfigChangeEvent;
 import com.ctrip.framework.apollo.spring.annotation.ApolloConfigChangeListener;
 import com.ctrip.framework.apollo.spring.annotation.EnableApolloConfig;
-import static org.junit.Assert.*;
-
 import com.google.common.util.concurrent.SettableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
@@ -23,21 +23,23 @@ import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 /**
- * Create by zhangzheng on 8/16/18
- * Email:zhangzheng@youzan.com
+ * Create by zhangzheng on 8/16/18 Email:zhangzheng@youzan.com
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringApplicationConfiguration(classes = TestConfiguration.class)
-public class SpringIntegrationTest {
-  @Autowired
-  TestBean testBean;
+public class ApolloMockServerSpringIntegrationTest {
+
+  private static final String otherNamespace = "otherNamespace";
 
   @ClassRule
   public static EmbeddedApollo embeddedApollo = new EmbeddedApollo();
 
+  @Autowired
+  private TestBean testBean;
+
   @Test
   @DirtiesContext
-  public void testPropertyInject(){
+  public void testPropertyInject() {
     assertEquals("value1", testBean.key1);
     assertEquals("value2", testBean.key2);
   }
@@ -45,8 +47,7 @@ public class SpringIntegrationTest {
   @Test
   @DirtiesContext
   public void testListenerTriggeredByAdd() throws InterruptedException, ExecutionException, TimeoutException {
-    String otherNamespace = "othernamespace";
-    embeddedApollo.addOrModifyPropery(otherNamespace,"someKey","someValue");
+    embeddedApollo.addOrModifyProperty(otherNamespace, "someKey", "someValue");
     ConfigChangeEvent changeEvent = testBean.futureData.get(5000, TimeUnit.MILLISECONDS);
     assertEquals(otherNamespace, changeEvent.getNamespace());
     assertEquals("someValue", changeEvent.getChange("someKey").getNewValue());
@@ -56,42 +57,34 @@ public class SpringIntegrationTest {
   @DirtiesContext
   public void testListenerTriggeredByDel()
       throws InterruptedException, ExecutionException, TimeoutException {
-    String otherNamespace = "othernamespace";
-    embeddedApollo.delete(otherNamespace, "key1");
+    embeddedApollo.deleteProperty(otherNamespace, "key1");
     ConfigChangeEvent changeEvent = testBean.futureData.get(5000, TimeUnit.MILLISECONDS);
     assertEquals(otherNamespace, changeEvent.getNamespace());
     assertEquals(PropertyChangeType.DELETED, changeEvent.getChange("key1").getChangeType());
   }
 
-
-
-
-
-
-
-
-  @EnableApolloConfig("application")
+  @EnableApolloConfig
   @Configuration
-  static class TestConfiguration{
+  static class TestConfiguration {
+
     @Bean
-    public TestBean testBean(){
+    public TestBean testBean() {
       return new TestBean();
     }
   }
 
-  static class TestBean{
+  private static class TestBean {
+
     @Value("${key1:default}")
-    String key1;
+    private String key1;
     @Value("${key2:default}")
-    String key2;
+    private String key2;
 
-    SettableFuture<ConfigChangeEvent> futureData = SettableFuture.create();
+    private SettableFuture<ConfigChangeEvent> futureData = SettableFuture.create();
 
-    @ApolloConfigChangeListener("othernamespace")
+    @ApolloConfigChangeListener(otherNamespace)
     private void onChange(ConfigChangeEvent changeEvent) {
       futureData.set(changeEvent);
     }
   }
-
-
 }

apollo-mockserver/src/test/resources/META-INF/app.properties

+app.id=someAppId

apollo-mockserver/src/test/resources/mockdata-otherNamespace.properties

+key1=otherValue1
+key2=otherValue2

apollo-mockserver/src/test/resources/mockdata-othernamespace.properties

-key1=othervalue1
-key2=othervalue2

pom.xml

@@ -113,6 +113,11 @@
 				<artifactId>apollo-core</artifactId>
 				<version>${project.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>com.ctrip.framework.apollo</groupId>
+				<artifactId>apollo-client</artifactId>
+				<version>${project.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>com.ctrip.framework.apollo</groupId>
 				<artifactId>apollo-common</artifactId>