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:12 UTC
[3/5] isis git commit: ISIS-1052: recreating simpleapp archetype
ISIS-1052: recreating simpleapp archetype
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/28e4dbf7
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/28e4dbf7
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/28e4dbf7
Branch: refs/heads/master
Commit: 28e4dbf763df60eef1a1d25e67cc19a7404b23ab
Parents: f69eaf4
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Apr 17 17:01:57 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Apr 17 17:01:57 2015 +0100
----------------------------------------------------------------------
.../src/main/resources/archetype-resources/dom/pom.xml | 7 +++++++
.../domainapp/dom/modules/simple/SimpleObjectTest.java | 6 +++---
.../domainapp/dom/modules/simple/SimpleObjectsTest.java | 8 ++++----
.../main/resources/archetype-resources/integtests/pom.xml | 6 ++++++
.../tests/modules/simple/SimpleObjectIntegTest.java | 10 +++++-----
.../tests/modules/simple/SimpleObjectsIntegTest.java | 10 +++++-----
.../src/main/resources/archetype-resources/pom.xml | 7 +++++++
.../test/resources/projects/basic/archetype.properties | 2 +-
8 files changed, 38 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/28e4dbf7/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/pom.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/pom.xml
index 5eef061..d43af6d 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/pom.xml
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/pom.xml
@@ -113,6 +113,13 @@
<artifactId>objenesis</artifactId>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/isis/blob/28e4dbf7/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectTest.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectTest.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectTest.java
index 96f2ee9..d609568 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectTest.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectTest.java
@@ -24,7 +24,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 {
@@ -41,13 +41,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/28e4dbf7/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectsTest.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectsTest.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectsTest.java
index 908cf11..75b5eff 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectsTest.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectsTest.java
@@ -32,7 +32,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 {
@@ -74,8 +74,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");
}
}
@@ -99,7 +99,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/28e4dbf7/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/pom.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/pom.xml
index 2b31421..6e413aa 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/pom.xml
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/pom.xml
@@ -81,6 +81,12 @@
</dependency>
<dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/28e4dbf7/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectIntegTest.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectIntegTest.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectIntegTest.java
index 9659479..fc79389 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectIntegTest.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectIntegTest.java
@@ -38,7 +38,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 {
@@ -64,7 +64,7 @@ public class SimpleObjectIntegTest extends SimpleAppIntegTest {
simpleObjectPojo = fs.getSimpleObjects().get(0);
- assertThat(simpleObjectPojo, is(not(nullValue())));
+ assertThat(simpleObjectPojo).isNotNull();
simpleObjectWrapped = wrap(simpleObjectPojo);
}
@@ -77,7 +77,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
@@ -100,7 +100,7 @@ public class SimpleObjectIntegTest extends SimpleAppIntegTest {
simpleObjectWrapped.updateName("new name");
// then
- assertThat(simpleObjectWrapped.getName(), is("new name"));
+ assertThat(simpleObjectWrapped.getName()).isEqualTo("new name");
}
@Test
@@ -131,7 +131,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/28e4dbf7/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectsIntegTest.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectsIntegTest.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectsIntegTest.java
index 6c2f84c..75840e6 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectsIntegTest.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectsIntegTest.java
@@ -40,7 +40,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 {
@@ -68,10 +68,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
@@ -86,7 +86,7 @@ public class SimpleObjectsIntegTest extends SimpleAppIntegTest {
final List<SimpleObject> all = wrap(simpleObjects).listAll();
// then
- assertThat(all.size(), is(0));
+ assertThat(all).hasSize(0);
}
}
@@ -105,7 +105,7 @@ public class SimpleObjectsIntegTest extends SimpleAppIntegTest {
// then
final List<SimpleObject> all = wrap(simpleObjects).listAll();
- assertThat(all.size(), is(1));
+ assertThat(all).hasSize(1);
}
@Test
http://git-wip-us.apache.org/repos/asf/isis/blob/28e4dbf7/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
index a5569c2..5b4fdc3 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
@@ -40,6 +40,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <assertj-core.version>2.0.0</assertj-core.version>
</properties>
<repositories>
@@ -326,6 +327,12 @@
<scope>import</scope>
</dependency>
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <version>${assertj-core.version}</version>
+ </dependency>
+
<!-- this project's own modules -->
<dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/28e4dbf7/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties b/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
index c78e3ba..be2db98 100644
--- a/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
+++ b/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
@@ -1,4 +1,4 @@
-#Sun Mar 29 15:44:24 BST 2015
+#Fri Apr 17 17:01:50 BST 2015
package=it.pkg
version=0.1-SNAPSHOT
groupId=archetype.it