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 2018/09/05 07:21:37 UTC
[isis] branch master updated: ISIS-1976: fixing some tests
This is an automated email from the ASF dual-hosted git repository.
ahuber 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 8533556 ISIS-1976: fixing some tests
8533556 is described below
commit 85335569a0dc62ced9664f5c0d06467183f79ddb
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Sep 5 09:17:43 2018 +0200
ISIS-1976: fixing some tests
reason: IsisSessionFactory does no longer live on the ServletContext
Task-Url: https://issues.apache.org/jira/browse/ISIS-1976
---
.../restfulobjects/server/ResourceContextTest_getArg.java | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
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 965d7df..8f29bb3 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
@@ -32,6 +32,7 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import org.apache.isis.commons.internal.context._Context;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.url.UrlDecoderUtil;
@@ -75,14 +76,17 @@ public class ResourceContextTest_getArg {
public void setUp() throws Exception {
deploymentCategory = DeploymentCategory.PRODUCTION;
+ _Context.put(IsisSessionFactory.class, mockIsisSessionFactory, false);
+
context.checking(new Expectations() {
{
allowing(mockHttpServletRequest).getQueryString();
will(returnValue(""));
- allowing(mockHttpServletRequest).getServletContext();
- will(returnValue(mockServletContext));
- allowing(mockServletContext).getAttribute("org.apache.isis.core.webapp.isisSessionFactory");
- will(returnValue(mockIsisSessionFactory));
+ //[ISIS-1976] IsisSessionFactory does no longer live on the ServletContext
+// allowing(mockHttpServletRequest).getServletContext();
+// will(returnValue(mockServletContext));
+// allowing(mockServletContext).getAttribute("org.apache.isis.core.webapp.isisSessionFactory");
+// will(returnValue(mockIsisSessionFactory));
allowing(mockIsisSessionFactory).getServicesInjector();
will(returnValue(mockServicesInjector));
allowing(mockIsisSessionFactory).getConfiguration();