You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2015/04/20 21:04:11 UTC
[2/5] isis git commit: ISIS-1052: converted assertions to AssertJ
ISIS-1052: converted assertions to AssertJ
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/f69eaf43
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/f69eaf43
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/f69eaf43
Branch: refs/heads/master
Commit: f69eaf43fddbbe10e09767d031fdc6dc593cfd6c
Parents: d5999f8
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Apr 17 17:00:56 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Apr 17 17:00:56 2015 +0100
----------------------------------------------------------------------
.../domainapp/dom/modules/simple/SimpleObjectTest.java | 6 +++---
.../domainapp/dom/modules/simple/SimpleObjectsTest.java | 8 ++++----
.../tests/modules/simple/SimpleObjectIntegTest.java | 10 +++++-----
.../tests/modules/simple/SimpleObjectsIntegTest.java | 10 +++++-----
4 files changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/f69eaf43/example/application/simpleapp/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectTest.java
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectTest.java b/example/application/simpleapp/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectTest.java
index ff4b6fe..78cefc5 100644
--- a/example/application/simpleapp/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectTest.java
+++ b/example/application/simpleapp/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectTest.java
@@ -21,7 +21,7 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
public class SimpleObjectTest {
@@ -38,13 +38,13 @@ public class SimpleObjectTest {
public void happyCase() throws Exception {
// given
String name = "Foobar";
- assertThat(simpleObject.getName(), is(nullValue()));
+ assertThat(simpleObject.getName()).isNull();
// when
simpleObject.setName(name);
// then
- assertThat(simpleObject.getName(), is(name));
+ assertThat(simpleObject.getName()).isEqualTo(name);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/f69eaf43/example/application/simpleapp/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectsTest.java
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectsTest.java b/example/application/simpleapp/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectsTest.java
index 6756190..3be73c9 100644
--- a/example/application/simpleapp/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectsTest.java
+++ b/example/application/simpleapp/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectsTest.java
@@ -29,7 +29,7 @@ import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
public class SimpleObjectsTest {
@@ -71,8 +71,8 @@ public class SimpleObjectsTest {
final SimpleObject obj = simpleObjects.create("Foobar");
// then
- assertThat(obj, is(simpleObject));
- assertThat(obj.getName(), is("Foobar"));
+ assertThat(obj).isEqualTo(simpleObject);
+ assertThat(obj.getName()).isEqualTo("Foobar");
}
}
@@ -96,7 +96,7 @@ public class SimpleObjectsTest {
final List<SimpleObject> list = simpleObjects.listAll();
// then
- assertThat(list, is(all));
+ assertThat(list).isEqualTo(all);
}
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/f69eaf43/example/application/simpleapp/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectIntegTest.java
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectIntegTest.java b/example/application/simpleapp/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectIntegTest.java
index 9991e3c..077e9cb 100644
--- a/example/application/simpleapp/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectIntegTest.java
+++ b/example/application/simpleapp/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectIntegTest.java
@@ -35,7 +35,7 @@ import domainapp.integtests.tests.SimpleAppIntegTest;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
public class SimpleObjectIntegTest extends SimpleAppIntegTest {
@@ -61,7 +61,7 @@ public class SimpleObjectIntegTest extends SimpleAppIntegTest {
simpleObjectPojo = fs.getSimpleObjects().get(0);
- assertThat(simpleObjectPojo, is(not(nullValue())));
+ assertThat(simpleObjectPojo).isNotNull();
simpleObjectWrapped = wrap(simpleObjectPojo);
}
@@ -74,7 +74,7 @@ public class SimpleObjectIntegTest extends SimpleAppIntegTest {
final String name = simpleObjectWrapped.getName();
//
// then
- assertThat(name, is(fs.NAMES.get(0)));
+ assertThat(name).isEqualTo(fs.NAMES.get(0));
}
@Test
@@ -97,7 +97,7 @@ public class SimpleObjectIntegTest extends SimpleAppIntegTest {
simpleObjectWrapped.updateName("new name");
// then
- assertThat(simpleObjectWrapped.getName(), is("new name"));
+ assertThat(simpleObjectWrapped.getName()).isEqualTo("new name");
}
@Test
@@ -128,7 +128,7 @@ public class SimpleObjectIntegTest extends SimpleAppIntegTest {
final String title = container.titleOf(simpleObjectWrapped);
// then
- assertThat(title, is("Object: " + name));
+ assertThat(title).isEqualTo("Object: " + name);
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/f69eaf43/example/application/simpleapp/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectsIntegTest.java
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectsIntegTest.java b/example/application/simpleapp/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectsIntegTest.java
index 72aba14..533900a 100644
--- a/example/application/simpleapp/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectsIntegTest.java
+++ b/example/application/simpleapp/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectsIntegTest.java
@@ -37,7 +37,7 @@ import domainapp.fixture.modules.simple.SimpleObjectsTearDown;
import domainapp.fixture.scenarios.RecreateSimpleObjects;
import domainapp.integtests.tests.SimpleAppIntegTest;
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
public class SimpleObjectsIntegTest extends SimpleAppIntegTest {
@@ -65,10 +65,10 @@ public class SimpleObjectsIntegTest extends SimpleAppIntegTest {
final List<SimpleObject> all = wrap(simpleObjects).listAll();
// then
- assertThat(all.size(), is(fs.getSimpleObjects().size()));
+ assertThat(all).hasSize(fs.getSimpleObjects().size());
SimpleObject simpleObject = wrap(all.get(0));
- assertThat(simpleObject.getName(), is(fs.getSimpleObjects().get(0).getName()));
+ assertThat(simpleObject.getName()).isEqualTo(fs.getSimpleObjects().get(0).getName());
}
@Test
@@ -83,7 +83,7 @@ public class SimpleObjectsIntegTest extends SimpleAppIntegTest {
final List<SimpleObject> all = wrap(simpleObjects).listAll();
// then
- assertThat(all.size(), is(0));
+ assertThat(all).hasSize(0);
}
}
@@ -102,7 +102,7 @@ public class SimpleObjectsIntegTest extends SimpleAppIntegTest {
// then
final List<SimpleObject> all = wrap(simpleObjects).listAll();
- assertThat(all.size(), is(1));
+ assertThat(all).hasSize(1);
}
@Test