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 2020/05/10 19:50:05 UTC

[isis] branch master updated: ISIS-2340: fixes test mockups (2)

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 c813611  ISIS-2340: fixes test mockups (2)
c813611 is described below

commit c8136118e7f660a5a2587d1414a5087e46854f18
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun May 10 21:49:51 2020 +0200

    ISIS-2340: fixes test mockups (2)
---
 .../wrapper/WrapperFactoryDefault_wrappedObject_Test.java             | 2 --
 .../org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java | 4 ++++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
index 68e63b0..63fac2a 100644
--- a/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
+++ b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
@@ -365,8 +365,6 @@ public class WrapperFactoryDefault_wrappedObject_Test {
 
                 ignoring(mockCommand);
 
-                //ignoring(mockStringSpec);
-                
                 allowing(mockStringSpec).isParented();
                 will(returnValue(false));
                 
diff --git a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
index 554f888..00ed51d 100644
--- a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
+++ b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
@@ -38,6 +38,7 @@ import org.junit.Rule;
 import org.junit.Test;
 
 import org.apache.isis.applib.annotation.Where;
+import org.apache.isis.applib.services.metamodel.BeanSort;
 import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2;
 import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2.Mode;
 import org.apache.isis.core.metamodel.MetaModelContext_forTesting;
@@ -117,6 +118,9 @@ public class ObjectMemberAbstractTest {
 
             allowing(mockSpecForCustomer).isViewModel();
             will(returnValue(false));
+            
+            allowing(mockSpecForCustomer).getBeanSort();
+            will(returnValue(BeanSort.ENTITY));
 
             allowing(mockSpecForCustomer).getShortIdentifier();
             will(returnValue("Customer"));