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 815fa641df ISIS-2297: migrate wicket.viewer to JUnit5
815fa641df is described below
commit 815fa641df5c67c40d6f8d833b37037fbec3b99e
Author: Andi Huber <[email protected]>
AuthorDate: Mon Nov 14 18:22:38 2022 +0100
ISIS-2297: migrate wicket.viewer to JUnit5
---
viewers/wicket/viewer/pom.xml | 2 +-
...nticatedWebSessionForCauseway_Authenticate.java | 115 ++++++++-------------
...orCauseway_DownCastsInheritedFunctionality.java | 14 +--
...ticatedWebSessionForCauseway_Instantiation.java | 43 +++-----
.../AuthenticatedWebSessionForCauseway_SignIn.java | 70 +++++--------
...nticatedWebSessionForCauseway_TestAbstract.java | 54 ++++------
.../pages/PageClassListDefault_Instantiation.java | 43 +++-----
...ageClassListDefault_RegistrationAndCaching.java | 12 +--
.../services/TranslationsResolverWicketTest.java | 42 ++++----
9 files changed, 153 insertions(+), 242 deletions(-)
diff --git a/viewers/wicket/viewer/pom.xml b/viewers/wicket/viewer/pom.xml
index c15baa7ec6..114a6f34c1 100644
--- a/viewers/wicket/viewer/pom.xml
+++ b/viewers/wicket/viewer/pom.xml
@@ -143,7 +143,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/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/integration/AuthenticatedWebSessionForCauseway_Authenticate.java
b/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/integration/AuthenticatedWebSessionForCauseway_Authenticate.java
index 1fc0c18b1e..c9b72728fa 100644
---
a/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/integration/AuthenticatedWebSessionForCauseway_Authenticate.java
+++
b/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/integration/AuthenticatedWebSessionForCauseway_Authenticate.java
@@ -23,11 +23,9 @@ import java.util.Locale;
import java.util.Optional;
import org.apache.wicket.request.Request;
-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 static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
@@ -37,8 +35,6 @@ import static org.hamcrest.Matchers.nullValue;
import org.apache.causeway.applib.services.iactnlayer.InteractionLayerTracker;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
import org.apache.causeway.applib.services.user.ImpersonatedUserHolder;
-import org.apache.causeway.commons.functional.ThrowingRunnable;
-import org.apache.causeway.core.internaltestsupport.jmocking.JUnitRuleMockery2;
import org.apache.causeway.core.metamodel._testing.MetaModelContext_forTesting;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import
org.apache.causeway.core.security._testing.InteractionService_forTesting;
@@ -49,25 +45,20 @@ import
org.apache.causeway.core.security.authentication.InteractionContextFactor
import
org.apache.causeway.core.security.authentication.manager.AuthenticationManager;
import
org.apache.causeway.core.security.authentication.standard.RandomCodeGeneratorDefault;
-public class AuthenticatedWebSessionForCauseway_Authenticate {
-
- @Rule
- public final JUnitRuleMockery2 context =
-
JUnitRuleMockery2.createFor(JUnitRuleMockery2.Mode.INTERFACES_AND_CLASSES);
+class AuthenticatedWebSessionForCauseway_Authenticate {
private AuthenticationManager authMgr;
-
- @Mock protected Request mockRequest;
- @Mock protected Authenticator mockAuthenticator;
- @Mock protected InteractionService mockInteractionService;
- @Mock protected ImpersonatedUserHolder mockImpersonatedUserHolder;
- @Mock protected InteractionLayerTracker mockInteractionLayerTracker;
+ protected Request mockRequest = Mockito.mock(Request.class);
+ protected Authenticator mockAuthenticator =
Mockito.mock(Authenticator.class);
+ protected InteractionService mockInteractionService =
Mockito.mock(InteractionService.class);
+ protected ImpersonatedUserHolder mockImpersonatedUserHolder =
Mockito.mock(ImpersonatedUserHolder.class);
+ protected InteractionLayerTracker mockInteractionLayerTracker =
Mockito.mock(InteractionLayerTracker.class);
protected AuthenticatedWebSessionForCauseway webSession;
private MetaModelContext mmc;
- @Before
- public void setUp() throws Exception {
+ @BeforeEach
+ void setUp() throws Exception {
mmc = MetaModelContext_forTesting.builder()
.singleton(mockInteractionService)
@@ -81,60 +72,42 @@ public class
AuthenticatedWebSessionForCauseway_Authenticate {
Optional.empty(),
Collections.emptyList());
- context.checking(new Expectations() {
- {
-
allowing(mockInteractionLayerTracker).currentInteractionContext();
-
will(returnValue(Optional.of(InteractionContextFactory.testing())));
-
- allowing(mockInteractionService)
- .run(with(InteractionContextFactory.testing()),
with(any(ThrowingRunnable.class)));
-
- allowing(mockInteractionService)
- .runAnonymous(with(any(ThrowingRunnable.class)));
-
- // ignore
-
- // must provide explicit expectation, since Locale is final.
- allowing(mockRequest).getLocale();
- will(returnValue(Locale.getDefault()));
-
- // stub everything else out
- ignoring(mockRequest);
- }
- });
+ Mockito
+ .when(mockInteractionLayerTracker.currentInteractionContext())
+ .thenReturn(Optional.of(InteractionContextFactory.testing()));
+ Mockito
+ // must provide explicit expectation, since Locale is final.
+ .when(mockRequest.getLocale())
+ .thenReturn(Locale.getDefault());
}
protected void setupWebSession() {
webSession = new AuthenticatedWebSessionForCauseway(mockRequest) {
private static final long serialVersionUID = 1L;
-
- {
- metaModelContext = mmc;
- }
-
- @Override
- public AuthenticationManager getAuthenticationManager() {
+ { metaModelContext = mmc; }
+ @Override public AuthenticationManager getAuthenticationManager() {
return authMgr;
}
};
}
+ @Test
+ void delegatesToAuthenticationManagerAndCachesAuthSessionIfOk() {
+ Mockito
+ .when(mockImpersonatedUserHolder.getUserMemento())
+ .thenReturn(Optional.empty());
- @Test
- public void delegatesToAuthenticationManagerAndCachesAuthSessionIfOk() {
-
- context.checking(new Expectations() {
- {
- oneOf(mockImpersonatedUserHolder).getUserMemento();
- will(returnValue(Optional.empty()));
-
oneOf(mockAuthenticator).canAuthenticate(AuthenticationRequestPassword.class);
- will(returnValue(true));
-
oneOf(mockAuthenticator).authenticate(with(any(AuthenticationRequest.class)),
with(any(String.class)));
- will(returnValue(InteractionContextFactory.testing()));
- }
- });
+ Mockito
+
.when(mockAuthenticator.canAuthenticate(AuthenticationRequestPassword.class))
+ .thenReturn(true);
+
+ Mockito
+ .when(mockAuthenticator.authenticate(
+ Mockito.any(AuthenticationRequest.class),
+ Mockito.any(String.class)))
+ .thenReturn(InteractionContextFactory.testing());
setupWebSession();
@@ -146,15 +119,17 @@ public class
AuthenticatedWebSessionForCauseway_Authenticate {
}
@Test
- public void delegatesToAuthenticationManagerAndHandlesIfNotAuthenticated()
{
- context.checking(new Expectations() {
- {
-
oneOf(mockAuthenticator).canAuthenticate(AuthenticationRequestPassword.class);
- will(returnValue(true));
-
oneOf(mockAuthenticator).authenticate(with(any(AuthenticationRequest.class)),
with(any(String.class)));
- will(returnValue(null));
- }
- });
+ void delegatesToAuthenticationManagerAndHandlesIfNotAuthenticated() {
+
+ Mockito
+
.when(mockAuthenticator.canAuthenticate(AuthenticationRequestPassword.class))
+ .thenReturn(true);
+
+ Mockito
+ .when(mockAuthenticator.authenticate(
+ Mockito.any(AuthenticationRequest.class),
+ Mockito.any(String.class)))
+ .thenReturn(null);
setupWebSession();
diff --git
a/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/integration/AuthenticatedWebSessionForCauseway_DownCastsInheritedFunctionality.java
b/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/integration/AuthenticatedWebSessionForCauseway_DownCastsInheritedFunctionality.java
index d6242be92a..7eee46e293 100644
---
a/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/integration/AuthenticatedWebSessionForCauseway_DownCastsInheritedFunctionality.java
+++
b/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/integration/AuthenticatedWebSessionForCauseway_DownCastsInheritedFunctionality.java
@@ -18,22 +18,22 @@
*/
package org.apache.causeway.viewer.wicket.viewer.integration;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
-public class
AuthenticatedWebSessionForCauseway_DownCastsInheritedFunctionality {
+class AuthenticatedWebSessionForCauseway_DownCastsInheritedFunctionality {
- @Before
+ @BeforeEach
public void setUp() throws Exception {
}
- @Ignore("thread-safe downcast of inherited functionality")
+ @Disabled("thread-safe downcast of inherited functionality")
@Test
public void testGet() {
}
- @Ignore("thread-safe downcast of inherited functionality")
+ @Disabled("thread-safe downcast of inherited functionality")
@Test
public void testGetClientInfo() {
}
diff --git
a/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/integration/AuthenticatedWebSessionForCauseway_Instantiation.java
b/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/integration/AuthenticatedWebSessionForCauseway_Instantiation.java
index a2d0ec69ec..d943a4de21 100644
---
a/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/integration/AuthenticatedWebSessionForCauseway_Instantiation.java
+++
b/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/integration/AuthenticatedWebSessionForCauseway_Instantiation.java
@@ -21,41 +21,30 @@ package
org.apache.causeway.viewer.wicket.viewer.integration;
import java.util.Locale;
import org.apache.wicket.request.Request;
-import org.jmock.Expectations;
-import org.jmock.auto.Mock;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
-import org.apache.causeway.core.internaltestsupport.jmocking.JUnitRuleMockery2;
-import
org.apache.causeway.core.internaltestsupport.jmocking.JUnitRuleMockery2.Mode;
+import static org.junit.jupiter.api.Assertions.assertThrows;
-public class AuthenticatedWebSessionForCauseway_Instantiation {
+class AuthenticatedWebSessionForCauseway_Instantiation {
- @Rule
- public final JUnitRuleMockery2 context =
JUnitRuleMockery2.createFor(Mode.INTERFACES_AND_CLASSES);
-
- @Mock
- private Request stubRequest;
+ private Request mockRequest = Mockito.mock(Request.class);
@Test
- public void canInstantiateIfProvideRequest() {
- context.checking(new Expectations() {
- {
- // must provide explicit expectation, since Locale is final.
- allowing(stubRequest).getLocale();
- will(returnValue(Locale.getDefault()));
-
- // stub everything else out
- ignoring(stubRequest);
- }
- });
+ void canInstantiateIfProvideRequest() {
+ Mockito
+ // must provide explicit expectation, since Locale is final.
+ .when(mockRequest.getLocale())
+ .thenReturn(Locale.getDefault());
- new AuthenticatedWebSessionForCauseway(stubRequest);
+ new AuthenticatedWebSessionForCauseway(mockRequest);
}
- @Test(expected = Exception.class)
- public void requestMustBeProvided() {
- new AuthenticatedWebSessionForCauseway(null);
+ @Test
+ void requestMustBeProvided() {
+ assertThrows(Exception.class, ()->{
+ new AuthenticatedWebSessionForCauseway(null);
+ });
}
}
diff --git
a/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/integration/AuthenticatedWebSessionForCauseway_SignIn.java
b/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/integration/AuthenticatedWebSessionForCauseway_SignIn.java
index bbc9f19bf3..4c3f5c286e 100644
---
a/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/integration/AuthenticatedWebSessionForCauseway_SignIn.java
+++
b/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/integration/AuthenticatedWebSessionForCauseway_SignIn.java
@@ -25,19 +25,15 @@ import static java.util.Collections.emptyList;
import static java.util.Collections.singletonList;
import org.apache.wicket.request.Request;
-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 static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
import org.apache.causeway.applib.services.registry.ServiceRegistry;
-import org.apache.causeway.commons.functional.ThrowingRunnable;
-import org.apache.causeway.core.internaltestsupport.jmocking.JUnitRuleMockery2;
import org.apache.causeway.core.metamodel._testing.MetaModelContext_forTesting;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import
org.apache.causeway.core.security._testing.InteractionService_forTesting;
@@ -48,24 +44,20 @@ import
org.apache.causeway.core.security.authentication.InteractionContextFactor
import
org.apache.causeway.core.security.authentication.manager.AuthenticationManager;
import
org.apache.causeway.core.security.authentication.standard.RandomCodeGeneratorDefault;
-public class AuthenticatedWebSessionForCauseway_SignIn {
-
- @Rule
- public final JUnitRuleMockery2 context =
-
JUnitRuleMockery2.createFor(JUnitRuleMockery2.Mode.INTERFACES_AND_CLASSES);
+class AuthenticatedWebSessionForCauseway_SignIn {
private AuthenticationManager authMgr;
- @Mock protected Request mockRequest;
- @Mock protected Authenticator mockAuthenticator;
- @Mock protected InteractionService mockInteractionService;
- @Mock protected ServiceRegistry mockServiceRegistry;
+ protected Request mockRequest = Mockito.mock(Request.class);
+ protected Authenticator mockAuthenticator =
Mockito.mock(Authenticator.class);
+ protected InteractionService mockInteractionService =
Mockito.mock(InteractionService.class);
+ protected ServiceRegistry mockServiceRegistry =
Mockito.mock(ServiceRegistry.class);
protected AuthenticatedWebSessionForCauseway webSession;
private MetaModelContext mmc;
- @Before
- public void setUp() throws Exception {
+ @BeforeEach
+ void setUp() throws Exception {
mmc = MetaModelContext_forTesting.builder()
.singleton(mockInteractionService)
.build();
@@ -79,32 +71,22 @@ public class AuthenticatedWebSessionForCauseway_SignIn {
}
@Test
- public void signInJustDelegatesToAuthenticateAndSavesState() {
- context.checking(new Expectations() {
- {
-
- allowing(mockInteractionService)
- .run(with(InteractionContextFactory.testing()),
with(any(ThrowingRunnable.class)));
-
- allowing(mockInteractionService)
- .runAnonymous(with(any(ThrowingRunnable.class)));
-
- // ignore
-
- // must provide explicit expectation, since Locale is final.
- allowing(mockRequest).getLocale();
- will(returnValue(Locale.getDefault()));
-
- // stub everything else out
- ignoring(mockRequest);
-
-
oneOf(mockAuthenticator).canAuthenticate(AuthenticationRequestPassword.class);
- will(returnValue(true));
-
-
oneOf(mockAuthenticator).authenticate(with(any(AuthenticationRequest.class)),
with(any(String.class)));
- will(returnValue(InteractionContextFactory.testing()));
- }
- });
+ void signInJustDelegatesToAuthenticateAndSavesState() {
+
+ Mockito
+ // must provide explicit expectation, since Locale is final.
+ .when(mockRequest.getLocale())
+ .thenReturn(Locale.getDefault());
+
+ Mockito
+
.when(mockAuthenticator.canAuthenticate(AuthenticationRequestPassword.class))
+ .thenReturn(true);
+
+ Mockito
+ .when(mockAuthenticator.authenticate(
+ Mockito.any(AuthenticationRequest.class),
+ Mockito.any(String.class)))
+ .thenReturn(InteractionContextFactory.testing());
webSession = new AuthenticatedWebSessionForCauseway(mockRequest) {
private static final long serialVersionUID = 1L;
diff --git
a/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/integration/AuthenticatedWebSessionForCauseway_TestAbstract.java
b/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/integration/AuthenticatedWebSessionForCauseway_TestAbstract.java
index eff33c768c..deacb61de1 100644
---
a/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/integration/AuthenticatedWebSessionForCauseway_TestAbstract.java
+++
b/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/integration/AuthenticatedWebSessionForCauseway_TestAbstract.java
@@ -22,58 +22,42 @@ import java.util.Locale;
import java.util.Optional;
import org.apache.wicket.request.Request;
-import org.jmock.Expectations;
-import org.jmock.auto.Mock;
-import org.junit.Rule;
+import org.mockito.Mockito;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
import org.apache.causeway.applib.services.registry.ServiceRegistry;
import org.apache.causeway.applib.services.session.SessionSubscriber;
-import org.apache.causeway.commons.functional.ThrowingRunnable;
-import org.apache.causeway.core.internaltestsupport.jmocking.JUnitRuleMockery2;
-import
org.apache.causeway.core.internaltestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
-import
org.apache.causeway.core.security.authentication.InteractionContextFactory;
import
org.apache.causeway.core.security.authentication.manager.AuthenticationManager;
public abstract class AuthenticatedWebSessionForCauseway_TestAbstract {
- @Rule public final JUnitRuleMockery2 context =
- JUnitRuleMockery2.createFor(Mode.INTERFACES_AND_CLASSES);
-
- @Mock protected Request mockRequest;
- @Mock protected AuthenticationManager mockAuthMgr;
- @Mock protected MetaModelContext mockCommonContext;
- @Mock protected InteractionService mockInteractionService;
- @Mock protected ServiceRegistry mockServiceRegistry;
+ protected Request mockRequest = Mockito.mock(Request.class);
+ protected AuthenticationManager mockAuthMgr =
Mockito.mock(AuthenticationManager.class);
+ protected MetaModelContext mockCommonContext =
Mockito.mock(MetaModelContext.class);
+ protected InteractionService mockInteractionService =
Mockito.mock(InteractionService.class);
+ protected ServiceRegistry mockServiceRegistry =
Mockito.mock(ServiceRegistry.class);
protected AuthenticatedWebSessionForCauseway webSession;
protected void setUp() throws Exception {
- context.checking(new Expectations() {
- {
- allowing(mockCommonContext).getServiceRegistry();
- will(returnValue(mockServiceRegistry));
-
allowing(mockServiceRegistry).lookupService(SessionSubscriber.class);
- will(returnValue(Optional.empty()));
+ Mockito
+ // must provide explicit expectation, since Locale is final.
+ .when(mockRequest.getLocale())
+ .thenReturn(Locale.getDefault());
-
allowing(mockCommonContext).lookupServiceElseFail(InteractionService.class);
- will(returnValue(mockInteractionService));
+ Mockito
+ .when(mockCommonContext.getServiceRegistry())
+ .thenReturn(mockServiceRegistry);
- allowing(mockInteractionService).run(
- InteractionContextFactory.testing(),
- with(any(ThrowingRunnable.class)));
- // ignore
+ Mockito
+ .when(mockServiceRegistry.lookupService(SessionSubscriber.class))
+ .thenReturn(Optional.empty());
- // must provide explicit expectation, since Locale is final.
- allowing(mockRequest).getLocale();
- will(returnValue(Locale.getDefault()));
-
- // stub everything else out
- ignoring(mockRequest);
- }
- });
+ Mockito
+
.when(mockServiceRegistry.lookupServiceElseFail(InteractionService.class))
+ .thenReturn(mockInteractionService);
}
diff --git
a/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/registries/pages/PageClassListDefault_Instantiation.java
b/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/registries/pages/PageClassListDefault_Instantiation.java
index 203ddb9e12..3345ac80a3 100644
---
a/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/registries/pages/PageClassListDefault_Instantiation.java
+++
b/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/registries/pages/PageClassListDefault_Instantiation.java
@@ -18,54 +18,35 @@
*/
package org.apache.causeway.viewer.wicket.viewer.registries.pages;
-import org.jmock.Expectations;
-import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
-import org.jmock.integration.junit4.JUnit4Mockery;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
-import org.apache.causeway.viewer.wicket.ui.pages.PageClassList;
-import org.apache.causeway.viewer.wicket.ui.pages.PageClassRegistrySpi;
-
-@RunWith(JMock.class)
-public class PageClassListDefault_Instantiation {
+import static org.junit.jupiter.api.Assertions.assertThrows;
- private final Mockery context = new JUnit4Mockery();
-
- @Before
- public void setUp() throws Exception {
- }
+import org.apache.causeway.viewer.wicket.ui.pages.PageClassList;
- @After
- public void tearDown() throws Exception {
- }
+class PageClassListDefault_Instantiation {
@Test
- public void shouldCauseAllPagesToBeRegistered() {
+ void shouldCauseAllPagesToBeRegistered() {
// necessary to provide an implementation that will register
// all pages with the registry.
final PageClassListDefault pageClassList = new PageClassListDefault();
newPageClassRegistryDefault(pageClassList);
}
- @Test(expected = IllegalStateException.class)
- public void shouldFailIfNoPagesRegistered() {
+ @Test
+ void shouldFailIfNoPagesRegistered() {
// no side effects, ie doesn't register
- final PageClassList mockPageClassList =
context.mock(PageClassList.class);
- context.checking(new Expectations() {
- {
-
mockPageClassList.registerPages(with(any(PageClassRegistrySpi.class)));
- }
+ final PageClassList mockPageClassList =
Mockito.mock(PageClassList.class);
+ assertThrows(IllegalStateException.class, ()->{
+ newPageClassRegistryDefault(mockPageClassList);
});
- newPageClassRegistryDefault(mockPageClassList);
}
// -- HELPER
- public static PageClassRegistryDefault
newPageClassRegistryDefault(PageClassList pageClassList) {
+ static PageClassRegistryDefault newPageClassRegistryDefault(final
PageClassList pageClassList) {
PageClassRegistryDefault pageClassRegistry = new
PageClassRegistryDefault(pageClassList);
pageClassRegistry.init();
return pageClassRegistry;
diff --git
a/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/registries/pages/PageClassListDefault_RegistrationAndCaching.java
b/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/registries/pages/PageClassListDefault_RegistrationAndCaching.java
index 2e100bfd46..43f86793d8 100644
---
a/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/registries/pages/PageClassListDefault_RegistrationAndCaching.java
+++
b/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/registries/pages/PageClassListDefault_RegistrationAndCaching.java
@@ -19,8 +19,8 @@
package org.apache.causeway.viewer.wicket.viewer.registries.pages;
import org.apache.wicket.Page;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
@@ -28,12 +28,12 @@ import static org.hamcrest.Matchers.is;
import org.apache.causeway.viewer.wicket.model.models.PageType;
import
org.apache.causeway.viewer.wicket.ui.pages.standalonecollection.StandaloneCollectionPage;
-public class PageClassListDefault_RegistrationAndCaching {
+class PageClassListDefault_RegistrationAndCaching {
private PageClassRegistryDefault registryImpl;
- @Before
- public void setUp() throws Exception {
+ @BeforeEach
+ void setUp() throws Exception {
// necessary to provide an implementation that will register
// all pages with the registry.
final PageClassListDefault pageClassList = new PageClassListDefault();
@@ -41,7 +41,7 @@ public class PageClassListDefault_RegistrationAndCaching {
}
@Test
- public void canRegisterNewPageType() {
+ void canRegisterNewPageType() {
class TestingStandaloneCollectionPage extends StandaloneCollectionPage
{
private static final long serialVersionUID = 1L;
diff --git
a/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/services/TranslationsResolverWicketTest.java
b/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/services/TranslationsResolverWicketTest.java
index 637a27d45f..2302d00c8d 100644
---
a/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/services/TranslationsResolverWicketTest.java
+++
b/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/services/TranslationsResolverWicketTest.java
@@ -20,37 +20,37 @@ package org.apache.causeway.viewer.wicket.viewer.services;
import java.io.File;
-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.junit.Assume.assumeThat;
-public class TranslationsResolverWicketTest {
+import org.apache.causeway.commons.internal.base._Files;
- public static class NewFile extends TranslationsResolverWicketTest {
+import lombok.val;
- @Before
- public void setUp() throws Exception {
- assumeThat(System.getProperty("os.name").startsWith("Windows"),
is(true));
- }
+class TranslationsResolverWicketTest {
- @Test
- public void simple() throws Exception {
- final File file = TranslationsResolverWicket.newFile("c:/foo",
"bar").toFile();
- final String absolutePath = file.getAbsolutePath();
- assertThat(absolutePath, is("c:\\foo\\bar"));
- }
+ private File tempDir;
- @Test
- public void nestedChild() throws Exception {
- final File file = TranslationsResolverWicket.newFile("c:/foo",
"bar/baz").toFile();
- final String absolutePath = file.getAbsolutePath();
- assertThat(absolutePath, is("c:\\foo\\bar\\baz"));
- }
+ @BeforeEach
+ public void setUp() throws Exception {
+ tempDir = _Files.tempDir("foo");
+ }
+ @Test
+ public void simple() throws Exception {
+ final File file =
TranslationsResolverWicket.newFile(tempDir.getAbsolutePath(), "bar").toFile();
+ val expected = new File(tempDir, "bar");
+ assertThat(file.getAbsolutePath(), is(expected.getAbsolutePath()));
}
+ @Test
+ public void nestedChild() throws Exception {
+ final File file =
TranslationsResolverWicket.newFile(tempDir.getAbsolutePath(),
"bar/baz").toFile();
+ val expected = new File(tempDir, "bar/baz");
+ assertThat(file.getAbsolutePath(), is(expected.getAbsolutePath()));
+ }
}
\ No newline at end of file
