This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/causeway.git
The following commit(s) were added to refs/heads/master by this push:
new b33769753c CAUSEWAY-3275: Wicket Viewer: backport artifact changes
from spring6 to master branch
b33769753c is described below
commit b33769753cb5e220fa0d45912639b23d731bc489
Author: Andi Huber <[email protected]>
AuthorDate: Wed May 24 06:45:14 2023 +0200
CAUSEWAY-3275: Wicket Viewer: backport artifact changes from spring6 to
master branch
- IDE issues, failing to build the Wicket UI tests since
JUnit-API is forced onto the module-path by Wicket.
- As a workaround putting tests into their own artifact. (At least
works for Eclipse.)
---
viewers/wicket/model/pom.xml | 9 ----
viewers/wicket/pom.xml | 3 +-
viewers/wicket/ui-test/pom.xml | 62 ++++++++++++++++++++++
.../test/LowestCommonSuperclassClosureTest.java | 0
.../model/models/test/UiObjectWkt_hintsTest.java | 0
.../ui/test/ComponentFactoryAbstractTest_init.java | 0
.../ui/test/ComponentType_ConstantsTest.java | 0
.../EntityIconAndTitlePanelTest_abbreviated.java | 0
.../test/components/scalars/ConverterTester.java | 0
.../scalars/jdkdates/JavaSqlDateConverterTest.java | 0
.../jdkdates/JavaUtilDateConverterTest.java | 0
.../scalars/jdkmath/BigDecimalConverterTest.java | 0
.../jodatime/JodaDateTimeConverterTest.java | 0
.../jodatime/JodaLocalDateConverterTest.java | 0
.../jodatime/JodaLocalDateTimeConverterTest.java | 0
.../jodatime/jdk8time/LocalDateConverterTest.java | 0
.../jdk8time/LocalDateTimeConverterTest.java | 0
.../jdk8time/OffsetDateTimeConverterTest.java | 0
.../components/scalars/uuid/UuidConverterTest.java | 0
.../choices/ChoiceProviderForReferencesTest.java | 0
.../choices/ChoiceProviderForValuesTest.java | 0
.../choices/ChoiceProviderTestAbstract.java | 0
.../wicket/ui/test/errors/JGrowlUtilTest.java | 0
.../viewer/wicket/ui/test/fixtures/Customers.java | 0
.../wicket/ui/test/pages/PageAbstractTest.java | 0
.../accmngt/SuccessFeedbackCookieUtilTest.java | 0
.../password_reset/EmailAddressValidator_Test.java | 0
viewers/wicket/ui/pom.xml | 22 --------
28 files changed, 64 insertions(+), 32 deletions(-)
diff --git a/viewers/wicket/model/pom.xml b/viewers/wicket/model/pom.xml
index 643aa32ea4..ea11731627 100644
--- a/viewers/wicket/model/pom.xml
+++ b/viewers/wicket/model/pom.xml
@@ -51,16 +51,7 @@
<groupId>org.apache.causeway.viewer</groupId>
<artifactId>causeway-viewer-commons-model</artifactId>
</dependency>
-
- <!-- TESTING -->
-
- <dependency>
- <groupId>org.apache.causeway.core</groupId>
-
<artifactId>causeway-core-internaltestsupport</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
-
</project>
diff --git a/viewers/wicket/pom.xml b/viewers/wicket/pom.xml
index 6a9f7b7dde..c238020f4b 100644
--- a/viewers/wicket/pom.xml
+++ b/viewers/wicket/pom.xml
@@ -114,8 +114,9 @@
<modules>
<module>applib</module>
<module>model</module>
- <module>viewer</module>
<module>ui</module>
+ <module>ui-test</module>
+ <module>viewer</module>
</modules>
</project>
diff --git a/viewers/wicket/ui-test/pom.xml b/viewers/wicket/ui-test/pom.xml
new file mode 100644
index 0000000000..0ec76132d5
--- /dev/null
+++ b/viewers/wicket/ui-test/pom.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more
contributor
+ license agreements. See the NOTICE file distributed with this work for
additional
+ information regarding copyright ownership. The ASF licenses this file to
+ you under the Apache License, Version 2.0 (the "License"); you may not
use
+ this file except in compliance with the License. You may obtain a copy
of
+ the License at http://www.apache.org/licenses/LICENSE-2.0 Unless
required
+ by applicable law or agreed to in writing, software distributed under
the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
CONDITIONS
+ OF ANY KIND, either express or implied. See the License for the specific
+ language governing permissions and limitations under the License. -->
+<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/xsd/maven-4.0.0.xsd";>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.causeway.viewer</groupId>
+ <artifactId>causeway-viewer-wicket</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>causeway-viewer-wicket-ui-test</artifactId>
+ <name>Apache Causeway Viewer - Wicket (UI Test)</name>
+
+ <properties>
+
<jar-plugin.automaticModuleName>org.apache.causeway.viewer.wicket.ui.test</jar-plugin.automaticModuleName>
+
<git-plugin.propertiesDir>org/apache/causeway/viewer/wicket/ui-test</git-plugin.propertiesDir>
+ </properties>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.causeway.viewer</groupId>
+ <artifactId>causeway-viewer-wicket-ui</artifactId>
+ </dependency>
+
+ <!-- TESTING -->
+
+ <dependency>
+ <groupId>org.apache.causeway.core</groupId>
+
<artifactId>causeway-core-internaltestsupport</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.causeway.core</groupId>
+ <artifactId>causeway-core-runtimeservices</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.causeway.valuetypes</groupId>
+
<artifactId>causeway-valuetypes-jodatime-integration</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ </dependencies>
+
+
+</project>
diff --git
a/viewers/wicket/model/src/test/java/org/apache/causeway/viewer/wicket/model/models/test/LowestCommonSuperclassClosureTest.java
b/viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/model/models/test/LowestCommonSuperclassClosureTest.java
similarity index 100%
rename from
viewers/wicket/model/src/test/java/org/apache/causeway/viewer/wicket/model/models/test/LowestCommonSuperclassClosureTest.java
rename to
viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/model/models/test/LowestCommonSuperclassClosureTest.java
diff --git
a/viewers/wicket/model/src/test/java/org/apache/causeway/viewer/wicket/model/models/test/UiObjectWkt_hintsTest.java
b/viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/model/models/test/UiObjectWkt_hintsTest.java
similarity index 100%
rename from
viewers/wicket/model/src/test/java/org/apache/causeway/viewer/wicket/model/models/test/UiObjectWkt_hintsTest.java
rename to
viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/model/models/test/UiObjectWkt_hintsTest.java
diff --git
a/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/ComponentFactoryAbstractTest_init.java
b/viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/ComponentFactoryAbstractTest_init.java
similarity index 100%
rename from
viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/ComponentFactoryAbstractTest_init.java
rename to
viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/ComponentFactoryAbstractTest_init.java
diff --git
a/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/ComponentType_ConstantsTest.java
b/viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/ComponentType_ConstantsTest.java
similarity index 100%
rename from
viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/ComponentType_ConstantsTest.java
rename to
viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/ComponentType_ConstantsTest.java
diff --git
a/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/entity/icontitle/EntityIconAndTitlePanelTest_abbreviated.java
b/viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/entity/icontitle/EntityIconAndTitlePanelTest_abbreviated.java
similarity index 100%
rename from
viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/entity/icontitle/EntityIconAndTitlePanelTest_abbreviated.java
rename to
viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/entity/icontitle/EntityIconAndTitlePanelTest_abbreviated.java
diff --git
a/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/ConverterTester.java
b/viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/ConverterTester.java
similarity index 100%
rename from
viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/ConverterTester.java
rename to
viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/ConverterTester.java
diff --git
a/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/jdkdates/JavaSqlDateConverterTest.java
b/viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/jdkdates/JavaSqlDateConverterTest.java
similarity index 100%
rename from
viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/jdkdates/JavaSqlDateConverterTest.java
rename to
viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/jdkdates/JavaSqlDateConverterTest.java
diff --git
a/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/jdkdates/JavaUtilDateConverterTest.java
b/viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/jdkdates/JavaUtilDateConverterTest.java
similarity index 100%
rename from
viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/jdkdates/JavaUtilDateConverterTest.java
rename to
viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/jdkdates/JavaUtilDateConverterTest.java
diff --git
a/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/jdkmath/BigDecimalConverterTest.java
b/viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/jdkmath/BigDecimalConverterTest.java
similarity index 100%
rename from
viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/jdkmath/BigDecimalConverterTest.java
rename to
viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/jdkmath/BigDecimalConverterTest.java
diff --git
a/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/jodatime/JodaDateTimeConverterTest.java
b/viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/jodatime/JodaDateTimeConverterTest.java
similarity index 100%
rename from
viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/jodatime/JodaDateTimeConverterTest.java
rename to
viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/jodatime/JodaDateTimeConverterTest.java
diff --git
a/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/jodatime/JodaLocalDateConverterTest.java
b/viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/jodatime/JodaLocalDateConverterTest.java
similarity index 100%
rename from
viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/jodatime/JodaLocalDateConverterTest.java
rename to
viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/jodatime/JodaLocalDateConverterTest.java
diff --git
a/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/jodatime/JodaLocalDateTimeConverterTest.java
b/viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/jodatime/JodaLocalDateTimeConverterTest.java
similarity index 100%
rename from
viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/jodatime/JodaLocalDateTimeConverterTest.java
rename to
viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/jodatime/JodaLocalDateTimeConverterTest.java
diff --git
a/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/jodatime/jdk8time/LocalDateConverterTest.java
b/viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/jodatime/jdk8time/LocalDateConverterTest.java
similarity index 100%
rename from
viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/jodatime/jdk8time/LocalDateConverterTest.java
rename to
viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/jodatime/jdk8time/LocalDateConverterTest.java
diff --git
a/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/jodatime/jdk8time/LocalDateTimeConverterTest.java
b/viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/jodatime/jdk8time/LocalDateTimeConverterTest.java
similarity index 100%
rename from
viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/jodatime/jdk8time/LocalDateTimeConverterTest.java
rename to
viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/jodatime/jdk8time/LocalDateTimeConverterTest.java
diff --git
a/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/jodatime/jdk8time/OffsetDateTimeConverterTest.java
b/viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/jodatime/jdk8time/OffsetDateTimeConverterTest.java
similarity index 100%
rename from
viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/jodatime/jdk8time/OffsetDateTimeConverterTest.java
rename to
viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/jodatime/jdk8time/OffsetDateTimeConverterTest.java
diff --git
a/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/uuid/UuidConverterTest.java
b/viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/uuid/UuidConverterTest.java
similarity index 100%
rename from
viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/uuid/UuidConverterTest.java
rename to
viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/uuid/UuidConverterTest.java
diff --git
a/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/widgets/choices/ChoiceProviderForReferencesTest.java
b/viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/widgets/choices/ChoiceProviderForReferencesTest.java
similarity index 100%
rename from
viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/widgets/choices/ChoiceProviderForReferencesTest.java
rename to
viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/widgets/choices/ChoiceProviderForReferencesTest.java
diff --git
a/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/widgets/choices/ChoiceProviderForValuesTest.java
b/viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/widgets/choices/ChoiceProviderForValuesTest.java
similarity index 100%
rename from
viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/widgets/choices/ChoiceProviderForValuesTest.java
rename to
viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/widgets/choices/ChoiceProviderForValuesTest.java
diff --git
a/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/widgets/choices/ChoiceProviderTestAbstract.java
b/viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/widgets/choices/ChoiceProviderTestAbstract.java
similarity index 100%
rename from
viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/widgets/choices/ChoiceProviderTestAbstract.java
rename to
viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/widgets/choices/ChoiceProviderTestAbstract.java
diff --git
a/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/errors/JGrowlUtilTest.java
b/viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/errors/JGrowlUtilTest.java
similarity index 100%
rename from
viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/errors/JGrowlUtilTest.java
rename to
viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/errors/JGrowlUtilTest.java
diff --git
a/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/fixtures/Customers.java
b/viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/fixtures/Customers.java
similarity index 100%
rename from
viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/fixtures/Customers.java
rename to
viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/fixtures/Customers.java
diff --git
a/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/pages/PageAbstractTest.java
b/viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/pages/PageAbstractTest.java
similarity index 100%
rename from
viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/pages/PageAbstractTest.java
rename to
viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/pages/PageAbstractTest.java
diff --git
a/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/pages/accmngt/SuccessFeedbackCookieUtilTest.java
b/viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/pages/accmngt/SuccessFeedbackCookieUtilTest.java
similarity index 100%
rename from
viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/pages/accmngt/SuccessFeedbackCookieUtilTest.java
rename to
viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/pages/accmngt/SuccessFeedbackCookieUtilTest.java
diff --git
a/viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/pages/accmngt/password_reset/EmailAddressValidator_Test.java
b/viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/pages/accmngt/password_reset/EmailAddressValidator_Test.java
similarity index 100%
rename from
viewers/wicket/ui/src/test/java/org/apache/causeway/viewer/wicket/ui/test/pages/accmngt/password_reset/EmailAddressValidator_Test.java
rename to
viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/pages/accmngt/password_reset/EmailAddressValidator_Test.java
diff --git a/viewers/wicket/ui/pom.xml b/viewers/wicket/ui/pom.xml
index 31f50599f1..df9a454127 100644
--- a/viewers/wicket/ui/pom.xml
+++ b/viewers/wicket/ui/pom.xml
@@ -266,28 +266,6 @@
<scope>provided</scope>
</dependency>
- <!-- TESTING -->
-
- <dependency>
- <groupId>org.apache.causeway.core</groupId>
-
<artifactId>causeway-core-internaltestsupport</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.causeway.core</groupId>
- <artifactId>causeway-core-runtimeservices</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.causeway.valuetypes</groupId>
-
<artifactId>causeway-valuetypes-jodatime-integration</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
-
</dependencies>
-
</project>
