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 2019/01/04 14:07:38 UTC
[isis] 02/03: ISIS-1978: moves demo test from helloworld to
isis-core-webserver
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 1bde83e684959b9405ca3bddb4af7be285818475
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 4 13:56:38 2019 +0000
ISIS-1978: moves demo test from helloworld to isis-core-webserver
chose isis-core-webserver because it can "see" the rest of the framework, so a convenient place to write such "regression" tests.
---
core/pom.xml | 6 ++--
core/webserver/config/isis.properties | 1 +
core/webserver/pom.xml | 37 ++++++++++++++++++++++
.../isis/core/webserver/DummyAppManifest.java | 13 ++++++++
.../core/webserver}/HelloWorldAppConfigTest.java | 12 +++++--
5 files changed, 63 insertions(+), 6 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 01d9cc5..9d5b379 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -135,8 +135,7 @@
<guava.version>19.0</guava.version>
<hamcrest.version>1.3</hamcrest.version>
- <assertj.version>3.6.2</assertj.version>
-
+
<reflections.version>0.9.10</reflections.version>
<findbugs-annotations.version>2.0.1</findbugs-annotations.version>
@@ -180,7 +179,8 @@
<htmlparser.version>2.1</htmlparser.version>
<junit.version>5.3.1</junit.version>
-
+ <assertj.version>3.11.1</assertj.version>
+
<!-- 2.8.1 depends on cglib-nodep 3.1 whereas axonframework depends on 2.2.2 -->
<jmock.version>2.6.0</jmock.version>
<easymock.version>2.5.2</easymock.version>
diff --git a/core/webserver/config/isis.properties b/core/webserver/config/isis.properties
new file mode 100644
index 0000000..3a4de45
--- /dev/null
+++ b/core/webserver/config/isis.properties
@@ -0,0 +1 @@
+isis.appManifest=org.apache.isis.core.webserver.DummyAppManifest
\ No newline at end of file
diff --git a/core/webserver/pom.xml b/core/webserver/pom.xml
index 7ad78e2..09b2438 100644
--- a/core/webserver/pom.xml
+++ b/core/webserver/pom.xml
@@ -35,6 +35,25 @@
<git-plugin.propertiesDir>org/apache/isis/core/webserver</git-plugin.propertiesDir>
</properties>
+ <build>
+ <resources>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ </build>
+
<dependencies>
<dependency>
<groupId>org.apache.isis.core</groupId>
@@ -48,6 +67,24 @@
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-plugins-discovery-reflections</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-plugins-jdo-datanucleus-5</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.mavendeps</groupId>
+ <artifactId>isis-mavendeps-testing</artifactId>
+ <type>pom</type>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<profiles>
diff --git a/core/webserver/src/test/java/org/apache/isis/core/webserver/DummyAppManifest.java b/core/webserver/src/test/java/org/apache/isis/core/webserver/DummyAppManifest.java
new file mode 100644
index 0000000..27a0a62
--- /dev/null
+++ b/core/webserver/src/test/java/org/apache/isis/core/webserver/DummyAppManifest.java
@@ -0,0 +1,13 @@
+package org.apache.isis.core.webserver;
+
+import org.apache.isis.applib.AppManifestAbstract2;
+import org.apache.isis.applib.ModuleAbstract;
+
+public class DummyAppManifest extends AppManifestAbstract2 {
+ private static final Builder builder = AppManifestAbstract2.Builder.forModule(new ModuleAbstract() {
+ });
+
+ public DummyAppManifest() {
+ super(builder);
+ }
+}
\ No newline at end of file
diff --git a/example/application/helloworld/src/test/java/domainapp/application/HelloWorldAppConfigTest.java b/core/webserver/src/test/java/org/apache/isis/core/webserver/HelloWorldAppConfigTest.java
similarity index 73%
rename from example/application/helloworld/src/test/java/domainapp/application/HelloWorldAppConfigTest.java
rename to core/webserver/src/test/java/org/apache/isis/core/webserver/HelloWorldAppConfigTest.java
index 81e43e5..3856bbd 100644
--- a/example/application/helloworld/src/test/java/domainapp/application/HelloWorldAppConfigTest.java
+++ b/core/webserver/src/test/java/org/apache/isis/core/webserver/HelloWorldAppConfigTest.java
@@ -1,4 +1,4 @@
-package domainapp.application;
+package org.apache.isis.core.webserver;
import java.util.Map;
@@ -10,6 +10,8 @@ import org.junit.jupiter.api.Test;
import org.apache.isis.config.AppConfigLocator;
import org.apache.isis.config.IsisConfiguration;
+import static org.assertj.core.api.Assertions.assertThat;
+
class HelloWorldAppConfigTest {
@BeforeEach
@@ -22,13 +24,17 @@ class HelloWorldAppConfigTest {
@Test
void test() {
-
+
+ // when
IsisConfiguration isisConfiguration = AppConfigLocator.getAppConfig().isisConfiguration();
+
+ // then
Assertions.assertNotNull(isisConfiguration);
Map<String, String> config = isisConfiguration.asMap();
Assertions.assertNotNull(config);
- Assertions.assertTrue(config.size()>20);
+ assertThat(config).hasSize(1);
+ assertThat(config.get("isis.appManifest")).isEqualTo(DummyAppManifest.class.getName());
}
}