This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git
The following commit(s) were added to refs/heads/master by this push:
new eadd734259 Re-enable SpringWebApplicationFactoryTest
eadd734259 is described below
commit eadd734259ea2ec784523cf0ca55a3a29c89c26e
Author: Martin Tzvetanov Grigorov <[email protected]>
AuthorDate: Wed Jan 10 10:51:09 2024 +0200
Re-enable SpringWebApplicationFactoryTest
Use JUnit 5.x APIs for the disabled CDI tests
Signed-off-by: Martin Tzvetanov Grigorov <[email protected]>
---
.../apache/wicket/cdi/CdiConfigurationTest.java | 18 +++++++-------
.../wicket/cdi/ConversationPropagatorTest.java | 28 +++++++++++-----------
.../spring/SpringWebApplicationFactoryTest.java | 5 +---
3 files changed, 24 insertions(+), 27 deletions(-)
diff --git
a/wicket-cdi/src/test/java/org/apache/wicket/cdi/CdiConfigurationTest.java
b/wicket-cdi/src/test/java/org/apache/wicket/cdi/CdiConfigurationTest.java
index 5a2391ed8f..0ee921bade 100644
--- a/wicket-cdi/src/test/java/org/apache/wicket/cdi/CdiConfigurationTest.java
+++ b/wicket-cdi/src/test/java/org/apache/wicket/cdi/CdiConfigurationTest.java
@@ -22,18 +22,18 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import org.apache.wicket.cdi.testapp.TestConversationPage;
import org.apache.wicket.cdi.testapp.TestPage;
import org.apache.wicket.util.tester.WicketTester;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
/**
* @author jsarman
*/
-// FIXME Wicket 10
-@Ignore
-public class CdiConfigurationTest extends WicketCdiTestCase
+// FIXME Wicket 10. Re-enable once cdi-unit is adapted to jakarta.**
+@Disabled
+class CdiConfigurationTest extends WicketCdiTestCase
{
@Test
- public void testApplicationScope()
+ void testApplicationScope()
{
configure(new CdiConfiguration());
tester.startPage(TestPage.class);
@@ -41,7 +41,7 @@ public class CdiConfigurationTest extends WicketCdiTestCase
}
@Test
- public void testConversationScope()
+ void testConversationScope()
{
configure(new CdiConfiguration());
tester.startPage(TestConversationPage.class);
@@ -53,7 +53,7 @@ public class CdiConfigurationTest extends WicketCdiTestCase
}
@Test
- public void testConfigureTwice()
+ void testConfigureTwice()
{
configure(new CdiConfiguration());
@@ -64,7 +64,7 @@ public class CdiConfigurationTest extends WicketCdiTestCase
}
@Test
- public void testApplicationLevelConfiguration()
+ void testApplicationLevelConfiguration()
{
WicketTester tester = new WicketTester();
CdiConfiguration config = new CdiConfiguration();
diff --git
a/wicket-cdi/src/test/java/org/apache/wicket/cdi/ConversationPropagatorTest.java
b/wicket-cdi/src/test/java/org/apache/wicket/cdi/ConversationPropagatorTest.java
index 10033c0e40..e18971cfd4 100644
---
a/wicket-cdi/src/test/java/org/apache/wicket/cdi/ConversationPropagatorTest.java
+++
b/wicket-cdi/src/test/java/org/apache/wicket/cdi/ConversationPropagatorTest.java
@@ -25,21 +25,21 @@ 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.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
/**
* @author jsarman
*/
-// FIXME Wicket 10
-@Ignore
-public class ConversationPropagatorTest extends WicketCdiTestCase
+// FIXME Wicket 10. Re-enable once cdi-unit is adapted to jakarta.**
+@Disabled
+class ConversationPropagatorTest extends WicketCdiTestCase
{
@Inject
Conversation conversation;
@Test
- public void testAutoConversationNonBookmarkable()
+ void testAutoConversationNonBookmarkable()
{
configure(new CdiConfiguration());
@@ -59,7 +59,7 @@ public class ConversationPropagatorTest extends
WicketCdiTestCase
}
@Test
- public void testAutoConversationBookmarkable()
+ void testAutoConversationBookmarkable()
{
configure(new CdiConfiguration());
@@ -81,7 +81,7 @@ public class ConversationPropagatorTest extends
WicketCdiTestCase
}
@Test
- public void testPropagationAllNonBookmarkable()
+ void testPropagationAllNonBookmarkable()
{
configure(new
CdiConfiguration().setPropagation(ConversationPropagation.ALL));
@@ -101,7 +101,7 @@ public class ConversationPropagatorTest extends
WicketCdiTestCase
}
@Test
- public void testPropagationAllHybrid()
+ void testPropagationAllHybrid()
{
configure(new
CdiConfiguration().setPropagation(ConversationPropagation.ALL));
tester.getApplication().getRootRequestMapperAsCompound().add(new
MountedMapper("segment/${pageType}", TestConversationPage.class));
@@ -123,10 +123,10 @@ public class ConversationPropagatorTest extends
WicketCdiTestCase
}
/**
- * https://issues.apache.org/jira/browse/WICKET-6257
+ * <a
href="https://issues.apache.org/jira/browse/WICKET-6257";>WICKET-6257</a>
*/
@Test
- public void testPropagationAllHybridRefresh()
+ void testPropagationAllHybridRefresh()
{
configure(new
CdiConfiguration().setPropagation(ConversationPropagation.ALL));
tester.getApplication().getRootRequestMapperAsCompound().add(new
MountedMapper("segment/${pageType}", TestConversationPage.class));
@@ -142,7 +142,7 @@ public class ConversationPropagatorTest extends
WicketCdiTestCase
}
@Test
- public void testPropagationAllBookmarkable()
+ void testPropagationAllBookmarkable()
{
configure(new
CdiConfiguration().setPropagation(ConversationPropagation.ALL));
@@ -163,7 +163,7 @@ public class ConversationPropagatorTest extends
WicketCdiTestCase
}
@Test
- public void testPropagationNonBookmarkable()
+ void testPropagationNonBookmarkable()
{
configure(new CdiConfiguration());
@@ -184,7 +184,7 @@ public class ConversationPropagatorTest extends
WicketCdiTestCase
}
@Test
- public void testPropagationNone()
+ void testPropagationNone()
{
configure(new
CdiConfiguration().setPropagation(ConversationPropagation.NONE));
diff --git
a/wicket-spring/src/test/java/org/apache/wicket/spring/SpringWebApplicationFactoryTest.java
b/wicket-spring/src/test/java/org/apache/wicket/spring/SpringWebApplicationFactoryTest.java
index 64ffc87ed2..86ff0e1efd 100644
---
a/wicket-spring/src/test/java/org/apache/wicket/spring/SpringWebApplicationFactoryTest.java
+++
b/wicket-spring/src/test/java/org/apache/wicket/spring/SpringWebApplicationFactoryTest.java
@@ -22,7 +22,6 @@ import org.apache.wicket.protocol.http.WicketFilter;
import org.apache.wicket.protocol.http.mock.MockServletContext;
import org.apache.wicket.spring.injection.annot.SpringComponentInjector;
import org.apache.wicket.util.lang.Packages;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import jakarta.servlet.FilterConfig;
@@ -38,8 +37,6 @@ import static org.junit.jupiter.api.Assertions.fail;
*
* @author svenmeier
*/
-// FIXME Wicket 10
-@Disabled
class SpringWebApplicationFactoryTest
{
@@ -60,7 +57,7 @@ class SpringWebApplicationFactoryTest
assertTrue(Destroyable.instance.destroyed, "is not destroyed");
}
- private class FilterConfigImpl implements FilterConfig
+ private static class FilterConfigImpl implements FilterConfig
{
@Override
