You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2022/03/22 09:04:08 UTC
[isis] branch master updated: ISIS-2981: test fixes (2)
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/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 3f88de6 ISIS-2981: test fixes (2)
3f88de6 is described below
commit 3f88de689ec39ce261f79ac21c7ffcc83c0d99b8
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Mar 22 10:03:59 2022 +0100
ISIS-2981: test fixes (2)
---
.../isis/viewer/wicket/viewer/wicketapp/CryptFactoryTest.java | 8 +++++++-
.../javax/servlet/http/LocalStrings.properties | 0
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/wicketapp/CryptFactoryTest.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/wicketapp/CryptFactoryTest.java
index 16085a8..65dc4d0 100644
--- a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/wicketapp/CryptFactoryTest.java
+++ b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/wicketapp/CryptFactoryTest.java
@@ -33,6 +33,7 @@ import org.apache.wicket.request.Url;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.cycle.RequestCycleContext;
import org.apache.wicket.util.crypt.ICrypt;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
@@ -45,7 +46,7 @@ import static org.mockito.Mockito.mock;
import lombok.val;
/**
- * Requires {@code javax/servlet/http/LocalStrings.properties}
+ * Requires resource {@code javax/servlet/http/LocalStrings.properties} for Cookie testing.
*/
class CryptFactoryTest {
@@ -76,6 +77,11 @@ class CryptFactoryTest {
}
+ @AfterEach
+ void cleanUp() throws Exception {
+ ThreadContext.setRequestCycle(null);
+ }
+
@ParameterizedTest(name = "{index} {0}")
@MethodSource("provideCryptoCandidates")
void authenticationStrategyRoundtrip(
diff --git a/viewers/wicket/viewer/src/test/java/javax/servlet/http/LocalStrings.properties b/viewers/wicket/viewer/src/test/resources/javax/servlet/http/LocalStrings.properties
similarity index 100%
rename from viewers/wicket/viewer/src/test/java/javax/servlet/http/LocalStrings.properties
rename to viewers/wicket/viewer/src/test/resources/javax/servlet/http/LocalStrings.properties