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 2019/10/31 15:50:56 UTC
[isis] branch v2 updated: ISIS-2158: fixes wrapper tests (new
expectations handled)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/v2 by this push:
new 24547c0 ISIS-2158: fixes wrapper tests (new expectations handled)
24547c0 is described below
commit 24547c0bd92dfaf0f28ea179974ac1ed5456f2b3
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Oct 31 16:50:46 2019 +0100
ISIS-2158: fixes wrapper tests (new expectations handled)
---
.../apache/isis/wrapper/WrapperFactoryDefaultTest_wrappedObject.java | 5 +++++
.../wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java | 5 ++++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/wrapper/WrapperFactoryDefaultTest_wrappedObject.java b/core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
index 3bb3c73..6fddad7 100644
--- a/core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
+++ b/core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
@@ -45,6 +45,7 @@ import org.apache.isis.metamodel.facets.FacetedMethod;
import org.apache.isis.metamodel.facets.all.named.NamedFacetInferred;
import org.apache.isis.metamodel.facets.members.disabled.method.DisableForContextFacetViaMethod;
import org.apache.isis.metamodel.facets.members.hidden.method.HideForContextFacetViaMethod;
+import org.apache.isis.metamodel.facets.object.entity.EntityFacet;
import org.apache.isis.metamodel.facets.properties.accessor.PropertyAccessorFacetViaAccessor;
import org.apache.isis.metamodel.facets.properties.update.clear.PropertyClearFacetViaClearMethod;
import org.apache.isis.metamodel.facets.properties.update.init.PropertyInitializationFacetViaSetterMethod;
@@ -189,6 +190,10 @@ public class WrapperFactoryDefaultTest_wrappedObject {
allowing(mockEmployeeSpec).getMember(methodOf(Employee.class, "getEmployeeRepository"));
will(returnValue(null));
+
+ allowing(mockEmployeeSpec).getFacet(EntityFacet.class);
+ will(returnValue(null));
+
// allowing(mockAdapterForStringJones).isDestroyed();
// will(returnValue(false));
diff --git a/core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java b/core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
index 0848fa0..406812a 100644
--- a/core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
+++ b/core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
@@ -42,7 +42,6 @@ import org.apache.isis.applib.services.wrapper.events.PropertyVisibilityEvent;
import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.metamodel.MetaModelContext;
import org.apache.isis.metamodel.MetaModelContext_forTesting;
-import org.apache.isis.metamodel.adapter.ObjectAdapterProvider;
import org.apache.isis.metamodel.consent.Allow;
import org.apache.isis.metamodel.consent.Consent;
import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
@@ -51,6 +50,7 @@ import org.apache.isis.metamodel.consent.Veto;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facets.members.disabled.DisabledFacet;
import org.apache.isis.metamodel.facets.members.disabled.DisabledFacetAbstractAlwaysEverywhere;
+import org.apache.isis.metamodel.facets.object.entity.EntityFacet;
import org.apache.isis.metamodel.facets.properties.accessor.PropertyAccessorFacetViaAccessor;
import org.apache.isis.metamodel.facets.properties.update.modify.PropertySetterFacetViaSetterMethod;
import org.apache.isis.metamodel.objectmanager.ObjectManager;
@@ -177,6 +177,9 @@ public class WrapperFactoryDefaultTest_wrappedObject_transient {
allowing(mockEmployeeSpec).getMember(with(getPasswordMethod));
will(returnValue(mockPasswordMember));
+
+ allowing(mockEmployeeSpec).getFacet(EntityFacet.class);
+ will(returnValue(null));
allowing(mockPasswordMember).getName();
will(returnValue("password"));