Repository: incubator-tamaya-extensions Updated Branches: refs/heads/master 518ceb8e5 -> 4c68c583e
TAMAYA-216: Add infra for assertj * Fix setup of assertJ - thanks Oliver ;-) * Use assertj in first test to make sure it works fine. * Needed to add another maven repo to fetch assertj. 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/4c68c583 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/4c68c583 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/4c68c583 Branch: refs/heads/master Commit: 4c68c583e2ef8549bd40b994f8bd4cbf26eaafd5 Parents: 518ceb8 Author: Hugo Hirsch <[email protected]> Authored: Mon Jan 16 23:10:02 2017 +0100 Committer: Hugo Hirsch <[email protected]> Committed: Mon Jan 16 23:10:02 2017 +0100 ---------------------------------------------------------------------- modules/events/pom.xml | 6 ++++++ .../tamaya/events/ConfigurationChangeTest.java | 6 +++--- pom.xml | 19 +++++++++++++++++++ 3 files changed, 28 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/4c68c583/modules/events/pom.xml ---------------------------------------------------------------------- diff --git a/modules/events/pom.xml b/modules/events/pom.xml index 1e80133..bd96532 100644 --- a/modules/events/pom.xml +++ b/modules/events/pom.xml @@ -64,6 +64,12 @@ under the License. </dependency> <dependency> + <groupId>org.assertj</groupId> + <artifactId>assertj-core</artifactId> + <version>${assertj.version}</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/4c68c583/modules/events/src/test/java/org/apache/tamaya/events/ConfigurationChangeTest.java ---------------------------------------------------------------------- diff --git a/modules/events/src/test/java/org/apache/tamaya/events/ConfigurationChangeTest.java b/modules/events/src/test/java/org/apache/tamaya/events/ConfigurationChangeTest.java index 904f3db..4cedeab 100644 --- a/modules/events/src/test/java/org/apache/tamaya/events/ConfigurationChangeTest.java +++ b/modules/events/src/test/java/org/apache/tamaya/events/ConfigurationChangeTest.java @@ -25,7 +25,7 @@ import org.junit.Test; import java.util.Map; import static org.junit.Assert.*; - +import static org.assertj.core.api.Assertions.*; /** * Test class for {@link ConfigurationChange}. */ @@ -34,8 +34,8 @@ public class ConfigurationChangeTest { @Test public void testEmptyChangeSet() throws Exception { ConfigurationChange change = ConfigurationChange.emptyChangeSet(ConfigurationProvider.getConfiguration()); - assertNotNull(change); - assertTrue(change.isEmpty()); + assertThat(change).isNotNull(); + assertThat(change.getChanges()).isEmpty(); } @Test http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/4c68c583/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index ab5c988..20b2d74 100644 --- a/pom.xml +++ b/pom.xml @@ -61,6 +61,7 @@ under the License. <json.spec.version>1.0-alpha-1</json.spec.version> <johnzon.version>0.9-incubating</johnzon.version> <junit.version>4.12</junit.version> + <assertj.version>3.6.1</assertj.version> <!-- Dependency and plugin relate version properties go here --> <arquillian.version>1.1.7.Final</arquillian.version> @@ -230,6 +231,13 @@ under the License. <scope>test</scope> </dependency> + <!-- with mvn 3.3.9 this definition is not inherited among multiple parent-pom relationships --> + <dependency> + <groupId>org.assertj</groupId> + <artifactId>assertj-core</artifactId> + <version>${assertj.version}</version> + <scope>test</scope> + </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -967,4 +975,15 @@ under the License. </plugin> </plugins> </reporting> + <repositories> + <repository> + <snapshots> + <enabled>false</enabled> + </snapshots> + <id>maven-central</id> + <name>Maven Central Repository</name> + <url>https://repo1.maven.org/maven2</url> + </repository> + </repositories> + </project>
