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/08/04 17:09:31 UTC
[2/6] isis git commit: ISIS-1686: adds some further convenience
services to FixtureScript, and for IntegrationTestAbstract2
ISIS-1686: adds some further convenience services to FixtureScript, and for IntegrationTestAbstract2
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/4ce7e757
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/4ce7e757
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/4ce7e757
Branch: refs/heads/master
Commit: 4ce7e757d6bdb2039560a8a90cf3f05b71cf11e5
Parents: 96d7746
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Aug 4 17:47:08 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Aug 4 17:47:08 2017 +0100
----------------------------------------------------------------------
.../applib/fixturescripts/FixtureScript.java | 8 ++++++
.../IntegrationTestAbstract2.java | 26 +++++++++++++++++++-
2 files changed, 33 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/4ce7e757/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java
index 822f319..df30290 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java
@@ -45,7 +45,9 @@ import org.apache.isis.applib.fixtures.FixtureType;
import org.apache.isis.applib.fixtures.InstallableFixture;
import org.apache.isis.applib.services.factory.FactoryService;
import org.apache.isis.applib.services.registry.ServiceRegistry2;
+import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.services.sessmgmt.SessionManagementService;
+import org.apache.isis.applib.services.user.UserService;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.applib.services.xactn.TransactionService;
@@ -1000,6 +1002,12 @@ public abstract class FixtureScript
protected ServiceRegistry2 serviceRegistry;
@javax.inject.Inject
+ protected RepositoryService repositoryService;
+
+ @javax.inject.Inject
+ protected UserService userService;
+
+ @javax.inject.Inject
protected WrapperFactory wrapperFactory;
@javax.inject.Inject
http://git-wip-us.apache.org/repos/asf/isis/blob/4ce7e757/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IntegrationTestAbstract2.java
----------------------------------------------------------------------
diff --git a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IntegrationTestAbstract2.java b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IntegrationTestAbstract2.java
index 9f382cd..f3a1eee 100644
--- a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IntegrationTestAbstract2.java
+++ b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IntegrationTestAbstract2.java
@@ -28,6 +28,12 @@ import org.apache.isis.applib.AppManifest;
import org.apache.isis.applib.AppManifestAbstract;
import org.apache.isis.applib.fixturescripts.FixtureScript;
import org.apache.isis.applib.fixturescripts.FixtureScripts;
+import org.apache.isis.applib.services.factory.FactoryService;
+import org.apache.isis.applib.services.registry.ServiceRegistry2;
+import org.apache.isis.applib.services.repository.RepositoryService;
+import org.apache.isis.applib.services.sessmgmt.SessionManagementService;
+import org.apache.isis.applib.services.user.UserService;
+import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.core.integtestsupport.scenarios.ScenarioExecutionForIntegration;
import org.apache.isis.objectstore.jdo.datanucleus.IsisConfigurationForJdoIntegTests;
@@ -91,10 +97,28 @@ public abstract class IntegrationTestAbstract2 extends IntegrationTestAbstract {
}
@Inject
+ protected FixtureScripts fixtureScripts;
+
+ @Inject
+ protected FactoryService factoryService;
+
+ @javax.inject.Inject
+ protected ServiceRegistry2 serviceRegistry;
+
+ @Inject
+ RepositoryService repositoryService;
+
+ @javax.inject.Inject
+ protected UserService userService;
+
+ @javax.inject.Inject
+ protected WrapperFactory wrapperFactory;
+
+ @Inject
protected TransactionService transactionService;
@Inject
- protected FixtureScripts fixtureScripts;
+ protected SessionManagementService sessionManagementService;
}