diff --git a/README.md b/README.md index cafc98b3525f95186f0455a2c55f6714005c1681..2e11462a87e9533a3d5c31a6a9e34846584b1741 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,8 @@ # Apollo - A reliable configuration management system -[![Build Status](https://travis-ci.org/ctripcorp/apollo.svg?branch=master)](https://travis-ci.org/ctripcorp/apollo) -[![GitHub release](https://img.shields.io/github/release/ctripcorp/apollo.svg)](https://github.com/ctripcorp/apollo/releases) +[![Build Status](https://github.com/ctripcorp/apollo/workflows/build/badge.svg)](https://github.com/ctripcorp/apollo/actions) +[![GitHub Release](https://img.shields.io/github/release/ctripcorp/apollo.svg)](https://github.com/ctripcorp/apollo/releases) [![Maven Central Repo](https://img.shields.io/maven-central/v/com.ctrip.framework.apollo/apollo.svg)](https://mvnrepository.com/artifact/com.ctrip.framework.apollo/apollo-client) [![codecov.io](https://codecov.io/github/ctripcorp/apollo/coverage.svg?branch=master)](https://codecov.io/github/ctripcorp/apollo?branch=master) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) diff --git a/apollo-client/src/test/java/com/ctrip/framework/apollo/spring/JavaConfigAnnotationTest.java b/apollo-client/src/test/java/com/ctrip/framework/apollo/spring/JavaConfigAnnotationTest.java index c74932e917647b0df1adf3ce23ae3a51916fa23b..11be21bc5e0161776673c5962b6112594531c015 100644 --- a/apollo-client/src/test/java/com/ctrip/framework/apollo/spring/JavaConfigAnnotationTest.java +++ b/apollo-client/src/test/java/com/ctrip/framework/apollo/spring/JavaConfigAnnotationTest.java @@ -80,6 +80,7 @@ public class JavaConfigAnnotationTest extends AbstractSpringIntegrationTest { mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig); mockConfig(FX_APOLLO_NAMESPACE, fxApolloConfig); + prepareYamlConfigFile(APPLICATION_YAML_NAMESPACE, readYamlContentAsConfigFileProperties("case9.yml")); TestApolloChildConfigBean bean = getBean(TestApolloChildConfigBean.class, AppConfig6.class); diff --git a/apollo-client/src/test/java/com/ctrip/framework/apollo/util/yaml/YamlParserTest.java b/apollo-client/src/test/java/com/ctrip/framework/apollo/util/yaml/YamlParserTest.java index f1adf641856c02e88311a0d5e6961ebb4c012dc9..6e30cac01f5f62ae07e2c687dee0da794b33cae0 100644 --- a/apollo-client/src/test/java/com/ctrip/framework/apollo/util/yaml/YamlParserTest.java +++ b/apollo-client/src/test/java/com/ctrip/framework/apollo/util/yaml/YamlParserTest.java @@ -6,6 +6,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import com.ctrip.framework.apollo.build.MockInjector; +import com.ctrip.framework.apollo.internals.DefaultInjector; import com.ctrip.framework.apollo.util.OrderedProperties; import com.ctrip.framework.apollo.util.factory.PropertiesFactory; import com.google.common.base.Charsets; @@ -13,6 +14,7 @@ import com.google.common.io.Files; import java.io.File; import java.io.IOException; import java.util.Properties; +import org.junit.Before; import org.junit.Test; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; @@ -22,7 +24,15 @@ import org.yaml.snakeyaml.parser.ParserException; public class YamlParserTest { - private YamlParser parser = new YamlParser(); + private YamlParser parser; + + @Before + public void setUp() throws Exception { + MockInjector.reset(); + MockInjector.setDelegate(new DefaultInjector()); + + parser = new YamlParser(); + } @Test public void testValidCases() throws Exception {