This is an automated email from the ASF dual-hosted git repository. ahuber pushed a commit to branch spring6 in repository https://gitbox.apache.org/repos/asf/isis.git
commit ee4dda76b6b2fd94646953cdcbe141d40640464e Merge: 300e607178 4d80a0e5c7 Author: Andi Huber <[email protected]> AuthorDate: Mon Nov 14 18:45:01 2022 +0100 ISIS-3275: purge JUnit4 core/internaltestvintage/pom.xml | 91 ------ .../jmocking/CausewayActions.java | 60 ---- .../jmocking/ImposteriserUsingCodegenPlugin.java | 92 ------- .../jmocking/Imposterisers.java | 34 --- .../jmocking/InjectIntoJMockAction.java | 62 ----- .../internaltestsupport/jmocking/JMockActions.java | 86 ------ .../jmocking/JUnitRuleMockery2.java | 306 --------------------- .../internaltestsupport/jmocking/MyMockomatic.java | 111 -------- .../jmocking/PostponedAction.java | 48 ---- core/pom.xml | 6 - extensions/core/excel/applib/pom.xml | 2 +- .../excel/applib/util/AnnotationListTest.java | 7 +- .../excel/applib/util/AnnotationTripletTest.java | 8 +- .../excel/applib/util/PivotUtilsTest.java | 12 +- .../excel/applib/util/SheetPivoterTest.java | 149 +++++----- persistence/jdo/metamodel/pom.xml | 2 +- ...atastoreIdentityAnnotationFacetFactoryTest.java | 9 +- ...GivenJdoPersistenceCapableFacetFactoryTest.java | 8 +- .../query/JdoQueryAnnotationFacetFactoryTest.java | 4 +- .../JdoVersionAnnotationFacetFactoryTest.java | 7 +- ...VersionAnnotationFacetFactoryTest_validate.java | 25 +- ...malFromJdoColumnAnnotationFacetFactoryTest.java | 6 +- ...oryFromJdoColumnAnnotationFacetFactoryTest.java | 5 +- ...impleObjectWithBigDecimalColumnAnnotations.java | 3 +- ...impleObjectWithColumnAllowsNullAnnotations.java | 18 +- ...JdoNotPersistentAnnotationFacetFactoryTest.java | 7 +- .../SimpleObjectWithNotPersistentColumn.java | 2 +- ...venJdoPrimaryKeyAnnotationFacetFactoryTest.java | 7 +- .../primarykey/SimpleObjectWithPrimaryKey.java | 2 +- .../testing/AbstractFacetFactoryTest.java | 41 +-- security/shiro/pom.xml | 2 +- .../shiro/CausewayPermissionTest_setParts.java | 12 +- .../shiro/CausewayPermissionTest_typicalUsage.java | 35 +-- ...AuthenticatorOrAuthorizorTest_authenticate.java | 4 +- ...ticatorOrAuthorizorTest_isVisibleInAnyRole.java | 9 +- .../CausewayPermissionTest_equals.java | 11 +- .../PermissionToRoleMapperFromIniTest.java | 8 +- .../PermissionToRoleMapperFromStringTest.java | 8 +- .../shiro/permrolemapper/UtilTest_parse.java | 6 +- 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 +- viewers/restfulobjects/testing/pom.xml | 2 +- .../Parser_forCacheControl_ContractTest.java | 2 +- .../Parser_forJaxRsMediaType_ContractTest.java | 2 +- ...entationTypeTest_getMediaType_ContractTest.java | 2 +- ...epresentationTypeTest_getName_ContractTest.java | 2 +- ...RepresentationTypeTest_lookup_ContractTest.java | 6 +- ...RepresentationTypeTest_parser_ContractTest.java | 4 +- ..._ensureCompatibleAcceptHeader_ContractTest.java | 68 ++--- ...tsApplicationExceptionMapper_Test_Contract.java | 27 +- 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 +++--- 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 +-- 70 files changed, 573 insertions(+), 1596 deletions(-) diff --cc core/pom.xml index f8b2fa5003,bc0bbc12a5..6be1a474a7 --- a/core/pom.xml +++ b/core/pom.xml @@@ -462,13 -462,8 +462,8 @@@ <dependency> <groupId>org.apache.causeway.core</groupId> <artifactId>causeway-core-internaltestsupport</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> </dependency> - <dependency> - <groupId>org.apache.causeway.core</groupId> - <artifactId>causeway-core-internaltestvintage</artifactId> - <version>3.0.0-SNAPSHOT</version> - </dependency> <dependency> <groupId>org.apache.causeway.core</groupId> <artifactId>causeway-core-metamodel</artifactId> diff --cc security/shiro/src/test/java/org/apache/causeway/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java index 213b67928a,4206823f3d..905ead2901 --- a/security/shiro/src/test/java/org/apache/causeway/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java +++ b/security/shiro/src/test/java/org/apache/causeway/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java @@@ -68,9 -68,9 +68,9 @@@ class ShiroAuthenticatorOrAuthorizorTes } @Test - public void vetoing() throws Exception { + void vetoing() throws Exception { // given - Factory<SecurityManager> factory = new IniSecurityManagerFactory("classpath:shiro.ini"); + IniFactorySupport<SecurityManager> factory = new IniSecurityManagerFactory("classpath:shiro.ini"); SecurityManager securityManager = factory.getInstance(); SecurityUtils.setSecurityManager(securityManager); @@@ -85,9 -85,9 +85,9 @@@ } @Test - public void vetoingOverridden() throws Exception { + void vetoingOverridden() throws Exception { // given - Factory<SecurityManager> factory = new IniSecurityManagerFactory("classpath:shiro.ini"); + IniFactorySupport<SecurityManager> factory = new IniSecurityManagerFactory("classpath:shiro.ini"); SecurityManager securityManager = factory.getInstance(); SecurityUtils.setSecurityManager(securityManager); diff --cc viewers/restfulobjects/testing/src/main/java/org/apache/causeway/viewer/restfulobjects/testing/Parser_forCacheControl_ContractTest.java index 141818f9b4,ed885ef12a..ce286ffc5f --- a/viewers/restfulobjects/testing/src/main/java/org/apache/causeway/viewer/restfulobjects/testing/Parser_forCacheControl_ContractTest.java +++ b/viewers/restfulobjects/testing/src/main/java/org/apache/causeway/viewer/restfulobjects/testing/Parser_forCacheControl_ContractTest.java @@@ -18,9 -18,9 +18,9 @@@ */ package org.apache.causeway.viewer.restfulobjects.testing; -import javax.ws.rs.core.CacheControl; +import jakarta.ws.rs.core.CacheControl; - import org.junit.Test; + import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; diff --cc viewers/restfulobjects/testing/src/main/java/org/apache/causeway/viewer/restfulobjects/testing/RepresentationTypeTest_lookup_ContractTest.java index e6af9fe6bd,bd036ea3d9..e982210377 --- a/viewers/restfulobjects/testing/src/main/java/org/apache/causeway/viewer/restfulobjects/testing/RepresentationTypeTest_lookup_ContractTest.java +++ b/viewers/restfulobjects/testing/src/main/java/org/apache/causeway/viewer/restfulobjects/testing/RepresentationTypeTest_lookup_ContractTest.java @@@ -18,9 -18,9 +18,9 @@@ */ package org.apache.causeway.viewer.restfulobjects.testing; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; - import org.junit.Test; + import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --cc viewers/restfulobjects/testing/src/main/java/org/apache/causeway/viewer/restfulobjects/testing/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java index c83c2ab5d0,c018b916d2..66cbe066ed --- a/viewers/restfulobjects/testing/src/main/java/org/apache/causeway/viewer/restfulobjects/testing/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java +++ b/viewers/restfulobjects/testing/src/main/java/org/apache/causeway/viewer/restfulobjects/testing/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java @@@ -21,16 -21,14 +21,14 @@@ package org.apache.causeway.viewer.rest import java.util.Arrays; import java.util.List; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; - 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.is; diff --cc viewers/restfulobjects/testing/src/main/java/org/apache/causeway/viewer/restfulobjects/testing/RestfulObjectsApplicationExceptionMapper_Test_Contract.java index 39e5521867,d428c82fbd..09ceef1aba --- a/viewers/restfulobjects/testing/src/main/java/org/apache/causeway/viewer/restfulobjects/testing/RestfulObjectsApplicationExceptionMapper_Test_Contract.java +++ b/viewers/restfulobjects/testing/src/main/java/org/apache/causeway/viewer/restfulobjects/testing/RestfulObjectsApplicationExceptionMapper_Test_Contract.java @@@ -18,13 -18,12 +18,12 @@@ */ package org.apache.causeway.viewer.restfulobjects.testing; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; - 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.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; diff --cc viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java index fe0a54d75e,04d191b765..76aa08f9c5 --- 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 @@@ -18,14 -18,12 +18,12 @@@ */ package org.apache.causeway.viewer.restfulobjects.viewer.context; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.ServletContext; +import jakarta.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; diff --cc viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/webmodule/CausewayRestfulObjectsSessionFilter_lookupPassThru_Test.java index 133036e3a6,0c20b23bd1..15dd20a5c7 --- 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 @@@ -20,23 -20,15 +20,15 @@@ package org.apache.causeway.viewer.rest import java.util.List; -import javax.servlet.FilterConfig; +import jakarta.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;
