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 1a55391e77 fixed non-idempotent unit tests (#929)
1a55391e77 is described below
commit 1a55391e77e3bc6951a59ac99c6bf23c8b66d40b
Author: Kaiyao Ke <47203510+kaiya...@users.noreply.github.com>
AuthorDate: Tue Jul 30 14:45:17 2024 +0800
fixed non-idempotent unit tests (#929)
---
.../java/org/apache/wicket/ComponentOnConfigureTest.java | 11 +++++++++++
.../wicket/markup/repeater/AbstractPageableViewTest.java | 7 +++++++
.../wicket/pageStore/AbstractPersistentPageStoreTest.java | 2 ++
.../wicket/resource/FileSystemResourceReferenceTest.java | 14 ++++++++++++--
.../java/org/apache/wicket/util/string/StringsTest.java | 3 ++-
5 files changed, 34 insertions(+), 3 deletions(-)
diff --git
a/wicket-core-tests/src/test/java/org/apache/wicket/ComponentOnConfigureTest.java
b/wicket-core-tests/src/test/java/org/apache/wicket/ComponentOnConfigureTest.java
index f1f80aeea3..b6e3444e05 100644
---
a/wicket-core-tests/src/test/java/org/apache/wicket/ComponentOnConfigureTest.java
+++
b/wicket-core-tests/src/test/java/org/apache/wicket/ComponentOnConfigureTest.java
@@ -28,6 +28,7 @@ import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.WicketTestCase;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
/**
@@ -41,6 +42,16 @@ class ComponentOnConfigureTest extends WicketTestCase
private static final AtomicInteger BEHAVIOR = new AtomicInteger(0);
private static final AtomicInteger APPLICATION_LISTENER = new
AtomicInteger(0);
+ @BeforeEach
+ void resetCounters()
+ {
+ COUNTER.set(0);
+ PAGE.set(0);
+ COMPONENT.set(0);
+ BEHAVIOR.set(0);
+ APPLICATION_LISTENER.set(0);
+ }
+
/**
* testOrder()
*/
diff --git
a/wicket-core-tests/src/test/java/org/apache/wicket/markup/repeater/AbstractPageableViewTest.java
b/wicket-core-tests/src/test/java/org/apache/wicket/markup/repeater/AbstractPageableViewTest.java
index 7cbc77a443..b85aff8816 100644
---
a/wicket-core-tests/src/test/java/org/apache/wicket/markup/repeater/AbstractPageableViewTest.java
+++
b/wicket-core-tests/src/test/java/org/apache/wicket/markup/repeater/AbstractPageableViewTest.java
@@ -25,6 +25,7 @@ import java.util.List;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.tester.WicketTestCase;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
/**
@@ -34,6 +35,12 @@ public class AbstractPageableViewTest extends WicketTestCase
{
private static int count = 5;
+ @BeforeEach
+ public void resetCount()
+ {
+ count = 5;
+ }
+
/**
*/
@Test
diff --git
a/wicket-core-tests/src/test/java/org/apache/wicket/pageStore/AbstractPersistentPageStoreTest.java
b/wicket-core-tests/src/test/java/org/apache/wicket/pageStore/AbstractPersistentPageStoreTest.java
index 2b9f3f86ee..c2b7dd9713 100644
---
a/wicket-core-tests/src/test/java/org/apache/wicket/pageStore/AbstractPersistentPageStoreTest.java
+++
b/wicket-core-tests/src/test/java/org/apache/wicket/pageStore/AbstractPersistentPageStoreTest.java
@@ -88,6 +88,8 @@ class AbstractPersistentPageStoreTest
};
assertTrue(store.canBeAsynchronous(context));
+ store.destroy();
+
}
}
diff --git
a/wicket-core-tests/src/test/java/org/apache/wicket/resource/FileSystemResourceReferenceTest.java
b/wicket-core-tests/src/test/java/org/apache/wicket/resource/FileSystemResourceReferenceTest.java
index 0fa16f0c23..56b779b03c 100644
---
a/wicket-core-tests/src/test/java/org/apache/wicket/resource/FileSystemResourceReferenceTest.java
+++
b/wicket-core-tests/src/test/java/org/apache/wicket/resource/FileSystemResourceReferenceTest.java
@@ -23,7 +23,11 @@ import java.io.InputStream;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
+import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
+import java.nio.file.FileSystemAlreadyExistsException;
import java.nio.file.Path;
+import java.util.Collections;
import org.apache.wicket.core.util.lang.WicketObjects;
import org.apache.wicket.util.io.ByteArrayOutputStream;
@@ -55,8 +59,14 @@ class FileSystemResourceReferenceTest extends WicketTestCase
try
{
URL resource =
FileSystemResourceReferenceTest.class.getResource("FileSystemResourceReferenceTest.zip");
- Path path =
FileSystemResourceReference.getPath(URI.create("jar:" + resource.toURI() +
-
"!/folderInZip/FileSystemResourceReference.txt"));
+ URI uri = URI.create("jar:" + resource.toURI() +
"!/folderInZip/FileSystemResourceReference.txt");
+ FileSystem fs = null;
+ try {
+ fs = FileSystems.newFileSystem(uri,
Collections.emptyMap());
+ } catch (FileSystemAlreadyExistsException e) {
+ fs = FileSystems.getFileSystem(uri);
+ }
+ Path path =
fs.getPath("/folderInZip/FileSystemResourceReference.txt");
final FileSystemResource fileSystemResource = new
FileSystemResource(path);
FileSystemResourceReference fileSystemResourceReference
= new FileSystemResourceReference(
"test", path)
diff --git
a/wicket-util/src/test/java/org/apache/wicket/util/string/StringsTest.java
b/wicket-util/src/test/java/org/apache/wicket/util/string/StringsTest.java
index 98c528645d..dcc3031c1e 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/string/StringsTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/string/StringsTest.java
@@ -53,13 +53,14 @@ class StringsTest
// WICKET-6858
final Field sessionIdParamField =
Strings.class.getDeclaredField("SESSION_ID_PARAM");
sessionIdParamField.setAccessible(true);
+ String origSessionIdParam = (String)
sessionIdParamField.get(null);
try {
final String customSessionIdParam = ";Custom seSsion -
ид=";
sessionIdParamField.set(null, customSessionIdParam);
assertEquals(url + ";a=b;c=d?param=a;b",
Strings.stripJSessionId(url + ";a=b;c=d" +
customSessionIdParam + "12345?param=a;b"));
} finally {
- sessionIdParamField.set(null, "jsessionid");
+ sessionIdParamField.set(null, origSessionIdParam);
sessionIdParamField.setAccessible(false);
}
}
