add more test case

spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/bootstrap/AcmPropertySourceLocator.java

@@ -42,6 +42,8 @@ public class AcmPropertySourceLocator implements PropertySourceLocator {
 		CompositePropertySource compositePropertySource = new CompositePropertySource(
 				DIAMOND_PROPERTY_SOURCE_NAME);
 
+		acmIntegrationProperties.setActiveProfiles(environment.getActiveProfiles());
+
 		for (String dataId : acmIntegrationProperties.getGroupConfigurationDataIds()) {
 			loadDiamondDataIfPresent(compositePropertySource, dataId,
 					acmIntegrationProperties.getAcmProperties().getGroup(), true);

spring-cloud-alicloud-acm/src/test/java/org/springframework/cloud/alicloud/acm/AcmConfigurationTests.java

@@ -126,6 +126,7 @@ public class AcmConfigurationTests {
 		checkoutAcmProfiles();
 		checkoutAcmRefreshEnabled();
 		checkoutDataLoad();
+		checkoutProfileDataLoad();
 	}
 
 	private void checkoutAcmServerAddr() {
@@ -178,10 +179,13 @@ public class AcmConfigurationTests {
 	}
 
 	private void checkoutDataLoad() {
-		Assert.assertEquals(environment.getProperty("user.name"), "dev");
 		Assert.assertEquals(environment.getProperty("user.age"), "12");
 	}
 
+	private void checkoutProfileDataLoad() {
+		Assert.assertEquals(environment.getProperty("user.name"), "dev");
+	}
+
 	@Configuration
 	@EnableAutoConfiguration
 	@ImportAutoConfiguration({ AcmEndpointAutoConfiguration.class,

spring-cloud-alicloud-acm/src/test/java/org/springframework/cloud/alicloud/acm/AcmFileExtensionTest.java

@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) 2019 the original author or authors.
+ *
+ * Licensed 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.springframework.cloud.alicloud.acm;
+
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.NONE;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.api.support.MethodProxy;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+import org.powermock.modules.junit4.PowerMockRunnerDelegate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.cloud.alicloud.acm.endpoint.AcmEndpointAutoConfiguration;
+import org.springframework.cloud.alicloud.context.acm.AcmContextBootstrapConfiguration;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.env.Environment;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.alibaba.edas.acm.ConfigService;
+
+/**
+ * @author xiaojing
+ */
+
+@RunWith(PowerMockRunner.class)
+@PowerMockRunnerDelegate(SpringRunner.class)
+@PrepareForTest({ ConfigService.class })
+@SpringBootTest(classes = AcmFileExtensionTest.TestConfig.class, properties = {
+		"spring.application.name=test-name",
+		"spring.cloud.alicloud.acm.server-list=127.0.0.1",
+		"spring.cloud.alicloud.acm.server-port=8080",
+		"spring.cloud.alicloud.acm.file-extension=yaml" }, webEnvironment = NONE)
+public class AcmFileExtensionTest {
+
+	static {
+
+		try {
+			Method method = PowerMockito.method(ConfigService.class, "getConfig",
+					String.class, String.class, long.class);
+			MethodProxy.proxy(method, new InvocationHandler() {
+				@Override
+				public Object invoke(Object proxy, Method method, Object[] args)
+						throws Throwable {
+					if ("test-name.yaml".equals(args[0])
+							&& "DEFAULT_GROUP".equals(args[1])) {
+						return "user:\n  name: hello\n  age: 12";
+					}
+					return "";
+				}
+			});
+
+		}
+		catch (Exception ignore) {
+			ignore.printStackTrace();
+
+		}
+	}
+
+	@Autowired
+	private Environment environment;
+
+	@Test
+	public void contextLoads() throws Exception {
+
+		Assert.assertEquals(environment.getProperty("user.name"), "hello");
+		Assert.assertEquals(environment.getProperty("user.age"), "12");
+	}
+
+	@Configuration
+	@EnableAutoConfiguration
+	@ImportAutoConfiguration({ AcmEndpointAutoConfiguration.class,
+			AcmAutoConfiguration.class, AcmContextBootstrapConfiguration.class })
+	public static class TestConfig {
+	}
+}

spring-cloud-alicloud-acm/src/test/java/org/springframework/cloud/alicloud/acm/AcmGroupConfigurationTest.java

@@ -67,11 +67,11 @@ public class AcmGroupConfigurationTest {
 						throws Throwable {
 					if ("com.test:application.properties".equals(args[0])
 							&& "test-group".equals(args[1])) {
-						return "com.test.value=com.test";
+						return "com.test.value=com.test\ntest.priority=1";
 					}
 					if ("com.test.hello:application.properties".equals(args[0])
 							&& "test-group".equals(args[1])) {
-						return "com.test.hello.value=com.test.hello";
+						return "com.test.hello.value=com.test.hello\ntest.priority=2";
 					}
 					return "";
 				}
@@ -91,6 +91,7 @@ public class AcmGroupConfigurationTest {
 	public void contextLoads() throws Exception {
 
 		Assert.assertEquals(environment.getProperty("com.test.value"), "com.test");
+		Assert.assertEquals(environment.getProperty("test.priority"), "2");
 		Assert.assertEquals(environment.getProperty("com.test.hello.value"),
 				"com.test.hello");
 

spring-cloud-alicloud-acm/src/test/java/org/springframework/cloud/alicloud/acm/endpoint/AcmEndpointTests.java

@@ -35,19 +35,15 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import org.powermock.modules.junit4.PowerMockRunnerDelegate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.actuate.health.Health.Builder;
-import org.springframework.boot.actuate.health.HealthIndicator;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.alicloud.acm.AcmAutoConfiguration;
 import org.springframework.cloud.alicloud.acm.AcmPropertySourceRepository;
-import org.springframework.cloud.alicloud.acm.bootstrap.AcmPropertySourceLocator;
 import org.springframework.cloud.alicloud.acm.refresh.AcmRefreshHistory;
 import org.springframework.cloud.alicloud.context.acm.AcmContextBootstrapConfiguration;
-import org.springframework.cloud.alicloud.context.acm.AcmIntegrationProperties;
 import org.springframework.cloud.alicloud.context.acm.AcmProperties;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.env.Environment;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import com.alibaba.edas.acm.ConfigService;