You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by po...@apache.org on 2017/11/27 21:22:37 UTC

incubator-tamaya-sandbox git commit: TAMAYA-218: Add assertJ tests

Repository: incubator-tamaya-sandbox
Updated Branches:
  refs/heads/master bda217bc2 -> 50e092585


TAMAYA-218: Add assertJ tests


Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/commit/50e09258
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/tree/50e09258
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/diff/50e09258

Branch: refs/heads/master
Commit: 50e0925857a25c86dcf7220182092ce65cd93e33
Parents: bda217b
Author: Phil Ottlinger <po...@apache.org>
Authored: Mon Nov 27 22:22:30 2017 +0100
Committer: Phil Ottlinger <po...@apache.org>
Committed: Mon Nov 27 22:22:30 2017 +0100

----------------------------------------------------------------------
 metamodel/pom.xml                                             | 4 ++++
 .../java/org/apache/tamaya/metamodel/ext/IntegrationTest.java | 6 +++---
 pom.xml                                                       | 7 +++++++
 3 files changed, 14 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/50e09258/metamodel/pom.xml
----------------------------------------------------------------------
diff --git a/metamodel/pom.xml b/metamodel/pom.xml
index 860b383..f5bbb36 100644
--- a/metamodel/pom.xml
+++ b/metamodel/pom.xml
@@ -105,6 +105,10 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
         </dependency>
+		<dependency>
+		    <groupId>org.assertj</groupId>
+		    <artifactId>assertj-core</artifactId>
+		</dependency>
     </dependencies>
 
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/50e09258/metamodel/src/test/java/org/apache/tamaya/metamodel/ext/IntegrationTest.java
----------------------------------------------------------------------
diff --git a/metamodel/src/test/java/org/apache/tamaya/metamodel/ext/IntegrationTest.java b/metamodel/src/test/java/org/apache/tamaya/metamodel/ext/IntegrationTest.java
index be744f7..f18d736 100644
--- a/metamodel/src/test/java/org/apache/tamaya/metamodel/ext/IntegrationTest.java
+++ b/metamodel/src/test/java/org/apache/tamaya/metamodel/ext/IntegrationTest.java
@@ -33,7 +33,7 @@ import java.net.URL;
 import java.util.List;
 
 import static junit.framework.TestCase.*;
-
+import static org.assertj.core.api.Assertions.*;
 /**
  * Created by atsticks on 06.12.16.
  */
@@ -41,7 +41,7 @@ public class IntegrationTest {
 
     @Test
     public void checkSystemLoads(){
-        assertNotNull(ConfigurationProvider.getConfiguration());
+        assertThat(ConfigurationProvider.getConfiguration()).isNotNull();
         System.out.println(ConfigurationProvider.getConfiguration());
     }
 
@@ -200,7 +200,7 @@ public class IntegrationTest {
         assertFalse(config.getContext().getPropertyConverters().isEmpty());
         assertTrue(config.getContext().getPropertyFilters().isEmpty());
         assertEquals(1, config.getContext().getPropertyConverters().size());
-        PropertyConverter converter = config.getContext().getPropertyConverters().values().iterator()
+        PropertyConverter<?> converter = config.getContext().getPropertyConverters().values().iterator()
                 .next().get(0);
         assertNotNull(converter);
         assertTrue(converter instanceof MyConverter);

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/50e09258/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5503c7d..0e6fdf5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -227,6 +227,13 @@ under the License.
                 <version>${hamcrest.version}</version>
                 <scope>test</scope>
             </dependency>
+            
+			<dependency>
+			    <groupId>org.assertj</groupId>
+			    <artifactId>assertj-core</artifactId>
+			    <version>${assertj.version}</version>
+			    <scope>test</scope>
+			</dependency>
 
             <dependency>
                 <groupId>org.jboss.arquillian</groupId>