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/12/13 11:15:55 UTC

[isis] branch master updated: isis-1782: simplifications/improvements to the Headless (integration test) API

This is an automated email from the ASF dual-hosted git repository.

danhaywood 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 fdc886c  isis-1782: simplifications/improvements to the Headless (integration test) API
fdc886c is described below

commit fdc886cc1ee40fdaa56ffe3832e4c5b79670d475
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Dec 13 11:14:44 2017 +0000

    isis-1782: simplifications/improvements to the Headless (integration test) API
---
 .../java/org/apache/isis/applib/AppManifest2.java  |  4 +-
 .../integtestsupport/IntegrationTestAbstract3.java | 11 ++---
 .../HeadlessWithBootstrappingAbstract.java         | 28 ++++--------
 .../runtime/headless/IsisSystemBootstrapper.java   | 50 ++++++++++++++--------
 .../specs/CukeGlueIntegrationScopeAbstract.java    |  2 +-
 5 files changed, 47 insertions(+), 48 deletions(-)

diff --git a/core/applib/src/main/java/org/apache/isis/applib/AppManifest2.java b/core/applib/src/main/java/org/apache/isis/applib/AppManifest2.java
index a9daa4c..88b34e0 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/AppManifest2.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/AppManifest2.java
@@ -27,8 +27,8 @@ public interface AppManifest2 extends AppManifest {
     @Programmatic
     Module getModule();
     @Programmatic
-    FixtureScript getTeardownFixture();
-    @Programmatic
     FixtureScript getRefDataSetupFixture();
+    @Programmatic
+    FixtureScript getTeardownFixture();
 
 }
diff --git a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IntegrationTestAbstract3.java b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IntegrationTestAbstract3.java
index c8def8a..67394ad 100644
--- a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IntegrationTestAbstract3.java
+++ b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IntegrationTestAbstract3.java
@@ -150,17 +150,14 @@ public abstract class IntegrationTestAbstract3 extends HeadlessWithBootstrapping
     }
 
 
-    protected IntegrationTestAbstract3(
-            final Module module,
-            final Class... additionalModuleClasses) {
-        this(new LogConfig(Level.INFO), module, additionalModuleClasses);
+    protected IntegrationTestAbstract3(final Module module) {
+        this(new LogConfig(Level.INFO), module);
     }
 
     protected IntegrationTestAbstract3(
             final LogConfig logConfig,
-            final Module module,
-            final Class... additionalModuleClasses) {
-        super(logConfig, module, additionalModuleClasses);
+            final Module module) {
+        super(logConfig, module);
     }
 
     @Override
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/headless/HeadlessWithBootstrappingAbstract.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/headless/HeadlessWithBootstrappingAbstract.java
index e9bb689..25ea0ab 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/headless/HeadlessWithBootstrappingAbstract.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/headless/HeadlessWithBootstrappingAbstract.java
@@ -59,18 +59,14 @@ public abstract class HeadlessWithBootstrappingAbstract extends HeadlessAbstract
 
     private final IsisSystemBootstrapper isisSystemBootstrapper;
 
-    protected Long t0;
-
     protected HeadlessWithBootstrappingAbstract(
-            final Module module,
-            final Class... additionalModuleClasses) {
-        this(new LogConfig(Level.INFO), module, additionalModuleClasses);
+            final Module module) {
+        this(new LogConfig(Level.INFO), module);
     }
 
     protected HeadlessWithBootstrappingAbstract(
             final LogConfig logConfig,
-            final Module module,
-            final Class... additionalModuleClasses) {
+            final Module module) {
 
         this.logConfig = logConfig;
 
@@ -78,7 +74,6 @@ public abstract class HeadlessWithBootstrappingAbstract extends HeadlessAbstract
         if(firstTime) {
             PropertyConfigurator.configure(logConfig.getLoggingPropertyFile());
             setupLogging.set(true);
-            t0 = System.currentTimeMillis();
         }
 
         String moduleFqcn = System.getProperty("isis.headless.module");
@@ -86,17 +81,12 @@ public abstract class HeadlessWithBootstrappingAbstract extends HeadlessAbstract
             moduleFqcn = System.getProperty("isis.integTest.module"); // to deprecate
         }
 
-        final Module moduleToUse;
-        final Class[] additionalModuleClassesToUse;
-        if(!Strings.isNullOrEmpty(moduleFqcn)) {
-            moduleToUse = InstanceUtil.createInstance(moduleFqcn, Module.class);
-            additionalModuleClassesToUse = new Class<?>[] { };
-        } else {
-            moduleToUse = module;
-            additionalModuleClassesToUse = additionalModuleClasses;
-        }
+        final Module moduleToUse =
+                !Strings.isNullOrEmpty(moduleFqcn)
+                        ? InstanceUtil.createInstance(moduleFqcn, Module.class)
+                        : module;
         this.isisSystemBootstrapper =
-                new IsisSystemBootstrapper(logConfig, moduleToUse, additionalModuleClassesToUse);
+                new IsisSystemBootstrapper(logConfig, moduleToUse);
     }
 
 
