You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by pe...@apache.org on 2026/02/08 21:43:17 UTC
(wicket) 02/03: WICKET-7176 test @ActivatedAlternatives annotation
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 0c5ce6d31c48cc04ce60e694944925e4c80e6b9a
Author: Pedro Santos <pe...@gmail.com>
AuthorDate: Sun Feb 8 00:30:14 2026 -0300
WICKET-7176 test @ActivatedAlternatives annotation
---
...t.java => AlternativeCdiConfigurationTest.java} | 65 +---------------------
.../apache/wicket/cdi/CdiConfigurationTest.java | 5 +-
2 files changed, 4 insertions(+), 66 deletions(-)
diff --git a/wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/CdiConfigurationTest.java b/wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/AlternativeCdiConfigurationTest.java
similarity index 51%
copy from wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/CdiConfigurationTest.java
copy to wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/AlternativeCdiConfigurationTest.java
index 47e23be9bd..cd07f2abde 100644
--- a/wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/CdiConfigurationTest.java
+++ b/wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/AlternativeCdiConfigurationTest.java
@@ -19,21 +19,16 @@ package org.apache.wicket.cdi;
import io.github.cdiunit.ActivatedAlternatives;
import jakarta.enterprise.inject.spi.BeanManager;
import jakarta.inject.Inject;
-import org.apache.wicket.Application;
import org.apache.wicket.cdi.testapp.AlternativeTestAppScope;
-import org.apache.wicket.cdi.testapp.ModelWithInjectedDependency;
-import org.apache.wicket.cdi.testapp.TestConversationPage;
import org.apache.wicket.cdi.testapp.TestPage;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
/**
- * @author jsarman
+ * @author pedrosans
*/
@ActivatedAlternatives(AlternativeTestAppScope.class)
-class CdiConfigurationTest extends WicketCdiTestCase
+class AlternativeCdiConfigurationTest extends WicketCdiTestCase
{
@Inject
BeanManager beanManager;
@@ -43,7 +38,7 @@ class CdiConfigurationTest extends WicketCdiTestCase
{
configure(new CdiConfiguration());
tester.startPage(TestPage.class);
- tester.assertLabel("appscope", "Test ok");
+ tester.assertLabel("appscope", "Alternative ok");
}
@Test
@@ -54,58 +49,4 @@ class CdiConfigurationTest extends WicketCdiTestCase
tester.assertLabel("appscope", "Alternative ok");
}
- @Test
- void testConversationScope()
- {
- configure(new CdiConfiguration());
- tester.startPage(TestConversationPage.class);
- for (int i = 0; i < 20; i++)
- {
- tester.assertCount(i);
- tester.clickLink("increment");
- }
- }
-
- @Test
- void testNotConfigured()
- {
- assertThrows(IllegalStateException.class, () -> {
- new ModelWithInjectedDependency();
- });
-
- }
-
- @Test
- void testAlreadyConfigured()
- {
- configure(new CdiConfiguration());
-
- assertThrows(IllegalStateException.class, () -> {
- CdiConfiguration.get(Application.get()).setBeanManager(beanManager);
- });
-
- }
-
- @Test
- void testConfigureTwice()
- {
- configure(new CdiConfiguration());
-
- assertThrows(Exception.class, () -> {
- new CdiConfiguration().configure(tester.getApplication());
- });
-
- }
-
- @Test
- void testApplicationLevelConfiguration()
- {
- CdiConfiguration config = new CdiConfiguration();
- for (ConversationPropagation cp : ConversationPropagation.values())
- {
- config.setPropagation(cp);
- assertEquals(cp, config.getPropagation());
- }
- configure(config);
- }
}
diff --git a/wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/CdiConfigurationTest.java b/wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/CdiConfigurationTest.java
index 47e23be9bd..8d6716f73e 100644
--- a/wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/CdiConfigurationTest.java
+++ b/wicket-cdi-tests/src/test/java/org/apache/wicket/cdi/CdiConfigurationTest.java
@@ -16,11 +16,9 @@
*/
package org.apache.wicket.cdi;
-import io.github.cdiunit.ActivatedAlternatives;
import jakarta.enterprise.inject.spi.BeanManager;
import jakarta.inject.Inject;
import org.apache.wicket.Application;
-import org.apache.wicket.cdi.testapp.AlternativeTestAppScope;
import org.apache.wicket.cdi.testapp.ModelWithInjectedDependency;
import org.apache.wicket.cdi.testapp.TestConversationPage;
import org.apache.wicket.cdi.testapp.TestPage;
@@ -32,7 +30,6 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
/**
* @author jsarman
*/
-@ActivatedAlternatives(AlternativeTestAppScope.class)
class CdiConfigurationTest extends WicketCdiTestCase
{
@Inject
@@ -51,7 +48,7 @@ class CdiConfigurationTest extends WicketCdiTestCase
{
configure(new CdiConfiguration().setBeanManager(beanManager));
tester.startPage(TestPage.class);
- tester.assertLabel("appscope", "Alternative ok");
+ tester.assertLabel("appscope", "Test ok");
}
@Test