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/12/01 11:18:29 UTC
[isis] branch master updated: ISIS-1786: fixes unit test
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 04a7edc ISIS-1786: fixes unit test
04a7edc is described below
commit 04a7edc964bef1e66ec8367171ab5b8693fdb9f4
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Dec 1 11:18:11 2017 +0000
ISIS-1786: fixes unit test
---
.../core/metamodel/facets/AbstractFacetFactoryTest.java | 3 +++
...NamedFacetForCollectionLayoutAnnotationFactoryTest.java | 14 ++++++++++++--
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java
index 4f10c97..0e15985 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java
@@ -31,6 +31,7 @@ import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
+import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.deployment.DeploymentCategoryProvider;
@@ -74,6 +75,7 @@ public abstract class AbstractFacetFactoryTest extends TestCase {
protected IsisConfigurationDefault stubConfiguration;
protected SpecificationLoader mockSpecificationLoader;
+ protected IsisConfiguration mockConfiguration;
protected ProgrammableMethodRemover methodRemover;
protected FacetHolder facetHolder;
@@ -109,6 +111,7 @@ public abstract class AbstractFacetFactoryTest extends TestCase {
mockDeploymentCategoryProvider = context.mock(DeploymentCategoryProvider.class);
mockAuthenticationSessionProvider = context.mock(AuthenticationSessionProvider.class);
+ mockConfiguration = context.mock(IsisConfiguration.class);
stubServicesInjector = context.mock(ServicesInjector.class);
mockTranslationService = context.mock(TranslationService.class);
stubConfiguration = new IsisConfigurationDefault();
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/layout/annotation/NamedFacetForCollectionLayoutAnnotationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/layout/annotation/NamedFacetForCollectionLayoutAnnotationFactoryTest.java
index d7095ed..2126572 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/layout/annotation/NamedFacetForCollectionLayoutAnnotationFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/layout/annotation/NamedFacetForCollectionLayoutAnnotationFactoryTest.java
@@ -24,6 +24,7 @@ import java.util.Set;
import java.util.SortedSet;
import com.google.common.collect.Sets;
import org.apache.isis.applib.annotation.CollectionLayout;
+import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
@@ -39,7 +40,12 @@ import static org.junit.Assert.assertThat;
public class NamedFacetForCollectionLayoutAnnotationFactoryTest extends AbstractFacetFactoryTest {
public void testCollectionLayoutAnnotationNamed() {
- final CollectionLayoutFacetFactory facetFactory = new CollectionLayoutFacetFactory();
+ final CollectionLayoutFacetFactory facetFactory = new CollectionLayoutFacetFactory() {
+ @Override protected IsisConfiguration getConfiguration() {
+ return stubConfiguration;
+ }
+ };
+
class Customer {
@SuppressWarnings("unused")
@@ -60,7 +66,11 @@ public class NamedFacetForCollectionLayoutAnnotationFactoryTest extends Abstract
}
public void testCollectionLayoutAnnotationNamedEscapedFalse() {
- final CollectionLayoutFacetFactory facetFactory = new CollectionLayoutFacetFactory();
+ final CollectionLayoutFacetFactory facetFactory = new CollectionLayoutFacetFactory() {
+ @Override protected IsisConfiguration getConfiguration() {
+ return stubConfiguration;
+ }
+ };
class Customer {
@SuppressWarnings("unused")
--
To stop receiving notification emails like this one, please contact
['"commits@isis.apache.org" <co...@isis.apache.org>'].