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 3727b97a3d ISIS-2297: migrate RO rendering to JUnit5
3727b97a3d is described below
commit 3727b97a3d9b45268d7547add6a46999a87ef18d
Author: Andi Huber <[email protected]>
AuthorDate: Mon Nov 14 16:56:17 2022 +0100
ISIS-2297: migrate RO rendering to JUnit5
---
viewers/restfulobjects/rendering/pom.xml | 2 +-
.../rendering/LinkFollowSpecsTest_follow.java | 4 +-
.../domainobjects/JsonValueEncoderTest.java | 4 +-
.../service/swagger/internal/GenerationTest.java | 6 +-
.../service/swagger/internal/TaggerTest.java | 70 ++++++++++------------
.../rendering/util/MapUtilsTest.java | 11 ++--
6 files changed, 49 insertions(+), 48 deletions(-)
diff --git a/viewers/restfulobjects/rendering/pom.xml
b/viewers/restfulobjects/rendering/pom.xml
index e292efb37c..eaed2c70f3 100644
--- a/viewers/restfulobjects/rendering/pom.xml
+++ b/viewers/restfulobjects/rendering/pom.xml
@@ -49,7 +49,7 @@
<!-- TEST DEPENDENCIES -->
<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/rendering/src/test/java/org/apache/causeway/viewer/restfulobjects/rendering/LinkFollowSpecsTest_follow.java
b/viewers/restfulobjects/rendering/src/test/java/org/apache/causeway/viewer/restfulobjects/rendering/LinkFollowSpecsTest_follow.java
index b1b2b04c92..0da6980647 100644
---
a/viewers/restfulobjects/rendering/src/test/java/org/apache/causeway/viewer/restfulobjects/rendering/LinkFollowSpecsTest_follow.java
+++
b/viewers/restfulobjects/rendering/src/test/java/org/apache/causeway/viewer/restfulobjects/rendering/LinkFollowSpecsTest_follow.java
@@ -20,7 +20,7 @@ package org.apache.causeway.viewer.restfulobjects.rendering;
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;
@@ -28,7 +28,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.causeway.viewer.restfulobjects.applib.util.Parser;
-public class LinkFollowSpecsTest_follow {
+class LinkFollowSpecsTest_follow {
@Test
public void simple() throws Exception {
diff --git
a/viewers/restfulobjects/rendering/src/test/java/org/apache/causeway/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest.java
b/viewers/restfulobjects/rendering/src/test/java/org/apache/causeway/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest.java
index 5d60a0bf96..503b938652 100644
---
a/viewers/restfulobjects/rendering/src/test/java/org/apache/causeway/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest.java
+++
b/viewers/restfulobjects/rendering/src/test/java/org/apache/causeway/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest.java
@@ -37,8 +37,8 @@ import org.junit.jupiter.params.provider.ValueSource;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertThrows;
import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
diff --git
a/viewers/restfulobjects/rendering/src/test/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/GenerationTest.java
b/viewers/restfulobjects/rendering/src/test/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/GenerationTest.java
index a7c5f79722..03fbe8de1b 100644
---
a/viewers/restfulobjects/rendering/src/test/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/GenerationTest.java
+++
b/viewers/restfulobjects/rendering/src/test/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/GenerationTest.java
@@ -20,7 +20,7 @@ package
org.apache.causeway.viewer.restfulobjects.rendering.service.swagger.inte
import java.util.Set;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
@@ -31,7 +31,9 @@ public class GenerationTest {
@Test
public void testAddReference() throws Exception {
- Generation context = new Generation(null, null, null, new
TaggerDefault(), new ClassExcluderDefault(), new ValuePropertyFactoryDefault());
+ Generation context =
+ new Generation(null, null, null, new TaggerDefault(),
+ new ClassExcluderDefault(), new
ValuePropertyFactoryDefault());
context.addSwaggerReference("foo");
context.addSwaggerReference("bar");
diff --git
a/viewers/restfulobjects/rendering/src/test/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/TaggerTest.java
b/viewers/restfulobjects/rendering/src/test/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/TaggerTest.java
index 12ace00443..870e9b6b0b 100644
---
a/viewers/restfulobjects/rendering/src/test/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/TaggerTest.java
+++
b/viewers/restfulobjects/rendering/src/test/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/TaggerTest.java
@@ -18,60 +18,56 @@
*/
package
org.apache.causeway.viewer.restfulobjects.rendering.service.swagger.internal;
-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.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-public class TaggerTest {
+class TaggerTest {
TaggerDefault taggerDefault;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
taggerDefault = new TaggerDefault();
}
- public static class TagFor extends TaggerTest {
-
- @Test
- public void fullyQualifiedClass() throws Exception {
- String tag = taggerDefault.tagForLogicalTypeName("foo.bar.Abc",
null);
- assertThat(tag, is(equalTo("bar")));
- }
-
- @Test
- public void jaxb() throws Exception {
- String tag =
taggerDefault.tagForLogicalTypeName("todoapp.app.viewmodels.todoitem.v1_0.ToDoItemDto",
null);
- assertThat(tag, is(equalTo("todoitem")));
- }
+ @Test
+ public void fullyQualifiedClass() throws Exception {
+ String tag = taggerDefault.tagForLogicalTypeName("foo.bar.Abc", null);
+ assertThat(tag, is(equalTo("bar")));
+ }
- @Test
- public void schemaClass() throws Exception {
- String tag = taggerDefault.tagForLogicalTypeName("bar.Abc", null);
- assertThat(tag, is(equalTo("bar")));
- }
+ @Test
+ public void jaxb() throws Exception {
+ String tag =
taggerDefault.tagForLogicalTypeName("todoapp.app.viewmodels.todoitem.v1_0.ToDoItemDto",
null);
+ assertThat(tag, is(equalTo("todoitem")));
+ }
- @Test
- public void noPackage() throws Exception {
- String tag = taggerDefault.tagForLogicalTypeName("Abc", null);
- assertThat(tag, is(equalTo("Abc")));
- }
+ @Test
+ public void schemaClass() throws Exception {
+ String tag = taggerDefault.tagForLogicalTypeName("bar.Abc", null);
+ assertThat(tag, is(equalTo("bar")));
+ }
- @Test
- public void internals() throws Exception {
- String tag =
taggerDefault.tagForLogicalTypeName("org.apache.causeway.Xxx", null);
- assertThat(tag, is(equalTo(". apache causeway internals")));
- }
+ @Test
+ public void noPackage() throws Exception {
+ String tag = taggerDefault.tagForLogicalTypeName("Abc", null);
+ assertThat(tag, is(equalTo("Abc")));
+ }
- @Test
- public void applib() throws Exception {
- String tag =
taggerDefault.tagForLogicalTypeName("causeway.conf.ConfigurationServiceMenu",
null);
- assertThat(tag, is(equalTo(". apache causeway conf")));
- }
+ @Test
+ public void internals() throws Exception {
+ String tag =
taggerDefault.tagForLogicalTypeName("org.apache.causeway.Xxx", null);
+ assertThat(tag, is(equalTo(". apache causeway internals")));
+ }
+ @Test
+ public void applib() throws Exception {
+ String tag =
taggerDefault.tagForLogicalTypeName("causeway.conf.ConfigurationServiceMenu",
null);
+ assertThat(tag, is(equalTo(". apache causeway conf")));
}
}
diff --git
a/viewers/restfulobjects/rendering/src/test/java/org/apache/causeway/viewer/restfulobjects/rendering/util/MapUtilsTest.java
b/viewers/restfulobjects/rendering/src/test/java/org/apache/causeway/viewer/restfulobjects/rendering/util/MapUtilsTest.java
index d5cb366ad2..5fad0c5a2e 100644
---
a/viewers/restfulobjects/rendering/src/test/java/org/apache/causeway/viewer/restfulobjects/rendering/util/MapUtilsTest.java
+++
b/viewers/restfulobjects/rendering/src/test/java/org/apache/causeway/viewer/restfulobjects/rendering/util/MapUtilsTest.java
@@ -20,12 +20,13 @@ package
org.apache.causeway.viewer.restfulobjects.rendering.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;
+import static org.junit.jupiter.api.Assertions.assertThrows;
-public class MapUtilsTest {
+class MapUtilsTest {
@Test
public void happyCase() throws Exception {
@@ -41,9 +42,11 @@ public class MapUtilsTest {
assertThat(map.size(), is(0));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void uneven() throws Exception {
- MapUtils.mapOf("foo");
+ assertThrows(IllegalArgumentException.class, ()->{
+ MapUtils.mapOf("foo");
+ });
}
}
