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 15:22:22 UTC
[isis] 08/21: ISIS-2259: moves core/integtestsupport to
testing/integtestsupport
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 033d444ad27364c707d956b4b4a1916a641bddc8
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 13:42:30 2020 +0000
ISIS-2259: moves core/integtestsupport to testing/integtestsupport
---
core/detached-tests/pom.xml | 11 -----------
core/metamodel/pom.xml | 2 ++
core/pom.xml | 2 +-
{core/testsupport => testing}/integtestsupport/pom.xml | 2 +-
.../integtestsupport/src/main/doc/antora.yml | 0
.../doc/modules/integ-test-support/images/integ-tests.png | Bin
.../doc/modules/integ-test-support/images/integ-tests.pptx | Bin
.../modules/integ-test-support/images/wrapper-factory.png | Bin
.../src/main/doc/modules/integ-test-support/nav.adoc | 0
.../main/doc/modules/integ-test-support/pages/about.adoc | 0
.../pages/integ-test-support/abstract-class.adoc | 0
.../pages/integ-test-support/bootstrapping.adoc | 0
.../pages/integ-test-support/configuration-properties.adoc | 0
.../pages/integ-test-support/maven-configuration.adoc | 0
.../pages/integ-test-support/typical-usage.adoc | 0
.../pages/integ-test-support/wrapper-factory.adoc | 0
.../doc/modules/integ-test-support/partials/module-nav.adoc | 0
.../isis/integtestsupport/ExceptionRecognizerTranslate.java | 0
.../isis/integtestsupport/IsisIntegrationTestAbstract.java | 0
.../org/apache/isis/integtestsupport/ThrowableMatchers.java | 0
.../isis/integtestsupport/validate/ValidateDomainModel.java | 0
21 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/core/detached-tests/pom.xml b/core/detached-tests/pom.xml
index 5ec207f..d2d7664 100644
--- a/core/detached-tests/pom.xml
+++ b/core/detached-tests/pom.xml
@@ -49,11 +49,6 @@
<artifactId>isis-core-config</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-unittestsupport</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
@@ -74,12 +69,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-integtestsupport</artifactId>
- <scope>test</scope>
- </dependency>
-
<!-- core plugins required to run this module's own tests -->
<dependency>
<groupId>org.apache.isis.core</groupId>
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index a8c428a..aa2926d 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -109,11 +109,13 @@
</exclusions>
</dependency>
+<!--
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-unittestsupport</artifactId>
<scope>test</scope>
</dependency>
+-->
<dependency>
<groupId>org.apache.isis.core</groupId>
diff --git a/core/pom.xml b/core/pom.xml
index e630ad8..8910151 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1855,7 +1855,7 @@
<module>webboot-springboot</module>
<module>testsupport/unittestsupport</module>
- <module>testsupport/integtestsupport</module>
+ <module>../testing/integtestsupport</module>
<module>security</module>
<module>../security/bypass</module>
diff --git a/core/testsupport/integtestsupport/pom.xml b/testing/integtestsupport/pom.xml
similarity index 99%
rename from core/testsupport/integtestsupport/pom.xml
rename to testing/integtestsupport/pom.xml
index af521c4..b72a8a3 100644
--- a/core/testsupport/integtestsupport/pom.xml
+++ b/testing/integtestsupport/pom.xml
@@ -18,7 +18,7 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../../core/pom.xml</relativePath>
</parent>
<artifactId>isis-integtestsupport</artifactId>
diff --git a/core/testsupport/integtestsupport/src/main/doc/antora.yml b/testing/integtestsupport/src/main/doc/antora.yml
similarity index 100%
rename from core/testsupport/integtestsupport/src/main/doc/antora.yml
rename to testing/integtestsupport/src/main/doc/antora.yml
diff --git a/core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/images/integ-tests.png b/testing/integtestsupport/src/main/doc/modules/integ-test-support/images/integ-tests.png
similarity index 100%
rename from core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/images/integ-tests.png
rename to testing/integtestsupport/src/main/doc/modules/integ-test-support/images/integ-tests.png
diff --git a/core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/images/integ-tests.pptx b/testing/integtestsupport/src/main/doc/modules/integ-test-support/images/integ-tests.pptx
similarity index 100%
rename from core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/images/integ-tests.pptx
rename to testing/integtestsupport/src/main/doc/modules/integ-test-support/images/integ-tests.pptx
diff --git a/core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/images/wrapper-factory.png b/testing/integtestsupport/src/main/doc/modules/integ-test-support/images/wrapper-factory.png
similarity index 100%
rename from core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/images/wrapper-factory.png
rename to testing/integtestsupport/src/main/doc/modules/integ-test-support/images/wrapper-factory.png
diff --git a/core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/nav.adoc b/testing/integtestsupport/src/main/doc/modules/integ-test-support/nav.adoc
similarity index 100%
rename from core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/nav.adoc
rename to testing/integtestsupport/src/main/doc/modules/integ-test-support/nav.adoc
diff --git a/core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/pages/about.adoc b/testing/integtestsupport/src/main/doc/modules/integ-test-support/pages/about.adoc
similarity index 100%
rename from core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/pages/about.adoc
rename to testing/integtestsupport/src/main/doc/modules/integ-test-support/pages/about.adoc
diff --git a/core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/abstract-class.adoc b/testing/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/abstract-class.adoc
similarity index 100%
rename from core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/abstract-class.adoc
rename to testing/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/abstract-class.adoc
diff --git a/core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/bootstrapping.adoc b/testing/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/bootstrapping.adoc
similarity index 100%
rename from core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/bootstrapping.adoc
rename to testing/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/bootstrapping.adoc
diff --git a/core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/configuration-properties.adoc b/testing/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/configuration-properties.adoc
similarity index 100%
rename from core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/configuration-properties.adoc
rename to testing/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/configuration-properties.adoc
diff --git a/core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/maven-configuration.adoc b/testing/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/maven-configuration.adoc
similarity index 100%
rename from core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/maven-configuration.adoc
rename to testing/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/maven-configuration.adoc
diff --git a/core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/typical-usage.adoc b/testing/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/typical-usage.adoc
similarity index 100%
rename from core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/typical-usage.adoc
rename to testing/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/typical-usage.adoc
diff --git a/core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/wrapper-factory.adoc b/testing/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/wrapper-factory.adoc
similarity index 100%
rename from core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/wrapper-factory.adoc
rename to testing/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/wrapper-factory.adoc
diff --git a/core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/partials/module-nav.adoc b/testing/integtestsupport/src/main/doc/modules/integ-test-support/partials/module-nav.adoc
similarity index 100%
rename from core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/partials/module-nav.adoc
rename to testing/integtestsupport/src/main/doc/modules/integ-test-support/partials/module-nav.adoc
diff --git a/core/testsupport/integtestsupport/src/main/java/org/apache/isis/integtestsupport/ExceptionRecognizerTranslate.java b/testing/integtestsupport/src/main/java/org/apache/isis/integtestsupport/ExceptionRecognizerTranslate.java
similarity index 100%
rename from core/testsupport/integtestsupport/src/main/java/org/apache/isis/integtestsupport/ExceptionRecognizerTranslate.java
rename to testing/integtestsupport/src/main/java/org/apache/isis/integtestsupport/ExceptionRecognizerTranslate.java
diff --git a/core/testsupport/integtestsupport/src/main/java/org/apache/isis/integtestsupport/IsisIntegrationTestAbstract.java b/testing/integtestsupport/src/main/java/org/apache/isis/integtestsupport/IsisIntegrationTestAbstract.java
similarity index 100%
rename from core/testsupport/integtestsupport/src/main/java/org/apache/isis/integtestsupport/IsisIntegrationTestAbstract.java
rename to testing/integtestsupport/src/main/java/org/apache/isis/integtestsupport/IsisIntegrationTestAbstract.java
diff --git a/core/testsupport/integtestsupport/src/main/java/org/apache/isis/integtestsupport/ThrowableMatchers.java b/testing/integtestsupport/src/main/java/org/apache/isis/integtestsupport/ThrowableMatchers.java
similarity index 100%
rename from core/testsupport/integtestsupport/src/main/java/org/apache/isis/integtestsupport/ThrowableMatchers.java
rename to testing/integtestsupport/src/main/java/org/apache/isis/integtestsupport/ThrowableMatchers.java
diff --git a/core/testsupport/integtestsupport/src/main/java/org/apache/isis/integtestsupport/validate/ValidateDomainModel.java b/testing/integtestsupport/src/main/java/org/apache/isis/integtestsupport/validate/ValidateDomainModel.java
similarity index 100%
rename from core/testsupport/integtestsupport/src/main/java/org/apache/isis/integtestsupport/validate/ValidateDomainModel.java
rename to testing/integtestsupport/src/main/java/org/apache/isis/integtestsupport/validate/ValidateDomainModel.java