You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2018/09/26 13:39:34 UTC
[04/45] wicket git commit: - upgrade junit4 with junit5 in
wicket-util - replace Junit4 Methods in WicketTester.java - remove junit 4
dependencies in pom.xml
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/encoding/UrlEncoderTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/encoding/UrlEncoderTest.java b/wicket-util/src/test/java/org/apache/wicket/util/encoding/UrlEncoderTest.java
index 1f86c05..965256e 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/encoding/UrlEncoderTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/encoding/UrlEncoderTest.java
@@ -17,12 +17,13 @@
package org.apache.wicket.util.encoding;
import org.apache.wicket.util.crypt.CharEncoding;
-import org.apache.wicket.util.encoding.UrlEncoder;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
@SuppressWarnings("javadoc")
-public class UrlEncoderTest extends Assert
+public class UrlEncoderTest
{
// starts with ä
@@ -40,7 +41,7 @@ public class UrlEncoderTest extends Assert
}
}
}
-
+
@Test
public void queryStringUnencoded() {
String unencoded = "azAZ09.-_~!$*,:@/";
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/file/FilesTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/file/FilesTest.java b/wicket-util/src/test/java/org/apache/wicket/util/file/FilesTest.java
index 75fdab8..2b9986b 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/file/FilesTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/file/FilesTest.java
@@ -16,22 +16,21 @@
*/
package org.apache.wicket.util.file;
-import static java.lang.System.currentTimeMillis;
-import static org.hamcrest.Matchers.lessThan;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.net.URL;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static java.lang.System.currentTimeMillis;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
/**
* Tests for {@link Files}
*/
-public class FilesTest extends Assert
+public class FilesTest
{
/**
* Tests for {@link Files#remove(java.io.File)}
@@ -41,59 +40,82 @@ public class FilesTest extends Assert
@Test
public void remove() throws IOException
{
- assertFalse("'null' files are not deleted.", Files.remove(null));
+ assertFalse(Files.remove(null), "'null' files are not deleted.");
- assertFalse("Non existing files are not deleted.", Files.remove(new File(
- "/somethingThatDoesntExistsOnMostMachines-111111111111111111111111111111")));
+ assertFalse(
+ Files.remove(new File(
+ "/somethingThatDoesntExistsOnMostMachines-111111111111111111111111111111")),
+ "Non existing files are not deleted.");
java.io.File file = getFile();
file.createNewFile();
- assertTrue("The just created file should exist!", file.isFile());
+ assertTrue(file.isFile(), "The just created file should exist!");
boolean removed = Files.remove(file);
- assertFalse("The just removed file should not exist!", file.exists());
- assertTrue("Files.remove(file) should remove the file", removed);
+ assertFalse(file.exists(), "The just removed file should not exist!");
+ assertTrue(removed, "Files.remove(file) should remove the file");
// try to remove non-existing file
removed = Files.remove(file);
- assertFalse("The just removed file should not exist!", file.exists());
- assertFalse("Files.remove(file) should not remove the file", removed);
+ assertFalse(file.exists(), "The just removed file should not exist!");
+ assertFalse(removed, "Files.remove(file) should not remove the file");
// try to remove a folder
java.io.File folder = getFolder();
Files.mkdirs(folder);
assertTrue(folder.isDirectory());
- assertFalse("Should not be able to delete a folder, even empty one.", Files.remove(folder));
- assertTrue("Should not be able to delete a folder.", Files.removeFolder(folder));
+ assertFalse(Files.remove(folder), "Should not be able to delete a folder, even empty one.");
+ assertTrue(Files.removeFolder(folder), "Should not be able to delete a folder.");
+ }
+
+ /**
+ * @return a reference to a file, without creating it !
+ * @throws IOException
+ */
+ private java.io.File getFile() throws IOException
+ {
+ return new java.io.File(System.getProperty("java.io.tmpdir"), "wicket-7.x-test-file");
+ }
+
+ /**
+ * @return a reference to a folder, without creating it !
+ */
+ private java.io.File getFolder()
+ {
+ File folder = new File(System.getProperty("java.io.tmpdir"), "wicket-7.x-test-folder");
+ return folder;
}
/**
- * WICKET-6236 - honoring the javadoc by putting a wait only after the 10th failed attempt to delete a file
+ * WICKET-6236 - honoring the javadoc by putting a wait only after the 10th failed attempt to
+ * delete a file
*/
@Test
- public void dontWaitTooMuchIfCantDelete(){
+ public void dontWaitTooMuchIfCantDelete()
+ {
java.io.File f = mock(java.io.File.class);
when(f.isFile()).thenReturn(true);
when(f.delete()).thenReturn(false);
long start = currentTimeMillis();
Files.remove(f);
long end = currentTimeMillis();
- assertThat(end - start, lessThan(5000l));
+ assertTrue((end - start) < 5000l);
}
-
/**
* Tests for {@link Files#removeFolder(java.io.File)}
- *
+ *
* @throws Exception
*/
@Test
public void removeFolder() throws Exception
{
- assertFalse("'null' folders are not deleted.", Files.removeFolder(null));
+ assertFalse(Files.removeFolder(null), "'null' folders are not deleted.");
- assertFalse("Non existing folders are not deleted.", Files.removeFolder(new File(
- "/somethingThatDoesntExistsOnMostMachines-111111111111111111111111111111")));
+ assertFalse(
+ Files.removeFolder(new File(
+ "/somethingThatDoesntExistsOnMostMachines-111111111111111111111111111111")),
+ "Non existing folders are not deleted.");
java.io.File folder = new File(System.getProperty("java.io.tmpdir"), "wicket-test-folder");
Files.mkdirs(folder);
@@ -102,35 +124,35 @@ public class FilesTest extends Assert
file.createNewFile();
assertTrue(file.exists());
- assertTrue("Should be able to delete a folder.", Files.removeFolder(folder));
+ assertTrue(Files.removeFolder(folder), "Should be able to delete a folder.");
}
/**
* Tests for {@link Files#removeAsync(java.io.File, IFileCleaner)}
- *
+ *
* @throws Exception
*/
@Test
- @Ignore // the test is unreliable on the CI server
+ @Disabled // the test is unreliable on the CI server
public void removeAsync() throws Exception
{
IFileCleaner fileCleaner = new FileCleaner();
- assertFalse("'null' files are not deleted.", Files.removeAsync(null, fileCleaner));
+ assertFalse(Files.removeAsync(null, fileCleaner), "'null' files are not deleted.");
File nonExistingFile = new File(
"/somethingThatDoesntExistsOnMostMachines-111111111111111111111111111111");
- assertTrue("Even non existing file are scheduled for deletion.",
- Files.removeFolderAsync(nonExistingFile, fileCleaner));
+ assertTrue(Files.removeFolderAsync(nonExistingFile, fileCleaner),
+ "Even non existing file are scheduled for deletion.");
assertFalse(nonExistingFile.exists());
java.io.File file = getFile();
file.createNewFile();
- assertTrue("The just created file should exist!", file.exists());
+ assertTrue(file.exists(), "The just created file should exist!");
assertTrue(file.isFile());
- assertTrue("The file is scheduled for deletion.", Files.removeAsync(file, fileCleaner));
+ assertTrue(Files.removeAsync(file, fileCleaner), "The file is scheduled for deletion.");
// remove the reference to the file to be deleted
// this way the FileCleaningTracker's ReferenceQueue will mark it as eligible for GC
@@ -149,26 +171,26 @@ public class FilesTest extends Assert
break;
}
}
- assertFalse("The file no longer exists", exists);
+ assertFalse(exists, "The file no longer exists");
}
/**
* Tests for {@link Files#removeFolderAsync(java.io.File, IFileCleaner)}
- *
+ *
* @throws Exception
*/
@Test
- @Ignore // the test is unreliable on the CI server
+ @Disabled // the test is unreliable on the CI server
public void removeFolderAsync() throws Exception
{
- assertFalse("'null' folders are not deleted.", Files.removeFolderAsync(null, null));
+ assertFalse(Files.removeFolderAsync(null, null), "'null' folders are not deleted.");
IFileCleaner fileCleaner = new FileCleaner();
File nonExistingFolder = new File(
"/somethingThatDoesntExistsOnMostMachines-111111111111111111111111111111");
- assertTrue("Even non existing folders are scheduled for deletion.",
- Files.removeFolderAsync(nonExistingFolder, fileCleaner));
+ assertTrue(Files.removeFolderAsync(nonExistingFolder, fileCleaner),
+ "Even non existing folders are scheduled for deletion.");
assertFalse(nonExistingFolder.exists());
java.io.File folder = getFolder();
@@ -178,8 +200,8 @@ public class FilesTest extends Assert
file.createNewFile();
assertTrue(file.exists());
- assertTrue("The folder is scheduled for deletion.",
- Files.removeFolderAsync(folder, fileCleaner));
+ assertTrue(Files.removeFolderAsync(folder, fileCleaner),
+ "The folder is scheduled for deletion.");
// remove the reference to the folder to be deleted
// this way the FileCleaningTracker's ReferenceQueue will mark it as eligible for GC
@@ -189,12 +211,12 @@ public class FilesTest extends Assert
System.gc();
Thread.sleep(5);
java.io.File newFolderReference = getFolder();
- assertFalse("The folder still exists", newFolderReference.exists());
+ assertFalse(newFolderReference.exists(), "The folder still exists");
}
/**
* WICKET-4509
- *
+ *
* @throws Exception
*/
@Test
@@ -202,25 +224,8 @@ public class FilesTest extends Assert
{
URL url = new URL("file:/file%20with%20whitespace");
- assertEquals( java.io.File.separator + "file with whitespace", Files.getLocalFileFromUrl(url).getPath());
- }
-
- /**
- * @return a reference to a folder, without creating it !
- */
- private java.io.File getFolder()
- {
- File folder = new File(System.getProperty("java.io.tmpdir"), "wicket-7.x-test-folder");
- return folder;
- }
-
- /**
- * @return a reference to a file, without creating it !
- * @throws IOException
- */
- private java.io.File getFile() throws IOException
- {
- return new java.io.File(System.getProperty("java.io.tmpdir"), "wicket-7.x-test-file");
+ assertEquals(java.io.File.separator + "file with whitespace",
+ Files.getLocalFileFromUrl(url).getPath());
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/file/WebXmlFileTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/file/WebXmlFileTest.java b/wicket-util/src/test/java/org/apache/wicket/util/file/WebXmlFileTest.java
index 4f76c6c..9e16f1a 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/file/WebXmlFileTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/file/WebXmlFileTest.java
@@ -16,20 +16,20 @@
*/
package org.apache.wicket.util.file;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
+import org.junit.jupiter.api.Test;
+import org.xml.sax.SAXException;
import javax.xml.parsers.ParserConfigurationException;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.xml.sax.SAXException;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
/**
*
*/
-public class WebXmlFileTest extends Assert
+public class WebXmlFileTest
{
/**
*
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/io/ConnectionsTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/io/ConnectionsTest.java b/wicket-util/src/test/java/org/apache/wicket/util/io/ConnectionsTest.java
index ef95539..8608ad4 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/io/ConnectionsTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/io/ConnectionsTest.java
@@ -16,21 +16,16 @@
*/
package org.apache.wicket.util.io;
-import static org.junit.Assert.*;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.notNullValue;
+import org.apache.wicket.util.time.Time;
+import org.junit.jupiter.api.Test;
import java.net.URL;
-import org.apache.wicket.util.SlowTests;
-import org.apache.wicket.util.time.Time;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
@SuppressWarnings("javadoc")
-@Category(SlowTests.class)
-public class ConnectionsTest
+public class ConnectionsTest
{
/**
* https://issues.apache.org/jira/browse/WICKET-5838
@@ -40,7 +35,7 @@ public class ConnectionsTest
{
URL url = new URL("http://wicket.apache.org/learn/books/wia.png");
Time lastModified = Connections.getLastModified(url);
- assertThat(lastModified, is(notNullValue()));
- assertThat(lastModified.getMilliseconds(), is(not(0L)));
+ assertNotNull(lastModified);
+ assertNotEquals(lastModified.getMilliseconds(), 0L);
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/io/LastModifiedTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/io/LastModifiedTest.java b/wicket-util/src/test/java/org/apache/wicket/util/io/LastModifiedTest.java
index 866be29..481ef87 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/io/LastModifiedTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/io/LastModifiedTest.java
@@ -16,19 +16,20 @@
*/
package org.apache.wicket.util.io;
+import org.apache.wicket.util.file.Files;
+import org.apache.wicket.util.time.Time;
+import org.junit.jupiter.api.Test;
+
import java.io.File;
import java.io.IOException;
import java.net.URL;
-import org.apache.wicket.util.file.Files;
-import org.apache.wicket.util.time.Time;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
/**
* @author pertl
*/
-public class LastModifiedTest extends Assert
+public class LastModifiedTest
{
private static final String FILE = "/some/folder/file.jar";
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/io/XmlReaderTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/io/XmlReaderTest.java b/wicket-util/src/test/java/org/apache/wicket/util/io/XmlReaderTest.java
index 1cbb1d6..e3965c1 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/io/XmlReaderTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/io/XmlReaderTest.java
@@ -16,13 +16,15 @@
*/
package org.apache.wicket.util.io;
+import org.junit.jupiter.api.Test;
+
import java.io.BufferedReader;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
@SuppressWarnings("javadoc")
-public class XmlReaderTest extends Assert
+public class XmlReaderTest
{
@Test
public void readHtmlFileWithoutAnyTags() throws Exception
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/lang/ArgsTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/lang/ArgsTest.java b/wicket-util/src/test/java/org/apache/wicket/util/lang/ArgsTest.java
index 7f0a3a8..c70bc88 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/lang/ArgsTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/lang/ArgsTest.java
@@ -16,23 +16,19 @@
*/
package org.apache.wicket.util.lang;
+import org.junit.jupiter.api.Test;
+
import java.util.Collection;
import java.util.Collections;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import static org.junit.jupiter.api.Assertions.assertThrows;
/**
* Tests for {@link Args}
*/
public class ArgsTest
{
- /**
- * A rule for expecting exceptions
- */
- @Rule
- public ExpectedException thrown = ExpectedException.none();
+
/**
* Test for {@link Args#notEmpty(java.util.Collection, String, Object...)}
@@ -40,10 +36,10 @@ public class ArgsTest
@Test
public void notNullCollection()
{
- thrown.expect(IllegalArgumentException.class);
- thrown.expectMessage("Collection 'col' may not be null or empty");
+ assertThrows(IllegalArgumentException.class, () -> {
+ Args.notEmpty((Collection<?>)null, "col");
+ });
- Args.notEmpty((Collection<?>)null, "col");
}
/**
@@ -52,10 +48,9 @@ public class ArgsTest
@Test
public void notEmptyCollection()
{
- thrown.expect(IllegalArgumentException.class);
- thrown.expectMessage("Collection 'col' may not be null or empty");
-
- Args.notEmpty(Collections.emptySet(), "col");
+ assertThrows(IllegalArgumentException.class, () -> {
+ Args.notEmpty(Collections.emptySet(), "col");
+ });
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/lang/BytesTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/lang/BytesTest.java b/wicket-util/src/test/java/org/apache/wicket/util/lang/BytesTest.java
index bfa6b93..13d010b 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/lang/BytesTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/lang/BytesTest.java
@@ -16,18 +16,19 @@
*/
package org.apache.wicket.util.lang;
+import org.apache.wicket.util.string.StringValueConversionException;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
import java.util.Locale;
-import org.apache.wicket.util.string.StringValueConversionException;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
/**
* Tests the <code>Bytes</code> class.
*/
-public class BytesTest extends Assert
+public class BytesTest
{
/**
* Backup of the default locale.
@@ -38,13 +39,14 @@ public class BytesTest extends Assert
/**
* Save the default locale.
*/
- @Before
+ @BeforeEach
public void before()
{
originalFormatLocale = Locale.getDefault(Locale.Category.FORMAT);
originalDefaultLocale = Locale.getDefault();
- // these tests run in US locale for formatting and German default locale - they should still work with split
+ // these tests run in US locale for formatting and German default locale - they should still
+ // work with split
// locale.
Locale.setDefault(Locale.GERMANY);
Locale.setDefault(Locale.Category.FORMAT, Locale.US);
@@ -53,7 +55,7 @@ public class BytesTest extends Assert
/**
* Restore the default locale.
*/
- @After
+ @AfterEach
public void after()
{
Locale.setDefault(originalDefaultLocale);
@@ -76,21 +78,21 @@ public class BytesTest extends Assert
assertEquals(1024L * 1024 * 1024, Bytes.gigabytes(1).bytes());
assertEquals(1024L * 1024 * 1024 * 1024, Bytes.terabytes(1).bytes());
- assertEquals(1.5, Bytes.bytes(1536).kilobytes(), 0);
- assertEquals(1.0, Bytes.kilobytes(1).kilobytes(), 0);
- assertEquals(0.5, Bytes.bytes(512).kilobytes(), 0);
+ assertEquals(1.5, Bytes.bytes(1536).kilobytes());
+ assertEquals(1.0, Bytes.kilobytes(1).kilobytes());
+ assertEquals(0.5, Bytes.bytes(512).kilobytes());
- assertEquals(1.5, Bytes.kilobytes(1536).megabytes(), 0);
- assertEquals(1.0, Bytes.megabytes(1).megabytes(), 0);
- assertEquals(0.5, Bytes.kilobytes(512).megabytes(), 0);
+ assertEquals(1.5, Bytes.kilobytes(1536).megabytes());
+ assertEquals(1.0, Bytes.megabytes(1).megabytes());
+ assertEquals(0.5, Bytes.kilobytes(512).megabytes());
- assertEquals(1.5, Bytes.megabytes(1536).gigabytes(), 0);
- assertEquals(1.0, Bytes.gigabytes(1).gigabytes(), 0);
- assertEquals(0.5, Bytes.megabytes(512).gigabytes(), 0);
+ assertEquals(1.5, Bytes.megabytes(1536).gigabytes());
+ assertEquals(1.0, Bytes.gigabytes(1).gigabytes());
+ assertEquals(0.5, Bytes.megabytes(512).gigabytes());
- assertEquals(1.5, Bytes.gigabytes(1536).terabytes(), 0);
- assertEquals(1.0, Bytes.terabytes(1).terabytes(), 0);
- assertEquals(0.5, Bytes.gigabytes(512).terabytes(), 0);
+ assertEquals(1.5, Bytes.gigabytes(1536).terabytes());
+ assertEquals(1.0, Bytes.terabytes(1).terabytes());
+ assertEquals(0.5, Bytes.gigabytes(512).terabytes());
}
/**
@@ -160,10 +162,13 @@ public class BytesTest extends Assert
/**
* Negative values are not supported
*/
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void negative()
{
- Bytes.bytes(-1);
- fail("Bytes should not support negative values!");
+ assertThrows(IllegalArgumentException.class, () -> {
+ Bytes.bytes(-1);
+ fail("Bytes should not support negative values!");
+ });
+
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/lang/ClassesTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/lang/ClassesTest.java b/wicket-util/src/test/java/org/apache/wicket/util/lang/ClassesTest.java
index 80e7d7f..763f785 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/lang/ClassesTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/lang/ClassesTest.java
@@ -16,16 +16,17 @@
*/
package org.apache.wicket.util.lang;
+import org.junit.jupiter.api.Test;
+
import java.text.SimpleDateFormat;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* @since 1.5.8
*/
@SuppressWarnings({"javadoc", "serial"})
-public class ClassesTest extends Assert
+public class ClassesTest
{
@Test
public void simpleName() throws Exception
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/lang/NumbersTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/lang/NumbersTest.java b/wicket-util/src/test/java/org/apache/wicket/util/lang/NumbersTest.java
index 9b08c3a..ba15a76 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/lang/NumbersTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/lang/NumbersTest.java
@@ -16,17 +16,18 @@
*/
package org.apache.wicket.util.lang;
+import org.junit.jupiter.api.Test;
+
import java.math.BigDecimal;
import java.math.BigInteger;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* @since 1.5.8
*/
@SuppressWarnings("javadoc")
-public class NumbersTest extends Assert
+public class NumbersTest
{
/**
* See WICKET-4696 for Float and Double minimum value
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/lang/ObjectsTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/lang/ObjectsTest.java b/wicket-util/src/test/java/org/apache/wicket/util/lang/ObjectsTest.java
index dc158e8..32fe8f1 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/lang/ObjectsTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/lang/ObjectsTest.java
@@ -16,16 +16,17 @@
*/
package org.apache.wicket.util.lang;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests the Objects class.
*
* @author Martijn Dashorst
*/
-public class ObjectsTest extends Assert
+public class ObjectsTest
{
/**
* Test method for 'org.apache.wicket.util.lang.Objects.equal(Object, Object)'
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/lang/PackagesTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/lang/PackagesTest.java b/wicket-util/src/test/java/org/apache/wicket/util/lang/PackagesTest.java
index 7b9be38..35447b3 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/lang/PackagesTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/lang/PackagesTest.java
@@ -16,14 +16,15 @@
*/
package org.apache.wicket.util.lang;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* @since 1.5.5
*/
@SuppressWarnings("javadoc")
-public class PackagesTest extends Assert
+public class PackagesTest
{
@Test
public void absolutePath0() throws Exception
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/lang/PrimitivesTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/lang/PrimitivesTest.java b/wicket-util/src/test/java/org/apache/wicket/util/lang/PrimitivesTest.java
index 9f79952..7c7ca47 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/lang/PrimitivesTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/lang/PrimitivesTest.java
@@ -16,9 +16,11 @@
*/
package org.apache.wicket.util.lang;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests the <code>Primitives</code> class. The code for testing the hashcode is taken from the
@@ -28,7 +30,7 @@ import org.junit.Test;
* @author Martijn Dashorst
* @author <a href="mailto:pholser@yahoo.com">Paul Holser</a>
*/
-public class PrimitivesTest extends Assert
+public class PrimitivesTest
{
/**
* Test stub for testing the hashcode function.
@@ -66,7 +68,7 @@ public class PrimitivesTest extends Assert
/**
* Creates the objects for the tests.
*/
- @Before
+ @BeforeEach
public void before()
{
eq1 = new HashCodeObject(26);
@@ -83,10 +85,10 @@ public class PrimitivesTest extends Assert
@Test
public final void hashCodeContract()
{
- assertEquals("1st vs. 2nd", eq1.hashCode(), eq2.hashCode());
- assertEquals("1st vs. 3rd", eq1.hashCode(), eq3.hashCode());
- assertEquals("2nd vs. 3rd", eq2.hashCode(), eq3.hashCode());
- assertTrue("1st vs. neq", eq1.hashCode() != neq.hashCode());
+ assertEquals(eq1.hashCode(), eq2.hashCode(), "1st vs. 2nd");
+ assertEquals(eq1.hashCode(), eq3.hashCode(), "1st vs. 3rd");
+ assertEquals(eq2.hashCode(), eq3.hashCode(), "2nd vs. 3rd");
+ assertTrue(eq1.hashCode() != neq.hashCode(), "1st vs. neq");
}
/**
@@ -104,10 +106,10 @@ public class PrimitivesTest extends Assert
for (int i = 0; i < 2; ++i)
{
- assertEquals("1st equal instance", eq1Hash, eq1.hashCode());
- assertEquals("2nd equal instance", eq2Hash, eq2.hashCode());
- assertEquals("3rd equal instance", eq3Hash, eq3.hashCode());
- assertEquals("not-equal instance", neqHash, neq.hashCode());
+ assertEquals(eq1Hash, eq1.hashCode(), "1st equal instance");
+ assertEquals(eq2Hash, eq2.hashCode(), "2nd equal instance");
+ assertEquals(eq3Hash, eq3.hashCode(), "3rd equal instance");
+ assertEquals(neqHash, neq.hashCode(), "not-equal instance");
}
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/parse/metapattern/MetaPatternTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/parse/metapattern/MetaPatternTest.java b/wicket-util/src/test/java/org/apache/wicket/util/parse/metapattern/MetaPatternTest.java
index 04ff836..6a4187c 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/parse/metapattern/MetaPatternTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/parse/metapattern/MetaPatternTest.java
@@ -16,22 +16,22 @@
*/
package org.apache.wicket.util.parse.metapattern;
-
-import java.util.regex.Matcher;
-
import org.apache.wicket.util.parse.metapattern.parsers.CommaSeparatedVariableParser;
import org.apache.wicket.util.parse.metapattern.parsers.IntegerVariableAssignmentParser;
import org.apache.wicket.util.parse.metapattern.parsers.TagNameParser;
import org.apache.wicket.util.parse.metapattern.parsers.VariableAssignmentParser;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import java.util.regex.Matcher;
+
+import static org.junit.jupiter.api.Assertions.*;
/**
* Test cases for this object
*
* @author Jonathan Locke
*/
-public final class MetaPatternTest extends Assert
+public final class MetaPatternTest
{
/**
*
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/parse/metapattern/parsers/VariableAssignmentParserTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/parse/metapattern/parsers/VariableAssignmentParserTest.java b/wicket-util/src/test/java/org/apache/wicket/util/parse/metapattern/parsers/VariableAssignmentParserTest.java
index 9ff73b9..8622360 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/parse/metapattern/parsers/VariableAssignmentParserTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/parse/metapattern/parsers/VariableAssignmentParserTest.java
@@ -16,13 +16,14 @@
*/
package org.apache.wicket.util.parse.metapattern.parsers;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* @since 1.5.8
*/
-public class VariableAssignmentParserTest extends Assert
+public class VariableAssignmentParserTest
{
/**
* Tests parsing of attribute names with and without namespaces
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/resource/ResourceUtilsTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/resource/ResourceUtilsTest.java b/wicket-util/src/test/java/org/apache/wicket/util/resource/ResourceUtilsTest.java
index 4174444..89e935d 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/resource/ResourceUtilsTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/resource/ResourceUtilsTest.java
@@ -16,17 +16,15 @@
*/
package org.apache.wicket.util.resource;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
+import org.junit.jupiter.api.Test;
import java.util.Locale;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
/** */
-public class ResourceUtilsTest extends Assert
+public class ResourceUtilsTest
{
/**
* https://issues.apache.org/jira/browse/WICKET-5706
@@ -37,27 +35,27 @@ public class ResourceUtilsTest extends Assert
ResourceUtils.PathLocale pathLocale;
pathLocale = ResourceUtils.getLocaleFromFilename("some.ext");
- assertThat(pathLocale.path, is(equalTo("some.ext")));
- assertThat(pathLocale.locale, is(nullValue()));
+ assertEquals(pathLocale.path, "some.ext");
+ assertNull(pathLocale.locale);
pathLocale = ResourceUtils.getLocaleFromFilename("some.min.ext");
- assertThat(pathLocale.path, is(equalTo("some.min.ext")));
- assertThat(pathLocale.locale, is(nullValue()));
+ assertEquals(pathLocale.path, "some.min.ext");
+ assertNull(pathLocale.locale);
pathLocale = ResourceUtils.getLocaleFromFilename("some.min_en.ext");
- assertThat(pathLocale.path, is(equalTo("some.min.ext")));
- assertThat(pathLocale.locale, is(Locale.ENGLISH));
+ assertEquals(pathLocale.path, "some.min.ext");
+ assertEquals(pathLocale.locale, Locale.ENGLISH);
pathLocale = ResourceUtils.getLocaleFromFilename("some_fr_CA.min.ext");
- assertThat(pathLocale.path, is(equalTo("some.min.ext")));
- assertThat(pathLocale.locale, is(Locale.CANADA_FRENCH));
+ assertEquals(pathLocale.path, "some.min.ext");
+ assertEquals(pathLocale.locale, Locale.CANADA_FRENCH);
String localeVariant = "blah";
pathLocale = ResourceUtils
.getLocaleFromFilename("some_fr_CA_" + localeVariant + ".min.ext");
- assertThat(pathLocale.path, is(equalTo("some.min.ext")));
- assertThat(pathLocale.locale.getLanguage(), is("fr"));
- assertThat(pathLocale.locale.getCountry(), is("CA"));
- assertThat(pathLocale.locale.getVariant(), is(localeVariant));
+ assertEquals(pathLocale.path, "some.min.ext");
+ assertEquals(pathLocale.locale.getLanguage(), "fr");
+ assertEquals(pathLocale.locale.getCountry(), "CA");
+ assertEquals(pathLocale.locale.getVariant(), localeVariant);
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/size/BytesTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/size/BytesTest.java b/wicket-util/src/test/java/org/apache/wicket/util/size/BytesTest.java
index 3f74671..cd9b4bd 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/size/BytesTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/size/BytesTest.java
@@ -16,22 +16,23 @@
*/
package org.apache.wicket.util.size;
+import org.apache.wicket.util.lang.Bytes;
+import org.apache.wicket.util.string.StringValueConversionException;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import java.util.Locale;
-import org.apache.wicket.util.lang.Bytes;
-import org.apache.wicket.util.string.StringValueConversionException;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Test cases for this object
*
* @author Jonathan Locke
*/
-public final class BytesTest extends Assert
+public final class BytesTest
{
/**
* Backup of the default locale.
@@ -41,7 +42,7 @@ public final class BytesTest extends Assert
/**
* Save the default locale.
*/
- @Before
+ @BeforeEach
public void before()
{
defaultLocale = Locale.getDefault(Locale.Category.FORMAT);
@@ -50,7 +51,7 @@ public final class BytesTest extends Assert
/**
* Restore the default locale.
*/
- @After
+ @AfterEach
public void after()
{
Locale.setDefault(Locale.Category.FORMAT, defaultLocale);
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/string/AppendingStringBufferTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/string/AppendingStringBufferTest.java b/wicket-util/src/test/java/org/apache/wicket/util/string/AppendingStringBufferTest.java
index a7d8bc7..aca03fe 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/string/AppendingStringBufferTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/string/AppendingStringBufferTest.java
@@ -16,11 +16,14 @@
*/
package org.apache.wicket.util.string;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
@SuppressWarnings("javadoc")
-public class AppendingStringBufferTest extends Assert
+public class AppendingStringBufferTest
{
@Test
public void append()
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/string/PrependingStringBufferTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/string/PrependingStringBufferTest.java b/wicket-util/src/test/java/org/apache/wicket/util/string/PrependingStringBufferTest.java
index 191291c..4363ed2 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/string/PrependingStringBufferTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/string/PrependingStringBufferTest.java
@@ -16,13 +16,15 @@
*/
package org.apache.wicket.util.string;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* @author jcompagner
*/
-public class PrependingStringBufferTest extends Assert
+public class PrependingStringBufferTest
{
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/string/StringListTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/string/StringListTest.java b/wicket-util/src/test/java/org/apache/wicket/util/string/StringListTest.java
index dfe46ab..8299d35 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/string/StringListTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/string/StringListTest.java
@@ -16,17 +16,18 @@
*/
package org.apache.wicket.util.string;
+import org.junit.jupiter.api.Test;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
/**
* Tests the <code>StringList</code> class.
*/
-public class StringListTest extends Assert
+public class StringListTest
{
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/string/StringValueTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/string/StringValueTest.java b/wicket-util/src/test/java/org/apache/wicket/util/string/StringValueTest.java
index 81c002f..527b3ad 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/string/StringValueTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/string/StringValueTest.java
@@ -16,15 +16,16 @@
*/
package org.apache.wicket.util.string;
-import java.util.Locale;
-
import org.apache.wicket.util.time.Duration;
import org.apache.wicket.util.time.Time;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import java.util.Locale;
+
+import static org.junit.jupiter.api.Assertions.*;
@SuppressWarnings("javadoc")
-public class StringValueTest extends Assert
+public class StringValueTest
{
/**
* WICKET-5359 equals
@@ -32,12 +33,12 @@ public class StringValueTest extends Assert
@Test
public void equals()
{
- assertFalse(StringValue.valueOf("bla", Locale.FRANCE).equals(
- StringValue.valueOf("bla", Locale.CANADA)));
- assertTrue(StringValue.valueOf("bla", Locale.FRANCE).equals(
- StringValue.valueOf("bla", Locale.FRANCE)));
- assertFalse(StringValue.valueOf("bla", Locale.FRANCE).equals(
- StringValue.valueOf("blo", Locale.FRANCE)));
+ assertFalse(StringValue.valueOf("bla", Locale.FRANCE)
+ .equals(StringValue.valueOf("bla", Locale.CANADA)));
+ assertTrue(StringValue.valueOf("bla", Locale.FRANCE)
+ .equals(StringValue.valueOf("bla", Locale.FRANCE)));
+ assertFalse(StringValue.valueOf("bla", Locale.FRANCE)
+ .equals(StringValue.valueOf("blo", Locale.FRANCE)));
}
/**
@@ -125,12 +126,8 @@ public class StringValueTest extends Assert
assertNull(sv.toOptional(String[].class));
}
- static enum TestEnum {
- FOO, BAR, BAZ
- }
-
@Test
- public void enums()
+ public void enums()
{
assertEquals(TestEnum.FOO, new StringValue("FOO").toEnum(TestEnum.class));
assertEquals(TestEnum.FOO, new StringValue("FOO").toEnum(TestEnum.BAR));
@@ -143,15 +140,26 @@ public class StringValueTest extends Assert
assertNull(new StringValue(null).toOptionalEnum(TestEnum.class));
}
- @Test(expected = StringValueConversionException.class)
+ @Test
public void failingEnum() throws Exception
{
- new StringValue("camelot").toEnum(TestEnum.class);
+
+ assertThrows(StringValueConversionException.class, () -> {
+ new StringValue("camelot").toEnum(TestEnum.class);
+ });
+
}
- @Test(expected = StringValueConversionException.class)
+ @Test
public void failingEnum2() throws Exception
{
- new StringValue("camelot").toOptionalEnum(TestEnum.class);
+ assertThrows(StringValueConversionException.class, () -> {
+ new StringValue("camelot").toOptionalEnum(TestEnum.class);
+ });
+
+ }
+
+ static enum TestEnum {
+ FOO, BAR, BAZ
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/string/StringsTest.java
----------------------------------------------------------------------
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 dc5fb8e..bb0fa39 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
@@ -16,13 +16,13 @@
*/
package org.apache.wicket.util.string;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
import java.io.UnsupportedEncodingException;
import java.util.Arrays;
import java.util.List;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
@SuppressWarnings("javadoc")
public class StringsTest
@@ -187,8 +187,10 @@ public class StringsTest
// The escaped unicode is ����������"
assertEquals("Çüéâäàåçêë",
- Strings.escapeMarkup("\u00c7\u00fc\u00e9\u00e2\u00e4\u00e0\u00e5\u00e7\u00ea\u00eb",
- false, true).toString());
+ Strings
+ .escapeMarkup("\u00c7\u00fc\u00e9\u00e2\u00e4\u00e0\u00e5\u00e7\u00ea\u00eb", false,
+ true)
+ .toString());
}
@@ -256,10 +258,13 @@ public class StringsTest
assertTrue(Strings.isTrue("1"));
}
- @Test(expected = StringValueConversionException.class)
+ @Test
public void invalidIsTrue()
{
- Strings.isTrue("foo");
+ assertThrows(StringValueConversionException.class, () -> {
+ Strings.isTrue("foo");
+ });
+
}
@Test
@@ -338,10 +343,12 @@ public class StringsTest
assertEquals(Boolean.TRUE, Strings.toBoolean("1"));
}
- @Test(expected = StringValueConversionException.class)
+ @Test
public void invalidToBoolean()
{
- Strings.toBoolean("waar");
+ assertThrows(StringValueConversionException.class, () -> {
+ Strings.toBoolean("waar");
+ });
}
@Test
@@ -351,22 +358,30 @@ public class StringsTest
assertEquals('a', Strings.toChar("a"));
}
- @Test(expected = StringValueConversionException.class)
+ @Test
public void invalidToChar1()
{
- Strings.toChar("");
+ assertThrows(StringValueConversionException.class, () -> {
+ Strings.toChar("");
+ });
+
}
- @Test(expected = StringValueConversionException.class)
+ @Test
public void invalidToChar2()
{
- Strings.toChar(null);
+
+ assertThrows(StringValueConversionException.class, () -> {
+ Strings.toChar(null);
+ });
}
- @Test(expected = StringValueConversionException.class)
+ @Test
public void invalidToChar3()
{
- Strings.toChar("aa");
+ assertThrows(StringValueConversionException.class, () -> {
+ Strings.toChar("aa");
+ });
}
@Test
@@ -386,9 +401,8 @@ public class StringsTest
// WICKET-4837
assertEquals(
"<p><a href=\"mailto:john@doe.com\">john@doe.com</a><br/><a href=\"http://apache.wicket.org\">http://apache.wicket.org</a></p>",
- Strings
- .toMultilineMarkup(
- "<a href=\"mailto:john@doe.com\">john@doe.com</a>\n<a href=\"http://apache.wicket.org\">http://apache.wicket.org</a>")
+ Strings.toMultilineMarkup(
+ "<a href=\"mailto:john@doe.com\">john@doe.com</a>\n<a href=\"http://apache.wicket.org\">http://apache.wicket.org</a>")
.toString());
assertEquals("<p>abc</p><p>def</p><p>ghi</p>",
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/string/interpolator/VariableInterpolatorTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/string/interpolator/VariableInterpolatorTest.java b/wicket-util/src/test/java/org/apache/wicket/util/string/interpolator/VariableInterpolatorTest.java
index 67e4cf8..8ee5523 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/string/interpolator/VariableInterpolatorTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/string/interpolator/VariableInterpolatorTest.java
@@ -16,18 +16,20 @@
*/
package org.apache.wicket.util.string.interpolator;
+import org.junit.jupiter.api.Test;
+
import java.util.HashMap;
import java.util.Map;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* Tests {@link MapVariableInterpolator}
*
* @author <a href="mailto:jbq@apache.org">Jean-Baptiste Quenot</a>
*/
-public class VariableInterpolatorTest extends Assert
+public class VariableInterpolatorTest
{
/**
*
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/time/DurationTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/time/DurationTest.java b/wicket-util/src/test/java/org/apache/wicket/util/time/DurationTest.java
index 47f3c4a..1ff1460 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/time/DurationTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/time/DurationTest.java
@@ -16,16 +16,15 @@
*/
package org.apache.wicket.util.time;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import org.apache.wicket.util.string.StringValueConversionException;
+import org.junit.jupiter.api.Test;
import java.text.NumberFormat;
import java.util.Locale;
import java.util.Locale.Category;
-import org.apache.wicket.util.string.StringValueConversionException;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Test cases for this object
@@ -84,8 +83,8 @@ public final class DurationTest
{
Locale.setDefault(Locale.US);
Locale.setDefault(Category.FORMAT, Locale.GERMANY);
- assertEquals("should take formatting locale into account", "1,5 minutes", Duration.seconds(90)
- .toString());
+ assertEquals("1,5 minutes", Duration.seconds(90)
+ .toString(), "should take formatting locale into account");
} finally
{
Locale.setDefault(oldDefaultLocale);
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/time/TimeFrameTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/time/TimeFrameTest.java b/wicket-util/src/test/java/org/apache/wicket/util/time/TimeFrameTest.java
index a2fe4ef..9b23927 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/time/TimeFrameTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/time/TimeFrameTest.java
@@ -16,13 +16,14 @@
*/
package org.apache.wicket.util.time;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
/**
* @author v857829
*/
-public class TimeFrameTest extends Assert
+public class TimeFrameTest
{
private final TimeOfDay three = TimeOfDay.time(3, 0, TimeOfDay.PM);
@@ -38,7 +39,7 @@ public class TimeFrameTest extends Assert
public void eachDay()
{
ITimeFrameSource test = TimeFrame.eachDay(three, five);
- Assert.assertTrue(test.getTimeFrame().contains(Time.valueOf(four)));
+ assertTrue(test.getTimeFrame().contains(Time.valueOf(four)));
}
/**
@@ -50,8 +51,8 @@ public class TimeFrameTest extends Assert
public void valueOfTimeDuration()
{
TimeFrame test = TimeFrame.valueOf(Time.valueOf(three), Duration.minutes(60));
- Assert.assertEquals(test.getStart(), Time.valueOf(three));
- Assert.assertEquals(test.getEnd(), Time.valueOf(four));
+ assertEquals(test.getStart(), Time.valueOf(three));
+ assertEquals(test.getEnd(), Time.valueOf(four));
}
/**
@@ -62,7 +63,7 @@ public class TimeFrameTest extends Assert
public void contains()
{
TimeFrame test = TimeFrame.valueOf(Time.valueOf(three), Duration.minutes(70));
- Assert.assertTrue(test.contains(Time.valueOf(four)));
+ assertTrue(test.contains(Time.valueOf(four)));
}
/**
@@ -77,10 +78,10 @@ public class TimeFrameTest extends Assert
TimeFrame test2 = TimeFrame.valueOf(Time.valueOf(four), Duration.minutes(50));
TimeFrame test3 = TimeFrame.valueOf(Time.valueOf(four), Time.valueOf(five));
TimeFrame test4 = TimeFrame.valueOf(Time.valueOf(three), Duration.minutes(20));
- Assert.assertTrue(test.overlaps(test2));
- Assert.assertTrue(test3.overlaps(test2));
- Assert.assertTrue(test.overlaps(test3));
- Assert.assertFalse(test4.overlaps(test3));
+ assertTrue(test.overlaps(test2));
+ assertTrue(test3.overlaps(test2));
+ assertTrue(test.overlaps(test3));
+ assertFalse(test4.overlaps(test3));
}
/**
@@ -92,8 +93,8 @@ public class TimeFrameTest extends Assert
TimeFrame test = TimeFrame.valueOf(Time.valueOf(three), Duration.minutes(60));
TimeFrame test2 = TimeFrame.valueOf(Time.valueOf(three), Time.valueOf(four));
TimeFrame test3 = TimeFrame.valueOf(Time.valueOf(three), Duration.minutes(59));
- Assert.assertEquals(test, test2);
- Assert.assertNotSame(test2, test3);
+ assertEquals(test, test2);
+ assertNotSame(test2, test3);
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/time/TimeMapTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/time/TimeMapTest.java b/wicket-util/src/test/java/org/apache/wicket/util/time/TimeMapTest.java
index 17e503a..508f2ff 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/time/TimeMapTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/time/TimeMapTest.java
@@ -16,20 +16,21 @@
*/
package org.apache.wicket.util.time;
+import org.junit.jupiter.api.Test;
import java.text.ParseException;
import java.util.GregorianCalendar;
import java.util.Locale;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
/**
* Test cases for this object
*
* @author Jonathan Locke
*/
-public final class TimeMapTest extends Assert
+public final class TimeMapTest
{
/**
*
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/time/TimeOfDayTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/time/TimeOfDayTest.java b/wicket-util/src/test/java/org/apache/wicket/util/time/TimeOfDayTest.java
index b4e3a17..e7cea80 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/time/TimeOfDayTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/time/TimeOfDayTest.java
@@ -16,15 +16,17 @@
*/
package org.apache.wicket.util.time;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Test cases for {@link TimeOfDay}.
*
* @author Jonathan Locke
*/
-public final class TimeOfDayTest extends Assert
+public final class TimeOfDayTest
{
/**
*
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/time/TimeTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/time/TimeTest.java b/wicket-util/src/test/java/org/apache/wicket/util/time/TimeTest.java
index b13b745..5593ed0 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/time/TimeTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/time/TimeTest.java
@@ -16,15 +16,15 @@
*/
package org.apache.wicket.util.time;
+import org.junit.jupiter.api.Test;
import java.text.ParseException;
import java.util.Calendar;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
@SuppressWarnings("javadoc")
-public final class TimeTest extends Assert
+public final class TimeTest
{
@Test
public void test() throws ParseException
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/value/LongValueTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/value/LongValueTest.java b/wicket-util/src/test/java/org/apache/wicket/util/value/LongValueTest.java
index fa5158f..b5c8e5b 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/value/LongValueTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/value/LongValueTest.java
@@ -16,11 +16,9 @@
*/
package org.apache.wicket.util.value;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
+import org.junit.jupiter.api.Test;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
/**
* {@link LongValue} tests
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/value/ValueMapTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/value/ValueMapTest.java b/wicket-util/src/test/java/org/apache/wicket/util/value/ValueMapTest.java
index 2251fad..2b5671b 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/value/ValueMapTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/value/ValueMapTest.java
@@ -18,14 +18,17 @@ package org.apache.wicket.util.value;
import org.apache.wicket.util.time.Duration;
import org.apache.wicket.util.time.Time;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* @author jcompagner
* @author Doug Donohoe
*/
-public class ValueMapTest extends Assert
+public class ValueMapTest
{
/**
* @throws Exception
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/visit/AllVisitFilterTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/visit/AllVisitFilterTest.java b/wicket-util/src/test/java/org/apache/wicket/util/visit/AllVisitFilterTest.java
index fbcf96d..f286d46 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/visit/AllVisitFilterTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/visit/AllVisitFilterTest.java
@@ -16,15 +16,16 @@
*/
package org.apache.wicket.util.visit;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Test for {@link IVisitFilter#ANY}.
*
* @since 1.5.7
*/
-public class AllVisitFilterTest extends Assert
+public class AllVisitFilterTest
{
/**
* @throws Exception
http://git-wip-us.apache.org/repos/asf/wicket/blob/978ea5cb/wicket-util/src/test/java/org/apache/wicket/util/visit/ClassVisitFilterTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/visit/ClassVisitFilterTest.java b/wicket-util/src/test/java/org/apache/wicket/util/visit/ClassVisitFilterTest.java
index 01894c4..e683622 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/visit/ClassVisitFilterTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/visit/ClassVisitFilterTest.java
@@ -16,15 +16,17 @@
*/
package org.apache.wicket.util.visit;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Test for {@link ClassVisitFilter}.
*
* @since 1.5.7
*/
-public class ClassVisitFilterTest extends Assert
+public class ClassVisitFilterTest
{
/**
* @throws Exception