[causeway] branch master updated: CAUSEWAY-3424: ... however, keep tests for now

[ahuber]

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/causeway.git


The following commit(s) were added to refs/heads/master by this push:
     new 26ae2912a8 CAUSEWAY-3424: ... however, keep tests for now
26ae2912a8 is described below

commit 26ae2912a874cc1474ed7445b2bc0353ad49a713
Author: andi-huber <ahu...@apache.org>
AuthorDate: Wed Apr 12 17:25:49 2023 +0200

    CAUSEWAY-3424: ... however, keep tests for now
---
 .../actions/action/ActionAnnotationFacetFactoryTest_Hidden.java      | 5 ++---
 .../collections/collection/CollectionAnnotationFacetFactoryTest.java | 5 ++---
 .../properties/property/PropertyAnnotationFacetFactoryTest.java      | 5 ++---
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git 
a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Hidden.java
 
b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Hidden.java
index e4d8e43051..771f4b708a 100644
--- 
a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Hidden.java
+++ 
b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Hidden.java
@@ -26,7 +26,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.apache.causeway.applib.annotation.Action;
-import org.apache.causeway.applib.annotation.ActionLayout;
 import org.apache.causeway.applib.annotation.Where;
 import 
org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessMethodContext;
 import org.apache.causeway.core.metamodel.facets.all.hide.HiddenFacet;
@@ -44,11 +43,11 @@ extends ActionAnnotationFacetFactoryTest {
     }
 
     @Test
+    @Deprecated(forRemoval = true, since = "2.0.0-RC2")
     void withAnnotation() {
 
         class Customer {
-            @Action
-            @ActionLayout(hidden = Where.REFERENCES_PARENT)
+            @Action(hidden = Where.REFERENCES_PARENT)
             public void someAction() {
             }
         }
diff --git 
a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest.java
 
b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest.java
index 56fc647a1b..5ce1cf6063 100644
--- 
a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest.java
+++ 
b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest.java
@@ -33,7 +33,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.calls;
 
 import org.apache.causeway.applib.annotation.Collection;
-import org.apache.causeway.applib.annotation.CollectionLayout;
 import org.apache.causeway.applib.annotation.Where;
 import 
org.apache.causeway.core.config.progmodel.ProgrammingModelConstants.CollectionSemantics;
 import org.apache.causeway.core.metamodel.commons.matchers.CausewayMatchers;
@@ -100,6 +99,7 @@ extends AbstractFacetFactoryJupiterTestCase {
     }
 
 
+    @Deprecated(forRemoval = true, since = "2.0.0-RC2")
     static class Hidden extends CollectionAnnotationFacetFactoryTest {
 
         @Test
@@ -108,8 +108,7 @@ extends AbstractFacetFactoryJupiterTestCase {
             class Order {
             }
             class Customer {
-                @Collection
-                @CollectionLayout(hidden = Where.REFERENCES_PARENT)
+                @Collection(hidden = Where.REFERENCES_PARENT)
                 public List<Order> getOrders() {
                     return null;
                 }
diff --git 
a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
 
b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
index 4f8cdf5edc..ab41ab31ac 100644
--- 
a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
+++ 
b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
@@ -38,7 +38,6 @@ import static org.mockito.Mockito.calls;
 
 import org.apache.causeway.applib.annotation.Optionality;
 import org.apache.causeway.applib.annotation.Property;
-import org.apache.causeway.applib.annotation.PropertyLayout;
 import org.apache.causeway.applib.annotation.Publishing;
 import org.apache.causeway.applib.annotation.Snapshot;
 import org.apache.causeway.applib.annotation.Where;
@@ -396,12 +395,12 @@ class PropertyAnnotationFacetFactoryTest extends 
AbstractFacetFactoryJupiterTest
     public static class Hidden extends PropertyAnnotationFacetFactoryTest {
 
         @Test
+        @Deprecated(forRemoval = true, since = "2.0.0-RC2")
         public void withAnnotation() {
 
             @SuppressWarnings("unused")
             class Customer {
-                @Property
-                @PropertyLayout(hidden = Where.REFERENCES_PARENT)
+                @Property(hidden = Where.REFERENCES_PARENT)
                 @Getter @Setter private String name;
             }