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 2021/01/20 08:37:59 UTC
[isis] branch master updated: ISIS-439: fixes unit tests
This is an automated email from the ASF dual-hosted git repository.
danhaywood 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 3142908 ISIS-439: fixes unit tests
3142908 is described below
commit 3142908c5f62a1d46a59e17bea30de777702f756
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jan 20 08:37:33 2021 +0000
ISIS-439: fixes unit tests
---
.../facets/param/name/ParameterNameFacetTest.java | 26 +++++++-------
.../objects/OneToManyAssociationDefaultTest.java | 42 +++++++++++-----------
2 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/param/name/ParameterNameFacetTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/param/name/ParameterNameFacetTest.java
index dd8818e..900b503 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/param/name/ParameterNameFacetTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/param/name/ParameterNameFacetTest.java
@@ -42,7 +42,7 @@ import org.apache.isis.core.metamodel.progmodels.dflt.ProgrammingModelFacetsJava
import lombok.val;
/**
- * needs the javac -parameter flag set when compiling this test
+ * needs the javac -parameter flag set when compiling this test
*/
public class ParameterNameFacetTest extends AbstractFacetFactoryJUnit4TestCase {
@@ -55,16 +55,16 @@ public class ParameterNameFacetTest extends AbstractFacetFactoryJUnit4TestCase {
val mockServiceInjector = Mockito.mock(ServiceInjector.class);
programmingModel = new ProgrammingModelFacetsJava8(mockServiceInjector);
-
+
val metaModelContext = MetaModelContext_forTesting.builder().build();
-
+
((ProgrammingModelAbstract)programmingModel)
.init(new ProgrammingModelInitFilterDefault(), metaModelContext);
-
+
super.setUpFacetedMethodAndParameter();
-
- // verify that
- assertEquals(124, programmingModel.streamFactories().count());
+
+ // verify that
+ assertEquals(122, programmingModel.streamFactories().count());
}
@Override
@@ -81,15 +81,15 @@ public class ParameterNameFacetTest extends AbstractFacetFactoryJUnit4TestCase {
@SuppressWarnings("unused")
public void someAction(final String anAwesomeName) { }
}
-
+
val someAction = _Reflect.streamAllMethods(Customer.class, false)
.filter(method->method.getName().equals("someAction"))
.findFirst()
.get();
-
+
assertEquals("anAwesomeName", someAction.getParameters()[0].getName());
}
-
+
@Test
public void someActionParameterShouldHaveProperName() {
@@ -102,10 +102,10 @@ public class ParameterNameFacetTest extends AbstractFacetFactoryJUnit4TestCase {
actionMethod = findMethod(Customer.class, "someAction", new Class[]{String.class} );
// when
- val processParameterContext =
+ val processParameterContext =
new FacetFactory.ProcessParameterContext(
Customer.class, actionMethod, 0, null, facetedMethodParameter);
-
+
programmingModel.streamFactories()
.forEach(facetFactory->facetFactory.processParams(processParameterContext));
@@ -133,7 +133,7 @@ public class ParameterNameFacetTest extends AbstractFacetFactoryJUnit4TestCase {
actionMethod = findMethod(Customer.class, "someAction", new Class[]{String.class} );
// when
- val processParameterContext =
+ val processParameterContext =
new FacetFactory.ProcessParameterContext(
Customer.class, actionMethod, 0, null, facetedMethodParameter);
programmingModel.streamFactories().forEach(facetFactory->facetFactory.processParams(processParameterContext));
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/OneToManyAssociationDefaultTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/OneToManyAssociationDefaultTest.java
index d631635..18a66e7 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/OneToManyAssociationDefaultTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/OneToManyAssociationDefaultTest.java
@@ -81,23 +81,23 @@ public class OneToManyAssociationDefaultTest {
.singleton(mockMessageService)
.build();
-// allowingPeerToReturnCollectionType();
+ allowingPeerToReturnCollectionType();
allowingPeerToReturnIdentifier();
-// allowingSpecLoaderToReturnSpecs();
+ allowingSpecLoaderToReturnSpecs();
association = new OneToManyAssociationDefault(mockPeer);
}
-// private void allowingSpecLoaderToReturnSpecs() {
-// context.checking(new Expectations() {
-// {
-// allowing(mockSpecificationLoader).loadSpecification(Order.class);
-//
-// allowing(mockPeer).getMetaModelContext();
-// will(returnValue(metaModelContext));
-//
-// }
-// });
-// }
+ private void allowingSpecLoaderToReturnSpecs() {
+ context.checking(new Expectations() {
+ {
+ allowing(mockSpecificationLoader).loadSpecification(Order.class);
+
+ allowing(mockPeer).getMetaModelContext();
+ will(returnValue(metaModelContext));
+
+ }
+ });
+ }
@Test
public void id() {
@@ -110,14 +110,14 @@ public class OneToManyAssociationDefaultTest {
assertThat(association.getName(), is(equalTo("My name")));
}
-// private void allowingPeerToReturnCollectionType() {
-// context.checking(new Expectations() {
-// {
-// allowing(mockPeer).getType();
-// will(returnValue(COLLECTION_TYPE));
-// }
-// });
-// }
+ private void allowingPeerToReturnCollectionType() {
+ context.checking(new Expectations() {
+ {
+ allowing(mockPeer).getType();
+ will(returnValue(COLLECTION_TYPE));
+ }
+ });
+ }
private void allowingPeerToReturnIdentifier() {
context.checking(new Expectations() {