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 48e45e1467 ISIS-2297: migrate JDO metamodel to JUnit5
48e45e1467 is described below
commit 48e45e1467c58d6b9e89c68da9a7172e715e28da
Author: Andi Huber <[email protected]>
AuthorDate: Mon Nov 14 17:34:54 2022 +0100
ISIS-2297: migrate JDO metamodel to JUnit5
---
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 ++++++----------------
15 files changed, 78 insertions(+), 68 deletions(-)
diff --git a/persistence/jdo/metamodel/pom.xml
b/persistence/jdo/metamodel/pom.xml
index f0c7e1e959..f3a4586718 100644
--- a/persistence/jdo/metamodel/pom.xml
+++ b/persistence/jdo/metamodel/pom.xml
@@ -52,7 +52,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/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/datastoreidentity/GivenJdoDatastoreIdentityAnnotationFacetFactoryTest.java
b/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/datastoreidentity/GivenJdoDatastoreIdentityAnnotationFacetFactoryTest.java
index 24746d544e..8b07af8eab 100644
---
a/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/datastoreidentity/GivenJdoDatastoreIdentityAnnotationFacetFactoryTest.java
+++
b/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/datastoreidentity/GivenJdoDatastoreIdentityAnnotationFacetFactoryTest.java
@@ -22,6 +22,12 @@ import javax.jdo.annotations.DatastoreIdentity;
import javax.jdo.annotations.IdGeneratorStrategy;
import javax.jdo.annotations.PersistenceCapable;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facetapi.FeatureType;
import
org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessClassContext;
@@ -30,7 +36,7 @@ import
org.apache.causeway.persistence.jdo.provider.metamodel.facets.object.data
import lombok.val;
-public class GivenJdoDatastoreIdentityAnnotationFacetFactoryTest
+class GivenJdoDatastoreIdentityAnnotationFacetFactoryTest
extends AbstractFacetFactoryTest {
private JdoDatastoreIdentityAnnotationFacetFactory facetFactory;
@@ -38,7 +44,6 @@ extends AbstractFacetFactoryTest {
@Override
protected void setUp() throws Exception {
super.setUp();
-
facetFactory = new
JdoDatastoreIdentityAnnotationFacetFactory(metaModelContext, jdoFacetContext);
}
diff --git
a/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/persistencecapable/GivenJdoPersistenceCapableFacetFactoryTest.java
b/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/persistencecapable/GivenJdoPersistenceCapableFacetFactoryTest.java
index 9e5daac0c3..d80959a2bd 100644
---
a/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/persistencecapable/GivenJdoPersistenceCapableFacetFactoryTest.java
+++
b/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/persistencecapable/GivenJdoPersistenceCapableFacetFactoryTest.java
@@ -21,6 +21,12 @@ package
org.apache.causeway.persistence.jdo.metamodel.facets.object.persistencec
import javax.jdo.annotations.IdentityType;
import javax.jdo.annotations.PersistenceCapable;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facetapi.FeatureType;
import
org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessClassContext;
@@ -30,7 +36,7 @@ import
org.apache.causeway.persistence.jdo.provider.metamodel.facets.object.pers
import lombok.val;
-public class GivenJdoPersistenceCapableFacetFactoryTest
+class GivenJdoPersistenceCapableFacetFactoryTest
extends AbstractFacetFactoryTest {
private JdoPersistenceCapableFacetFactory facetFactory;
diff --git
a/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/query/JdoQueryAnnotationFacetFactoryTest.java
b/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/query/JdoQueryAnnotationFacetFactoryTest.java
index 834857aeb2..88b1b8a622 100644
---
a/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/query/JdoQueryAnnotationFacetFactoryTest.java
+++
b/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/query/JdoQueryAnnotationFacetFactoryTest.java
@@ -18,14 +18,14 @@
*/
package org.apache.causeway.persistence.jdo.metamodel.facets.object.query;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.nullValue;
-public class JdoQueryAnnotationFacetFactoryTest {
+class JdoQueryAnnotationFacetFactoryTest {
public static class From_Test extends JdoQueryAnnotationFacetFactoryTest {
diff --git
a/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest.java
b/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest.java
index ee6f2eb29c..9cb1c9f28c 100644
---
a/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest.java
+++
b/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest.java
@@ -21,6 +21,11 @@ package
org.apache.causeway.persistence.jdo.metamodel.facets.object.version;
import javax.jdo.annotations.PersistenceCapable;
import javax.jdo.annotations.Version;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facetapi.FeatureType;
import
org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessClassContext;
@@ -29,7 +34,7 @@ import
org.apache.causeway.persistence.jdo.provider.metamodel.facets.object.vers
import lombok.val;
-public class JdoVersionAnnotationFacetFactoryTest extends
AbstractFacetFactoryTest {
+class JdoVersionAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
private JdoVersionAnnotationFacetFactory facetFactory;
diff --git
a/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest_validate.java
b/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest_validate.java
index b64fcad300..6d90a1303a 100644
---
a/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest_validate.java
+++
b/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest_validate.java
@@ -21,12 +21,12 @@ package
org.apache.causeway.persistence.jdo.metamodel.facets.object.version;
import javax.jdo.annotations.Version;
import org.hamcrest.CoreMatchers;
-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.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.metamodel._testing.MetaModelContext_forTesting;
@@ -37,12 +37,12 @@ import
org.apache.causeway.persistence.jdo.metamodel.testing.AbstractFacetFactor
import lombok.val;
-public class JdoVersionAnnotationFacetFactoryTest_validate {
+class JdoVersionAnnotationFacetFactoryTest_validate {
private MetaModelContext_forTesting metaModelContext;
- @Before
- public void setUp() throws Exception {
+ @BeforeEach
+ void setUp() throws Exception {
val configuration = new CausewayConfiguration(null);
@@ -69,7 +69,7 @@ public class JdoVersionAnnotationFacetFactoryTest_validate {
}
@Test
- public void whenNoFacet() {
+ void whenNoFacet() {
class Child {}
@@ -78,7 +78,7 @@ public class JdoVersionAnnotationFacetFactoryTest_validate {
}
@Test
- public void whenHasFacetNoSuperType() {
+ void whenHasFacetNoSuperType() {
@Version
class Child {}
@@ -88,7 +88,7 @@ public class JdoVersionAnnotationFacetFactoryTest_validate {
}
@Test
- public void whenHasFacetWithSuperTypeHasNoFacet() {
+ void whenHasFacetWithSuperTypeHasNoFacet() {
class Parent {}
@@ -101,7 +101,7 @@ public class JdoVersionAnnotationFacetFactoryTest_validate {
@Test
- public void whenHasFacetWithParentTypeHasFacet() {
+ void whenHasFacetWithParentTypeHasFacet() {
@Version
class Parent {}
@@ -118,7 +118,7 @@ public class JdoVersionAnnotationFacetFactoryTest_validate {
@Test
- public void whenHasFacetWithGrandParentTypeHasFacet() {
+ void whenHasFacetWithGrandParentTypeHasFacet() {
@Version
class GrandParent {}
@@ -136,7 +136,7 @@ public class JdoVersionAnnotationFacetFactoryTest_validate {
}
@Test
- public void whenHasFacetWithAbstactParentTypeHasFacet() {
+ void whenHasFacetWithAbstactParentTypeHasFacet() {
@Version
abstract class Parent {}
@@ -148,7 +148,6 @@ public class JdoVersionAnnotationFacetFactoryTest_validate {
assertThat(failures.getNumberOfFailures(), is(0));
}
-
private ValidationFailures processThenValidate(final Class<?> cls) {
val specLoader = metaModelContext.getSpecificationLoader();
specLoader.specForType(cls).get(); // fail if empty
diff --git
a/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/BigDecimalFromJdoColumnAnnotationFacetFactoryTest.java
b/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/BigDecimalFromJdoColumnAnnotationFacetFactoryTest.java
index 3430105ff1..63780abccb 100644
---
a/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/BigDecimalFromJdoColumnAnnotationFacetFactoryTest.java
+++
b/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/BigDecimalFromJdoColumnAnnotationFacetFactoryTest.java
@@ -22,6 +22,10 @@ import java.lang.reflect.Method;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.causeway.core.metamodel._testing.MetaModelContext_forTesting;
import org.apache.causeway.core.metamodel.facetapi.FeatureType;
@@ -33,7 +37,7 @@ import
org.apache.causeway.persistence.jdo.metamodel.testing.AbstractFacetFactor
import lombok.val;
-public class BigDecimalFromJdoColumnAnnotationFacetFactoryTest
+class BigDecimalFromJdoColumnAnnotationFacetFactoryTest
extends AbstractFacetFactoryTest {
private BigDecimalFromColumnAnnotationFacetFactory facetFactory;
diff --git
a/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactoryTest.java
b/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactoryTest.java
index 68398fd487..54f439b41c 100644
---
a/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactoryTest.java
+++
b/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactoryTest.java
@@ -22,6 +22,9 @@ import java.lang.reflect.Method;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.causeway.core.metamodel.facetapi.FeatureType;
import
org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessMethodContext;
@@ -30,7 +33,7 @@ import
org.apache.causeway.persistence.jdo.metamodel.testing.AbstractFacetFactor
import lombok.val;
-public class MandatoryFromJdoColumnAnnotationFacetFactoryTest
+class MandatoryFromJdoColumnAnnotationFacetFactoryTest
extends AbstractFacetFactoryTest {
private MandatoryFromColumnAnnotationFacetFactory facetFactory;
diff --git
a/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/SimpleObjectWithBigDecimalColumnAnnotations.java
b/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/SimpleObjectWithBigDecimalColumnAnnotations.java
index c147a68ce9..3fc79e2076 100644
---
a/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/SimpleObjectWithBigDecimalColumnAnnotations.java
+++
b/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/SimpleObjectWithBigDecimalColumnAnnotations.java
@@ -22,8 +22,7 @@ import java.math.BigDecimal;
import javax.jdo.annotations.Column;
-
-public class SimpleObjectWithBigDecimalColumnAnnotations {
+class SimpleObjectWithBigDecimalColumnAnnotations {
private BigDecimal bigDecimalPropertyWithColumnAnnotation;
diff --git
a/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/SimpleObjectWithColumnAllowsNullAnnotations.java
b/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/SimpleObjectWithColumnAllowsNullAnnotations.java
index bf15bea851..41e56d3959 100644
---
a/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/SimpleObjectWithColumnAllowsNullAnnotations.java
+++
b/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/column/SimpleObjectWithColumnAllowsNullAnnotations.java
@@ -20,14 +20,14 @@ package
org.apache.causeway.persistence.jdo.metamodel.facets.prop.column;
import javax.jdo.annotations.Column;
-public abstract class SimpleObjectWithColumnAllowsNullAnnotations {
+abstract class SimpleObjectWithColumnAllowsNullAnnotations {
private int primitiveWithNoAnnotation;
public int getPrimitiveWithNoAnnotation() {
return primitiveWithNoAnnotation;
}
- public void setPrimitiveWithNoAnnotation(int primitive) {
+ public void setPrimitiveWithNoAnnotation(final int primitive) {
this.primitiveWithNoAnnotation = primitive;
}
@@ -36,7 +36,7 @@ public abstract class
SimpleObjectWithColumnAllowsNullAnnotations {
public int getPrimitiveWithNoAllowsNull() {
return primitiveWithNoAllowsNull;
}
- public void setPrimitiveWithNoAllowsNull(int primitive) {
+ public void setPrimitiveWithNoAllowsNull(final int primitive) {
this.primitiveWithNoAllowsNull = primitive;
}
@@ -45,7 +45,7 @@ public abstract class
SimpleObjectWithColumnAllowsNullAnnotations {
public int getPrimitiveWithAllowsNullFalse() {
return primitiveWithAllowsNullFalse;
}
- public void setPrimitiveWithAllowsNullFalse(int primitive) {
+ public void setPrimitiveWithAllowsNullFalse(final int primitive) {
this.primitiveWithAllowsNullFalse = primitive;
}
@@ -55,7 +55,7 @@ public abstract class
SimpleObjectWithColumnAllowsNullAnnotations {
public int getPrimitiveWithAllowsNullTrue() {
return primitiveWithAllowsNullTrue;
}
- public void setPrimitiveWithAllowsNullTrue(int primitive) {
+ public void setPrimitiveWithAllowsNullTrue(final int primitive) {
this.primitiveWithAllowsNullTrue = primitive;
}
@@ -64,7 +64,7 @@ public abstract class
SimpleObjectWithColumnAllowsNullAnnotations {
public String getReferenceWithNoAnnotation() {
return referenceWithNoAnnotation;
}
- public void setReferenceWithNoAnnotation(String reference) {
+ public void setReferenceWithNoAnnotation(final String reference) {
this.referenceWithNoAnnotation = reference;
}
@@ -73,7 +73,7 @@ public abstract class
SimpleObjectWithColumnAllowsNullAnnotations {
public String getReferenceWithNoAllowsNull() {
return referenceWithNoAllowsNull;
}
- public void setReferenceWithNoAllowsNull(String reference) {
+ public void setReferenceWithNoAllowsNull(final String reference) {
this.referenceWithNoAllowsNull = reference;
}
@@ -82,7 +82,7 @@ public abstract class
SimpleObjectWithColumnAllowsNullAnnotations {
public String getReferenceWithAllowsNullFalse() {
return referenceWithAllowsNullFalse;
}
- public void setReferenceWithAllowsNullFalse(String
referenceWithAllowsNullFalse) {
+ public void setReferenceWithAllowsNullFalse(final String
referenceWithAllowsNullFalse) {
this.referenceWithAllowsNullFalse = referenceWithAllowsNullFalse;
}
@@ -92,7 +92,7 @@ public abstract class
SimpleObjectWithColumnAllowsNullAnnotations {
public String getReferenceWithAllowsNullTrue() {
return referenceWithAllowsNullTrue;
}
- public void setReferenceWithAllowsNullTrue(String
referenceWithAllowsNullTrue) {
+ public void setReferenceWithAllowsNullTrue(final String
referenceWithAllowsNullTrue) {
this.referenceWithAllowsNullTrue = referenceWithAllowsNullTrue;
}
diff --git
a/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/notpersistent/GivenJdoNotPersistentAnnotationFacetFactoryTest.java
b/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/notpersistent/GivenJdoNotPersistentAnnotationFacetFactoryTest.java
index 5bfd7a4089..9ce2add793 100644
---
a/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/notpersistent/GivenJdoNotPersistentAnnotationFacetFactoryTest.java
+++
b/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/notpersistent/GivenJdoNotPersistentAnnotationFacetFactoryTest.java
@@ -22,6 +22,11 @@ import java.lang.reflect.Method;
import javax.jdo.annotations.NotPersistent;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facetapi.FeatureType;
import
org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessMethodContext;
@@ -30,7 +35,7 @@ import
org.apache.causeway.persistence.jdo.provider.metamodel.facets.prop.notper
import lombok.val;
-public class GivenJdoNotPersistentAnnotationFacetFactoryTest
+class GivenJdoNotPersistentAnnotationFacetFactoryTest
extends AbstractFacetFactoryTest {
private JdoNotPersistentAnnotationFacetFactory facetFactory;
diff --git
a/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/notpersistent/SimpleObjectWithNotPersistentColumn.java
b/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/notpersistent/SimpleObjectWithNotPersistentColumn.java
index 831296a230..bee353f05a 100644
---
a/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/notpersistent/SimpleObjectWithNotPersistentColumn.java
+++
b/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/notpersistent/SimpleObjectWithNotPersistentColumn.java
@@ -20,7 +20,7 @@ package
org.apache.causeway.persistence.jdo.metamodel.facets.prop.notpersistent;
import javax.jdo.annotations.NotPersistent;
-public abstract class SimpleObjectWithNotPersistentColumn {
+abstract class SimpleObjectWithNotPersistentColumn {
private Long someColumn;
diff --git
a/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/primarykey/GivenJdoPrimaryKeyAnnotationFacetFactoryTest.java
b/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/primarykey/GivenJdoPrimaryKeyAnnotationFacetFactoryTest.java
index 9978657f09..d15c73d129 100644
---
a/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/primarykey/GivenJdoPrimaryKeyAnnotationFacetFactoryTest.java
+++
b/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/primarykey/GivenJdoPrimaryKeyAnnotationFacetFactoryTest.java
@@ -22,6 +22,11 @@ import java.lang.reflect.Method;
import javax.jdo.annotations.PrimaryKey;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facetapi.FeatureType;
import
org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessMethodContext;
@@ -32,7 +37,7 @@ import
org.apache.causeway.persistence.jdo.provider.metamodel.facets.prop.primar
import lombok.val;
-public class GivenJdoPrimaryKeyAnnotationFacetFactoryTest
+class GivenJdoPrimaryKeyAnnotationFacetFactoryTest
extends AbstractFacetFactoryTest {
private JdoPrimaryKeyAnnotationFacetFactory facetFactory;
diff --git
a/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/primarykey/SimpleObjectWithPrimaryKey.java
b/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/primarykey/SimpleObjectWithPrimaryKey.java
index 067494b2ae..4209561489 100644
---
a/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/primarykey/SimpleObjectWithPrimaryKey.java
+++
b/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/prop/primarykey/SimpleObjectWithPrimaryKey.java
@@ -20,7 +20,7 @@ package
org.apache.causeway.persistence.jdo.metamodel.facets.prop.primarykey;
import javax.jdo.annotations.PrimaryKey;
-public abstract class SimpleObjectWithPrimaryKey {
+abstract class SimpleObjectWithPrimaryKey {
private Long id;
diff --git
a/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/testing/AbstractFacetFactoryTest.java
b/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/testing/AbstractFacetFactoryTest.java
index eb9d88fdbb..6c21fa3100 100644
---
a/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/testing/AbstractFacetFactoryTest.java
+++
b/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/testing/AbstractFacetFactoryTest.java
@@ -21,8 +21,9 @@ package org.apache.causeway.persistence.jdo.metamodel.testing;
import java.lang.reflect.Method;
import java.util.Optional;
-import org.jmock.Expectations;
-import org.junit.Rule;
+import org.mockito.Mockito;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.causeway.applib.Identifier;
import org.apache.causeway.applib.id.LogicalType;
@@ -32,7 +33,6 @@ import
org.apache.causeway.applib.services.iactnlayer.InteractionService;
import org.apache.causeway.applib.services.repository.EntityState;
import org.apache.causeway.commons.collections.ImmutableEnumSet;
import org.apache.causeway.core.config.beans.PersistenceStack;
-import org.apache.causeway.core.internaltestsupport.jmocking.JUnitRuleMockery2;
import org.apache.causeway.core.metamodel._testing.MetaModelContext_forTesting;
import org.apache.causeway.core.metamodel._testing.MethodRemover_forTesting;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
@@ -40,17 +40,11 @@ import
org.apache.causeway.core.metamodel.facetapi.FeatureType;
import org.apache.causeway.core.metamodel.facets.FacetedMethod;
import org.apache.causeway.core.metamodel.facets.FacetedMethodParameter;
import org.apache.causeway.core.metamodel.facets.object.entity.EntityFacet;
-import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
import
org.apache.causeway.core.security.authentication.InteractionContextFactory;
import org.apache.causeway.persistence.jdo.provider.entities.JdoFacetContext;
-import junit.framework.TestCase;
-
-public abstract class AbstractFacetFactoryTest extends TestCase {
-
- @Rule
- public JUnitRuleMockery2 context =
JUnitRuleMockery2.createFor(JUnitRuleMockery2.Mode.INTERFACES_AND_CLASSES);
+public abstract class AbstractFacetFactoryTest {
public static class Customer {
@@ -77,17 +71,13 @@ public abstract class AbstractFacetFactoryTest extends
TestCase {
protected MetaModelContext_forTesting metaModelContext;
protected JdoFacetContext jdoFacetContext;
- @Override
protected void setUp() throws Exception {
- super.setUp();
-
- // PRODUCTION
methodRemover = new MethodRemover_forTesting();
- mockInteractionService = context.mock(InteractionService.class);
- mockTranslationService = context.mock(TranslationService.class);
- mockSpecificationLoader = context.mock(SpecificationLoader.class);
+ mockInteractionService = Mockito.mock(InteractionService.class);
+ mockTranslationService = Mockito.mock(TranslationService.class);
+ mockSpecificationLoader = Mockito.mock(SpecificationLoader.class);
metaModelContext = MetaModelContext_forTesting.builder()
.specificationLoader(mockSpecificationLoader)
@@ -95,11 +85,9 @@ public abstract class AbstractFacetFactoryTest extends
TestCase {
.interactionService(mockInteractionService)
.build();
- context.checking(new Expectations() {{
-
- allowing(mockInteractionService).currentInteractionContext();
- will(returnValue(Optional.of(iaContext)));
- }});
+ Mockito
+ .when(mockInteractionService.currentInteractionContext())
+ .thenReturn(Optional.of(iaContext));
facetHolder = FacetHolder.simple(
metaModelContext,
@@ -114,19 +102,10 @@ public abstract class AbstractFacetFactoryTest extends
TestCase {
jdoFacetContext = jdoFacetContextForTesting();
}
- protected void
allowing_specificationLoader_loadSpecification_any_willReturn(final
ObjectSpecification objectSpecification) {
- context.checking(new Expectations() {{
-
allowing(mockSpecificationLoader).specForType(with(any(Class.class)));
- will(returnValue(Optional.of(objectSpecification)));
- }});
- }
-
- @Override
protected void tearDown() throws Exception {
mockSpecificationLoader = null;
methodRemover = null;
facetedMethod = null;
- super.tearDown();
}
protected static boolean contains(final Class<?>[] types, final Class<?>
type) {
