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 2020/01/10 12:56:49 UTC
[isis] 03/22: ISIS-2259: reorg unittestsupport module
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2259
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 5206d9c32c7484c7fb0dc45e098f0b72beaec897
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 11:31:49 2020 +0000
ISIS-2259: reorg unittestsupport module
---
antora/playbooks/site-testing.yml | 2 +-
antora/playbooks/site.yml | 2 +-
testing/pom.xml | 5 +++--
testing/unittestsupport/{impl => applib}/pom.xml | 17 +++++----------
.../applib/IsisModuleTstUnitTestSupportApplib.java | 7 +++++++
.../applib}/bean/AbstractBeanPropertiesTest.java | 2 +-
.../bean/FixtureDatumFactoriesForAnyPojo.java | 2 +-
.../bean/FixtureDatumFactoriesForApplib.java | 2 +-
.../applib}/bean/FixtureDatumFactoriesForJoda.java | 2 +-
.../unittestsupport/applib}/bean/PojoTester.java | 2 +-
.../applib}/dom/assertions/Asserting.java | 2 +-
.../applib}/dom/matchers/IsisMatchers.java | 2 +-
.../dom/privatecons/PrivateConstructorTester.java | 2 +-
.../applib}/dom/reflect/ReflectUtils.java | 2 +-
.../applib}/dom/repo/FinderInteraction.java | 2 +-
.../unittestsupport/applib}/dom/valuetypes/VT.java | 2 +-
.../applib}/bean/PojoTesterTest_interference.java | 2 +-
.../dom/IsisModuleExtUnitTestSupport.java | 7 -------
testing/unittestsupport/pom.xml | 24 ++++++++++++++++++++++
.../{impl => }/src/main/doc/antora.yml | 0
.../doc/modules/unit-test-support-ext/nav.adoc | 0
.../modules/unit-test-support-ext/pages/about.adoc | 0
.../unit-test-support-ext/partials/module-nav.adoc | 0
23 files changed, 53 insertions(+), 35 deletions(-)
diff --git a/antora/playbooks/site-testing.yml b/antora/playbooks/site-testing.yml
index 44128c5..58015c9 100644
--- a/antora/playbooks/site-testing.yml
+++ b/antora/playbooks/site-testing.yml
@@ -40,7 +40,7 @@ content:
start_path: testing/specsupport/src/main/doc # testing
branches: HEAD
- url: .
- start_path: testing/unittestsupport/impl/src/main/doc # testing
+ start_path: testing/unittestsupport/src/main/doc # testing
branches: HEAD
diff --git a/antora/playbooks/site.yml b/antora/playbooks/site.yml
index dc1e417..56328e2 100644
--- a/antora/playbooks/site.yml
+++ b/antora/playbooks/site.yml
@@ -235,7 +235,7 @@ content:
start_path: testing/specsupport/src/main/doc # testing
branches: HEAD
- url: .
- start_path: testing/unittestsupport/impl/src/main/doc # testing
+ start_path: testing/unittestsupport/src/main/doc # testing
branches: HEAD
# valuetypes
diff --git a/testing/pom.xml b/testing/pom.xml
index d99dd36..eab6c4e 100644
--- a/testing/pom.xml
+++ b/testing/pom.xml
@@ -109,7 +109,7 @@
<dependency>
<groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-unittestsupport-dom</artifactId>
+ <artifactId>isis-testing-unittestsupport-applib</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
@@ -123,7 +123,8 @@
<module>hsqldbmgr</module>
<module>specsupport</module>
- <module>unittestsupport/impl</module>
+ <module>unittestsupport</module>
+ <module>unittestsupport/applib</module>
</modules>
<profiles>
diff --git a/testing/unittestsupport/impl/pom.xml b/testing/unittestsupport/applib/pom.xml
similarity index 63%
rename from testing/unittestsupport/impl/pom.xml
rename to testing/unittestsupport/applib/pom.xml
index 2f1f0d1..efc73cf 100644
--- a/testing/unittestsupport/impl/pom.xml
+++ b/testing/unittestsupport/applib/pom.xml
@@ -4,23 +4,16 @@
<parent>
<groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing</artifactId>
+ <artifactId>isis-testing-unittestsupport</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>isis-testing-unittestsupport-dom</artifactId>
-
- <packaging>jar</packaging>
-
- <name>Apache Isis Testing - Unit Test Support</name>
- <description>
- A module providing test utilities for unit testing of domain modules
- </description>
+ <artifactId>isis-testing-unittestsupport-applib</artifactId>
+ <name>Apache Isis Testing - Unit Test Support (applib)</name>
<properties>
- <jar-plugin.automaticModuleName>org.incode.platform.lib.unittestsupport</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/incode/platform/lib/unittestsupport</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.testing.unittestsupport.applib</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/testing/unittestsupport/applib</git-plugin.propertiesDir>
</properties>
<dependencies>
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/IsisModuleTstUnitTestSupportApplib.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/IsisModuleTstUnitTestSupportApplib.java
new file mode 100644
index 0000000..a5318f6
--- /dev/null
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/IsisModuleTstUnitTestSupportApplib.java
@@ -0,0 +1,7 @@
+package org.apache.isis.testing.unittestsupport.applib;
+
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class IsisModuleTstUnitTestSupportApplib {
+}
diff --git a/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/AbstractBeanPropertiesTest.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/bean/AbstractBeanPropertiesTest.java
similarity index 94%
rename from testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/AbstractBeanPropertiesTest.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/bean/AbstractBeanPropertiesTest.java
index d920178..fc5ff21 100644
--- a/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/AbstractBeanPropertiesTest.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/bean/AbstractBeanPropertiesTest.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.unittestsupport.dom.bean;
+package org.apache.isis.testing.unittestsupport.applib.bean;
import org.jmock.auto.Mock;
import org.junit.Rule;
diff --git a/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/FixtureDatumFactoriesForAnyPojo.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/bean/FixtureDatumFactoriesForAnyPojo.java
similarity index 91%
rename from testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/FixtureDatumFactoriesForAnyPojo.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/bean/FixtureDatumFactoriesForAnyPojo.java
index 0b5ddc9..46b6e40 100644
--- a/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/FixtureDatumFactoriesForAnyPojo.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/bean/FixtureDatumFactoriesForAnyPojo.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.unittestsupport.dom.bean;
+package org.apache.isis.testing.unittestsupport.applib.bean;
public class FixtureDatumFactoriesForAnyPojo {
diff --git a/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/FixtureDatumFactoriesForApplib.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/bean/FixtureDatumFactoriesForApplib.java
similarity index 92%
rename from testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/FixtureDatumFactoriesForApplib.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/bean/FixtureDatumFactoriesForApplib.java
index 7c6344b..f13f1bf 100644
--- a/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/FixtureDatumFactoriesForApplib.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/bean/FixtureDatumFactoriesForApplib.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.unittestsupport.dom.bean;
+package org.apache.isis.testing.unittestsupport.applib.bean;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.applib.value.Clob;
diff --git a/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/FixtureDatumFactoriesForJoda.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/bean/FixtureDatumFactoriesForJoda.java
similarity index 94%
rename from testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/FixtureDatumFactoriesForJoda.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/bean/FixtureDatumFactoriesForJoda.java
index 4acd954..b29947b 100644
--- a/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/FixtureDatumFactoriesForJoda.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/bean/FixtureDatumFactoriesForJoda.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.unittestsupport.dom.bean;
+package org.apache.isis.testing.unittestsupport.applib.bean;
import org.joda.time.DateTime;
import org.joda.time.LocalDate;
diff --git a/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/PojoTester.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/bean/PojoTester.java
similarity index 99%
rename from testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/PojoTester.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/bean/PojoTester.java
index 331d074..0adb0c3 100644
--- a/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/PojoTester.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/bean/PojoTester.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.unittestsupport.dom.bean;
+package org.apache.isis.testing.unittestsupport.applib.bean;
import java.io.File;
import java.lang.reflect.InvocationTargetException;
diff --git a/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/assertions/Asserting.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/assertions/Asserting.java
similarity index 87%
rename from testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/assertions/Asserting.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/assertions/Asserting.java
index a23a968..7c2c3b2 100644
--- a/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/assertions/Asserting.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/assertions/Asserting.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.unittestsupport.dom.assertions;
+package org.apache.isis.testing.unittestsupport.applib.dom.assertions;
public final class Asserting {
diff --git a/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/matchers/IsisMatchers.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/matchers/IsisMatchers.java
similarity index 99%
rename from testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/matchers/IsisMatchers.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/matchers/IsisMatchers.java
index 32c7f7d..1e28c33 100644
--- a/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/matchers/IsisMatchers.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/matchers/IsisMatchers.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.unittestsupport.dom.matchers;
+package org.apache.isis.testing.unittestsupport.applib.dom.matchers;
import java.io.File;
import java.io.IOException;
diff --git a/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/privatecons/PrivateConstructorTester.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/privatecons/PrivateConstructorTester.java
similarity index 84%
rename from testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/privatecons/PrivateConstructorTester.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/privatecons/PrivateConstructorTester.java
index 3e8e57b..7ad0214 100644
--- a/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/privatecons/PrivateConstructorTester.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/privatecons/PrivateConstructorTester.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.unittestsupport.dom.privatecons;
+package org.apache.isis.testing.unittestsupport.applib.dom.privatecons;
import java.lang.reflect.Constructor;
diff --git a/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/reflect/ReflectUtils.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/reflect/ReflectUtils.java
similarity index 92%
rename from testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/reflect/ReflectUtils.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/reflect/ReflectUtils.java
index 10b770b..8954df2 100644
--- a/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/reflect/ReflectUtils.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/reflect/ReflectUtils.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.unittestsupport.dom.reflect;
+package org.apache.isis.testing.unittestsupport.applib.dom.reflect;
import java.lang.reflect.Field;
diff --git a/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/repo/FinderInteraction.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/repo/FinderInteraction.java
similarity index 94%
rename from testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/repo/FinderInteraction.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/repo/FinderInteraction.java
index 69c6b9c..5b9a96d 100644
--- a/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/repo/FinderInteraction.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/repo/FinderInteraction.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.unittestsupport.dom.repo;
+package org.apache.isis.testing.unittestsupport.applib.dom.repo;
import java.util.Map;
diff --git a/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/valuetypes/VT.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/valuetypes/VT.java
similarity index 98%
rename from testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/valuetypes/VT.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/valuetypes/VT.java
index 1cd577a..a454635 100644
--- a/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/valuetypes/VT.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/valuetypes/VT.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.unittestsupport.dom.valuetypes;
+package org.apache.isis.testing.unittestsupport.applib.dom.valuetypes;
//import org.incode.module.base.dom.valuetypes.AbstractInterval;
//import org.incode.module.base.dom.valuetypes.LocalDateInterval;
diff --git a/testing/unittestsupport/impl/src/test/java/org/apache/isis/extensions/unittestsupport/dom/bean/PojoTesterTest_interference.java b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/bean/PojoTesterTest_interference.java
similarity index 96%
rename from testing/unittestsupport/impl/src/test/java/org/apache/isis/extensions/unittestsupport/dom/bean/PojoTesterTest_interference.java
rename to testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/bean/PojoTesterTest_interference.java
index 693b57f..1e12fd2 100644
--- a/testing/unittestsupport/impl/src/test/java/org/apache/isis/extensions/unittestsupport/dom/bean/PojoTesterTest_interference.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/bean/PojoTesterTest_interference.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.unittestsupport.dom.bean;
+package org.apache.isis.testing.unittestsupport.applib.bean;
import org.junit.Rule;
import org.junit.Test;
diff --git a/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/IsisModuleExtUnitTestSupport.java b/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/IsisModuleExtUnitTestSupport.java
deleted file mode 100644
index fda6961..0000000
--- a/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/IsisModuleExtUnitTestSupport.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.apache.isis.extensions.unittestsupport.dom;
-
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class IsisModuleExtUnitTestSupport {
-}
diff --git a/testing/unittestsupport/pom.xml b/testing/unittestsupport/pom.xml
new file mode 100644
index 0000000..2bf6209
--- /dev/null
+++ b/testing/unittestsupport/pom.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.isis.testing</groupId>
+ <artifactId>isis-testing</artifactId>
+ <version>2.0.0-M3-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>isis-testing-unittestsupport</artifactId>
+
+ <name>Apache Isis Testing - Unit Test Support (parent)</name>
+ <description>
+ A module providing test utilities for unit testing of domain modules
+ </description>
+
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>applib</module>
+ </modules>
+
+</project>
diff --git a/testing/unittestsupport/impl/src/main/doc/antora.yml b/testing/unittestsupport/src/main/doc/antora.yml
similarity index 100%
rename from testing/unittestsupport/impl/src/main/doc/antora.yml
rename to testing/unittestsupport/src/main/doc/antora.yml
diff --git a/testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext/nav.adoc b/testing/unittestsupport/src/main/doc/modules/unit-test-support-ext/nav.adoc
similarity index 100%
rename from testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext/nav.adoc
rename to testing/unittestsupport/src/main/doc/modules/unit-test-support-ext/nav.adoc
diff --git a/testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext/pages/about.adoc b/testing/unittestsupport/src/main/doc/modules/unit-test-support-ext/pages/about.adoc
similarity index 100%
rename from testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext/pages/about.adoc
rename to testing/unittestsupport/src/main/doc/modules/unit-test-support-ext/pages/about.adoc
diff --git a/testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext/partials/module-nav.adoc b/testing/unittestsupport/src/main/doc/modules/unit-test-support-ext/partials/module-nav.adoc
similarity index 100%
rename from testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext/partials/module-nav.adoc
rename to testing/unittestsupport/src/main/doc/modules/unit-test-support-ext/partials/module-nav.adoc