From b50cd9266f7831b925c3173ce3fc9b49bf07e388 Mon Sep 17 00:00:00 2001
From: flystar32 <flystar32@163.com>
Date: Thu, 7 Mar 2019 10:17:30 +0800
Subject: [PATCH] update nacos and fescar version and format some testcase

---
 spring-cloud-alibaba-dependencies/pom.xml       |  4 ++--
 .../src/main/resources/application.properties   |  4 ++--
 .../nacos/NacosConfigurationExtConfigTests.java |  4 ----
 .../alibaba/nacos/NacosConfigurationTests.java  | 17 +++++------------
 4 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/spring-cloud-alibaba-dependencies/pom.xml b/spring-cloud-alibaba-dependencies/pom.xml
index df04b40c..b69903cb 100644
--- a/spring-cloud-alibaba-dependencies/pom.xml
+++ b/spring-cloud-alibaba-dependencies/pom.xml
@@ -19,8 +19,8 @@
     <properties>
         <sentinel.version>1.4.2</sentinel.version>
         <oss.version>3.1.0</oss.version>
-        <fescar.version>0.1.3</fescar.version>
-        <nacos.client.version>0.8.2</nacos.client.version>
+        <fescar.version>0.2.3</fescar.version>
+        <nacos.client.version>0.9.1</nacos.client.version>
         <nacos.config.version>0.8.0</nacos.config.version>
         <acm.version>1.0.8</acm.version>
         <ans.version>1.0.1</ans.version>
diff --git a/spring-cloud-alibaba-examples/fescar-example/storage-service/src/main/resources/application.properties b/spring-cloud-alibaba-examples/fescar-example/storage-service/src/main/resources/application.properties
index 832eaecd..b65047c8 100644
--- a/spring-cloud-alibaba-examples/fescar-example/storage-service/src/main/resources/application.properties
+++ b/spring-cloud-alibaba-examples/fescar-example/storage-service/src/main/resources/application.properties
@@ -5,5 +5,5 @@ mysql.server.ip=127.0.0.1
 mysql.server.port=3306
 mysql.db.name=demo
 
-mysql.user.name=xxxxx
-mysql.user.password=xxxxx
\ No newline at end of file
+mysql.user.name=root
+mysql.user.password=123456
\ No newline at end of file
diff --git a/spring-cloud-alibaba-nacos-config/src/test/java/org/springframework/cloud/alibaba/nacos/NacosConfigurationExtConfigTests.java b/spring-cloud-alibaba-nacos-config/src/test/java/org/springframework/cloud/alibaba/nacos/NacosConfigurationExtConfigTests.java
index 024ddbc4..cc7098b1 100644
--- a/spring-cloud-alibaba-nacos-config/src/test/java/org/springframework/cloud/alibaba/nacos/NacosConfigurationExtConfigTests.java
+++ b/spring-cloud-alibaba-nacos-config/src/test/java/org/springframework/cloud/alibaba/nacos/NacosConfigurationExtConfigTests.java
@@ -16,15 +16,12 @@
 
 package org.springframework.cloud.alibaba.nacos;
 
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.NONE;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 
-import java.util.Map;
-
 import com.alibaba.nacos.client.config.NacosConfigService;
 
 import org.junit.Assert;
@@ -42,7 +39,6 @@ import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.alibaba.nacos.client.NacosPropertySourceLocator;
 import org.springframework.cloud.alibaba.nacos.endpoint.NacosConfigEndpointAutoConfiguration;
-import org.springframework.cloud.alibaba.nacos.refresh.NacosRefreshHistory;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;
 import org.springframework.test.context.junit4.SpringRunner;
diff --git a/spring-cloud-alibaba-nacos-config/src/test/java/org/springframework/cloud/alibaba/nacos/NacosConfigurationTests.java b/spring-cloud-alibaba-nacos-config/src/test/java/org/springframework/cloud/alibaba/nacos/NacosConfigurationTests.java
index 8a4bdda6..34f275c2 100644
--- a/spring-cloud-alibaba-nacos-config/src/test/java/org/springframework/cloud/alibaba/nacos/NacosConfigurationTests.java
+++ b/spring-cloud-alibaba-nacos-config/src/test/java/org/springframework/cloud/alibaba/nacos/NacosConfigurationTests.java
@@ -164,12 +164,10 @@ public class NacosConfigurationTests {
 		checkoutNacosConfigTimeout();
 		checkoutNacosConfigEncode();
 		checkoutNacosConfigProfiles();
-		checkoutNacosConfigExtConfig();
 
 		checkoutEndpoint();
+		checkoutDataLoad();
 
-		Assert.assertEquals(environment.getProperty("user.name"), "dev");
-		Assert.assertEquals(environment.getProperty("user.age"), "12");
 	}
 
 	private void checkoutNacosConfigServerAddr() {
@@ -235,15 +233,10 @@ public class NacosConfigurationTests {
 				properties.getEncode());
 	}
 
-	private void checkoutNacosConfigExtConfig() {
-		assertEquals("NacosConfigProperties' ext config is wrong",
-				"ext-config-common01.properties",
-				properties.getExtConfig().get(0).getDataId());
-		assertEquals("NacosConfigProperties' ext config is wrong",
-				"ext-config-common02.properties",
-				properties.getExtConfig().get(1).getDataId());
-		assertEquals("NacosConfigProperties' ext config is wrong", "GLOBAL_GROUP",
-				properties.getExtConfig().get(1).getGroup());
+	private void checkoutDataLoad() {
+
+		Assert.assertEquals(environment.getProperty("user.name"), "dev");
+		Assert.assertEquals(environment.getProperty("user.age"), "12");
 	}
 
 	private void checkoutNacosConfigProfiles() {