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 18:35:35 UTC
[isis] 10/14: ISIS-2259: more fixes to unit tests (string literals)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit e2cb0f9a3e7d64ca1c95e4bae97ba1fafa5dec41
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 17:25:01 2020 +0000
ISIS-2259: more fixes to unit tests (string literals)
---
.../isis-configurations-and-modules.pptx | Bin 49796 -> 49903 bytes
api/applib/pom.xml | 6 -----
core/commons/pom.xml | 6 -----
core/config/pom.xml | 6 -----
core/detached-tests/pom.xml | 27 +++++----------------
.../commons/internal/reflection/ReflectTest.java | 8 +++---
core/metamodel/pom.xml | 6 -----
core/pom.xml | 8 ++++++
core/security/pom.xml | 6 -----
core/unittestsupport/pom.xml | 6 -----
10 files changed, 18 insertions(+), 61 deletions(-)
diff --git a/antora/components/core/modules/archdesign/attachments/isis-configurations-and-modules.pptx b/antora/components/core/modules/archdesign/attachments/isis-configurations-and-modules.pptx
index 05aebce..17f9f60 100644
Binary files a/antora/components/core/modules/archdesign/attachments/isis-configurations-and-modules.pptx and b/antora/components/core/modules/archdesign/attachments/isis-configurations-and-modules.pptx differ
diff --git a/api/applib/pom.xml b/api/applib/pom.xml
index 66e1058..44d7207 100644
--- a/api/applib/pom.xml
+++ b/api/applib/pom.xml
@@ -91,12 +91,6 @@
<artifactId>annotations</artifactId>
</dependency>
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <scope>provided</scope>
- </dependency>
-
<!-- TESTS -->
<dependency>
<groupId>org.apache.isis.core</groupId>
diff --git a/core/commons/pom.xml b/core/commons/pom.xml
index 3126113..6db6ed6 100644
--- a/core/commons/pom.xml
+++ b/core/commons/pom.xml
@@ -65,12 +65,6 @@
</dependency>
<dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
diff --git a/core/config/pom.xml b/core/config/pom.xml
index dbbdcfc..9f7318e 100644
--- a/core/config/pom.xml
+++ b/core/config/pom.xml
@@ -93,12 +93,6 @@
<type>test-jar</type>
</dependency>
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <scope>provided</scope>
- </dependency>
-
</dependencies>
diff --git a/core/detached-tests/pom.xml b/core/detached-tests/pom.xml
index d2d7664..6fdbad7 100644
--- a/core/detached-tests/pom.xml
+++ b/core/detached-tests/pom.xml
@@ -24,8 +24,8 @@
<name>Apache Isis Core - Detached Tests</name>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.detachedtests</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/detachedtests</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.core.detachedtests</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/core/detachedtests</git-plugin.propertiesDir>
<!-- to support the ParameterNameFacet Test -->
<compiler-plugin.compilerArgument>-parameters</compiler-plugin.compilerArgument>
@@ -86,27 +86,12 @@
<scope>test</scope>
</dependency>
-<!--
<dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
- </dependency>
- <dependency>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit-legacy.version}</version>
- <scope>compile</scope>
- <optional>true</optional>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-unittestsupport</artifactId>
+ <scope>test</scope>
</dependency>
--->
+
<dependency>
<groupId>org.picocontainer</groupId>
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/commons/internal/reflection/ReflectTest.java b/core/detached-tests/src/test/java/org/apache/isis/core/commons/internal/reflection/ReflectTest.java
index 993bb45..fb4d6b8 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/core/commons/internal/reflection/ReflectTest.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/commons/internal/reflection/ReflectTest.java
@@ -55,7 +55,7 @@ class ReflectTest {
.collect(Collectors.joining(",\n"));
assertEquals(""
- + "UserServiceDefault$SudoServiceSpi,\n"
+ + "org.apache.isis.core.metamodel.services.user.UserServiceDefault$SudoServiceSpi,\n"
+ "java.lang.Object",
typeListLiteral);
@@ -71,7 +71,7 @@ class ReflectTest {
.collect(Collectors.joining(",\n"));
assertEquals(
- "UserServiceDefault$SudoServiceSpi,\n"
+ "org.apache.isis.core.metamodel.services.user.UserServiceDefault$SudoServiceSpi,\n"
+ "org.apache.isis.applib.services.sudo.SudoService$Spi,\n"
+ "java.lang.Object",
typeListLiteral);
@@ -91,8 +91,8 @@ class ReflectTest {
assertEquals(""
+ "public abstract void org.apache.isis.applib.services.sudo.SudoService$Spi.releaseRunAs(),\n"
+ "public abstract void org.apache.isis.applib.services.sudo.SudoService$Spi.runAs(java.lang.String,java.util.List),\n"
- + "public void UserServiceDefault$SudoServiceSpi.releaseRunAs(),\n"
- + "public void UserServiceDefault$SudoServiceSpi.runAs(java.lang.String,java.util.List)"
+ + "public void org.apache.isis.core.metamodel.services.user.UserServiceDefault$SudoServiceSpi.releaseRunAs(),\n"
+ + "public void org.apache.isis.core.metamodel.services.user.UserServiceDefault$SudoServiceSpi.runAs(java.lang.String,java.util.List)"
,
typeListLiteral);
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index b21692c..1721f76 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -134,12 +134,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <scope>provided</scope>
- </dependency>
-
</dependencies>
diff --git a/core/pom.xml b/core/pom.xml
index 0da70c9..bc27fc1 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1559,6 +1559,14 @@
</dependencies>
</dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
<profiles>
<profile>
<id>apache-release</id>
diff --git a/core/security/pom.xml b/core/security/pom.xml
index 3492f17..0072bdb 100644
--- a/core/security/pom.xml
+++ b/core/security/pom.xml
@@ -77,12 +77,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <scope>provided</scope>
- </dependency>
-
</dependencies>
</project>
diff --git a/core/unittestsupport/pom.xml b/core/unittestsupport/pom.xml
index 0189f69..03b9a29 100644
--- a/core/unittestsupport/pom.xml
+++ b/core/unittestsupport/pom.xml
@@ -179,12 +179,6 @@
</exclusions>
</dependency>
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <scope>provided</scope>
- </dependency>
-
</dependencies>
<profiles>