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 6f7a66e301 ISIS-2297: migrate RO viewer to JUnit5
6f7a66e301 is described below
commit 6f7a66e301a8157932340188016bbd6f082797c7
Author: Andi Huber <[email protected]>
AuthorDate: Mon Nov 14 17:13:48 2022 +0100
ISIS-2297: migrate RO viewer to JUnit5
---
viewers/restfulobjects/viewer/pom.xml | 2 +-
.../context/ResourceContext_getArg_Test.java | 76 ++++++++++-----------
.../context/ResourceContext_stripQuotes_Test.java | 20 +++---
.../DomainResourceHelper_readBodyAsMap_Test.java | 48 +++++++------
.../viewer/resources/JsonParserHelper_Test.java | 11 +--
.../viewer/util/UrlParserUtils_Test.java | 12 ++--
...ulObjectsSessionFilter_lookupPassThru_Test.java | 78 ++++++++++------------
7 files changed, 118 insertions(+), 129 deletions(-)
diff --git a/viewers/restfulobjects/viewer/pom.xml
b/viewers/restfulobjects/viewer/pom.xml
index 021cc47114..69fcaa75fa 100644
--- a/viewers/restfulobjects/viewer/pom.xml
+++ b/viewers/restfulobjects/viewer/pom.xml
@@ -61,7 +61,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/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java
b/viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java
index 2d90b5fb98..04d191b765 100644
---
a/viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java
+++
b/viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java
@@ -21,11 +21,9 @@ package
org.apache.causeway.viewer.restfulobjects.viewer.context;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
-import org.jmock.Expectations;
-import org.jmock.auto.Mock;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
import org.springframework.web.context.WebApplicationContext;
import static org.hamcrest.CoreMatchers.equalTo;
@@ -34,9 +32,6 @@ import static org.hamcrest.MatcherAssert.assertThat;
import org.apache.causeway.applib.services.iactnlayer.InteractionLayerTracker;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
import org.apache.causeway.commons.internal.codec._UrlDecoderUtil;
-import org.apache.causeway.core.interaction.session.CausewayInteraction;
-import org.apache.causeway.core.internaltestsupport.jmocking.JUnitRuleMockery2;
-import
org.apache.causeway.core.internaltestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.causeway.core.metamodel._testing.MetaModelContext_forTesting;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
@@ -47,59 +42,57 @@ import
org.apache.causeway.viewer.restfulobjects.applib.RestfulRequest.RequestPa
import org.apache.causeway.viewer.restfulobjects.applib.util.UrlEncodingUtils;
import
org.apache.causeway.viewer.restfulobjects.viewer.resources.ResourceDescriptor;
-public class ResourceContext_getArg_Test {
+class ResourceContext_getArg_Test {
- @Rule public JUnitRuleMockery2 context =
JUnitRuleMockery2.createFor(Mode.INTERFACES_AND_CLASSES);
-
- @Mock private HttpServletRequest mockHttpServletRequest;
- @Mock private ServletContext mockServletContext;
- @Mock private CausewayInteraction mockCausewayInteraction;
- @Mock private InteractionService mockInteractionService;
- @Mock private InteractionLayerTracker mockInteractionLayerTracker;
- @Mock private AuthenticationManager mockAuthenticationManager;
- @Mock private SpecificationLoader mockSpecificationLoader;
- @Mock private WebApplicationContext webApplicationContext;
+ private HttpServletRequest mockHttpServletRequest;
+ private ServletContext mockServletContext;
+ private InteractionService mockInteractionService;
+ private InteractionLayerTracker mockInteractionLayerTracker;
+ private AuthenticationManager mockAuthenticationManager;
+ private SpecificationLoader mockSpecificationLoader;
+ private WebApplicationContext webApplicationContext;
private ResourceContext resourceContext;
private MetaModelContext metaModelContext;
- @Before
- public void setUp() throws Exception {
-
- // PRODUCTION;
+ @BeforeEach
+ void setUp() throws Exception {
metaModelContext = MetaModelContext_forTesting.builder()
.specificationLoader(mockSpecificationLoader)
.singleton(mockInteractionService)
.singleton(mockAuthenticationManager)
.singleton(mockInteractionLayerTracker)
- // .serviceInjector(mockServiceInjector)
- // .serviceRegistry(mockServiceRegistry)
- // .translationService(mockTranslationService)
- //
.objectAdapterProvider(mockPersistenceSessionServiceInternal)
- //
.authenticationProvider(mockAuthenticationProvider)
.build();
+ mockHttpServletRequest = Mockito.mock(HttpServletRequest.class);
+ mockServletContext = Mockito.mock(ServletContext.class);
+ mockInteractionService = Mockito.mock(InteractionService.class);
+ mockInteractionLayerTracker =
Mockito.mock(InteractionLayerTracker.class);
+ mockAuthenticationManager = Mockito.mock(AuthenticationManager.class);
+ mockSpecificationLoader = Mockito.mock(SpecificationLoader.class);
+ webApplicationContext = Mockito.mock(WebApplicationContext.class);
- context.checking(new Expectations() {{
+ Mockito
+ .when(webApplicationContext.getBean(MetaModelContext.class))
+ .thenReturn(metaModelContext);
-
allowing(webApplicationContext).getBean(MetaModelContext.class);
- will(returnValue(metaModelContext));
+ Mockito
+
.when(mockServletContext.getAttribute("org.springframework.web.context.WebApplicationContext.ROOT"))
+ .thenReturn(webApplicationContext);
-
allowing(mockServletContext).getAttribute("org.springframework.web.context.WebApplicationContext.ROOT");
- will(returnValue(webApplicationContext));
+ Mockito
+ .when(mockHttpServletRequest.getServletContext())
+ .thenReturn(mockServletContext);
- allowing(mockHttpServletRequest).getServletContext();
- will(returnValue(mockServletContext));
+ Mockito
+ .when(mockHttpServletRequest.getQueryString())
+ .thenReturn("");
- allowing(mockHttpServletRequest).getQueryString();
- will(returnValue(""));
-
- }});
}
@Test
- public void whenArgExists() throws Exception {
+ void whenArgExists() throws Exception {
final String queryString =
UrlEncodingUtils.urlEncode(JsonRepresentation.newMap("x-ro-page",
"123").asJsonNode());
resourceContext = new ResourceContext(ResourceDescriptor.empty(),
null, null, null, null, null,
@@ -116,7 +109,7 @@ public class ResourceContext_getArg_Test {
}
@Test
- public void whenArgDoesNotExist() throws Exception {
+ void whenArgDoesNotExist() throws Exception {
final String queryString =
UrlEncodingUtils.urlEncode(JsonRepresentation.newMap("xxx",
"123").asJsonNode());
resourceContext = new ResourceContext(ResourceDescriptor.empty(),
null, null, null, null, null,
@@ -132,5 +125,4 @@ public class ResourceContext_getArg_Test {
assertThat(arg, equalTo(RequestParameter.PAGE.getDefault()));
}
-
}
diff --git
a/viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/context/ResourceContext_stripQuotes_Test.java
b/viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/context/ResourceContext_stripQuotes_Test.java
index 59777a54b5..d8de303060 100644
---
a/viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/context/ResourceContext_stripQuotes_Test.java
+++
b/viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/context/ResourceContext_stripQuotes_Test.java
@@ -18,58 +18,58 @@
*/
package org.apache.causeway.viewer.restfulobjects.viewer.context;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.nullValue;
-public class ResourceContext_stripQuotes_Test {
+class ResourceContext_stripQuotes_Test {
@Test
- public void whenQuotes() throws Exception {
+ void whenQuotes() throws Exception {
final String x = ResourceContext.stripQuotes("\"123\"");
assertThat(x, is("123"));
}
@Test
- public void whenNoQuotes() throws Exception {
+ void whenNoQuotes() throws Exception {
final String x = ResourceContext.stripQuotes("123");
assertThat(x, is("123"));
}
@Test
- public void whenFirstQuote() throws Exception {
+ void whenFirstQuote() throws Exception {
final String x = ResourceContext.stripQuotes("\"123");
assertThat(x, is("\"123"));
}
@Test
- public void whenEndQuote() throws Exception {
+ void whenEndQuote() throws Exception {
final String x = ResourceContext.stripQuotes("123\"");
assertThat(x, is("123\""));
}
@Test
- public void whenCharsAfter() throws Exception {
+ void whenCharsAfter() throws Exception {
final String x = ResourceContext.stripQuotes("\"123\" ");
assertThat(x, is("\"123\" "));
}
@Test
- public void whenCharsBefore() throws Exception {
+ void whenCharsBefore() throws Exception {
final String x = ResourceContext.stripQuotes(" \"123\"");
assertThat(x, is(" \"123\""));
}
@Test
- public void whenEmpty() throws Exception {
+ void whenEmpty() throws Exception {
final String x = ResourceContext.stripQuotes("");
assertThat(x, is(""));
}
@Test
- public void whenNull() throws Exception {
+ void whenNull() throws Exception {
final String x = ResourceContext.stripQuotes(null);
assertThat(x, is(nullValue()));
}
diff --git
a/viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/DomainResourceHelper_readBodyAsMap_Test.java
b/viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/DomainResourceHelper_readBodyAsMap_Test.java
index a204326035..e3cdfe501f 100644
---
a/viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/DomainResourceHelper_readBodyAsMap_Test.java
+++
b/viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/DomainResourceHelper_readBodyAsMap_Test.java
@@ -18,61 +18,65 @@
*/
package org.apache.causeway.viewer.restfulobjects.viewer.resources;
-import org.hamcrest.CoreMatchers;
-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.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
import
org.apache.causeway.viewer.restfulobjects.rendering.RestfulObjectsApplicationException;
import org.apache.causeway.viewer.restfulobjects.rendering.util.Util;
-public class DomainResourceHelper_readBodyAsMap_Test {
+class DomainResourceHelper_readBodyAsMap_Test {
private JsonRepresentation representation;
@Test
- public void whenNull() throws Exception {
+ void whenNull() throws Exception {
representation = Util.readAsMap(null);
- Assert.assertThat(representation.isMap(), CoreMatchers.is(true));
- Assert.assertThat(representation.size(), CoreMatchers.is(0));
+ assertTrue(representation.isMap());
+ assertEquals(0, representation.size());
}
@Test
- public void whenEmptyString() throws Exception {
+ void whenEmptyString() throws Exception {
representation = Util.readAsMap("");
- Assert.assertThat(representation.isMap(), CoreMatchers.is(true));
- Assert.assertThat(representation.size(), CoreMatchers.is(0));
+ assertTrue(representation.isMap());
+ assertEquals(0, representation.size());
}
@Test
- public void whenWhitespaceOnlyString() throws Exception {
+ void whenWhitespaceOnlyString() throws Exception {
representation = Util.readAsMap(" \t ");
- Assert.assertThat(representation.isMap(), CoreMatchers.is(true));
- Assert.assertThat(representation.size(), CoreMatchers.is(0));
+ assertTrue(representation.isMap());
+ assertEquals(0, representation.size());
}
@Test
- public void emptyMap() throws Exception {
+ void emptyMap() throws Exception {
representation = Util.readAsMap("{}");
- Assert.assertThat(representation.isMap(), CoreMatchers.is(true));
- Assert.assertThat(representation.size(), CoreMatchers.is(0));
+ assertTrue(representation.isMap());
+ assertEquals(0, representation.size());
}
@Test
- public void map() throws Exception {
+ void map() throws Exception {
representation = Util.readAsMap("{\"foo\":\"bar\"}");
- Assert.assertThat(representation.isMap(), CoreMatchers.is(true));
- Assert.assertThat(representation.size(), CoreMatchers.is(1));
+ assertTrue(representation.isMap());
+ assertEquals(1, representation.size());
}
- @Test(expected = RestfulObjectsApplicationException.class)
- public void whenArray() throws Exception {
- Util.readAsMap("[]");
+ @Test
+ void whenArray() throws Exception {
+ assertThrows(RestfulObjectsApplicationException.class, ()->{
+ Util.readAsMap("[]");
+ });
}
}
diff --git
a/viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/JsonParserHelper_Test.java
b/viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/JsonParserHelper_Test.java
index 7b521b3ccf..011974842f 100644
---
a/viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/JsonParserHelper_Test.java
+++
b/viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/JsonParserHelper_Test.java
@@ -18,19 +18,20 @@
*/
package org.apache.causeway.viewer.restfulobjects.viewer.resources;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
-public class JsonParserHelper_Test {
+class JsonParserHelper_Test {
@Test
- public void oidFromLink() throws Exception {
+ void oidFromLink() throws Exception {
final JsonRepresentation link = JsonRepresentation.newMap();
link.mapPutString("href", "http://localhost/objects/OID/1";);
final String oidFromHref = JsonParserHelper.encodedOidFromLink(link);
- Assert.assertEquals("OID:1", oidFromHref);
+ assertEquals("OID:1", oidFromHref);
}
}
diff --git
a/viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/util/UrlParserUtils_Test.java
b/viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/util/UrlParserUtils_Test.java
index 95c586fbb7..95d23b7b44 100644
---
a/viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/util/UrlParserUtils_Test.java
+++
b/viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/util/UrlParserUtils_Test.java
@@ -18,16 +18,16 @@
*/
package org.apache.causeway.viewer.restfulobjects.viewer.util;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
-public class UrlParserUtils_Test {
+class UrlParserUtils_Test {
@Test
- public void domainTypeFromLink() throws Exception {
+ void domainTypeFromLink() throws Exception {
final JsonRepresentation link = JsonRepresentation.newMap();
link.mapPutString("href",
"http://localhost/domain-types/com.mycompany.myapp.Customer";);
final String oidFromHref = UrlParserUtils.domainTypeFrom(link);
@@ -35,7 +35,7 @@ public class UrlParserUtils_Test {
}
@Test
- public void domainTypeFromLinkTrailingSlash() throws Exception {
+ void domainTypeFromLinkTrailingSlash() throws Exception {
final JsonRepresentation link = JsonRepresentation.newMap();
link.mapPutString("href",
"http://localhost/domain-types/com.mycompany.myapp.Customer/";);
final String oidFromHref = UrlParserUtils.domainTypeFrom(link);
@@ -43,7 +43,7 @@ public class UrlParserUtils_Test {
}
@Test
- public void domainTypeFromLinkFollowingStuff() throws Exception {
+ void domainTypeFromLinkFollowingStuff() throws Exception {
final JsonRepresentation link = JsonRepresentation.newMap();
link.mapPutString("href",
"http://localhost/domain-types/com.mycompany.myapp.Customer/otherStuffHere";);
final String oidFromHref = UrlParserUtils.domainTypeFrom(link);
diff --git
a/viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/webmodule/CausewayRestfulObjectsSessionFilter_lookupPassThru_Test.java
b/viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/webmodule/CausewayRestfulObjectsSessionFilter_lookupPassThru_Test.java
index 0382169f1f..0c20b23bd1 100644
---
a/viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/webmodule/CausewayRestfulObjectsSessionFilter_lookupPassThru_Test.java
+++
b/viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/webmodule/CausewayRestfulObjectsSessionFilter_lookupPassThru_Test.java
@@ -22,77 +22,69 @@ import java.util.List;
import javax.servlet.FilterConfig;
-import org.jmock.Expectations;
-import org.jmock.auto.Mock;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
-import static org.hamcrest.CoreMatchers.is;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.apache.causeway.core.internaltestsupport.jmocking.JUnitRuleMockery2;
-
-public class CausewayRestfulObjectsSessionFilter_lookupPassThru_Test {
-
- @Rule
- public JUnitRuleMockery2 context =
JUnitRuleMockery2.createFor(JUnitRuleMockery2.Mode.INTERFACES_AND_CLASSES);
+class CausewayRestfulObjectsSessionFilter_lookupPassThru_Test {
CausewayRestfulObjectsInteractionFilter causewayInteractionFilter;
- @Mock
FilterConfig mockFilterConfig;
- @Before
- public void setUp() throws Exception {
+ @BeforeEach
+ void setUp() throws Exception {
causewayInteractionFilter = new
CausewayRestfulObjectsInteractionFilter();
+ mockFilterConfig = Mockito.mock(FilterConfig.class);
}
@Test
- public void when_null() throws Exception {
- context.checking(new Expectations() {{
-
allowing(mockFilterConfig).getInitParameter(CausewayRestfulObjectsInteractionFilter.PASS_THRU_KEY);
- will(returnValue(null));
- }});
+ void when_null() throws Exception {
+
+ Mockito
+
.when(mockFilterConfig.getInitParameter(CausewayRestfulObjectsInteractionFilter.PASS_THRU_KEY))
+ .thenReturn(null);
final List<String> x =
causewayInteractionFilter.lookupAndParsePassThru(mockFilterConfig);
- Assert.assertThat(x.size(), is(0));
+ assertEquals(0, x.size());
}
@Test
- public void when_none() throws Exception {
- context.checking(new Expectations() {{
-
allowing(mockFilterConfig).getInitParameter(CausewayRestfulObjectsInteractionFilter.PASS_THRU_KEY);
- will(returnValue(""));
- }});
+ void when_none() throws Exception {
+
+ Mockito
+
.when(mockFilterConfig.getInitParameter(CausewayRestfulObjectsInteractionFilter.PASS_THRU_KEY))
+ .thenReturn("");
final List<String> x =
causewayInteractionFilter.lookupAndParsePassThru(mockFilterConfig);
- Assert.assertThat(x.size(), is(0));
+ assertEquals(0, x.size());
}
@Test
- public void when_one() throws Exception {
- context.checking(new Expectations() {{
-
allowing(mockFilterConfig).getInitParameter(CausewayRestfulObjectsInteractionFilter.PASS_THRU_KEY);
- will(returnValue("/abc"));
- }});
+ void when_one() throws Exception {
+
+ Mockito
+
.when(mockFilterConfig.getInitParameter(CausewayRestfulObjectsInteractionFilter.PASS_THRU_KEY))
+ .thenReturn("/abc");
final List<String> x =
causewayInteractionFilter.lookupAndParsePassThru(mockFilterConfig);
- Assert.assertThat(x.size(), is(1));
- Assert.assertThat(x.get(0), is("/abc"));
+ assertEquals(1, x.size());
+ assertEquals("/abc", x.get(0));
}
@Test
- public void when_several() throws Exception {
- context.checking(new Expectations() {{
-
allowing(mockFilterConfig).getInitParameter(CausewayRestfulObjectsInteractionFilter.PASS_THRU_KEY);
- will(returnValue("/abc,/def"));
- }});
+ void when_several() throws Exception {
+
+ Mockito
+
.when(mockFilterConfig.getInitParameter(CausewayRestfulObjectsInteractionFilter.PASS_THRU_KEY))
+ .thenReturn("/abc,/def");
final List<String> x =
causewayInteractionFilter.lookupAndParsePassThru(mockFilterConfig);
- Assert.assertThat(x.size(), is(2));
- Assert.assertThat(x.get(0), is("/abc"));
- Assert.assertThat(x.get(1), is("/def"));
+ assertEquals(2, x.size());
+ assertEquals("/abc", x.get(0));
+ assertEquals("/def", x.get(1));
}
}
