This is an automated email from the ASF dual-hosted git repository. pedro pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/wicket.git
commit a59f5862a852e25f1685fe75d36317902d194d31 Author: Pedro Santos <[email protected]> AuthorDate: Mon Nov 4 15:54:17 2024 -0300 WICKET-7125 move wicket cdi tests to wicket-cdi-tests module --- README.md | 1 + pom.xml | 13 ++--- {wicket-cdi => wicket-cdi-tests}/pom.xml | 58 ++++++++++++---------- .../apache/wicket/cdi/ApacheLicenceHeaderTest.java | 0 .../apache/wicket/cdi/CdiConfigurationTest.java | 2 - .../org/apache/wicket/cdi/CdiWicketTester.java | 0 .../java/org/apache/wicket/cdi/ContextManager.java | 0 .../wicket/cdi/ConversationPropagatorTest.java | 3 -- .../org/apache/wicket/cdi/WicketCdiTestCase.java | 0 .../cdi/testapp/AlternativeTestAppScope.java | 0 .../cdi/testapp/ModelWithInjectedDependency.java | 0 .../apache/wicket/cdi/testapp/TestAppScope.java | 0 .../wicket/cdi/testapp/TestConversationBean.java | 0 .../wicket/cdi/testapp/TestConversationPage.html | 0 .../wicket/cdi/testapp/TestConversationPage.java | 0 .../wicket/cdi/testapp/TestConversationalPage.html | 0 .../wicket/cdi/testapp/TestConversationalPage.java | 0 .../cdi/testapp/TestNonConversationalPage.html | 0 .../cdi/testapp/TestNonConversationalPage.java | 0 .../org/apache/wicket/cdi/testapp/TestPage.html | 0 .../org/apache/wicket/cdi/testapp/TestPage.java | 0 .../apache/wicket/cdi/testapp/TestQualifier.java | 0 .../src/test/java/simplelogger.properties | 0 wicket-cdi/pom.xml | 19 ------- 24 files changed, 39 insertions(+), 57 deletions(-) diff --git a/README.md b/README.md index c174089e9f..e52d38b6b3 100644 --- a/README.md +++ b/README.md @@ -68,6 +68,7 @@ You will find the source code here: |-- wicket-auth-roles |-- wicket-bean-validation |-- wicket-cdi + |-- wicket-cdi-tests |-- wicket-core |-- wicket-tester |-- wicket-core-tests diff --git a/pom.xml b/pom.xml index 26ad083928..ea98ebd7e0 100644 --- a/pom.xml +++ b/pom.xml @@ -106,6 +106,7 @@ <module>wicket-extensions</module> <module>wicket-ioc</module> <module>wicket-cdi</module> + <module>wicket-cdi-tests</module> <module>wicket-spring</module> <module>wicket-velocity</module> <module>wicket-auth-roles</module> @@ -572,6 +573,12 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>io.github.cdi-unit</groupId> + <artifactId>cdi-unit</artifactId> + <version>${cdi-unit.version}</version> + <scope>test</scope> + </dependency> <dependency> <groupId>org.apache.wicket</groupId> <artifactId>wicket-tester</artifactId> @@ -637,12 +644,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>io.github.cdi-unit</groupId> - <artifactId>cdi-unit</artifactId> - <version>${cdi-unit.version}</version> - <scope>test</scope> - </dependency> <dependency> <groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter-engine</artifactId> diff --git a/wicket-cdi/pom.xml b/wicket-cdi-tests/pom.xml similarity index 78% copy from wicket-cdi/pom.xml copy to wicket-cdi-tests/pom.xml index ae40a917cf..d04b2ac9cf 100644 --- a/wicket-cdi/pom.xml +++ b/wicket-cdi-tests/pom.xml @@ -23,24 +23,19 @@ <version>10.3.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - <artifactId>wicket-cdi</artifactId> + <artifactId>wicket-cdi-tests</artifactId> <packaging>jar</packaging> - <name>Wicket CDI</name> + <name>Wicket CDI tests</name> <description> - Provides integration between Wicket and CDI containers. Enables injection of - components and behaviors, as well as other non-contextual object instances. - Also enables propagation of conversations between wicket artifacts such as pages - and resources. + Provides tests for the Wicket and CDI module. </description> <properties> <osgi.export.package>org.apache.wicket.cdi*;-noimport:=true</osgi.export.package> <osgi.import.package>!java*,!kotlin*,!sun.nio.ch,org.slf4j*;version="[1.7,3)",*</osgi.import.package> + <maven.deploy.skip>true</maven.deploy.skip> + <japicmp.skip>true</japicmp.skip> <!-- this module is not released --> </properties> <dependencies> - <dependency> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket-tester</artifactId> - </dependency> <dependency> <groupId>jakarta.annotation</groupId> <artifactId>jakarta.annotation-api</artifactId> @@ -55,7 +50,15 @@ </dependency> <dependency> <groupId>org.apache.wicket</groupId> - <artifactId>wicket-core</artifactId> + <artifactId>wicket-cdi</artifactId> + </dependency> + <dependency> + <groupId>io.github.cdi-unit</groupId> + <artifactId>cdi-unit</artifactId> + </dependency> + <dependency> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-tester</artifactId> </dependency> <dependency> <groupId>org.jboss.weld.module</groupId> @@ -67,23 +70,24 @@ <artifactId>weld-se-core</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>io.github.cdi-unit</groupId> - <artifactId>cdi-unit</artifactId> - <scope>test</scope> - </dependency> </dependencies> <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - </plugins> - </pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <executions> + <execution> + <id>test-compile</id> + <goals> + <goal>testCompile</goal> + </goals> + <configuration> + <useModulePath>false</useModulePath> + </configuration> + </execution> + </executions> + </plugin> + </plugins> </build> </project> diff --git a/wicket-cdi/src/test/java/org/apache/wicket/cdi/ApacheLicenceHeaderTest.java b/wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/ApacheLicenceHeaderTest.java similarity index 100% rename from wicket-cdi/src/test/java/org/apache/wicket/cdi/ApacheLicenceHeaderTest.java rename to wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/ApacheLicenceHeaderTest.java diff --git a/wicket-cdi/src/test/java/org/apache/wicket/cdi/CdiConfigurationTest.java b/wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/CdiConfigurationTest.java similarity index 97% rename from wicket-cdi/src/test/java/org/apache/wicket/cdi/CdiConfigurationTest.java rename to wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/CdiConfigurationTest.java index c7cb4218e6..47e23be9bd 100644 --- a/wicket-cdi/src/test/java/org/apache/wicket/cdi/CdiConfigurationTest.java +++ b/wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/CdiConfigurationTest.java @@ -32,8 +32,6 @@ import static org.junit.jupiter.api.Assertions.assertThrows; /** * @author jsarman */ -// FIXME Wicket 11. Re-enable once the tests are moved to its own module -@Disabled @ActivatedAlternatives(AlternativeTestAppScope.class) class CdiConfigurationTest extends WicketCdiTestCase { diff --git a/wicket-cdi/src/test/java/org/apache/wicket/cdi/CdiWicketTester.java b/wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/CdiWicketTester.java similarity index 100% rename from wicket-cdi/src/test/java/org/apache/wicket/cdi/CdiWicketTester.java rename to wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/CdiWicketTester.java diff --git a/wicket-cdi/src/test/java/org/apache/wicket/cdi/ContextManager.java b/wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/ContextManager.java similarity index 100% rename from wicket-cdi/src/test/java/org/apache/wicket/cdi/ContextManager.java rename to wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/ContextManager.java diff --git a/wicket-cdi/src/test/java/org/apache/wicket/cdi/ConversationPropagatorTest.java b/wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/ConversationPropagatorTest.java similarity index 97% rename from wicket-cdi/src/test/java/org/apache/wicket/cdi/ConversationPropagatorTest.java rename to wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/ConversationPropagatorTest.java index d61cf2d577..3bbc2addca 100644 --- a/wicket-cdi/src/test/java/org/apache/wicket/cdi/ConversationPropagatorTest.java +++ b/wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/ConversationPropagatorTest.java @@ -22,7 +22,6 @@ import org.apache.wicket.cdi.testapp.TestConversationPage; import org.apache.wicket.cdi.testapp.TestConversationalPage; import org.apache.wicket.core.request.mapper.MountedMapper; import org.apache.wicket.request.mapper.parameter.PageParameters; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import jakarta.enterprise.context.Conversation; @@ -31,8 +30,6 @@ import jakarta.inject.Inject; /** * @author jsarman */ -//FIXME Wicket 11. Re-enable once the tests are moved to its own module -@Disabled class ConversationPropagatorTest extends WicketCdiTestCase { @Inject diff --git a/wicket-cdi/src/test/java/org/apache/wicket/cdi/WicketCdiTestCase.java b/wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/WicketCdiTestCase.java similarity index 100% rename from wicket-cdi/src/test/java/org/apache/wicket/cdi/WicketCdiTestCase.java rename to wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/WicketCdiTestCase.java diff --git a/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/AlternativeTestAppScope.java b/wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/testapp/AlternativeTestAppScope.java similarity index 100% rename from wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/AlternativeTestAppScope.java rename to wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/testapp/AlternativeTestAppScope.java diff --git a/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/ModelWithInjectedDependency.java b/wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/testapp/ModelWithInjectedDependency.java similarity index 100% rename from wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/ModelWithInjectedDependency.java rename to wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/testapp/ModelWithInjectedDependency.java diff --git a/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestAppScope.java b/wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/testapp/TestAppScope.java similarity index 100% rename from wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestAppScope.java rename to wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/testapp/TestAppScope.java diff --git a/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestConversationBean.java b/wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/testapp/TestConversationBean.java similarity index 100% rename from wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestConversationBean.java rename to wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/testapp/TestConversationBean.java diff --git a/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestConversationPage.html b/wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/testapp/TestConversationPage.html similarity index 100% rename from wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestConversationPage.html rename to wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/testapp/TestConversationPage.html diff --git a/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestConversationPage.java b/wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/testapp/TestConversationPage.java similarity index 100% rename from wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestConversationPage.java rename to wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/testapp/TestConversationPage.java diff --git a/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestConversationalPage.html b/wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/testapp/TestConversationalPage.html similarity index 100% rename from wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestConversationalPage.html rename to wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/testapp/TestConversationalPage.html diff --git a/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestConversationalPage.java b/wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/testapp/TestConversationalPage.java similarity index 100% rename from wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestConversationalPage.java rename to wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/testapp/TestConversationalPage.java diff --git a/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestNonConversationalPage.html b/wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/testapp/TestNonConversationalPage.html similarity index 100% rename from wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestNonConversationalPage.html rename to wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/testapp/TestNonConversationalPage.html diff --git a/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestNonConversationalPage.java b/wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/testapp/TestNonConversationalPage.java similarity index 100% rename from wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestNonConversationalPage.java rename to wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/testapp/TestNonConversationalPage.java diff --git a/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestPage.html b/wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/testapp/TestPage.html similarity index 100% rename from wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestPage.html rename to wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/testapp/TestPage.html diff --git a/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestPage.java b/wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/testapp/TestPage.java similarity index 100% rename from wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestPage.java rename to wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/testapp/TestPage.java diff --git a/wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestQualifier.java b/wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/testapp/TestQualifier.java similarity index 100% rename from wicket-cdi/src/test/java/org/apache/wicket/cdi/testapp/TestQualifier.java rename to wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/testapp/TestQualifier.java diff --git a/wicket-cdi/src/test/java/simplelogger.properties b/wicket-cdi-tests/src/test/java/simplelogger.properties similarity index 100% rename from wicket-cdi/src/test/java/simplelogger.properties rename to wicket-cdi-tests/src/test/java/simplelogger.properties diff --git a/wicket-cdi/pom.xml b/wicket-cdi/pom.xml index ae40a917cf..cc231ea967 100644 --- a/wicket-cdi/pom.xml +++ b/wicket-cdi/pom.xml @@ -37,10 +37,6 @@ <osgi.import.package>!java*,!kotlin*,!sun.nio.ch,org.slf4j*;version="[1.7,3)",*</osgi.import.package> </properties> <dependencies> - <dependency> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket-tester</artifactId> - </dependency> <dependency> <groupId>jakarta.annotation</groupId> <artifactId>jakarta.annotation-api</artifactId> @@ -57,21 +53,6 @@ <groupId>org.apache.wicket</groupId> <artifactId>wicket-core</artifactId> </dependency> - <dependency> - <groupId>org.jboss.weld.module</groupId> - <artifactId>weld-web</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.weld.se</groupId> - <artifactId>weld-se-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>io.github.cdi-unit</groupId> - <artifactId>cdi-unit</artifactId> - <scope>test</scope> - </dependency> </dependencies> <build> <pluginManagement>
