You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/04/07 21:59:47 UTC

[isis] 06/10: ISIS-2523: prepare removal of MemberOrderFacet

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

commit a5bb75f44b4fcef7165da849fb16d9442fbc1c02
Author: ahuber@apache.org <ah...@luna>
AuthorDate: Wed Apr 7 20:24:52 2021 +0200

    ISIS-2523: prepare removal of MemberOrderFacet
---
 .../metamodel/facets/AbstractFacetFactoryTest.java | 21 +++++++++++
 ...atorTest.java => DeweyOrderComparatorTest.java} |  4 +-
 ...nFacetFactoryTest.java => LayoutOrderTest.java} | 44 ++++++++++------------
 3 files changed, 42 insertions(+), 27 deletions(-)

diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java
index 2030924..197cdbe 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java
@@ -38,6 +38,8 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
 import org.apache.isis.core.metamodel.facetapi.FeatureType;
 import org.apache.isis.core.metamodel.facetapi.IdentifiedHolder;
+import org.apache.isis.core.metamodel.facets.actions.layout.ActionLayoutFacetFactory;
+import org.apache.isis.core.metamodel.facets.collections.layout.CollectionLayoutFacetFactory;
 import org.apache.isis.core.metamodel.facets.properties.propertylayout.PropertyLayoutFacetFactory;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
@@ -177,4 +179,23 @@ public abstract class AbstractFacetFactoryTest extends TestCase {
         };
     }
     
+    protected static CollectionLayoutFacetFactory createCollectionLayoutFacetFactory() { 
+        return new CollectionLayoutFacetFactory() {
+            @Override
+            public IsisConfiguration getConfiguration() {
+                return new IsisConfiguration(null);
+            }  
+        };
+    }
+    
+    protected static ActionLayoutFacetFactory createActionLayoutFacetFactory() { 
+        return new ActionLayoutFacetFactory() {
+            @Override
+            public IsisConfiguration getConfiguration() {
+                return new IsisConfiguration(null);
+            }  
+        };
+    }
+    
+    
 }
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/memberorder/MemberOrderComparatorTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/memberorder/DeweyOrderComparatorTest.java
similarity index 98%
rename from core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/memberorder/MemberOrderComparatorTest.java
rename to core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/memberorder/DeweyOrderComparatorTest.java
index 73bf7c7..84d4a42 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/memberorder/MemberOrderComparatorTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/memberorder/DeweyOrderComparatorTest.java
@@ -36,10 +36,10 @@ import org.apache.isis.core.metamodel.layout.memberorderfacet.MemberOrderCompara
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-public class MemberOrderComparatorTest extends TestCase {
+public class DeweyOrderComparatorTest extends TestCase {
 
     public static void main(final String[] args) {
-        junit.textui.TestRunner.run(new TestSuite(MemberOrderComparatorTest.class));
+        junit.textui.TestRunner.run(new TestSuite(DeweyOrderComparatorTest.class));
     }
 
     private MemberOrderComparator comparator, laxComparator;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/memberorder/MemberOrderAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/memberorder/LayoutOrderTest.java
similarity index 73%
rename from core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/memberorder/MemberOrderAnnotationFacetFactoryTest.java
rename to core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/memberorder/LayoutOrderTest.java
index 2412556..8368f1b 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/memberorder/MemberOrderAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/memberorder/LayoutOrderTest.java
@@ -33,17 +33,17 @@ import org.apache.isis.applib.annotation.CollectionLayout;
 import org.apache.isis.applib.annotation.PropertyLayout;
 import org.apache.isis.applib.services.i18n.TranslationContext;
 import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
 import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
-import org.apache.isis.core.metamodel.facets.members.order.MemberOrderFacet;
-import org.apache.isis.core.metamodel.facets.members.order.annotprop.MemberOrderFacetAnnotation;
-import org.apache.isis.core.metamodel.facets.members.order.annotprop.MemberOrderFacetFactory;
+import org.apache.isis.core.metamodel.facets.members.layout.order.LayoutOrderFacet;
+import org.apache.isis.core.metamodel.facets.members.layout.order.LayoutOrderFacetFromActionLayoutAnnotation;
+import org.apache.isis.core.metamodel.facets.members.layout.order.LayoutOrderFacetFromCollectionLayoutAnnotation;
+import org.apache.isis.core.metamodel.facets.members.layout.order.LayoutOrderFacetFromPropertyLayoutAnnotation;
 
-public class MemberOrderAnnotationFacetFactoryTest 
-extends AbstractFacetFactoryTest {
+import lombok.val;
 
-    private MemberOrderFacetFactory facetFactory;
+public class LayoutOrderTest 
+extends AbstractFacetFactoryTest {
 
     @Rule
     public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(JUnitRuleMockery2.Mode.INTERFACES_AND_CLASSES);
@@ -66,16 +66,10 @@ extends AbstractFacetFactoryTest {
                 }
             });
         }});
