TAMAYA-217 Spring version bumps and test improvements This moves all of the asserts to AssertJ, as we're trying to do everywhere. It also updates the version of Spring that we test against to 5.1.2 and Spring Boot to 2.1.0.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/commit/41ce265e Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/41ce265e Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/41ce265e Branch: refs/heads/master Commit: 41ce265e5787ba692142b2da916d971d9da77c29 Parents: f3cd3cf Author: William Lieurance <[email protected]> Authored: Thu Nov 29 04:36:01 2018 -0600 Committer: William Lieurance <[email protected]> Committed: Thu Nov 29 04:36:11 2018 -0600 ---------------------------------------------------------------------- examples/05-spring-example/pom.xml | 4 ++-- modules/features/pom.xml | 2 +- modules/spring/pom.xml | 16 +++++++++++----- .../spring/SpringConfigInjectionPostProcessor.java | 4 ---- .../tamaya/integration/spring/SpringConfigTest.java | 13 ++++++------- .../integration/spring/SpringConfigTest2.java | 15 +++++---------- 6 files changed, 25 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/41ce265e/examples/05-spring-example/pom.xml ---------------------------------------------------------------------- diff --git a/examples/05-spring-example/pom.xml b/examples/05-spring-example/pom.xml index 6534adb..99465db 100644 --- a/examples/05-spring-example/pom.xml +++ b/examples/05-spring-example/pom.xml @@ -22,8 +22,8 @@ <artifactId>05-spring-example</artifactId> <properties> - <spring.version>4.3.13.RELEASE</spring.version> - <spring.boot.version>1.5.8.RELEASE</spring.boot.version> + <spring.version>5.1.2.RELEASE</spring.version> + <spring.boot.version>2.1.0.RELEASE</spring.boot.version> <tamaya-apicore.version>0.4-incubating-SNAPSHOT</tamaya-apicore.version> </properties> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/41ce265e/modules/features/pom.xml ---------------------------------------------------------------------- diff --git a/modules/features/pom.xml b/modules/features/pom.xml index db616aa..4de6373 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -128,7 +128,7 @@ under the License. <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> - <version>4.2.4.RELEASE</version> + <version>5.1.2.RELEASE</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/41ce265e/modules/spring/pom.xml ---------------------------------------------------------------------- diff --git a/modules/spring/pom.xml b/modules/spring/pom.xml index f6c166b..964e85c 100644 --- a/modules/spring/pom.xml +++ b/modules/spring/pom.xml @@ -32,8 +32,8 @@ under the License. <packaging>jar</packaging> <properties> - <spring.version>4.2.1.RELEASE</spring.version> - <spring.boot.version>1.2.6.RELEASE</spring.boot.version> + <spring.version>5.1.2.RELEASE</spring.version> + <spring.boot.version>2.1.0.RELEASE</spring.boot.version> </properties> <build> @@ -52,7 +52,9 @@ under the License. <executions> <execution> <id>check</id> - <goals><goal>check</goal></goals> + <goals> + <goal>check</goal> + </goals> </execution> </executions> </plugin> @@ -70,7 +72,11 @@ under the License. <artifactId>java-hamcrest</artifactId> <scope>test</scope> </dependency> - + <dependency> + <groupId>org.assertj</groupId> + <artifactId>assertj-core</artifactId> + <scope>test</scope> + </dependency> <dependency> <groupId>org.apache.tamaya</groupId> <artifactId>tamaya-core</artifactId> @@ -112,7 +118,7 @@ under the License. <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter</artifactId> - <version>2.0.4.RELEASE</version> + <version>${spring.boot.version}</version> <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/41ce265e/modules/spring/src/main/java/org/apache/tamaya/integration/spring/SpringConfigInjectionPostProcessor.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/main/java/org/apache/tamaya/integration/spring/SpringConfigInjectionPostProcessor.java b/modules/spring/src/main/java/org/apache/tamaya/integration/spring/SpringConfigInjectionPostProcessor.java index 0bcc5c3..84aecbb 100644 --- a/modules/spring/src/main/java/org/apache/tamaya/integration/spring/SpringConfigInjectionPostProcessor.java +++ b/modules/spring/src/main/java/org/apache/tamaya/integration/spring/SpringConfigInjectionPostProcessor.java @@ -21,12 +21,8 @@ package org.apache.tamaya.integration.spring; import org.apache.tamaya.inject.ConfigurationInjection; import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanPostProcessor; -import org.springframework.cglib.core.ReflectUtils; -import org.springframework.cglib.proxy.Enhancer; import org.springframework.stereotype.Component; -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.Proxy; /** * PostProcessor that performs injection of configured values using Tamaya {@link ConfigurationInjection}. http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/41ce265e/modules/spring/src/test/java/org/apache/tamaya/integration/spring/SpringConfigTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/apache/tamaya/integration/spring/SpringConfigTest.java b/modules/spring/src/test/java/org/apache/tamaya/integration/spring/SpringConfigTest.java index 1f28816..1f9bb07 100644 --- a/modules/spring/src/test/java/org/apache/tamaya/integration/spring/SpringConfigTest.java +++ b/modules/spring/src/test/java/org/apache/tamaya/integration/spring/SpringConfigTest.java @@ -24,8 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.assertj.core.api.Assertions.*; /** * Created by Anatole on 25.09.2015. @@ -39,23 +38,23 @@ public class SpringConfigTest { @Test public void assertBeanNotNull(){ - assertNotNull(configuredBean); + assertThat(configuredBean).isNotNull(); } @Test public void assert_JavaVersion_Injected(){ - assertNotNull(configuredBean.getJavaVersion()); - assertEquals(System.getProperty("java.version"), configuredBean.getJavaVersion()); + assertThat(configuredBean.getJavaVersion()).isNotNull(); + assertThat(System.getProperty("java.version")).isEqualTo(configuredBean.getJavaVersion()); } @Test public void assert_Number_Injected(){ - assertEquals(configuredBean.getTestNumber(), 23); + assertThat(configuredBean.getTestNumber()).isEqualTo(23); } @Test public void assert_Number_From_Environment(){ - assertEquals("value11", configuredBean.getEnv().getProperty("myConfiguredValue")); + assertThat("value11").isEqualTo(configuredBean.getEnv().getProperty("myConfiguredValue")); } } http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/41ce265e/modules/spring/src/test/java/org/apache/tamaya/integration/spring/SpringConfigTest2.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/apache/tamaya/integration/spring/SpringConfigTest2.java b/modules/spring/src/test/java/org/apache/tamaya/integration/spring/SpringConfigTest2.java index 6eab61d..ffa4d45 100644 --- a/modules/spring/src/test/java/org/apache/tamaya/integration/spring/SpringConfigTest2.java +++ b/modules/spring/src/test/java/org/apache/tamaya/integration/spring/SpringConfigTest2.java @@ -19,15 +19,10 @@ package org.apache.tamaya.integration.spring; import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.assertj.core.api.Assertions.*; /** * Test using standard Spring setup. @@ -38,10 +33,10 @@ public class SpringConfigTest2 { public void assertDefaultSetup(){ ApplicationContext context = new ClassPathXmlApplicationContext("classpath:spring-config-scanOnly.xml"); ConfiguredSpringBean configuredBean = context.getBean(ConfiguredSpringBean.class); - assertNotNull(configuredBean.getJavaVersion()); - assertEquals(System.getProperty("java.version"), configuredBean.getJavaVersion()); - assertNotNull(configuredBean.getMessage()); - assertEquals("value2", configuredBean.getMessage()); + assertThat(configuredBean.getJavaVersion()).isNotNull(); + assertThat(configuredBean.getJavaVersion()).isEqualTo(System.getProperty("java.version")); + assertThat(configuredBean.getMessage()).isNotNull(); + assertThat(configuredBean.getMessage()).isEqualTo("value2"); } }