@@ -107,7 +97,7 @@ public abstract class HeadlessWithBootstrappingAbstract extends HeadlessAbstract
         System.setProperty("isis.headless", "true");
         System.setProperty("isis.integTest", "true"); // to deprecate
 
-        isisSystemBootstrapper.bootstrapIfRequired(t0);
+        isisSystemBootstrapper.bootstrapIfRequired();
         isisSystemBootstrapper.injectServicesInto(this);
         fixtureScripts.setFixtureTracing(logConfig.getFixtureTracing());
 
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/headless/IsisSystemBootstrapper.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/headless/IsisSystemBootstrapper.java
index 9e5c546..3fa41db 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/headless/IsisSystemBootstrapper.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/headless/IsisSystemBootstrapper.java
@@ -52,27 +52,38 @@ public class IsisSystemBootstrapper {
 
 
     private final LogConfig logConfig;
-    private final Module module;
-    private final Class[] additionalModuleClasses;
+    private final AppManifest2 appManifest2;
 
     public IsisSystemBootstrapper(
             final LogConfig logConfig,
-            final Module module,
-            final Class... additionalModuleClasses) {
+            final Module module) {
+        this(logConfig, AppManifestAbstract2.Builder.forModule(module).build());
+    }
+
+    public IsisSystemBootstrapper(
+            final LogConfig logConfig,
+            final AppManifest2 appManifest2) {
 
         this.logConfig = logConfig;
-        this.module = module;
-        this.additionalModuleClasses = additionalModuleClasses;
+        this.appManifest2 = appManifest2;
     }
 
-    public void bootstrapIfRequired(final Long t0) {
+    public AppManifest2 getAppManifest2() {
+        return appManifest2;
+    }
 
-        final AppManifestAbstract2.Builder builder = AppManifestAbstract2.Builder.forModule(module);
-        builder.withAdditionalModules(additionalModuleClasses); // eg fake module, as passed into constructor
+    /**
+     * Corresponding to {@link AppManifest2} provided in {@link #IsisSystemBootstrapper(LogConfig, AppManifest2)}, or
+     * (equivalently) the {@link Module} provided directly in {@link #IsisSystemBootstrapper(LogConfig, Module)}.
+     */
+    public Module getModule() {
+        return appManifest2.getModule();
+    }
 
-        final AppManifest2 appManifest = builder.build();
+    public IsisSystem bootstrapIfRequired() {
+        bootstrapUsing(appManifest2);
 
-        bootstrapUsing(appManifest, t0);
+        return IsisSystem.get();
     }
 
     /**
@@ -85,7 +96,7 @@ public class IsisSystemBootstrapper {
     }
 
 
-    private void bootstrapUsing(AppManifest2 appManifest2, Long t0) {
+    private void bootstrapUsing(AppManifest2 appManifest2) {
 
         final SystemState systemState = determineSystemState(appManifest2);
         switch (systemState) {
@@ -98,15 +109,16 @@ public class IsisSystemBootstrapper {
             teardownSystem();
             // fall through
         case NOT_BOOTSTRAPPED:
+
+            long t0 = System.currentTimeMillis();
             setupSystem(appManifest2);
-            TickingFixtureClock.replaceExisting();
+            long t1 = System.currentTimeMillis();
+
+            log("##########################################################################");
+            log("# Bootstrapped in " + (t1- t0) + " millis");
+            log("##########################################################################");
 
-            if(t0 != null) {
-                long t1 = System.currentTimeMillis();
-                log("##########################################################################");
-                log("# Bootstrapped in " + (t1- t0) + " millis");
-                log("##########################################################################");
-            }
+            TickingFixtureClock.replaceExisting();
 
             break;
         }
diff --git a/core/specsupport/src/main/java/org/apache/isis/core/specsupport/specs/CukeGlueIntegrationScopeAbstract.java b/core/specsupport/src/main/java/org/apache/isis/core/specsupport/specs/CukeGlueIntegrationScopeAbstract.java
index f25e5cd..5fcc8f2 100644
--- a/core/specsupport/src/main/java/org/apache/isis/core/specsupport/specs/CukeGlueIntegrationScopeAbstract.java
+++ b/core/specsupport/src/main/java/org/apache/isis/core/specsupport/specs/CukeGlueIntegrationScopeAbstract.java
@@ -30,7 +30,7 @@ public abstract class CukeGlueIntegrationScopeAbstract extends HeadlessWithBoots
 
     protected CukeGlueIntegrationScopeAbstract(final Module module,
             final Class... additionalModuleClasses) {
-        super(module, additionalModuleClasses);
+        super(module);
     }
 
     @Before(order=100)

-- 
To stop receiving notification emails like this one, please contact
['"commits@isis.apache.org" <co...@isis.apache.org>'].