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 0d91b6d94b ISIS-2297: migrate RO applib to JUnit5
0d91b6d94b is described below
commit 0d91b6d94bc5d49f564e3b995886d89d30804cc2
Author: Andi Huber <[email protected]>
AuthorDate: Mon Nov 14 16:30:23 2022 +0100
ISIS-2297: migrate RO applib to JUnit5
---
viewers/restfulobjects/applib/pom.xml | 2 +-
...resentationTest_arrayGet_arraySetElementAt.java | 51 ++++++++++++---------
.../JsonRepresentationTest_asInputStream.java | 8 ++--
.../applib/JsonRepresentationTest_getArray.java | 10 ++---
.../JsonRepresentationTest_getBigDecimal.java | 51 +++++++++++----------
.../JsonRepresentationTest_getBigInteger.java | 52 +++++++++++-----------
.../applib/JsonRepresentationTest_getBoolean.java | 10 ++---
.../applib/JsonRepresentationTest_getDouble.java | 15 +++----
.../applib/JsonRepresentationTest_getInt.java | 10 ++---
.../JsonRepresentationTest_getLink_isLink.java | 10 ++---
.../applib/JsonRepresentationTest_getLong.java | 10 ++---
.../JsonRepresentationTest_getNull_isNull.java | 10 ++---
.../JsonRepresentationTest_getRepresentation.java | 8 ++--
.../JsonRepresentationTest_getString_isString.java | 10 ++---
...onRepresentationTest_isArray_isMap_isValue.java | 8 ++--
.../applib/JsonRepresentationTest_mapHas.java | 14 +++---
.../applib/JsonRepresentationTest_newArray.java | 4 +-
.../applib/JsonRepresentationTest_newObject.java | 4 +-
.../applib/JsonRepresentationTest_size.java | 15 ++++---
...JsonRepresentationTest_streamArrayElements.java | 8 ++--
.../applib/JsonRepresentationTest_urlEncoding.java | 4 +-
.../applib/LinkRepresentationTest_equals.java | 4 +-
.../restfulobjects/applib/Rel_getName_Test.java | 4 +-
.../RestfulRequest_DomainModelTest_parser.java | 6 +--
...equestParameterTest_valueOf_xrodomainmodel.java | 8 ++--
...equestParameterTest_valueOf_xrofollowlinks.java | 8 ++--
.../client/RestfulResponse_HeaderTest_Warning.java | 4 +-
.../client/RestfulResponse_HttpStatusCodeTest.java | 4 +-
...mainObjectRepresentationTest_getCollection.java | 8 ++--
...ainObjectRepresentationTest_getCollections.java | 8 ++--
...mainObjectRepresentationTest_getProperties.java | 8 ++--
...DomainObjectRepresentationTest_getProperty.java | 8 ++--
.../restfulobjects/applib/util/Parser_Test.java | 6 +--
.../applib/util/PathNodeTest_equalsHashcode.java | 8 ++--
.../applib/util/PathNodeTest_parse.java | 4 +-
.../applib/util/PathNodeTest_split.java | 4 +-
36 files changed, 211 insertions(+), 195 deletions(-)
diff --git a/viewers/restfulobjects/applib/pom.xml
b/viewers/restfulobjects/applib/pom.xml
index 0824f51363..8f0dfbfb49 100644
--- a/viewers/restfulobjects/applib/pom.xml
+++ b/viewers/restfulobjects/applib/pom.xml
@@ -55,7 +55,7 @@
<dependency>
<groupId>org.apache.causeway.core</groupId>
- <artifactId>causeway-core-internaltestvintage</artifactId>
+ <artifactId>causeway-core-internaltestsupport</artifactId>
<scope>test</scope>
</dependency>
diff --git
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_arrayGet_arraySetElementAt.java
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_arrayGet_arraySetElementAt.java
index ca43199963..44c2f08eef 100644
---
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_arrayGet_arraySetElementAt.java
+++
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_arrayGet_arraySetElementAt.java
@@ -20,38 +20,43 @@ package org.apache.causeway.viewer.restfulobjects.applib;
import java.io.IOException;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static
org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
-public class JsonRepresentationTest_arrayGet_arraySetElementAt {
+class JsonRepresentationTest_arrayGet_arraySetElementAt {
private JsonRepresentation jsonRepresentation;
private JsonRepresentation arrayRepr;
private JsonRepresentation objectRepr;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
arrayRepr = JsonRepresentation.newArray();
objectRepr = JsonRepresentation.newMap();
}
- @Test(expected = IndexOutOfBoundsException.class)
+ @Test
public void arrayGet_outOfBounds() throws IOException {
- jsonRepresentation = new
JsonRepresentation(readJson("emptyList.json"));
- jsonRepresentation.arrayGet(0);
+ assertThrows(IndexOutOfBoundsException.class, ()->{
+ jsonRepresentation = new
JsonRepresentation(readJson("emptyList.json"));
+ jsonRepresentation.arrayGet(0);
+ });
}
- @Test(expected = IndexOutOfBoundsException.class)
+ @Test
public void arraySetElementAt_outOfBounds() throws IOException {
- jsonRepresentation = new
JsonRepresentation(readJson("emptyList.json"));
- jsonRepresentation.arraySetElementAt(0, objectRepr);
+ assertThrows(IndexOutOfBoundsException.class, ()->{
+ jsonRepresentation = new
JsonRepresentation(readJson("emptyList.json"));
+ jsonRepresentation.arraySetElementAt(0, objectRepr);
+ });
}
@Test
@@ -66,23 +71,29 @@ public class
JsonRepresentationTest_arrayGet_arraySetElementAt {
jsonRepresentation.arraySetElementAt(0, objectRepr);
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void arraySetElementAt_forAttemptingToSetElementToArray() throws
IOException {
- jsonRepresentation = new JsonRepresentation(readJson("list.json"));
- jsonRepresentation.arraySetElementAt(0, arrayRepr);
+ assertThrows(IllegalArgumentException.class, ()->{
+ jsonRepresentation = new JsonRepresentation(readJson("list.json"));
+ jsonRepresentation.arraySetElementAt(0, arrayRepr);
+ });
}
- @Test(expected = IllegalStateException.class)
+ @Test
public void arrayGet_forMap() throws IOException {
- jsonRepresentation = new JsonRepresentation(readJson("emptyMap.json"));
- jsonRepresentation.arrayGet(0);
+ assertThrows(IllegalStateException.class, ()->{
+ jsonRepresentation = new
JsonRepresentation(readJson("emptyMap.json"));
+ jsonRepresentation.arrayGet(0);
+ });
}
- @Test(expected = IllegalStateException.class)
+ @Test
public void arrayGet_forValue() throws IOException {
- jsonRepresentation = new JsonRepresentation(readJson("map.json"));
- final JsonRepresentation valueRepresentation =
jsonRepresentation.getRepresentation("anInt");
- valueRepresentation.arrayGet(0);
+ assertThrows(IllegalStateException.class, ()->{
+ jsonRepresentation = new JsonRepresentation(readJson("map.json"));
+ final JsonRepresentation valueRepresentation =
jsonRepresentation.getRepresentation("anInt");
+ valueRepresentation.arrayGet(0);
+ });
}
}
diff --git
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_asInputStream.java
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_asInputStream.java
index 8a8e35f6cb..2ad5384d03 100644
---
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_asInputStream.java
+++
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_asInputStream.java
@@ -22,8 +22,8 @@ import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
@@ -35,11 +35,11 @@ import org.apache.causeway.commons.internal.base._Strings;
import static
org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
-public class JsonRepresentationTest_asInputStream {
+class JsonRepresentationTest_asInputStream {
private JsonRepresentation jsonRepresentation;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
jsonRepresentation = new JsonRepresentation(readJson("map.json"));
}
diff --git
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getArray.java
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getArray.java
index b8ce28025f..17f08a2bc3 100644
---
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getArray.java
+++
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getArray.java
@@ -20,22 +20,22 @@ package org.apache.causeway.viewer.restfulobjects.applib;
import java.io.IOException;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
import static
org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
-public class JsonRepresentationTest_getArray {
+class JsonRepresentationTest_getArray {
private JsonRepresentation jsonRepresentation;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
jsonRepresentation = new JsonRepresentation(readJson("map.json"));
}
diff --git
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getBigDecimal.java
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getBigDecimal.java
index 2725521b41..05f77ea708 100644
---
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getBigDecimal.java
+++
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getBigDecimal.java
@@ -21,25 +21,23 @@ package org.apache.causeway.viewer.restfulobjects.applib;
import java.io.IOException;
import java.math.BigDecimal;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static
org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
-public class JsonRepresentationTest_getBigDecimal {
+import lombok.val;
- @Rule
- public ExpectedException expectedException = ExpectedException.none();
+class JsonRepresentationTest_getBigDecimal {
private JsonRepresentation jsonRepresentation;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
jsonRepresentation = new JsonRepresentation(readJson("map.json"));
}
@@ -66,10 +64,12 @@ public class JsonRepresentationTest_getBigDecimal {
@Test
public void invalidFormat() throws IOException {
- expectedException.expect(IllegalArgumentException.class);
- expectedException.expectMessage("Value '12345678901234567890.1234'
larger than that allowed by format 'big-decimal(22,3)'");
- assertThat(jsonRepresentation.getBigDecimal("aBigDecimal",
"big-decimal(22,3)"), is(new BigDecimal("12345678901234567890")));
+ val expectMessage = "Value '12345678901234567890.1234' larger than
that allowed by format 'big-decimal(22,3)'";
+
+ assertThrows(IllegalArgumentException.class, ()->{
+ assertThat(jsonRepresentation.getBigDecimal("aBigDecimal",
"big-decimal(22,3)"), is(new BigDecimal("12345678901234567890")));
+ }, expectMessage);
}
@Test
@@ -79,10 +79,11 @@ public class JsonRepresentationTest_getBigDecimal {
@Test
public void invalidFormattedFromPath() throws IOException {
- expectedException.expect(IllegalArgumentException.class);
- expectedException.expectMessage("Value '123.45' larger than that
allowed by format 'big-decimal(4,2)'");
+ val expectMessage = "Value '123.45' larger than that allowed by format
'big-decimal(4,2)'";
-
jsonRepresentation.getBigDecimal("yetAnotherSubMap.anInvalidFormattedBigDecimal.value");
+ assertThrows(IllegalArgumentException.class, ()->{
+
jsonRepresentation.getBigDecimal("yetAnotherSubMap.anInvalidFormattedBigDecimal.value");
+ }, expectMessage);
}
@Test
@@ -97,26 +98,28 @@ public class JsonRepresentationTest_getBigDecimal {
@Test
public void forNonParseableString() throws IOException {
- expectedException.expect(IllegalArgumentException.class);
- expectedException.expectMessage("'aString' is not a bigdecimal");
+ val expectMessage = "'aString' is not a bigdecimal";
- jsonRepresentation.getBigDecimal("aString");
+ assertThrows(IllegalArgumentException.class, ()->{
+ jsonRepresentation.getBigDecimal("aString");
+ }, expectMessage);
}
@Test
public void forMap() throws IOException {
- expectedException.expect(IllegalArgumentException.class);
- expectedException.expectMessage("'aSubMap' is not a bigdecimal");
+ val expectMessage = "'aSubMap' is not a bigdecimal";
- jsonRepresentation.getBigDecimal("aSubMap");
+ assertThrows(IllegalArgumentException.class, ()->{
+ jsonRepresentation.getBigDecimal("aSubMap");
+ }, expectMessage);
}
@Test
public void forList() throws IOException {
- expectedException.expect(IllegalArgumentException.class);
- expectedException.expectMessage("'aSubList' is not a bigdecimal");
-
- jsonRepresentation.getBigDecimal("aSubList");
+ val expectMessage = "'aSubList' is not a bigdecimal";
+ assertThrows(IllegalArgumentException.class, ()->{
+ jsonRepresentation.getBigDecimal("aSubList");
+ }, expectMessage);
}
@Test
diff --git
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getBigInteger.java
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getBigInteger.java
index 07348ed6b9..169c686260 100644
---
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getBigInteger.java
+++
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getBigInteger.java
@@ -21,25 +21,23 @@ package org.apache.causeway.viewer.restfulobjects.applib;
import java.io.IOException;
import java.math.BigInteger;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static
org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
-public class JsonRepresentationTest_getBigInteger {
+import lombok.val;
- @Rule
- public ExpectedException expectedException = ExpectedException.none();
+class JsonRepresentationTest_getBigInteger {
private JsonRepresentation jsonRepresentation;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
jsonRepresentation = new JsonRepresentation(readJson("map.json"));
}
@@ -56,10 +54,12 @@ public class JsonRepresentationTest_getBigInteger {
@Test
public void invalidFormat() throws IOException {
- expectedException.expect(IllegalArgumentException.class);
- expectedException.expectMessage("Value '12345678901234567890' larger
than that allowed by format 'big-integer(19)'");
- assertThat(jsonRepresentation.getBigInteger("aBigInteger",
"big-integer(19)"), is(new BigInteger("12345678901234567890")));
+ val expectMessage = "Value '12345678901234567890' larger than that
allowed by format 'big-integer(19)'";
+
+ assertThrows(IllegalArgumentException.class, ()->{
+ assertThat(jsonRepresentation.getBigInteger("aBigInteger",
"big-integer(19)"), is(new BigInteger("12345678901234567890")));
+ }, expectMessage);
}
@Test
@@ -69,10 +69,11 @@ public class JsonRepresentationTest_getBigInteger {
@Test
public void invalidFormattedFromPath() throws IOException {
- expectedException.expect(IllegalArgumentException.class);
- expectedException.expectMessage("Value '123' larger than that allowed
by format 'big-integer(2)'");
+ val expectMessage = "Value '123' larger than that allowed by format
'big-integer(2)'";
-
jsonRepresentation.getBigInteger("yetAnotherSubMap.anInvalidFormattedBigInteger.value");
+ assertThrows(IllegalArgumentException.class, ()->{
+
jsonRepresentation.getBigInteger("yetAnotherSubMap.anInvalidFormattedBigInteger.value");
+ }, expectMessage);
}
@Test
@@ -87,26 +88,27 @@ public class JsonRepresentationTest_getBigInteger {
@Test
public void forNonParseableString() throws IOException {
- expectedException.expect(IllegalArgumentException.class);
- expectedException.expectMessage("'aString' is not a biginteger");
+ val expectMessage = "'aString' is not a biginteger";
- jsonRepresentation.getBigInteger("aString");
+ assertThrows(IllegalArgumentException.class, ()->{
+ jsonRepresentation.getBigInteger("aString");
+ }, expectMessage);
}
@Test
public void forMap() throws IOException {
- expectedException.expect(IllegalArgumentException.class);
- expectedException.expectMessage("'aSubMap' is not a biginteger");
-
- jsonRepresentation.getBigInteger("aSubMap");
+ val expectMessage = "'aSubMap' is not a biginteger";
+ assertThrows(IllegalArgumentException.class, ()->{
+ jsonRepresentation.getBigInteger("aSubMap");
+ }, expectMessage);
}
@Test
public void forList() throws IOException {
- expectedException.expect(IllegalArgumentException.class);
- expectedException.expectMessage("'aSubList' is not a biginteger");
-
- jsonRepresentation.getBigInteger("aSubList");
+ val expectMessage = "'aSubList' is not a biginteger";
+ assertThrows(IllegalArgumentException.class, ()->{
+ jsonRepresentation.getBigInteger("aSubList");
+ }, expectMessage);
}
@Test
diff --git
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getBoolean.java
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getBoolean.java
index 3c46b36655..cbaf74a339 100644
---
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getBoolean.java
+++
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getBoolean.java
@@ -20,21 +20,21 @@ package org.apache.causeway.viewer.restfulobjects.applib;
import java.io.IOException;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
import static
org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
-public class JsonRepresentationTest_getBoolean {
+class JsonRepresentationTest_getBoolean {
private JsonRepresentation jsonRepresentation;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
jsonRepresentation = new JsonRepresentation(readJson("map.json"));
}
diff --git
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getDouble.java
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getDouble.java
index fefc03680e..d7ea157dae 100644
---
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getDouble.java
+++
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getDouble.java
@@ -20,26 +20,21 @@ package org.apache.causeway.viewer.restfulobjects.applib;
import java.io.IOException;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
import static
org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
-public class JsonRepresentationTest_getDouble {
-
- @Rule
- public ExpectedException expectedException = ExpectedException.none();
+class JsonRepresentationTest_getDouble {
private JsonRepresentation jsonRepresentation;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
jsonRepresentation = new JsonRepresentation(readJson("map.json"));
}
diff --git
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getInt.java
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getInt.java
index 14d658695f..f02a627e0b 100644
---
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getInt.java
+++
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getInt.java
@@ -20,21 +20,21 @@ package org.apache.causeway.viewer.restfulobjects.applib;
import java.io.IOException;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
import static
org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
-public class JsonRepresentationTest_getInt {
+class JsonRepresentationTest_getInt {
private JsonRepresentation jsonRepresentation;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
jsonRepresentation = new JsonRepresentation(readJson("map.json"));
}
diff --git
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getLink_isLink.java
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getLink_isLink.java
index 722d322b5b..95af69bcc3 100644
---
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getLink_isLink.java
+++
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getLink_isLink.java
@@ -20,23 +20,23 @@ package org.apache.causeway.viewer.restfulobjects.applib;
import java.io.IOException;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
import static
org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
-public class JsonRepresentationTest_getLink_isLink {
+class JsonRepresentationTest_getLink_isLink {
private LinkRepresentation link;
private JsonRepresentation jsonRepresentation;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
link = new
LinkRepresentation().withHref("http://foo/bar";).withMethod(RestfulHttpMethod.GET);
jsonRepresentation = new JsonRepresentation(readJson("map.json"));
diff --git
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getLong.java
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getLong.java
index 9285c378d3..c6ccbc17c9 100644
---
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getLong.java
+++
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getLong.java
@@ -20,21 +20,21 @@ package org.apache.causeway.viewer.restfulobjects.applib;
import java.io.IOException;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
import static
org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
-public class JsonRepresentationTest_getLong {
+class JsonRepresentationTest_getLong {
private JsonRepresentation jsonRepresentation;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
jsonRepresentation = new JsonRepresentation(readJson("map.json"));
}
diff --git
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getNull_isNull.java
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getNull_isNull.java
index f0773fb843..b14110662e 100644
---
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getNull_isNull.java
+++
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getNull_isNull.java
@@ -20,22 +20,22 @@ package org.apache.causeway.viewer.restfulobjects.applib;
import java.io.IOException;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
import static
org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
-public class JsonRepresentationTest_getNull_isNull {
+class JsonRepresentationTest_getNull_isNull {
private JsonRepresentation jsonRepresentation;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
jsonRepresentation = new JsonRepresentation(readJson("map.json"));
}
diff --git
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getRepresentation.java
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getRepresentation.java
index ed9a6e6653..9407c46fb9 100644
---
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getRepresentation.java
+++
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getRepresentation.java
@@ -20,8 +20,8 @@ package org.apache.causeway.viewer.restfulobjects.applib;
import java.io.IOException;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
@@ -29,11 +29,11 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static
org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
-public class JsonRepresentationTest_getRepresentation {
+class JsonRepresentationTest_getRepresentation {
private JsonRepresentation jsonRepresentation;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
jsonRepresentation = new JsonRepresentation(readJson("map.json"));
}
diff --git
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getString_isString.java
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getString_isString.java
index eb35dab5ae..11d3970953 100644
---
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getString_isString.java
+++
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_getString_isString.java
@@ -20,21 +20,21 @@ package org.apache.causeway.viewer.restfulobjects.applib;
import java.io.IOException;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
import static
org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
-public class JsonRepresentationTest_getString_isString {
+class JsonRepresentationTest_getString_isString {
private JsonRepresentation jsonRepresentation;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
jsonRepresentation = new JsonRepresentation(readJson("map.json"));
}
diff --git
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_isArray_isMap_isValue.java
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_isArray_isMap_isValue.java
index 78cf7a5164..07b0e6187c 100644
---
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_isArray_isMap_isValue.java
+++
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_isArray_isMap_isValue.java
@@ -20,19 +20,19 @@ package org.apache.causeway.viewer.restfulobjects.applib;
import java.io.IOException;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static
org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
-public class JsonRepresentationTest_isArray_isMap_isValue {
+class JsonRepresentationTest_isArray_isMap_isValue {
private JsonRepresentation jsonRepresentation;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
jsonRepresentation = new JsonRepresentation(readJson("map.json"));
}
diff --git
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_mapHas.java
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_mapHas.java
index d7c9a08905..823ced4254 100644
---
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_mapHas.java
+++
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_mapHas.java
@@ -20,14 +20,15 @@ package org.apache.causeway.viewer.restfulobjects.applib;
import java.io.IOException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static
org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
-public class JsonRepresentationTest_mapHas {
+class JsonRepresentationTest_mapHas {
private JsonRepresentation jsonRepresentation;
@@ -40,11 +41,12 @@ public class JsonRepresentationTest_mapHas {
assertThat(jsonRepresentation.mapHas("nonExistent"), is(false));
}
- @Test(expected = IllegalStateException.class)
+ @Test
public void forList() throws IOException {
- jsonRepresentation = new JsonRepresentation(readJson("list.json"));
-
- jsonRepresentation.mapHas("aString");
+ assertThrows(IllegalStateException.class, ()->{
+ jsonRepresentation = new JsonRepresentation(readJson("list.json"));
+ jsonRepresentation.mapHas("aString");
+ });
}
}
diff --git
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_newArray.java
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_newArray.java
index d71cacb8f2..8399fafb76 100644
---
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_newArray.java
+++
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_newArray.java
@@ -18,12 +18,12 @@
*/
package org.apache.causeway.viewer.restfulobjects.applib;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-public class JsonRepresentationTest_newArray {
+class JsonRepresentationTest_newArray {
@Test
public void newArray() throws Exception {
diff --git
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_newObject.java
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_newObject.java
index eaf3241e59..eb716ea547 100644
---
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_newObject.java
+++
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_newObject.java
@@ -20,12 +20,12 @@ package org.apache.causeway.viewer.restfulobjects.applib;
import java.io.IOException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-public class JsonRepresentationTest_newObject {
+class JsonRepresentationTest_newObject {
@Test
public void happyCase() throws IOException {
diff --git
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_size.java
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_size.java
index 7631d1f72a..9fcb724d92 100644
---
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_size.java
+++
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_size.java
@@ -20,14 +20,15 @@ package org.apache.causeway.viewer.restfulobjects.applib;
import java.io.IOException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static
org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
-public class JsonRepresentationTest_size {
+class JsonRepresentationTest_size {
private JsonRepresentation jsonRepresentation;
@@ -55,11 +56,13 @@ public class JsonRepresentationTest_size {
assertThat(jsonRepresentation.size(), is(2));
}
- @Test(expected = IllegalStateException.class)
+ @Test
public void size_forValue() throws IOException {
- jsonRepresentation = new JsonRepresentation(readJson("map.json"));
- final JsonRepresentation valueRepresentation =
jsonRepresentation.getRepresentation("anInt");
- valueRepresentation.size();
+ assertThrows(IllegalStateException.class, ()->{
+ jsonRepresentation = new JsonRepresentation(readJson("map.json"));
+ final JsonRepresentation valueRepresentation =
jsonRepresentation.getRepresentation("anInt");
+ valueRepresentation.size();
+ });
}
}
diff --git
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_streamArrayElements.java
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_streamArrayElements.java
index 0039e9dd30..52d08fcb1f 100644
---
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_streamArrayElements.java
+++
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_streamArrayElements.java
@@ -21,21 +21,21 @@ package org.apache.causeway.viewer.restfulobjects.applib;
import java.io.IOException;
import java.util.Iterator;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static
org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
-public class JsonRepresentationTest_streamArrayElements {
+class JsonRepresentationTest_streamArrayElements {
private JsonRepresentation jsonRepresentation;
@Test
public void forJsonRepresentation() throws IOException {
jsonRepresentation = new JsonRepresentation(readJson("list.json"));
- final Iterator<JsonRepresentation> arrayIterator =
+ final Iterator<JsonRepresentation> arrayIterator =
jsonRepresentation.streamArrayElements(JsonRepresentation.class)
.iterator();
assertThat(arrayIterator.hasNext(), is(true));
@@ -48,7 +48,7 @@ public class JsonRepresentationTest_streamArrayElements {
@Test
public void forString() throws IOException {
jsonRepresentation = new
JsonRepresentation(readJson("listOfStrings.json"));
- final Iterator<String> arrayIterator =
+ final Iterator<String> arrayIterator =
jsonRepresentation.streamArrayElements(String.class)
.iterator();
assertThat(arrayIterator.hasNext(), is(true));
diff --git
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_urlEncoding.java
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_urlEncoding.java
index 51ccf1c778..e9e5ac1b27 100644
---
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_urlEncoding.java
+++
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/JsonRepresentationTest_urlEncoding.java
@@ -22,12 +22,12 @@ import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-public class JsonRepresentationTest_urlEncoding {
+class JsonRepresentationTest_urlEncoding {
@Test
public void test() throws UnsupportedEncodingException {
diff --git
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/LinkRepresentationTest_equals.java
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/LinkRepresentationTest_equals.java
index 1c7a3b5157..d09925d9c6 100644
---
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/LinkRepresentationTest_equals.java
+++
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/LinkRepresentationTest_equals.java
@@ -20,14 +20,14 @@ package org.apache.causeway.viewer.restfulobjects.applib;
import java.io.UnsupportedEncodingException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.MatcherAssert.assertThat;
-public class LinkRepresentationTest_equals {
+class LinkRepresentationTest_equals {
@Test
public void equalDependsOnMethodAndHref() throws
UnsupportedEncodingException {
diff --git
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/Rel_getName_Test.java
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/Rel_getName_Test.java
index 26a78e673c..8824b1b8cb 100644
---
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/Rel_getName_Test.java
+++
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/Rel_getName_Test.java
@@ -18,13 +18,13 @@
*/
package org.apache.causeway.viewer.restfulobjects.applib;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-public class Rel_getName_Test {
+class Rel_getName_Test {
@Test
public void iana_namespace() throws Exception {
diff --git
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/client/RestfulRequest_DomainModelTest_parser.java
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/client/RestfulRequest_DomainModelTest_parser.java
index 0c9271ceeb..f4074aa809 100644
---
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/client/RestfulRequest_DomainModelTest_parser.java
+++
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/client/RestfulRequest_DomainModelTest_parser.java
@@ -18,15 +18,15 @@
*/
package org.apache.causeway.viewer.restfulobjects.applib.client;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertSame;
import org.apache.causeway.viewer.restfulobjects.applib.RestfulRequest;
import
org.apache.causeway.viewer.restfulobjects.applib.RestfulRequest.DomainModel;
import org.apache.causeway.viewer.restfulobjects.applib.util.Parser;
-public class RestfulRequest_DomainModelTest_parser {
+class RestfulRequest_DomainModelTest_parser {
@Test
public void parser_roundtrips() {
diff --git
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/client/RestfulRequest_RequestParameterTest_valueOf_xrodomainmodel.java
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/client/RestfulRequest_RequestParameterTest_valueOf_xrodomainmodel.java
index 0c5485f6ec..dc5bb88368 100644
---
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/client/RestfulRequest_RequestParameterTest_valueOf_xrodomainmodel.java
+++
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/client/RestfulRequest_RequestParameterTest_valueOf_xrodomainmodel.java
@@ -18,8 +18,8 @@
*/
package org.apache.causeway.viewer.restfulobjects.applib.client;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
@@ -29,13 +29,13 @@ import
org.apache.causeway.viewer.restfulobjects.applib.RestfulRequest;
import
org.apache.causeway.viewer.restfulobjects.applib.RestfulRequest.DomainModel;
import
org.apache.causeway.viewer.restfulobjects.applib.RestfulRequest.RequestParameter;
-public class RestfulRequest_RequestParameterTest_valueOf_xrodomainmodel {
+class RestfulRequest_RequestParameterTest_valueOf_xrodomainmodel {
private final RequestParameter<DomainModel> requestParameter =
RestfulRequest.RequestParameter.DOMAIN_MODEL;
private JsonRepresentation repr;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
repr = JsonRepresentation.newMap();
}
diff --git
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/client/RestfulRequest_RequestParameterTest_valueOf_xrofollowlinks.java
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/client/RestfulRequest_RequestParameterTest_valueOf_xrofollowlinks.java
index 19d1d2eb0d..d6cde56af4 100644
---
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/client/RestfulRequest_RequestParameterTest_valueOf_xrofollowlinks.java
+++
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/client/RestfulRequest_RequestParameterTest_valueOf_xrofollowlinks.java
@@ -20,8 +20,8 @@ package
org.apache.causeway.viewer.restfulobjects.applib.client;
import java.util.List;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
@@ -30,13 +30,13 @@ import
org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.causeway.viewer.restfulobjects.applib.RestfulRequest;
import
org.apache.causeway.viewer.restfulobjects.applib.RestfulRequest.RequestParameter;
-public class RestfulRequest_RequestParameterTest_valueOf_xrofollowlinks {
+class RestfulRequest_RequestParameterTest_valueOf_xrofollowlinks {
private final RequestParameter<List<List<String>>> requestParameter =
RestfulRequest.RequestParameter.FOLLOW_LINKS;
private JsonRepresentation repr;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
repr = JsonRepresentation.newMap();
}
diff --git
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/client/RestfulResponse_HeaderTest_Warning.java
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/client/RestfulResponse_HeaderTest_Warning.java
index 6f5996bb6f..3c1a05748d 100644
---
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/client/RestfulResponse_HeaderTest_Warning.java
+++
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/client/RestfulResponse_HeaderTest_Warning.java
@@ -18,14 +18,14 @@
*/
package org.apache.causeway.viewer.restfulobjects.applib.client;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import org.apache.causeway.viewer.restfulobjects.applib.RestfulResponse;
-public class RestfulResponse_HeaderTest_Warning {
+class RestfulResponse_HeaderTest_Warning {
@Test
diff --git
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/client/RestfulResponse_HttpStatusCodeTest.java
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/client/RestfulResponse_HttpStatusCodeTest.java
index e6e5fcce1a..9242f1bcd5 100644
---
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/client/RestfulResponse_HttpStatusCodeTest.java
+++
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/client/RestfulResponse_HttpStatusCodeTest.java
@@ -20,14 +20,14 @@ package
org.apache.causeway.viewer.restfulobjects.applib.client;
import javax.ws.rs.core.Response.Status.Family;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import
org.apache.causeway.viewer.restfulobjects.applib.RestfulResponse.HttpStatusCode;
-public class RestfulResponse_HttpStatusCodeTest {
+class RestfulResponse_HttpStatusCodeTest {
@Test
public void knownStatusCode() {
diff --git
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getCollection.java
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getCollection.java
index f40d0f9ac3..3c0c3d10ce 100644
---
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getCollection.java
+++
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getCollection.java
@@ -20,8 +20,8 @@ package
org.apache.causeway.viewer.restfulobjects.applib.domainobjects;
import java.io.IOException;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
@@ -32,11 +32,11 @@ import
org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
import static
org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
-public class DomainObjectRepresentationTest_getCollection {
+class DomainObjectRepresentationTest_getCollection {
private DomainObjectRepresentation representation;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
representation = new
DomainObjectRepresentation(readJson("domainObjectRepresentation.json"));
}
diff --git
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getCollections.java
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getCollections.java
index 6e0abe48b5..efe1770c16 100644
---
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getCollections.java
+++
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getCollections.java
@@ -20,8 +20,8 @@ package
org.apache.causeway.viewer.restfulobjects.applib.domainobjects;
import java.io.IOException;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
@@ -30,11 +30,11 @@ import
org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
import static
org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
-public class DomainObjectRepresentationTest_getCollections {
+class DomainObjectRepresentationTest_getCollections {
private DomainObjectRepresentation representation;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
representation = new
DomainObjectRepresentation(readJson("domainObjectRepresentation.json"));
}
diff --git
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getProperties.java
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getProperties.java
index dad805be29..a1ea03b605 100644
---
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getProperties.java
+++
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getProperties.java
@@ -20,8 +20,8 @@ package
org.apache.causeway.viewer.restfulobjects.applib.domainobjects;
import java.io.IOException;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
@@ -30,11 +30,11 @@ import
org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
import static
org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
-public class DomainObjectRepresentationTest_getProperties {
+class DomainObjectRepresentationTest_getProperties {
private DomainObjectRepresentation representation;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
representation = new
DomainObjectRepresentation(readJson("domainObjectRepresentation.json"));
}
diff --git
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getProperty.java
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getProperty.java
index 6f14c5ff8d..9ffdb9afcb 100644
---
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getProperty.java
+++
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getProperty.java
@@ -20,8 +20,8 @@ package
org.apache.causeway.viewer.restfulobjects.applib.domainobjects;
import java.io.IOException;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
@@ -32,11 +32,11 @@ import
org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
import static
org.apache.causeway.viewer.restfulobjects.applib.JsonFixture.readJson;
-public class DomainObjectRepresentationTest_getProperty {
+class DomainObjectRepresentationTest_getProperty {
private DomainObjectRepresentation representation;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
representation = new
DomainObjectRepresentation(readJson("domainObjectRepresentation.json"));
}
diff --git
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/util/Parser_Test.java
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/util/Parser_Test.java
index e3e42d0842..0c37491ce3 100644
---
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/util/Parser_Test.java
+++
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/util/Parser_Test.java
@@ -26,13 +26,13 @@ import java.util.List;
import org.hamcrest.Description;
import org.hamcrest.Matcher;
import org.hamcrest.TypeSafeMatcher;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-public class Parser_Test {
+class Parser_Test {
@Test
public void forBoolean() {
@@ -127,7 +127,7 @@ public class Parser_Test {
//
// assertThat(list, sameContentsAs(valueOf));
// }
- //
+ //
// @Test
// public void forMediaTypeJson() {
// final MediaType mediaType =
MediaType.valueOf("application/json");
diff --git
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/util/PathNodeTest_equalsHashcode.java
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/util/PathNodeTest_equalsHashcode.java
index cf34b33bd8..1969497f06 100644
---
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/util/PathNodeTest_equalsHashcode.java
+++
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/util/PathNodeTest_equalsHashcode.java
@@ -18,12 +18,12 @@
*/
package org.apache.causeway.viewer.restfulobjects.applib.util;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
-public class PathNodeTest_equalsHashcode {
+class PathNodeTest_equalsHashcode {
@Test
public void simple() throws Exception {
diff --git
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/util/PathNodeTest_parse.java
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/util/PathNodeTest_parse.java
index e7f529f7b7..57afcbdfba 100644
---
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/util/PathNodeTest_parse.java
+++
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/util/PathNodeTest_parse.java
@@ -20,12 +20,12 @@ package
org.apache.causeway.viewer.restfulobjects.applib.util;
import java.util.Map;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-public class PathNodeTest_parse {
+class PathNodeTest_parse {
@Test
public void simple() throws Exception {
diff --git
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/util/PathNodeTest_split.java
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/util/PathNodeTest_split.java
index d41090a9cd..4c919a1a26 100644
---
a/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/util/PathNodeTest_split.java
+++
b/viewers/restfulobjects/applib/src/test/java/org/apache/causeway/viewer/restfulobjects/applib/util/PathNodeTest_split.java
@@ -20,12 +20,12 @@ package
org.apache.causeway.viewer.restfulobjects.applib.util;
import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-public class PathNodeTest_split {
+class PathNodeTest_split {
@Test
public void simple() throws Exception {
