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/05/11 10:23:41 UTC
[isis] 02/02: ISIS-2112: further fixing tests
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch 2112_SpringBoot
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 7c6065aed08ec7f7319599d7fe1ebb74bfa70d64
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sat May 11 12:23:29 2019 +0200
ISIS-2112: further fixing tests
- 29 still failing in 'metamodel'
Task-Url: https://issues.apache.org/jira/browse/ISIS-2112
---
.../runtime/system/context/session/RuntimeContextBase.java | 14 ++++++++------
.../JsonValueEncoderTest_appendValueAndFormat.java | 2 +-
.../restfulobjects/server/ResourceContextTest_getArg.java | 12 ++++++++++++
.../isis/core/webserver/HelloWorldAppConfigTest.java | 3 ++-
4 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/session/RuntimeContextBase.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/session/RuntimeContextBase.java
index e9283aa..666dbe6 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/session/RuntimeContextBase.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/session/RuntimeContextBase.java
@@ -23,6 +23,7 @@ import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.commons.internal.base._Lazy;
import org.apache.isis.commons.internal.base._Tuples.Tuple2;
import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.MetaModelContext;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.ObjectAdapterProvider;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
@@ -61,12 +62,13 @@ public abstract class RuntimeContextBase implements RuntimeContext {
// -- NO ARG CONSTRUCTOR
protected RuntimeContextBase() {
- configuration = IsisContext.getConfiguration();
- serviceInjector = IsisContext.getServiceInjector();
- serviceRegistry = IsisContext.getServiceRegistry();
- specificationLoader = IsisContext.getSpecificationLoader();
- authenticationSession = IsisContext.getAuthenticationSession().orElse(null);
- objectAdapterProvider = IsisContext.getObjectAdapterProvider();
+ val mmc = MetaModelContext.current();
+ configuration = mmc.getConfiguration();
+ serviceInjector = mmc.getServiceInjector();
+ serviceRegistry = mmc.getServiceRegistry();
+ specificationLoader = mmc.getSpecificationLoader();
+ authenticationSession = mmc.getAuthenticationSession();
+ objectAdapterProvider = mmc.getObjectAdapterProvider();
}
// -- OBJECT ADAPTER SUPPORT
diff --git a/core/viewer-restfulobjects-rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_appendValueAndFormat.java b/core/viewer-restfulobjects-rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_appendValueAndFormat.java
index 2df41fe..5e22849 100644
--- a/core/viewer-restfulobjects-rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_appendValueAndFormat.java
+++ b/core/viewer-restfulobjects-rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_appendValueAndFormat.java
@@ -55,7 +55,7 @@ public class JsonValueEncoderTest_appendValueAndFormat {
private EncodableFacet mockEncodableFacet;
@Mock
private ObjectAdapter mockObjectAdapter;
-
+ @Mock
private ObjectAdapterProvider mockAdapterManager;
@Before
diff --git a/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_getArg.java b/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_getArg.java
index 7161614..52cf111 100644
--- a/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_getArg.java
+++ b/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_getArg.java
@@ -34,7 +34,9 @@ import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.commons.internal.context._Context;
import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.internal._Config;
import org.apache.isis.core.commons.url.UrlDecoderUtil;
+import org.apache.isis.core.metamodel.MetaModelContext;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.core.runtime.system.session.IsisSession;
@@ -74,6 +76,16 @@ public class ResourceContextTest_getArg {
// PRODUCTION;
+ MetaModelContext.preset(MetaModelContext.builder()
+ .configuration(_Config.getConfiguration())
+ .specificationLoader(mockSpecificationLoader)
+// .serviceInjector(mockServiceInjector)
+// .serviceRegistry(mockServiceRegistry)
+// .translationService(mockTranslationService)
+// .objectAdapterProvider(mockPersistenceSessionServiceInternal)
+// .authenticationSessionProvider(mockAuthenticationSessionProvider)
+ .build());
+
_Context.put(IsisSessionFactory.class, mockIsisSessionFactory, false);
context.checking(new Expectations() {
diff --git a/core/webserver/src/test/java/org/apache/isis/core/webserver/HelloWorldAppConfigTest.java b/core/webserver/src/test/java/org/apache/isis/core/webserver/HelloWorldAppConfigTest.java
index e9332be..e80c657 100644
--- a/core/webserver/src/test/java/org/apache/isis/core/webserver/HelloWorldAppConfigTest.java
+++ b/core/webserver/src/test/java/org/apache/isis/core/webserver/HelloWorldAppConfigTest.java
@@ -23,6 +23,7 @@ import java.util.Map;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.apache.isis.config.AppConfigLocator;
@@ -40,7 +41,7 @@ class HelloWorldAppConfigTest {
void tearDown() throws Exception {
}
- @Test
+ @Test @Disabled("TODO[2112] AppConfigLocator is deprecated")
void test() {
// when