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/09/27 10:19:03 UTC
[isis] branch v2 updated: ISIS-2086: fixing up some mm tests to
support the new IsisConfiguration
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 df4895f ISIS-2086: fixing up some mm tests to support the new IsisConfiguration
df4895f is described below
commit df4895f5673db626cedd1a6b7e2c01e4a9c522c9
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Sep 27 12:18:54 2019 +0200
ISIS-2086: fixing up some mm tests to support the new IsisConfiguration
---
.../org/apache/isis/metamodel/MetaModelContext_forTesting.java | 8 ++------
.../metamodel/specloader/specimpl/FacetedMethodsBuilder.java | 4 ++--
.../metamodel/specloader/SpecificationLoaderTestAbstract.java | 9 +++++++++
3 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/MetaModelContext_forTesting.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/MetaModelContext_forTesting.java
index 5aa3873..ed5ac62 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/MetaModelContext_forTesting.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/MetaModelContext_forTesting.java
@@ -31,7 +31,6 @@ import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.applib.services.xactn.TransactionState;
import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.IsisConfigurationLegacy;
import org.apache.isis.config.internal._Config;
@@ -66,6 +65,8 @@ final class MetaModelContext_forTesting implements MetaModelContext {
private MetamodelEventService metamodelEventService =
MetamodelEventService.builder()
.build();
+
+ private IsisConfiguration configuration;
private SpecificationLoader specificationLoader;
@@ -103,11 +104,6 @@ final class MetaModelContext_forTesting implements MetaModelContext {
public IsisConfigurationLegacy getConfigurationLegacy() {
return _Config.getConfiguration();
}
-
- @Override
- public IsisConfiguration getConfiguration() {
- throw _Exceptions.notImplemented(); //TODO[2086] needs test integration, for legacy tests that don't use a Spring context
- }
@Override
public Stream<ObjectAdapter> streamServiceAdapters() {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/FacetedMethodsBuilder.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
index 2b63a3a..cb43bb3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
@@ -158,9 +158,9 @@ public class FacetedMethodsBuilder {
this.facetProcessor = facetedMethodsBuilderContext.facetProcessor;
this.specificationLoader = facetedMethodsBuilderContext.specificationLoader;
- val isisConfigProperties = MetaModelContext.current().getConfiguration();
+ val isisConfiguration = MetaModelContext.current().getConfiguration();
- this.explicitAnnotationsForActions = isisConfigProperties.getReflector().getExplicitAnnotations().isAction();
+ this.explicitAnnotationsForActions = isisConfiguration.getReflector().getExplicitAnnotations().isAction();
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/SpecificationLoaderTestAbstract.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/SpecificationLoaderTestAbstract.java
index 1f44577..7dd1f8e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/SpecificationLoaderTestAbstract.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/SpecificationLoaderTestAbstract.java
@@ -29,6 +29,7 @@ import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.applib.services.i18n.TranslationService.Mode;
import org.apache.isis.applib.services.message.MessageService;
import org.apache.isis.commons.internal.base._Timing;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.metamodel.MetaModelContext;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacet;
@@ -52,6 +53,12 @@ import lombok.val;
abstract class SpecificationLoaderTestAbstract {
static class Producers {
+
+ //@Produces
+ IsisConfiguration newConfiguration() {
+ val config = new IsisConfiguration(); // uses defaults!
+ return config;
+ }
//@Produces
AuthenticationSessionProvider mockAuthenticationSessionProvider() {
@@ -89,6 +96,7 @@ abstract class SpecificationLoaderTestAbstract {
}
+ protected IsisConfiguration isisConfiguration;
protected SpecificationLoader specificationLoader;
protected AuthenticationSessionProvider mockAuthenticationSessionProvider;
protected GridService mockGridService;
@@ -109,6 +117,7 @@ abstract class SpecificationLoaderTestAbstract {
val producers = new Producers();
MetaModelContext.preset(MetaModelContext.builder()
+ .configuration(isisConfiguration = producers.newConfiguration())
.specificationLoader(specificationLoader = producers.getSpecificationLoader())
.translationService(producers.mockTranslationService())
.objectAdapterProvider(mockPersistenceSessionServiceInternal = producers.mockPersistenceSessionServiceInternal())