#87 - moves integ tests around.

compiles, wip

Author: danhaywood

ex/app/extended/integtests/src/test/java/org/incode/extended/integtests/examples/communications/CommunicationsIntegTestAbstract.java

@@ -8,7 +8,7 @@
 
 import org.incode.domainapp.extended.module.fixtures.shared.ExampleDomDemoDomSubmodule;
 import org.incode.extended.integtests.examples.communications.app.CommunicationsModuleAppManifest;
-import org.incode.extended.integtests.examples.communications.app.services.fakesched.FakeScheduler;
+import org.incode.extended.integtests.examples.communications.appservices.fakesched.FakeScheduler;
 
 public abstract class CommunicationsIntegTestAbstract extends IntegrationTestAbstract2 {
 

ex/app/extended/integtests/src/test/java/org/incode/extended/integtests/examples/communications/app/CommunicationsModuleAppManifest.java

@@ -9,7 +9,7 @@
 
 import org.incode.domainapp.extended.module.fixtures.per_cpt.examples.communications.ExampleDomModuleCommunicationsModule;
 import org.incode.example.communications.dom.CommunicationsModuleDomModule;
-import org.incode.extended.integtests.examples.communications.app.services.DemoAppApplicationModuleServicesSubmodule;
+import org.incode.extended.integtests.examples.communications.appservices.DemoAppApplicationModuleServicesSubmodule;
 import org.incode.example.country.dom.CountryModule;
 import org.incode.example.document.dom.DocumentModule;
 

ex/app/extended/integtests/src/test/java/org/incode/extended/integtests/examples/communications/app/services/DemoAppApplicationModuleServicesSubmodule.java ex/app/extended/integtests/src/test/java/org/incode/extended/integtests/examples/communications/appservices/DemoAppApplicationModuleServicesSubmodule.java

@@ -1,4 +1,4 @@
-package org.incode.extended.integtests.examples.communications.app.services;
+package org.incode.extended.integtests.examples.communications.appservices;
 
 public final class DemoAppApplicationModuleServicesSubmodule {
     private DemoAppApplicationModuleServicesSubmodule(){}

ex/app/extended/integtests/src/test/java/org/incode/extended/integtests/examples/communications/app/services/fakecueap/FakeCurrentUserEmailAddressProvider.java ex/app/extended/integtests/src/test/java/org/incode/extended/integtests/examples/communications/appservices/fakecueap/FakeCurrentUserEmailAddressProvider.java

@@ -1,4 +1,4 @@
-package org.incode.extended.integtests.examples.communications.app.services.fakecueap;
+package org.incode.extended.integtests.examples.communications.appservices.fakecueap;
 
 import javax.inject.Inject;
 

ex/app/extended/integtests/src/test/java/org/incode/extended/integtests/examples/communications/app/services/fakeemail/EmailMessage.java ex/app/extended/integtests/src/test/java/org/incode/extended/integtests/examples/communications/appservices/fakeemail/EmailMessage.java

@@ -1,4 +1,4 @@
-package org.incode.extended.integtests.examples.communications.app.services.fakeemail;
+package org.incode.extended.integtests.examples.communications.appservices.fakeemail;
 
 import java.util.List;
 

ex/app/extended/integtests/src/test/java/org/incode/extended/integtests/examples/communications/app/services/fakeemail/EmailMessage.layout.xml ex/app/extended/integtests/src/test/java/org/incode/extended/integtests/examples/communications/appservices/fakeemail/EmailMessage.layout.xml

@@ -1,4 +1,4 @@
-package org.incode.extended.integtests.examples.communications.app.services.fakeemail;
+package org.incode.extended.integtests.examples.communications.appservices.fakeemail;
 
 import java.util.List;
 

ex/app/extended/integtests/src/test/java/org/incode/extended/integtests/examples/communications/app/services/fakeemail/FakeEmailService.java ex/app/extended/integtests/src/test/java/org/incode/extended/integtests/examples/communications/appservices/fakeemail/FakeEmailService.java

@@ -1,4 +1,4 @@
-package org.incode.extended.integtests.examples.communications.app.services.fakesched;
+package org.incode.extended.integtests.examples.communications.appservices.fakesched;
 
 import java.util.List;
 

ex/app/extended/integtests/src/test/java/org/incode/extended/integtests/examples/communications/app/services/fakesched/FakeScheduler.java ex/app/extended/integtests/src/test/java/org/incode/extended/integtests/examples/communications/appservices/fakesched/FakeScheduler.java

@@ -31,8 +31,8 @@
 import org.incode.example.communications.dom.mixins.Document_sendByEmail;
 import org.incode.example.communications.dom.mixins.Document_sendByPost;
 import org.incode.extended.integtests.examples.communications.CommunicationsIntegTestAbstract;
-import org.incode.extended.integtests.examples.communications.app.services.fakeemail.EmailMessage;
-import org.incode.extended.integtests.examples.communications.app.services.fakeemail.FakeEmailService;
+import org.incode.extended.integtests.examples.communications.appservices.fakeemail.EmailMessage;
+import org.incode.extended.integtests.examples.communications.appservices.fakeemail.FakeEmailService;
 import org.incode.example.document.dom.impl.docs.DocumentAbstract;
 import org.incode.example.document.dom.impl.paperclips.Paperclip;
 import org.incode.example.document.dom.impl.paperclips.PaperclipRepository;

ex/app/extended/integtests/src/test/java/org/incode/extended/integtests/examples/communications/integtests/Smoke_IntegTest.java

@@ -4,10 +4,8 @@
 
 import org.isisaddons.module.freemarker.dom.FreeMarkerModule;
 
-import org.incode.extended.integtests.examples.docfragment.app.fixture.DemoAppApplicationModuleFixtureSubmodule;
-import org.incode.example.docfragment.dom.DocFragmentModuleDomModule;
-
 import org.incode.domainapp.extended.module.fixtures.per_cpt.examples.docfragment.ExampleDomModuleDocFragmentModule;
+import org.incode.example.docfragment.dom.DocFragmentModuleDomModule;
 
 /**
  * Bootstrap the application.
@@ -17,7 +15,6 @@ public class DocFragmentAppAppManifest extends AppManifestAbstract {
     public static final Builder BUILDER = Builder.forModules(
             DocFragmentModuleDomModule.class,
             ExampleDomModuleDocFragmentModule.class,
-            DemoAppApplicationModuleFixtureSubmodule.class,
 
             FreeMarkerModule.class  // required by DocFragmentModule, do not yet support transitivity
     );

ex/app/extended/integtests/src/test/java/org/incode/extended/integtests/examples/docfragment/app/DocFragmentAppAppManifest.java

@@ -1,10 +1,10 @@
-package org.incode.platform.ext.flywaydb.integtests;
+package org.incode.extended.integtests.ext.flywaydb;
 
 import org.junit.BeforeClass;
 
 import org.apache.isis.core.integtestsupport.IntegrationTestAbstract2;
 
-import org.incode.platform.ext.flywaydb.integtests.app.FlywayDbDemoAppManifest;
+import org.incode.extended.integtests.ext.flywaydb.app.FlywayDbDemoAppManifest;
 
 public abstract class FlywayDbModuleIntegTestAbstract extends IntegrationTestAbstract2 {
 

ex/app/extended/integtests/src/test/java/org/incode/extended/integtests/examples/docfragment/app/fixture/DemoAppApplicationModuleFixtureSubmodule.java

@@ -1,4 +1,4 @@
-package org.incode.platform.ext.flywaydb.integtests.app;
+package org.incode.extended.integtests.ext.flywaydb.app;
 
 import org.apache.isis.applib.AppManifestAbstract;
 

ex/app/extended/integtests/src/test/java/org/incode/platform/ext/flywaydb/integtests/FlywayDbModuleIntegTestAbstract.java ex/app/extended/integtests/src/test/java/org/incode/extended/integtests/ext/flywaydb/FlywayDbModuleIntegTestAbstract.java

@@ -1,10 +1,10 @@
-package org.incode.platform.ext.flywaydb.integtests.tests;
+package org.incode.extended.integtests.ext.flywaydb.integtests;
 
 import org.junit.BeforeClass;
 
 import org.apache.isis.core.integtestsupport.IntegrationTestAbstract2;
 
-import org.incode.platform.ext.flywaydb.integtests.app.FlywayDbDemoAppManifest;
+import org.incode.extended.integtests.ext.flywaydb.app.FlywayDbDemoAppManifest;
 
 public abstract class DomainAppIntegTestAbstract extends IntegrationTestAbstract2 {
 

ex/app/extended/integtests/src/test/java/org/incode/platform/ext/flywaydb/integtests/app/FlywayDbDemoAppManifest.java ex/app/extended/integtests/src/test/java/org/incode/extended/integtests/ext/flywaydb/app/FlywayDbDemoAppManifest.java

@@ -1,4 +1,4 @@
-package org.incode.platform.ext.flywaydb.integtests.tests;
+package org.incode.extended.integtests.ext.flywaydb.integtests;
 
 import java.util.List;
 

ex/app/extended/integtests/src/test/java/org/incode/platform/ext/flywaydb/integtests/tests/DomainAppIntegTestAbstract.java ex/app/extended/integtests/src/test/java/org/incode/extended/integtests/ext/flywaydb/integtests/DomainAppIntegTestAbstract.java

@@ -1,4 +1,4 @@
-package org.incode.platform.ext.togglz.integtests;
+package org.incode.extended.integtests.ext.togglz;
 
 import org.junit.BeforeClass;
 import org.junit.Rule;
@@ -7,7 +7,7 @@
 import org.apache.isis.core.integtestsupport.IntegrationTestAbstract2;
 
 import org.incode.domainapp.extended.module.fixtures.shared.ExampleDomDemoDomSubmodule;
-import org.incode.platform.ext.togglz.integtests.app.TogglzExtAppManifest;
+import org.incode.extended.integtests.ext.togglz.app.TogglzExtAppManifest;
 
 import domainapp.modules.base.togglz.TogglzFeature;
 

ex/app/extended/integtests/src/test/java/org/incode/platform/ext/flywaydb/integtests/tests/Smoke_IntegTest.java ex/app/extended/integtests/src/test/java/org/incode/extended/integtests/ext/flywaydb/integtests/Smoke_IntegTest.java

@@ -1,4 +1,4 @@
-package org.incode.platform.ext.togglz.integtests.app;
+package org.incode.extended.integtests.ext.togglz.app;
 
 import java.util.List;
 

ex/app/extended/integtests/src/test/java/org/incode/platform/ext/togglz/integtests/TogglzModuleIntegTestAbstract.java ex/app/extended/integtests/src/test/java/org/incode/extended/integtests/ext/togglz/TogglzModuleIntegTestAbstract.java

@@ -1,4 +1,4 @@
-package org.incode.platform.ext.togglz.integtests.app;
+package org.incode.extended.integtests.ext.togglz.app;
 
 import org.apache.isis.applib.AppManifestAbstract;
 

ex/app/extended/integtests/src/test/java/org/incode/platform/ext/togglz/integtests/app/TogglzDemoAppManifestWithExtFixture.java ex/app/extended/integtests/src/test/java/org/incode/extended/integtests/ext/togglz/app/TogglzDemoAppManifestWithExtFixture.java

@@ -1,15 +1,16 @@
-package org.incode.platform.ext.togglz.integtests.app.fixtures;
+package org.incode.extended.integtests.ext.togglz.app.fixtures;
 
 import javax.inject.Inject;
 
 import org.apache.isis.applib.annotation.DomainService;
 import org.apache.isis.applib.annotation.NatureOfService;
 
+import org.isisaddons.module.togglz.glue.spi.FeatureState;
+import org.isisaddons.module.togglz.glue.spi.FeatureStateRepository;
+
 import org.incode.example.settings.dom.ApplicationSetting;
 import org.incode.example.settings.dom.ApplicationSettingsServiceRW;
 import org.incode.example.settings.dom.jdo.ApplicationSettingJdo;
-import org.isisaddons.module.togglz.glue.spi.FeatureState;
-import org.isisaddons.module.togglz.glue.spi.FeatureStateRepository;
 
 /**
  * Implements the togglz SPI and delegates to estatio's own wrapper around the settings service.

ex/app/extended/integtests/src/test/java/org/incode/platform/ext/togglz/integtests/app/TogglzExtAppManifest.java ex/app/extended/integtests/src/test/java/org/incode/extended/integtests/ext/togglz/app/TogglzExtAppManifest.java

@@ -1,4 +1,4 @@
-package org.incode.platform.ext.togglz.integtests.tests;
+package org.incode.extended.integtests.ext.togglz.integtests;
 
 import java.util.List;
 
@@ -13,7 +13,7 @@
 import org.incode.domainapp.extended.module.fixtures.per_cpt.ext.togglz.fixture.DemoObject_recreate3;
 import org.incode.domainapp.extended.module.fixtures.shared.demo.dom.DemoObject;
 import org.incode.domainapp.extended.module.fixtures.shared.demo.dom.DemoObjectMenu;
-import org.incode.platform.ext.togglz.integtests.TogglzModuleIntegTestAbstract;
+import org.incode.extended.integtests.ext.togglz.TogglzModuleIntegTestAbstract;
 
 
 public class TogglzDemoObjects_IntegTest extends TogglzModuleIntegTestAbstract {