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:34 UTC
[5/6] isis git commit: ISIS-1521: simplifies
SimpleModuleIntegTestAbstract
ISIS-1521: simplifies SimpleModuleIntegTestAbstract
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/b310e868
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/b310e868
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/b310e868
Branch: refs/heads/master
Commit: b310e8689b12e9fda087a511c37b5aa0f23080ae
Parents: 791963c
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Aug 4 18:01:30 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Aug 4 18:01:30 2017 +0100
----------------------------------------------------------------------
.../SimpleModuleIntegTestAbstract.java | 24 ++------------------
1 file changed, 2 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/b310e868/example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java b/example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
index 57f0cb6..7a0ca97 100644
--- a/example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
+++ b/example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
@@ -18,22 +18,9 @@
*/
package domainapp.modules.simple.integtests;
-import java.util.List;
-import java.util.Map;
-
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-
import org.junit.BeforeClass;
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
-import org.apache.isis.applib.fixturescripts.FixtureScripts;
-import org.apache.isis.applib.services.fixturespec.FixtureScriptsSpecification;
-import org.apache.isis.applib.services.fixturespec.FixtureScriptsSpecificationProvider;
import org.apache.isis.core.integtestsupport.IntegrationTestAbstract2;
-import org.apache.isis.core.integtestsupport.IsisSystemForTest;
-import org.apache.isis.core.integtestsupport.scenarios.ScenarioExecutionForIntegration;
import domainapp.modules.simple.SimpleModuleManifest;
@@ -41,15 +28,8 @@ public abstract class SimpleModuleIntegTestAbstract extends IntegrationTestAbstr
@BeforeClass
public static void initSystem() {
- bootstrapUsing(SimpleModuleManifest.BUILDER.withConfigurationProperty("isis.objects.editing","false"));
+ bootstrapUsing(new SimpleModuleManifest());
+ //bootstrapUsing(SimpleModuleManifest.BUILDER.withConfigurationProperty("isis.objects.editing","false"));
}
- @DomainService(nature = NatureOfService.DOMAIN)
- public static class ModuleFixtureScriptsSpecificationProvider implements FixtureScriptsSpecificationProvider {
- @Override
- public FixtureScriptsSpecification getSpecification() {
- return FixtureScriptsSpecification.builder("domainapp.modules.simple").with(
- FixtureScripts.MultipleExecutionStrategy.EXECUTE_ONCE_BY_VALUE).build();
- }
- }
}