-
-
-        facetFactory = new MemberOrderFacetFactory();
-        facetFactory.setMetaModelContext(super.metaModelContext);
-
     }
 
     @Override
     protected void tearDown() throws Exception {
-        facetFactory = null;
         super.tearDown();
     }
 
@@ -88,13 +82,13 @@ extends AbstractFacetFactoryTest {
         }
         final Method method = findMethod(Customer.class, "getFirstName");
 
+        val facetFactory = super.createPropertyLayoutFacetFactory();
         facetFactory.process(new ProcessMethodContext(Customer.class, null, method, methodRemover, facetedMethod));
 
-        final Facet facet = facetedMethod.getFacet(MemberOrderFacet.class);
+        val facet = facetedMethod.getFacet(LayoutOrderFacet.class);
         assertNotNull(facet);
-        assertTrue(facet instanceof MemberOrderFacetAnnotation);
-        final MemberOrderFacetAnnotation memberOrderFacetAnnotation = (MemberOrderFacetAnnotation) facet;
-        assertEquals("1", memberOrderFacetAnnotation.sequence());
+        assertTrue(facet instanceof LayoutOrderFacetFromPropertyLayoutAnnotation);
+        assertEquals("1", facet.getSequence());
 
         assertNoMethodsRemoved();
     }
@@ -114,13 +108,13 @@ extends AbstractFacetFactoryTest {
         }
         final Method method = findMethod(Customer.class, "getOrders");
 
+        val facetFactory = super.createCollectionLayoutFacetFactory();
         facetFactory.process(new ProcessMethodContext(Customer.class, null, method, methodRemover, facetedMethod));
 
-        final Facet facet = facetedMethod.getFacet(MemberOrderFacet.class);
+        val facet = facetedMethod.getFacet(LayoutOrderFacet.class);
         assertNotNull(facet);
-        assertTrue(facet instanceof MemberOrderFacetAnnotation);
-        final MemberOrderFacetAnnotation memberOrderFacetAnnotation = (MemberOrderFacetAnnotation) facet;
-        assertEquals("2", memberOrderFacetAnnotation.sequence());
+        assertTrue(facet instanceof LayoutOrderFacetFromCollectionLayoutAnnotation);
+        assertEquals("2", facet.getSequence());
 
         assertNoMethodsRemoved();
     }
@@ -133,13 +127,13 @@ extends AbstractFacetFactoryTest {
         }
         final Method method = findMethod(Customer.class, "someAction");
 
+        val facetFactory = super.createActionLayoutFacetFactory();
         facetFactory.process(new ProcessMethodContext(Customer.class, null, method, methodRemover, facetedMethod));
 
-        final Facet facet = facetedMethod.getFacet(MemberOrderFacet.class);
+        val facet = facetedMethod.getFacet(LayoutOrderFacet.class);
         assertNotNull(facet);
-        assertTrue(facet instanceof MemberOrderFacetAnnotation);
-        final MemberOrderFacetAnnotation memberOrderFacetAnnotation = (MemberOrderFacetAnnotation) facet;
-        assertEquals("3", memberOrderFacetAnnotation.sequence());
+        assertTrue(facet instanceof LayoutOrderFacetFromActionLayoutAnnotation);
+        assertEquals("3", facet.getSequence());
 
         assertNoMethodsRemoved();
     }