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/08/08 15:18:55 UTC
[isis] branch v2 updated: ISIS-2158 reinstates a disabled wrapper
factory test
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 48f4755 ISIS-2158 reinstates a disabled wrapper factory test
48f4755 is described below
commit 48f4755b38a3797787add87e4fd947d2402c5299
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Aug 8 17:18:47 2019 +0200
ISIS-2158 reinstates a disabled wrapper factory test
---
.../isis/metamodel/facets/ImperativeFacet.java | 12 +---------
...FactoryDefaultTest_wrappedObject_transient.java | 26 ++++++++--------------
2 files changed, 10 insertions(+), 28 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/ImperativeFacet.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/ImperativeFacet.java
index 35bab07..3e4160f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/ImperativeFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/ImperativeFacet.java
@@ -135,22 +135,12 @@ public interface ImperativeFacet extends Facet {
}
public static Intent getIntent(final ObjectMember member, final Method method) {
-// val imperativeFacets = member.streamFacets()
-// .map(ImperativeFacet.Util::getImperativeFacet)
-// .filter(_NullSafe::isPresent)
-// .filter(imperativeFacet->imperativeFacet.getMethods().contains(method))
-// .collect(Collectors.toList());
-
- val imperativeFacets1 = member.streamFacets()
+ val imperativeFacets = member.streamFacets()
.map(ImperativeFacet.Util::getImperativeFacet)
.filter(_NullSafe::isPresent)
- .collect(Collectors.toList());
-
- val imperativeFacets = imperativeFacets1.stream()
.filter(imperativeFacet->imperativeFacet.getMethods().contains(method))
.collect(Collectors.toList());
-
switch(imperativeFacets.size()) {
case 0:
break;
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 a4fe9f5..cb966d1 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
@@ -22,6 +22,7 @@ package org.apache.isis.wrapper;
import java.lang.reflect.Method;
import java.util.Arrays;
import java.util.Collections;
+import java.util.List;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
@@ -65,8 +66,6 @@ import static org.apache.isis.unittestsupport.jmocking.PostponedAction.returnVal
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import lombok.val;
-
/**
* Contract test.
*/
@@ -116,6 +115,7 @@ public class WrapperFactoryDefaultTest_wrappedObject_transient {
private WrapperFactoryDefault wrapperFactory;
private Employee employeeWO;
+ private List<Facet> facets;
@Before
public void setUp() throws Exception {
@@ -207,7 +207,7 @@ public class WrapperFactoryDefaultTest_wrappedObject_transient {
// given
final DisabledFacet disabledFacet = new DisabledFacetAbstractAlwaysEverywhere(mockPasswordMember){};
- val facets = Arrays.asList(disabledFacet, new PropertySetterFacetViaSetterMethod(setPasswordMethod, mockPasswordMember));
+ facets = Arrays.asList(disabledFacet, new PropertySetterFacetViaSetterMethod(setPasswordMethod, mockPasswordMember));
final Consent visibilityConsent = new Allow(new InteractionResult(new PropertyVisibilityEvent(employeeDO, null)));
@@ -256,36 +256,28 @@ public class WrapperFactoryDefaultTest_wrappedObject_transient {
}
});
- val facets1 = Arrays.asList((Facet)new PropertySetterFacetViaSetterMethod(
+ facets = Arrays.asList((Facet)new PropertySetterFacetViaSetterMethod(
setPasswordMethod, mockPasswordMember));
context.checking(new Expectations() {
{
allowing(mockPasswordMember).streamFacets();
- will(returnValuePostponed(facets1::stream));
+ will(returnValuePostponed(()->facets.stream()));
oneOf(mockPasswordMember)
.set(mockEmployeeAdapter, mockPasswordAdapter, InteractionInitiatedBy.USER);
+
+ oneOf(mockPasswordMember).get(mockEmployeeAdapter, InteractionInitiatedBy.USER);
+ will(returnValue(mockPasswordAdapter));
}
});
// when
employeeWO.setPassword(passwordValue);
-
// and given
- val facets2 = Arrays.asList((Facet)new PropertyAccessorFacetViaAccessor(
+ facets = Arrays.asList((Facet)new PropertyAccessorFacetViaAccessor(
mockOnType, getPasswordMethod, mockPasswordMember));
-
- context.checking(new Expectations() {
- {
- allowing(mockPasswordMember).streamFacets();
- will(returnValuePostponed(facets2::stream));
-
- oneOf(mockPasswordMember).get(mockEmployeeAdapter, InteractionInitiatedBy.USER);
- will(returnValue(mockPasswordAdapter));
- }
- });
// then be allowed
assertThat(employeeWO.getPassword(), is(passwordValue));