You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2017/10/09 16:57:40 UTC
[isis] branch dev/2.0.0/ISIS-1742-remove-deprecations updated:
ISIS-1742: fixes unit and integ tests
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/dev/2.0.0/ISIS-1742-remove-deprecations by this push:
new 1513e27 ISIS-1742: fixes unit and integ tests
1513e27 is described below
commit 1513e27bab1de4b99ef5c6b60fbb5062e360b5ce
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 9 17:57:14 2017 +0100
ISIS-1742: fixes unit and integ tests
---
.../isis/applib/annotation/CommandPersistence.java | 18 --------
.../isis/applib/annotation/EqualByContent.java | 6 +--
.../PrototypeFacetAnnotationFactoryTest.java | 3 ++
...bledAnnotationOnCollectionFacetFactoryTest.java | 2 +
...oicesFacetFromBoundedAnnotationFactoryTest.java | 2 +
...sabledAnnotationOnPropertyFacetFactoryTest.java | 6 ++-
.../isis/core/metamodel/spec/PersistableTest.java | 53 ----------------------
.../system/persistence/PersistenceSession.java | 3 --
.../runtime/system/ObjectMemberAbstractTest.java | 42 +----------------
9 files changed, 15 insertions(+), 120 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/CommandPersistence.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/CommandPersistence.java
index 262f863..d8121f7 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/CommandPersistence.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/CommandPersistence.java
@@ -40,22 +40,4 @@ public enum CommandPersistence {
*/
NOT_PERSISTED;
- @Deprecated
- public static CommandPersistence from(final Command.Persistence persistence) {
- if(persistence == null) return null;
- if(persistence == Command.Persistence.PERSISTED) return PERSISTED;
- if(persistence == Command.Persistence.IF_HINTED) return IF_HINTED;
- // shouldn't happen
- throw new IllegalArgumentException("Unrecognized : persistence" + persistence);
- }
-
- @Deprecated
- public static Command.Persistence from(final CommandPersistence commandPersistence) {
- if(commandPersistence == null) return null;
- if(commandPersistence == PERSISTED) return Command.Persistence.PERSISTED;
- if(commandPersistence == NOT_PERSISTED) return Command.Persistence.NOT_PERSISTED;
- if(commandPersistence == IF_HINTED) return Command.Persistence.IF_HINTED;
- // shouldn't happen
- throw new IllegalArgumentException("Unrecognized : persistence" + commandPersistence);
- }
}
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/EqualByContent.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/EqualByContent.java
index 499be0a..af51819 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/EqualByContent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/EqualByContent.java
@@ -47,11 +47,10 @@ import java.util.HashMap;
*
* <p>
* By default any {@link Value value} types are assumed to follow the
- * equal-by-content rule, though this can be overridden if required. Value types
- * are usually also {@link Immutable immutable} (though there are some classic
+ * equal-by-content rule, though this can be overridden if required.
+ * Value types are usually also immutable (though there are some classic
* exceptions to this, such as {@link Date}).
*
- * @see Immutable
* @see Value
*
* <p>
@@ -62,5 +61,4 @@ import java.util.HashMap;
@Target({ ElementType.TYPE, ElementType.METHOD })
@Retention(RetentionPolicy.RUNTIME)
public @interface EqualByContent {
- When value() default When.ALWAYS;
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/PrototypeFacetAnnotationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/PrototypeFacetAnnotationFactoryTest.java
index 083a0d5..c3fe0b7 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/PrototypeFacetAnnotationFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/PrototypeFacetAnnotationFactoryTest.java
@@ -21,6 +21,8 @@ package org.apache.isis.core.metamodel.facets.actions.action;
import java.lang.reflect.Method;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.RestrictTo;
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;
@@ -51,6 +53,7 @@ public class PrototypeFacetAnnotationFactoryTest extends AbstractFacetFactoryTes
public void testAnnotationPickedUp() {
class Customer {
@SuppressWarnings("unused")
+ @Action(restrictTo = RestrictTo.PROTOTYPING)
public void someAction() {
}
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/collection/DisabledAnnotationOnCollectionFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/collection/DisabledAnnotationOnCollectionFacetFactoryTest.java
index 1cd3437..46989d7 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/collection/DisabledAnnotationOnCollectionFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/collection/DisabledAnnotationOnCollectionFacetFactoryTest.java
@@ -22,6 +22,7 @@ package org.apache.isis.core.metamodel.facets.collections.collection;
import java.lang.reflect.Method;
import java.util.Collection;
+import org.apache.isis.applib.annotation.Editing;
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;
@@ -50,6 +51,7 @@ public class DisabledAnnotationOnCollectionFacetFactoryTest extends AbstractFace
public void testDisabledAnnotationPickedUpOnCollection() {
class Customer {
+ @org.apache.isis.applib.annotation.Collection(editing = Editing.DISABLED)
public Collection<?> getOrders() {
return null;
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/ChoicesFacetFromBoundedAnnotationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/ChoicesFacetFromBoundedAnnotationFactoryTest.java
index 0aee06e..6016cfb 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/ChoicesFacetFromBoundedAnnotationFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/ChoicesFacetFromBoundedAnnotationFactoryTest.java
@@ -19,6 +19,7 @@
package org.apache.isis.core.metamodel.facets.object.domainobject;
+import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessClassContext;
@@ -44,6 +45,7 @@ public class ChoicesFacetFromBoundedAnnotationFactoryTest extends AbstractFacetF
}
public void testBoundedAnnotationPickedUpOnClass() {
+ @DomainObject(bounded = true)
class Customer {
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/DisabledAnnotationOnPropertyFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/DisabledAnnotationOnPropertyFacetFactoryTest.java
index 3862b09..91b187b 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/DisabledAnnotationOnPropertyFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/DisabledAnnotationOnPropertyFacetFactoryTest.java
@@ -21,6 +21,8 @@ package org.apache.isis.core.metamodel.facets.properties.property;
import java.lang.reflect.Method;
+import org.apache.isis.applib.annotation.Editing;
+import org.apache.isis.applib.annotation.Property;
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;
@@ -49,6 +51,7 @@ public class DisabledAnnotationOnPropertyFacetFactoryTest extends AbstractFacetF
public void testDisabledAnnotationPickedUpOnProperty() {
class Customer {
+ @Property(editing = Editing.DISABLED)
public int getNumberOfOrders() {
return 0;
}
@@ -63,12 +66,13 @@ public class DisabledAnnotationOnPropertyFacetFactoryTest extends AbstractFacetF
final DisabledFacet disabledFacet = (DisabledFacet) facet;
assertThat(disabledFacet.disabledReason(null), is("Always disabled"));
-
+
assertNoMethodsRemoved();
}
public void testDisabledAnnotationWithReason() {
class Customer {
+ @Property(editing = Editing.DISABLED, editingDisabledReason = "Oh no you don't!")
public int getNumberOfOrders() {
return 0;
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/PersistableTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/PersistableTest.java
deleted file mode 100644
index 4af9b7e..0000000
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/PersistableTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.metamodel.spec;
-
-import junit.framework.TestCase;
-
-public class PersistableTest extends TestCase {
-
- private Persistability persistable;
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- }
-
- @Override
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
- public void testToStringForProgramPersistable() {
- persistable = Persistability.PROGRAM_PERSISTABLE;
- assertEquals("Program Persistable", persistable.toString());
- }
-
- public void testToStringForTransient() {
- persistable = Persistability.TRANSIENT;
- assertEquals("Transient", persistable.toString());
- }
-
- public void testToStringForUserPersistable() {
- persistable = Persistability.USER_PERSISTABLE;
- assertEquals("User Persistable", persistable.toString());
- }
-
-}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
index 1f39a42..c218254 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
@@ -94,7 +94,6 @@ import org.apache.isis.core.metamodel.facets.object.callbacks.UpdatingLifecycleE
import org.apache.isis.core.metamodel.facets.object.value.ValueFacet;
import org.apache.isis.core.metamodel.facets.object.viewmodel.ViewModelFacet;
import org.apache.isis.core.metamodel.facets.propcoll.accessor.PropertyOrCollectionAccessorFacet;
-import org.apache.isis.core.metamodel.interactions.ActionInteractionContext;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.services.container.query.QueryCardinality;
import org.apache.isis.core.metamodel.spec.FreeStandingList;
@@ -187,7 +186,6 @@ public class PersistenceSession implements
private final MetricsService metricsService;
private final ClockService clockService;
private final UserService userService;
- private final ActionInteractionContext actionInteractionContext;
/**
@@ -245,7 +243,6 @@ public class PersistenceSession implements
this.factoryService = lookupService(FactoryService.class);
this.clockService = lookupService(ClockService.class);
this.userService = lookupService(UserService.class);
- this.actionInteractionContext = lookupService(ActionInteractionContext.class);
// sub-components
final AdapterManager adapterManager = this;
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
index 5afc28e..88c3a43 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
@@ -173,50 +173,10 @@ public class ObjectMemberAbstractTest {
}
@Test
- public void testVisibleWhenTargetPersistentAndHiddenFacetSetToOncePersisted() {
+ public void testVisibleWhenHiddenFacetSet() {
testMember.addFacet(new HideForContextFacetNone(testMember));
testMember.addFacet(new HiddenFacetAbstractImpl(Where.ANYWHERE, testMember){});
- context.checking(new Expectations() {{
- allowing(mockPersistable).dnIsPersistent();
- will(returnValue(true));
- allowing(mockPersistable).dnIsDeleted();
- will(returnValue(false));
- }});
-
-
- assertFalse(testMember.isVisible(persistentAdapter, InteractionInitiatedBy.USER, Where.ANYWHERE).isAllowed());
- }
-
- @Test
- public void testVisibleWhenTargetPersistentAndHiddenFacetSetToUntilPersisted() {
- testMember.addFacet(new HideForContextFacetNone(testMember));
- testMember.addFacet(new HiddenFacetAbstractImpl(Where.ANYWHERE, testMember){});
-
- context.checking(new Expectations() {{
- allowing(mockPersistable).dnIsPersistent();
- will(returnValue(true));
- allowing(mockPersistable).dnIsDeleted();
- will(returnValue(false));
- }});
-
-
- final Consent visible = testMember.isVisible(persistentAdapter, InteractionInitiatedBy.USER, Where.ANYWHERE);
- assertTrue(visible.isAllowed());
- }
-
- @Test
- public void testVisibleWhenTargetTransientAndHiddenFacetSetToUntilPersisted() {
- testMember.addFacet(new HideForContextFacetNone(testMember));
- testMember.addFacet(new HiddenFacetAbstractImpl(Where.ANYWHERE, testMember){});
-
- context.checking(new Expectations() {{
- allowing(mockPersistable).dnIsPersistent();
- will(returnValue(false));
- allowing(mockPersistable).dnIsDeleted();
- will(returnValue(false));
- }});
-
final Consent visible = testMember.isVisible(transientAdapter, InteractionInitiatedBy.USER, Where.ANYWHERE);
assertFalse(visible.isAllowed());
}
--
To stop receiving notification emails like this one, please contact
['"commits@isis.apache.org" <co...@isis.apache.org>'].