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 2acdbccadb ISIS-3209: migrate core-metamodel
2acdbccadb is described below
commit 2acdbccadb84bb915ffc1c0a591f7aab48b25df9
Author: Andi Huber <[email protected]>
AuthorDate: Tue Sep 13 10:33:24 2022 +0200
ISIS-3209: migrate core-metamodel
---
core/metamodel/pom.xml | 2 +-
.../commons/JavaClassUtilsTest_getBuiltIn.java | 4 +--
.../isis/core/metamodel/commons/NameUtilTest.java | 14 +++++++--
.../commons/StringUtils_toLineSeparated.java | 12 ++++----
.../metamodel/consent/InteractionResultTest.java | 8 +++---
.../core/metamodel/facetapi/FacetAbstractTest.java | 15 +++++-----
...nEventHelperTest_newActionInteractionEvent.java | 4 +--
...HelperTest_newCollectionDomainEvent_forAdd.java | 4 +--
...perTest_newCollectionDomainEvent_forRemove.java | 4 +--
...HelperTest_newPropertyDomainEvent_forClear.java | 6 ++--
...ctionAnnotationFacetFactoryTest_RestrictTo.java | 2 +-
...tationFacetFactoryTest_executionPublishing.java | 4 +--
.../DomainObjectLayoutFactoryTest.java | 17 ++++-------
.../ordering/memberorder/DeweyOrderSetTest.java | 33 +++++++++++++++-------
.../BigDecimalValueSemanticsProviderTest.java | 6 ++--
.../value/BigIntValueSemanticsProviderTest.java | 4 +--
.../value/BlobValueSemanticsProviderTest.java | 4 +--
.../value/BooleanValueSemanticsProviderTest.java | 6 ++--
.../value/ByteValueSemanticsProviderTest.java | 6 ++--
.../value/CharacterValueSemanticsProviderTest.java | 6 ++--
.../value/ClobValueSemanticsProviderTest.java | 4 +--
.../value/DoubleValueSemanticsProviderTest.java | 6 ++--
.../value/FloatValueSemanticsProviderTest.java | 6 ++--
.../value/IntValueSemanticsProviderTest.java | 6 ++--
.../JavaSqlDateValueSemanticsProviderTest.java | 4 +--
.../value/JavaTimeValueSemanticsProviderTest.java | 2 +-
.../value/LongValueSemanticsProviderTest.java | 4 +--
.../value/PasswordValueSemanticsProviderTest.java | 4 +--
.../value/ShortValueSemanticsProviderTest.java | 6 ++--
.../value/StringValueSemanticsProviderTest.java | 2 +-
.../ValueSemanticsProviderAbstractTestCase.java | 24 +++++++---------
.../interactions/InteractionUtils_isA_Test.java | 30 ++++++++++++--------
.../objects/ObjectActionLayoutXmlDefaultTest.java | 2 +-
.../metamodel/services/grid/GridLoadingTest.java | 2 +-
.../specloader/SpecificationCacheDefaultTest.java | 2 +-
.../ClassSubstitutorTest_getClass.java | 4 +--
36 files changed, 145 insertions(+), 124 deletions(-)
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index 50c33009bf..803b6675d7 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -113,7 +113,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-internaltestvintage</artifactId>
+ <artifactId>isis-core-internaltestsupport</artifactId>
<scope>test</scope>
</dependency>
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/JavaClassUtilsTest_getBuiltIn.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/JavaClassUtilsTest_getBuiltIn.java
index 92e6c1db61..d9cfaccef8 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/JavaClassUtilsTest_getBuiltIn.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/JavaClassUtilsTest_getBuiltIn.java
@@ -20,9 +20,9 @@ package org.apache.isis.core.metamodel.commons;
import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-public class JavaClassUtilsTest_getBuiltIn {
+class JavaClassUtilsTest_getBuiltIn {
@Test
public void voidBuiltIns() throws ClassNotFoundException {
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/NameUtilTest.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/NameUtilTest.java
index 5929c33dae..627cdb2523 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/NameUtilTest.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/NameUtilTest.java
@@ -18,47 +18,57 @@
*/
package org.apache.isis.core.metamodel.commons;
-import junit.framework.TestCase;
+import org.junit.jupiter.api.Test;
-public class NameUtilTest extends TestCase {
+import static org.junit.jupiter.api.Assertions.assertEquals;
+class NameUtilTest {
+
+ @Test
public void testNaturalNameAddsSpacesToCamelCaseWords() {
assertEquals("Camel Case Word",
StringExtensions.asNaturalName2("CamelCaseWord"));
}
+ @Test
public void testNaturalNameAddsSpacesBeforeNumbers() {
assertEquals("One 2 One", StringExtensions.asNaturalName2("One2One"));
assertEquals("Type 123", StringExtensions.asNaturalName2("Type123"));
assertEquals("4321 Go", StringExtensions.asNaturalName2("4321Go"));
}
+ @Test
public void testNaturalNameRecognisesAcronymns() {
assertEquals("TNT Power", StringExtensions.asNaturalName2("TNTPower"));
assertEquals("Spam RAM Can",
StringExtensions.asNaturalName2("SpamRAMCan"));
assertEquals("DOB", StringExtensions.asNaturalName2("DOB"));
}
+ @Test
public void testNaturalNameWithShortNames() {
assertEquals("At", StringExtensions.asNaturalName2("At"));
assertEquals("I", StringExtensions.asNaturalName2("I"));
}
+ @Test
public void testNaturalNameNoChange() {
assertEquals("Camel Case Word",
StringExtensions.asNaturalName2("CamelCaseWord"));
assertEquals("Almost Normal english sentence",
StringExtensions.asNaturalName2("Almost Normal english sentence"));
}
+ @Test
public void testPluralNameAdd_S() {
assertEquals("Cans", StringExtensions.asPluralName("Can"));
assertEquals("Spaces", StringExtensions.asPluralName("Space"));
assertEquals("Noses", StringExtensions.asPluralName("Nose"));
}
+ @Test
public void testPluralNameReplace_Y_With_IES() {
assertEquals("Babies", StringExtensions.asPluralName("Baby"));
assertEquals("Cities", StringExtensions.asPluralName("City"));
}
+ @Test
public void testPluralNameReplaceAdd_ES() {
assertEquals("Foxes", StringExtensions.asPluralName("Fox"));
assertEquals("Bosses", StringExtensions.asPluralName("Boss"));
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/StringUtils_toLineSeparated.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/StringUtils_toLineSeparated.java
index d1792d3f6c..a838367d2b 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/StringUtils_toLineSeparated.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/StringUtils_toLineSeparated.java
@@ -18,12 +18,12 @@
*/
package org.apache.isis.core.metamodel.commons;
+import java.util.Objects;
+
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.junit.Assume.assumeThat;
class StringUtils_toLineSeparated {
@@ -34,18 +34,18 @@ class StringUtils_toLineSeparated {
@Test
public void windowsStyleCarriageReturnLeftUnchanged() throws Exception {
- assumeThatRunningOnWindows(); // ie windows
+ if(!isRunningOnWindows()) return;
assertThat(StringExtensions.lineSeparated("ok\r\n"), is("ok" +
System.getProperty("line.separator")));
}
@Test
public void macStyleCarriageReturnLeftUnchanged() throws Exception {
- assumeThatRunningOnWindows(); // ie windows
+ if(!isRunningOnWindows()) return;
assertThat(StringExtensions.lineSeparated("ok\r"), is("ok\r"));
}
- private static void assumeThatRunningOnWindows() {
- assumeThat(System.getProperty("file.separator"), is(equalTo("\\")));
+ private static boolean isRunningOnWindows() {
+ return Objects.equals(System.getProperty("file.separator"), "\\");
}
}
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/consent/InteractionResultTest.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/consent/InteractionResultTest.java
index a801a3e91a..db40a420f1 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/consent/InteractionResultTest.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/consent/InteractionResultTest.java
@@ -22,11 +22,11 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-public class InteractionResultTest {
+class InteractionResultTest {
private InteractionResult result;
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facetapi/FacetAbstractTest.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facetapi/FacetAbstractTest.java
index 6c468754d1..9f17649a30 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facetapi/FacetAbstractTest.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facetapi/FacetAbstractTest.java
@@ -18,11 +18,14 @@
*/
package org.apache.isis.core.metamodel.facetapi;
-import org.apache.isis.core.metamodel._testing.MetaModelContext_forTesting;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import junit.framework.TestCase;
+import org.apache.isis.core.metamodel._testing.MetaModelContext_forTesting;
-public class FacetAbstractTest extends TestCase {
+class FacetAbstractTest {
public static interface FooFacet extends Facet {
}
@@ -40,20 +43,18 @@ public class FacetAbstractTest extends TestCase {
private FacetAbstract fooFacet;
private FacetHolder facetHolder;
- @Override
+ @BeforeEach
protected void setUp() throws Exception {
- super.setUp();
facetHolder =
FacetHolder.forTesting(MetaModelContext_forTesting.buildDefault());
fooFacet = new ConcreteFacet(FooFacet.class, facetHolder);
new ConcreteFacet(BarFacet.class, facetHolder);
facetHolder.addFacet(fooFacet);
}
- @Override
+ @AfterEach
protected void tearDown() throws Exception {
fooFacet = null;
facetHolder = null;
- super.tearDown();
}
public void testFacetType() {
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newActionInteractionEvent.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newActionInteractionEvent.java
index c13113cae1..018d4649b1 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newActionInteractionEvent.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newActionInteractionEvent.java
@@ -24,14 +24,14 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertSame;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.events.domain.ActionDomainEvent;
import org.apache.isis.applib.id.LogicalType;
-public class DomainEventHelperTest_newActionInteractionEvent {
+class DomainEventHelperTest_newActionInteractionEvent {
public static class SomeDomainObject {
public String foo(final int x, final String y) { return null; }
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forAdd.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forAdd.java
index b379c23e95..7a3ca25632 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forAdd.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forAdd.java
@@ -24,14 +24,14 @@ import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertSame;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.events.domain.AbstractDomainEvent;
import org.apache.isis.applib.events.domain.CollectionDomainEvent;
import org.apache.isis.applib.id.LogicalType;
-public class DomainEventHelperTest_newCollectionDomainEvent_forAdd {
+class DomainEventHelperTest_newCollectionDomainEvent_forAdd {
public static class SomeDomainObject {
public Set<SomeReferencedObject> getReferences() { return null; }
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forRemove.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forRemove.java
index d764ec5542..c12902bc07 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forRemove.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forRemove.java
@@ -24,14 +24,14 @@ import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertSame;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.events.domain.AbstractDomainEvent;
import org.apache.isis.applib.events.domain.CollectionDomainEvent;
import org.apache.isis.applib.id.LogicalType;
-public class DomainEventHelperTest_newCollectionDomainEvent_forRemove {
+class DomainEventHelperTest_newCollectionDomainEvent_forRemove {
public static class SomeDomainObject {
public Set<SomeReferencedObject> getReferences() { return null; }
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newPropertyDomainEvent_forClear.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newPropertyDomainEvent_forClear.java
index 9d336678d0..b9cc84883c 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newPropertyDomainEvent_forClear.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newPropertyDomainEvent_forClear.java
@@ -24,15 +24,15 @@ import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.events.domain.PropertyDomainEvent;
import org.apache.isis.applib.id.LogicalType;
-public class DomainEventHelperTest_newPropertyDomainEvent_forClear {
+class DomainEventHelperTest_newPropertyDomainEvent_forClear {
public static class SomeDomainObject {}
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_RestrictTo.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_RestrictTo.java
index fd39c73c4d..8a7ac7ad95 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_RestrictTo.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_RestrictTo.java
@@ -20,8 +20,8 @@ package org.apache.isis.core.metamodel.facets.actions.action;
import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertNull;
import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_executionPublishing.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_executionPublishing.java
index 60dc11983d..e4427af0cb 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_executionPublishing.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_executionPublishing.java
@@ -22,10 +22,10 @@ import java.lang.reflect.Method;
import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.SemanticsOf;
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java
index 5411cdb130..fd37e0f4c7 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java
@@ -18,7 +18,6 @@
*/
package org.apache.isis.core.metamodel.facets.object.domainobjectlayout;
-import org.junit.Before;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -147,12 +146,8 @@ extends AbstractFacetFactoryJupiterTestCase {
@DisabledIfSystemProperty(named = "isRunningWithSurefire", matches =
"true")
public static class ForDomainObjectLayout extends CssClass {
- @Before
- public void setUp2() throws Exception {
- }
-
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
}
@@ -200,7 +195,7 @@ extends AbstractFacetFactoryJupiterTestCase {
public static class ForDomainObjectLayout extends CssClassFa {
- @Before
+ @BeforeEach
public void setUp2() throws Exception {
}
@@ -249,7 +244,7 @@ extends AbstractFacetFactoryJupiterTestCase {
public static class ForDomainObjectLayout extends DescribedAs {
- @Before
+ @BeforeEach
public void setUp2() throws Exception {
}
@@ -296,7 +291,7 @@ extends AbstractFacetFactoryJupiterTestCase {
public static class ForDomainObjectLayout extends Named {
- @Before
+ @BeforeEach
public void setUp2() throws Exception {
}
@@ -342,7 +337,7 @@ extends AbstractFacetFactoryJupiterTestCase {
public static class ForDomainObjectLayout extends Paged {
- @Before
+ @BeforeEach
public void setUp2() throws Exception {
}
@@ -388,7 +383,7 @@ extends AbstractFacetFactoryJupiterTestCase {
public static class ForDomainObjectLayout extends Plural {
- @Before
+ @BeforeEach
public void setUp2() throws Exception {
}
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/memberorder/DeweyOrderSetTest.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/memberorder/DeweyOrderSetTest.java
index 64d5e16ea5..b82131a482 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/memberorder/DeweyOrderSetTest.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/memberorder/DeweyOrderSetTest.java
@@ -20,8 +20,14 @@ package
org.apache.isis.core.metamodel.facets.ordering.memberorder;
import java.util.List;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.isis.applib.services.i18n.TranslationContext;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.commons.internal.collections._Lists;
@@ -35,14 +41,7 @@ import
org.apache.isis.core.metamodel.facets.members.layout.group.LayoutGroupFac
import
org.apache.isis.core.metamodel.facets.members.layout.order.LayoutOrderFacetAbstract;
import org.apache.isis.core.metamodel.layout.DeweyOrderSet;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class DeweyOrderSetTest extends TestCase {
-
- public static void main(final String[] args) {
- junit.textui.TestRunner.run(new TestSuite(DeweyOrderSetTest.class));
- }
+class DeweyOrderSetTest {
public static class Customer {
private String lastName;
@@ -86,7 +85,7 @@ public class DeweyOrderSetTest extends TestCase {
static TranslationContext ctx = TranslationContext.named("test");
- @Override
+ @BeforeEach
protected void setUp() {
_Context.clear();
@@ -109,10 +108,11 @@ public class DeweyOrderSetTest extends TestCase {
}
- @Override
+ @AfterEach
protected void tearDown() throws Exception {
}
+ @Test
public void testDefaultGroup() {
setupLayoutFacets("", "1", lastNameMember);
@@ -124,6 +124,7 @@ public class DeweyOrderSetTest extends TestCase {
assertEquals("", orderSet.getGroupPath());
}
+ @Test
public void testDefaultGroupSize() {
setupLayoutFacets("", "1", lastNameMember);
setupLayoutFacets("", "2", firstNameMember);
@@ -134,6 +135,7 @@ public class DeweyOrderSetTest extends TestCase {
assertEquals(0, orderSet.children().size());
}
+ @Test
public void testDefaultGroupTwoMembersSorted() {
setupLayoutFacets("", "1", lastNameMember);
setupLayoutFacets("", "2", firstNameMember);
@@ -143,6 +145,7 @@ public class DeweyOrderSetTest extends TestCase {
assertEquals(firstNameMember, orderSet.elementList().get(1));
}
+ @Test
public void testTwoMembersAtDefaultGroupOtherWay() {
setupLayoutFacets("", "2", lastNameMember);
setupLayoutFacets("", "1", firstNameMember);
@@ -152,6 +155,7 @@ public class DeweyOrderSetTest extends TestCase {
assertEquals(lastNameMember, orderSet.elementList().get(1));
}
+ @Test
public void testWithChildGroupDefaultGroupName() {
setupLayoutFacets("", "1", lastNameMember);
setupLayoutFacets("", "2", firstNameMember);
@@ -165,6 +169,7 @@ public class DeweyOrderSetTest extends TestCase {
assertEquals("", orderSet.getGroupPath());
}
+ @Test
public void testWithChildGroupSize() {
setupLayoutFacets("", "1", lastNameMember);
setupLayoutFacets("", "2", firstNameMember);
@@ -177,6 +182,7 @@ public class DeweyOrderSetTest extends TestCase {
assertEquals(3, orderSet.size());
}
+ @Test
public void testWithChildGroupChildsGroupName() {
setupLayoutFacets("", "1", lastNameMember);
setupLayoutFacets("", "2", firstNameMember);
@@ -192,6 +198,7 @@ public class DeweyOrderSetTest extends TestCase {
assertEquals("", childOrderSet.getGroupPath());
}
+ @Test
public void testWithChildGroupChildsGroupSize() {
setupLayoutFacets("", "1", lastNameMember);
setupLayoutFacets("", "2", firstNameMember);
@@ -205,6 +212,7 @@ public class DeweyOrderSetTest extends TestCase {
assertEquals(0, childOrderSet.children().size());
}
+ @Test
public void testWithChildGroupChildsGroupElementOrdering() {
setupLayoutFacets("", "1", lastNameMember);
setupLayoutFacets("", "2", firstNameMember);
@@ -219,6 +227,7 @@ public class DeweyOrderSetTest extends TestCase {
assertEquals(houseNumberMember, childOrderSet.elementList().get(2));
}
+ @Test
public void testWithChildGroupOrderedAtEnd() {
setupLayoutFacets("address", "6", houseNumberMember);
setupLayoutFacets("address", "5", streetNameMember);
@@ -232,17 +241,20 @@ public class DeweyOrderSetTest extends TestCase {
assertTrue(orderSet.elementList().get(2) instanceof DeweyOrderSet);
}
+ @Test
public void testDefaultGroupNeitherAnnotatedSize() {
final DeweyOrderSet orderSet =
DeweyOrderSet.createOrderSet(lastNameAndFirstName);
assertEquals(2, orderSet.elementList().size());
}
+ @Test
public void testDefaultGroupNeitherAnnotatedOrderedByName() {
final DeweyOrderSet orderSet =
DeweyOrderSet.createOrderSet(lastNameAndFirstName);
assertEquals(firstNameMember, orderSet.elementList().get(0));
assertEquals(lastNameMember, orderSet.elementList().get(1));
}
+ @Test
public void testDefaultGroupMixOfAnnotatedAndNotSize() {
setupLayoutFacets("", "1", lastNameMember);
setupLayoutFacets("address", "2", postalTownMember);
@@ -251,6 +263,7 @@ public class DeweyOrderSetTest extends TestCase {
assertEquals(3, orderSet.elementList().size());
}
+ @Test
public void
testDefaultGroupMixOfAnnotatedAndNotOrderedWithAnnotatedFirst() {
setupLayoutFacets("", "1", lastNameMember);
setupLayoutFacets("", "2", postalTownMember);
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigDecimalValueSemanticsProviderTest.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigDecimalValueSemanticsProviderTest.java
index 9237981694..61755f75fc 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigDecimalValueSemanticsProviderTest.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigDecimalValueSemanticsProviderTest.java
@@ -23,13 +23,13 @@ import java.math.BigDecimal;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
import org.apache.isis.applib.exceptions.recoverable.TextEntryParseException;
import org.apache.isis.core.metamodel.valuesemantics.BigDecimalValueSemantics;
-public class BigDecimalValueSemanticsProviderTest
+class BigDecimalValueSemanticsProviderTest
extends ValueSemanticsProviderAbstractTestCase<BigDecimal> {
private BigDecimalValueSemantics value;
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigIntValueSemanticsProviderTest.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigIntValueSemanticsProviderTest.java
index d3a413fc8a..260f9a7c05 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigIntValueSemanticsProviderTest.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigIntValueSemanticsProviderTest.java
@@ -23,8 +23,8 @@ import java.math.BigInteger;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
import org.apache.isis.applib.exceptions.recoverable.TextEntryParseException;
import org.apache.isis.core.metamodel.valuesemantics.BigIntegerValueSemantics;
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BlobValueSemanticsProviderTest.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BlobValueSemanticsProviderTest.java
index 02a52605c6..d8a97d4c09 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BlobValueSemanticsProviderTest.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BlobValueSemanticsProviderTest.java
@@ -21,12 +21,12 @@ package org.apache.isis.core.metamodel.facets.value;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.core.metamodel.valuesemantics.BlobValueSemantics;
-public class BlobValueSemanticsProviderTest
+class BlobValueSemanticsProviderTest
extends ValueSemanticsProviderAbstractTestCase<Blob> {
private Blob blob;
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BooleanValueSemanticsProviderTest.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BooleanValueSemanticsProviderTest.java
index 69fa4219e5..d735d06f09 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BooleanValueSemanticsProviderTest.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BooleanValueSemanticsProviderTest.java
@@ -21,13 +21,13 @@ package org.apache.isis.core.metamodel.facets.value;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
import org.apache.isis.applib.exceptions.recoverable.TextEntryParseException;
import org.apache.isis.core.metamodel.valuesemantics.BooleanValueSemantics;
-public class BooleanValueSemanticsProviderTest
+class BooleanValueSemanticsProviderTest
extends ValueSemanticsProviderAbstractTestCase<Boolean> {
private BooleanValueSemantics value;
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ByteValueSemanticsProviderTest.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ByteValueSemanticsProviderTest.java
index 1a589e28af..6d0d132e6e 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ByteValueSemanticsProviderTest.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ByteValueSemanticsProviderTest.java
@@ -21,13 +21,13 @@ package org.apache.isis.core.metamodel.facets.value;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
import org.apache.isis.applib.exceptions.recoverable.TextEntryParseException;
import org.apache.isis.core.metamodel.valuesemantics.ByteValueSemantics;
-public class ByteValueSemanticsProviderTest
+class ByteValueSemanticsProviderTest
extends ValueSemanticsProviderAbstractTestCase<Byte> {
private ByteValueSemantics value;
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/CharacterValueSemanticsProviderTest.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/CharacterValueSemanticsProviderTest.java
index 655b19b715..e5ca06342d 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/CharacterValueSemanticsProviderTest.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/CharacterValueSemanticsProviderTest.java
@@ -21,14 +21,14 @@ package org.apache.isis.core.metamodel.facets.value;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
import org.apache.isis.applib.exceptions.recoverable.InvalidEntryException;
import org.apache.isis.applib.value.semantics.ValueDecomposition;
import org.apache.isis.core.metamodel.valuesemantics.CharacterValueSemantics;
-public class CharacterValueSemanticsProviderTest
+class CharacterValueSemanticsProviderTest
extends ValueSemanticsProviderAbstractTestCase<Character> {
private CharacterValueSemantics valueSemantics;
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ClobValueSemanticsProviderTest.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ClobValueSemanticsProviderTest.java
index fe08437180..4d3a4f0373 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ClobValueSemanticsProviderTest.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ClobValueSemanticsProviderTest.java
@@ -21,12 +21,12 @@ package org.apache.isis.core.metamodel.facets.value;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.isis.applib.value.Clob;
import org.apache.isis.core.metamodel.valuesemantics.ClobValueSemantics;
-public class ClobValueSemanticsProviderTest
+class ClobValueSemanticsProviderTest
extends ValueSemanticsProviderAbstractTestCase<Clob> {
private ClobValueSemantics value;
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DoubleValueSemanticsProviderTest.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DoubleValueSemanticsProviderTest.java
index aa80868e97..3db953cfeb 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DoubleValueSemanticsProviderTest.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DoubleValueSemanticsProviderTest.java
@@ -21,13 +21,13 @@ package org.apache.isis.core.metamodel.facets.value;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
import org.apache.isis.applib.exceptions.recoverable.TextEntryParseException;
import org.apache.isis.core.metamodel.valuesemantics.DoubleValueSemantics;
-public class DoubleValueSemanticsProviderTest
+class DoubleValueSemanticsProviderTest
extends ValueSemanticsProviderAbstractTestCase<Double> {
private DoubleValueSemantics value;
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/FloatValueSemanticsProviderTest.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/FloatValueSemanticsProviderTest.java
index bf38b3fd58..2e9803e705 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/FloatValueSemanticsProviderTest.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/FloatValueSemanticsProviderTest.java
@@ -21,13 +21,13 @@ package org.apache.isis.core.metamodel.facets.value;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
import org.apache.isis.applib.exceptions.recoverable.TextEntryParseException;
import org.apache.isis.core.metamodel.valuesemantics.FloatValueSemantics;
-public class FloatValueSemanticsProviderTest
+class FloatValueSemanticsProviderTest
extends ValueSemanticsProviderAbstractTestCase<Float> {
private FloatValueSemantics value;
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/IntValueSemanticsProviderTest.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/IntValueSemanticsProviderTest.java
index 446c7ec1e7..752cf0a3c2 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/IntValueSemanticsProviderTest.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/IntValueSemanticsProviderTest.java
@@ -21,13 +21,13 @@ package org.apache.isis.core.metamodel.facets.value;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
import org.apache.isis.applib.exceptions.recoverable.TextEntryParseException;
import org.apache.isis.core.metamodel.valuesemantics.IntValueSemantics;
-public class IntValueSemanticsProviderTest
+class IntValueSemanticsProviderTest
extends ValueSemanticsProviderAbstractTestCase<Integer> {
private IntValueSemantics value;
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java
index 9a323fe1bb..348c2b8bf3 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java
@@ -26,8 +26,8 @@ import java.time.LocalDate;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
import org.apache.isis.applib.exceptions.recoverable.TextEntryParseException;
import org.apache.isis.applib.value.semantics.ValueSemanticsAbstract;
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaTimeValueSemanticsProviderTest.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaTimeValueSemanticsProviderTest.java
index 06a112f231..908ceb6332 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaTimeValueSemanticsProviderTest.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaTimeValueSemanticsProviderTest.java
@@ -25,7 +25,7 @@ import java.util.Locale;
import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import org.apache.isis.applib.annotation.TimePrecision;
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/LongValueSemanticsProviderTest.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/LongValueSemanticsProviderTest.java
index f94f8bb4bb..9cb1c0211d 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/LongValueSemanticsProviderTest.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/LongValueSemanticsProviderTest.java
@@ -21,8 +21,8 @@ package org.apache.isis.core.metamodel.facets.value;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
import org.apache.isis.applib.exceptions.recoverable.TextEntryParseException;
import org.apache.isis.core.metamodel.valuesemantics.LongValueSemantics;
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/PasswordValueSemanticsProviderTest.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/PasswordValueSemanticsProviderTest.java
index df80eb3130..f153ef035b 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/PasswordValueSemanticsProviderTest.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/PasswordValueSemanticsProviderTest.java
@@ -21,13 +21,13 @@ package org.apache.isis.core.metamodel.facets.value;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.isis.applib.value.Password;
import org.apache.isis.applib.value.semantics.ValueDecomposition;
import org.apache.isis.core.metamodel.valuesemantics.PasswordValueSemantics;
-public class PasswordValueSemanticsProviderTest
+class PasswordValueSemanticsProviderTest
extends ValueSemanticsProviderAbstractTestCase<Password> {
private PasswordValueSemantics valueSemantics;
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ShortValueSemanticsProviderTest.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ShortValueSemanticsProviderTest.java
index 7883e78d8a..c7a6c07ceb 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ShortValueSemanticsProviderTest.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ShortValueSemanticsProviderTest.java
@@ -21,13 +21,13 @@ package org.apache.isis.core.metamodel.facets.value;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
import org.apache.isis.applib.exceptions.recoverable.TextEntryParseException;
import org.apache.isis.core.metamodel.valuesemantics.ShortValueSemantics;
-public class ShortValueSemanticsProviderTest
+class ShortValueSemanticsProviderTest
extends ValueSemanticsProviderAbstractTestCase<Short> {
private ShortValueSemantics value;
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/StringValueSemanticsProviderTest.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/StringValueSemanticsProviderTest.java
index d13567b091..d9ed98c205 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/StringValueSemanticsProviderTest.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/StringValueSemanticsProviderTest.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.facets.value;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.isis.core.metamodel.valuesemantics.StringValueSemantics;
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
index fe4c4515ea..4fb24fe093 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
@@ -21,7 +21,6 @@ package org.apache.isis.core.metamodel.facets.value;
import java.util.Locale;
import java.util.Optional;
-import org.junit.Assume;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -30,11 +29,8 @@ import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.EnumSource;
import org.mockito.Mockito;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
import org.apache.isis.applib.services.iactnlayer.InteractionService;
import org.apache.isis.applib.value.semantics.Parser;
@@ -98,13 +94,13 @@ public abstract class
ValueSemanticsProviderAbstractTestCase<T> {
@Test
public void testParseNull() throws Exception {
- assumeValueSemanticsProviderIsSetup();
+ if(!isValueSemanticsProviderSetup()) return;
assertEquals(null, semantics.getParser().parseTextRepresentation(null,
null));
}
@Test
public void testParseEmptyString() throws Exception {
- assumeValueSemanticsProviderIsSetup();
+ if(!isValueSemanticsProviderSetup()) return;
final Object newValue =
semantics.getParser().parseTextRepresentation(null, "");
@@ -122,7 +118,7 @@ public abstract class
ValueSemanticsProviderAbstractTestCase<T> {
@ParameterizedTest
@EnumSource(Format.class)
public void testValueSerializer(final Format format) {
- assumeValueSemanticsProviderIsSetup();
+ if(!isValueSemanticsProviderSetup()) return;
final T value = getSample();
final String encoded = getValueSerializer().enstring(format, value);
@@ -143,7 +139,7 @@ public abstract class
ValueSemanticsProviderAbstractTestCase<T> {
@ParameterizedTest
@EnumSource(Format.class)
public void testDecodeNULL(final Format format) throws Exception {
- assumeValueSemanticsProviderIsSetup();
+ if(!isValueSemanticsProviderSetup()) return;
final Object newValue = getValueSerializer()
.destring(format, ValueSerializerDefault.ENCODED_NULL);
@@ -153,7 +149,7 @@ public abstract class
ValueSemanticsProviderAbstractTestCase<T> {
@ParameterizedTest
@EnumSource(Format.class)
public void testEmptyEncoding(final Format format) {
- assumeValueSemanticsProviderIsSetup();
+ if(!isValueSemanticsProviderSetup()) return;
assertEquals(ValueSerializerDefault.ENCODED_NULL, getValueSerializer()
.enstring(format, null));
@@ -161,7 +157,7 @@ public abstract class
ValueSemanticsProviderAbstractTestCase<T> {
@Test
public void testTitleOfForNullObject() {
- assumeValueSemanticsProviderIsSetup();
+ if(!isValueSemanticsProviderSetup()) return;
if(semantics instanceof StringValueSemantics) {
// string representation has null-to-empty semantics
@@ -175,8 +171,8 @@ public abstract class
ValueSemanticsProviderAbstractTestCase<T> {
}
// precondition for testing
- private void assumeValueSemanticsProviderIsSetup() {
- Assume.assumeThat(semantics, is(not(nullValue())));
+ private boolean isValueSemanticsProviderSetup() {
+ return semantics!=null;
}
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/interactions/InteractionUtils_isA_Test.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/interactions/InteractionUtils_isA_Test.java
index 53cff84e61..56e77d9b70 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/interactions/InteractionUtils_isA_Test.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/interactions/InteractionUtils_isA_Test.java
@@ -18,6 +18,13 @@
*/
package org.apache.isis.core.metamodel.interactions;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.isis.commons.internal.functions._Predicates;
import org.apache.isis.core.metamodel._testing.MetaModelContext_forTesting;
import org.apache.isis.core.metamodel.facetapi.Facet;
@@ -26,9 +33,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import lombok.val;
-import junit.framework.TestCase;
-
-public class InteractionUtils_isA_Test extends TestCase {
+class InteractionUtils_isA_Test {
public class FooSuperFacet extends FacetAbstract {
public FooSuperFacet(final Class<? extends Facet> facetType, final
FacetHolder holder) {
@@ -60,10 +65,8 @@ public class InteractionUtils_isA_Test extends TestCase {
private FooSuperFacet fooSuperFacet;
private BarFacet barFacet;
- @Override
+ @BeforeEach
protected void setUp() throws Exception {
- super.setUp();
-
facetHolder =
FacetHolder.forTesting(MetaModelContext_forTesting.buildDefault());
fooSuperFacet = new FooSuperFacet(FooSuperFacet.class, facetHolder);
fooFacet = new FooFacet(facetHolder);
@@ -71,34 +74,37 @@ public class InteractionUtils_isA_Test extends TestCase {
barFacet = new BarFacet(facetHolder);
}
- @Override
+ @AfterEach
protected void tearDown() throws Exception {
facetHolder = null;
fooSuperFacet = null;
fooSubFacet = null;
fooFacet = null;
barFacet = null;
- super.tearDown();
}
+ @Test
public void testIsAWhenIs() {
val predicate = _Predicates.instanceOf(FooFacet.class);
- TestCase.assertTrue(predicate.test(fooFacet));
+ assertTrue(predicate.test(fooFacet));
}
+ @Test
public void testIsAWhenIsNot() {
val predicate = _Predicates.instanceOf(FooFacet.class);
- TestCase.assertFalse(predicate.test(barFacet));
+ assertFalse(predicate.test(barFacet));
}
+ @Test
public void testIsAWhenIsSubclass() {
val predicate = _Predicates.instanceOf(FooFacet.class);
- TestCase.assertTrue(predicate.test(fooSubFacet));
+ assertTrue(predicate.test(fooSubFacet));
}
+ @Test
public void testIsAWhenIsNotBecauseASuperclass() {
val predicate = _Predicates.instanceOf(FooFacet.class);
- TestCase.assertFalse(predicate.test(fooSuperFacet));
+ assertFalse(predicate.test(fooSuperFacet));
}
}
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/ObjectActionLayoutXmlDefaultTest.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/ObjectActionLayoutXmlDefaultTest.java
index 6dfb45c4c2..0b1b38aa07 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/ObjectActionLayoutXmlDefaultTest.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/ObjectActionLayoutXmlDefaultTest.java
@@ -23,7 +23,7 @@ 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.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/grid/GridLoadingTest.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/grid/GridLoadingTest.java
index fa2a2ebc1f..f865c57627 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/grid/GridLoadingTest.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/grid/GridLoadingTest.java
@@ -21,9 +21,9 @@ package org.apache.isis.core.metamodel.services.grid;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertNotSame;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
import static org.junit.jupiter.api.Assertions.assertSame;
import org.apache.isis.applib.services.grid.GridLoaderService;
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationCacheDefaultTest.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationCacheDefaultTest.java
index f623fef316..7bcc8bd947 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationCacheDefaultTest.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationCacheDefaultTest.java
@@ -29,8 +29,8 @@ import org.mockito.junit.jupiter.MockitoExtension;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertSame;
import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertSame;
import org.apache.isis.applib.id.LogicalType;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutorTest_getClass.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutorTest_getClass.java
index 4fce791ab0..11eb7562f3 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutorTest_getClass.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutorTest_getClass.java
@@ -21,7 +21,7 @@ package
org.apache.isis.core.metamodel.specloader.classsubstitutor;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.isis.commons.internal.collections._Lists;
import
org.apache.isis.core.metamodel.services.classsubstitutor.ClassSubstitutor;
@@ -30,7 +30,7 @@ import
org.apache.isis.core.metamodel.services.classsubstitutor.ClassSubstitutor
import lombok.val;
-public class ClassSubstitutorTest_getClass {
+class ClassSubstitutorTest_getClass {
private ClassSubstitutor classSubstitutor;
private ClassSubstitutorRegistry classSubstitutorReg;
