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 2021/03/11 06:58:36 UTC
[isis-app-simpleapp] 01/03: fixing up tests etc
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch jdo
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
commit af2c09a67dd84cb70906ab70584561163da93cc0
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Mar 9 22:02:36 2021 +0000
fixing up tests etc
---
.../integtests/SimpleModuleIntegTestAbstract.java | 4 +-
...Jdo.java => SimpleModuleTestConfiguration.java} | 6 ++-
.../integtests/tests/SimpleObjects_IntegTest.java | 7 +--
.../src/test/resources/application-test.yml | 6 +++
pom.xml | 2 +-
.../services/health/HealthCheckServiceImpl.java | 3 --
webapp/src/main/resources/application.yml | 16 +++++--
.../main/resources/config/application.properties | 4 --
.../domainapp/webapp/bdd/CucumberTestAbstract.java | 12 ++---
.../stepdefs/infrastructure/BootstrapStepDef.java | 4 +-
.../integtests/ApplicationIntegTestAbstract.java | 22 ---------
...impleApplicationTestConfiguration_usingJdo.java | 56 ----------------------
.../webapp/integtests/WebAppIntegTestAbstract.java | 56 ++++++++++++++++++++++
.../metamodel/SwaggerExport_IntegTest.java | 10 ++--
.../metamodel/ValidateDomainModel_IntegTest.java | 10 ++--
.../lockdown/LockDownMetaModel_IntegTest.java | 6 +--
.../webapp/integtests/smoke/Smoke_IntegTest.java | 4 +-
.../util/CurrentVsApprovedApprovalTextWriter.java | 22 ---------
webapp/src/test/resources/application-test.yml | 4 ++
19 files changed, 112 insertions(+), 142 deletions(-)
diff --git a/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java b/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
index c225444..dc42df0 100644
--- a/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
+++ b/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
@@ -1,13 +1,15 @@
package domainapp.modules.simple.integtests;
import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
import org.apache.isis.testing.fixtures.applib.IsisIntegrationTestAbstractWithFixtures;
@SpringBootTest(
- classes = SimpleModuleTestConfiguration_usingJdo.class
+ classes = SimpleModuleTestConfiguration.class
)
+@ActiveProfiles("test")
public abstract class SimpleModuleIntegTestAbstract extends IsisIntegrationTestAbstractWithFixtures {
}
diff --git a/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleTestConfiguration_usingJdo.java b/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleTestConfiguration.java
similarity index 93%
rename from module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleTestConfiguration_usingJdo.java
rename to module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleTestConfiguration.java
index 0df5209..be30e32 100644
--- a/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleTestConfiguration_usingJdo.java
+++ b/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleTestConfiguration.java
@@ -19,6 +19,7 @@
package domainapp.modules.simple.integtests;
import org.springframework.boot.SpringBootConfiguration;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.PropertySources;
@@ -36,6 +37,7 @@ import domainapp.modules.simple.SimpleModule;
* here we in effect disable security checks, and we exclude any web/UI modules.
*/
@SpringBootConfiguration
+@EnableAutoConfiguration
@Import({
IsisModuleCoreRuntimeServices.class,
@@ -50,7 +52,7 @@ import domainapp.modules.simple.SimpleModule;
@PropertySource(IsisPresets.DatanucleusAutocreateNoValidate),
@PropertySource(IsisPresets.UseLog4j2Test),
})
-public class SimpleModuleTestConfiguration_usingJdo {
+public class SimpleModuleTestConfiguration {
-}
\ No newline at end of file
+}
diff --git a/module-simple/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjects_IntegTest.java b/module-simple/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjects_IntegTest.java
index dcd2302..348773b 100644
--- a/module-simple/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjects_IntegTest.java
+++ b/module-simple/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjects_IntegTest.java
@@ -7,6 +7,7 @@ import javax.jdo.JDODataStoreException;
import org.hamcrest.MatcherAssert;
import org.junit.jupiter.api.Test;
+import org.springframework.dao.DuplicateKeyException;
import org.springframework.transaction.annotation.Transactional;
import org.apache.isis.testing.integtestsupport.applib.ThrowableMatchers;
@@ -81,12 +82,12 @@ public class SimpleObjects_IntegTest extends SimpleModuleIntegTestAbstract {
});
// also expect
- MatcherAssert.assertThat(cause,
- ThrowableMatchers.causedBy(JDODataStoreException.class));
+ MatcherAssert.assertThat(cause,
+ ThrowableMatchers.causedBy(DuplicateKeyException.class));
}
}
-}
\ No newline at end of file
+}
diff --git a/module-simple/src/test/resources/application-test.yml b/module-simple/src/test/resources/application-test.yml
new file mode 100644
index 0000000..3da8c51
--- /dev/null
+++ b/module-simple/src/test/resources/application-test.yml
@@ -0,0 +1,6 @@
+isis:
+ persistence:
+ schema:
+ auto-create-schemas: "simple"
+
+
diff --git a/pom.xml b/pom.xml
index aee49cd..10a728a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.apache.isis.app</groupId>
<artifactId>isis-app-starter-parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0-M5</version>
<relativePath/>
</parent>
diff --git a/webapp/src/main/java/domainapp/webapp/application/services/health/HealthCheckServiceImpl.java b/webapp/src/main/java/domainapp/webapp/application/services/health/HealthCheckServiceImpl.java
index c03b01e..4f16352 100644
--- a/webapp/src/main/java/domainapp/webapp/application/services/health/HealthCheckServiceImpl.java
+++ b/webapp/src/main/java/domainapp/webapp/application/services/health/HealthCheckServiceImpl.java
@@ -8,13 +8,10 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.services.health.Health;
import org.apache.isis.applib.services.health.HealthCheckService;
-import lombok.extern.log4j.Log4j2;
-
import domainapp.modules.simple.dom.so.SimpleObjects;
@Service
@Named("domainapp.HealthCheckServiceImpl")
-@Log4j2
public class HealthCheckServiceImpl implements HealthCheckService {
private final SimpleObjects simpleObjects;
diff --git a/webapp/src/main/resources/application.yml b/webapp/src/main/resources/application.yml
index 0a07e91..42dda6d 100644
--- a/webapp/src/main/resources/application.yml
+++ b/webapp/src/main/resources/application.yml
@@ -9,8 +9,8 @@ isis:
annotation:
action:
explicit: true
- command: ignore_safe
- publishing: all
+ command-publishing: ignore_safe
+ execution-publishing: all
action-layout:
css-class:
patterns:
@@ -21,8 +21,8 @@ isis:
auditing: all
publishing: all
property:
- command: all
- publishing: all
+ command-publishing: all
+ execution-publishing: all
core:
meta-model:
@@ -100,6 +100,14 @@ spring:
banner:
location: banner.txt
+ quartz:
+ job-store-type: memory
+
+management:
+ endpoint:
+ health:
+ enabled: true
+
app:
simple-module:
types:
diff --git a/webapp/src/main/resources/config/application.properties b/webapp/src/main/resources/config/application.properties
index 94f0df5..304765d 100644
--- a/webapp/src/main/resources/config/application.properties
+++ b/webapp/src/main/resources/config/application.properties
@@ -8,10 +8,6 @@
#
-# note that properties under 'datanucleus' must use variously camelCase or PascalCase rather than kebab-case
-
-datanucleus.schema.autoCreateAll=true
-
spring.datasource.platform=h2
spring.datasource.url=jdbc:h2:mem:simple
diff --git a/webapp/src/test/java/domainapp/webapp/bdd/CucumberTestAbstract.java b/webapp/src/test/java/domainapp/webapp/bdd/CucumberTestAbstract.java
index 57f44c5..43c9e50 100644
--- a/webapp/src/test/java/domainapp/webapp/bdd/CucumberTestAbstract.java
+++ b/webapp/src/test/java/domainapp/webapp/bdd/CucumberTestAbstract.java
@@ -18,17 +18,17 @@
*/
package domainapp.webapp.bdd;
-import domainapp.webapp.integtests.ApplicationIntegTestAbstract;
+import domainapp.webapp.integtests.WebAppIntegTestAbstract;
import io.cucumber.spring.CucumberContextConfiguration;
/**
- *
- * Provides the App's Spring Context for testing with Cucumber.
+ *
+ * Provides the App's Spring Context for testing with Cucumber.
*
*/
@CucumberContextConfiguration
-public abstract class CucumberTestAbstract extends ApplicationIntegTestAbstract {
+public abstract class CucumberTestAbstract extends WebAppIntegTestAbstract {
+
+ // any cucumber specific stuff might go here
- // any cucumber specific stuff might go here
-
}
diff --git a/webapp/src/test/java/domainapp/webapp/bdd/stepdefs/infrastructure/BootstrapStepDef.java b/webapp/src/test/java/domainapp/webapp/bdd/stepdefs/infrastructure/BootstrapStepDef.java
index 860f6da..28e88b9 100644
--- a/webapp/src/test/java/domainapp/webapp/bdd/stepdefs/infrastructure/BootstrapStepDef.java
+++ b/webapp/src/test/java/domainapp/webapp/bdd/stepdefs/infrastructure/BootstrapStepDef.java
@@ -2,9 +2,9 @@ package domainapp.webapp.bdd.stepdefs.infrastructure;
import org.apache.isis.applib.annotation.OrderPrecedence;
-import domainapp.webapp.integtests.ApplicationIntegTestAbstract;
+import domainapp.webapp.integtests.WebAppIntegTestAbstract;
-public class BootstrapStepDef extends ApplicationIntegTestAbstract {
+public class BootstrapStepDef extends WebAppIntegTestAbstract {
@io.cucumber.java.Before(order= OrderPrecedence.FIRST)
public void bootstrap() {
diff --git a/webapp/src/test/java/domainapp/webapp/integtests/ApplicationIntegTestAbstract.java b/webapp/src/test/java/domainapp/webapp/integtests/ApplicationIntegTestAbstract.java
deleted file mode 100644
index 8a5199f..0000000
--- a/webapp/src/test/java/domainapp/webapp/integtests/ApplicationIntegTestAbstract.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package domainapp.webapp.integtests;
-
-import org.springframework.boot.test.context.SpringBootTest;
-
-import org.apache.isis.testing.integtestsupport.applib.IsisIntegrationTestAbstract;
-
-import domainapp.webapp.application.ApplicationModule;
-import domainapp.webapp.bdd.stepdefs.BddStepDefsModule;
-
-@SpringBootTest(
- classes = {
- SimpleApplicationTestConfiguration_usingJdo.class,
- BddStepDefsModule.class,
- ApplicationModule.class,
- },
- properties = {
- // "logging.level.io.cucumber.core.runner.Runner=DEBUG"
- }
-)
-public abstract class ApplicationIntegTestAbstract extends IsisIntegrationTestAbstract {
-
-}
diff --git a/webapp/src/test/java/domainapp/webapp/integtests/SimpleApplicationTestConfiguration_usingJdo.java b/webapp/src/test/java/domainapp/webapp/integtests/SimpleApplicationTestConfiguration_usingJdo.java
deleted file mode 100644
index 8628bc8..0000000
--- a/webapp/src/test/java/domainapp/webapp/integtests/SimpleApplicationTestConfiguration_usingJdo.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package domainapp.webapp.integtests;
-
-import org.springframework.boot.SpringBootConfiguration;
-import org.springframework.context.annotation.Import;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.context.annotation.PropertySources;
-
-import org.apache.isis.core.config.presets.IsisPresets;
-import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
-import org.apache.isis.persistence.jdo.datanucleus.IsisModuleJdoDatanucleus;
-import org.apache.isis.security.bypass.IsisModuleSecurityBypass;
-import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
-
-import domainapp.modules.simple.SimpleModule;
-
-/**
- * Compared to the production app manifest <code>domainapp.webapp.AppManifest</code>,
- * here we in effect disable security checks, and we exclude any web/UI modules.
- */
-@SpringBootConfiguration
-@Import({
-
- IsisModuleCoreRuntimeServices.class,
- IsisModuleSecurityBypass.class,
- IsisModuleJdoDatanucleus.class,
- IsisModuleTestingFixturesApplib.class,
-
- SimpleModule.class
-})
-@PropertySources({
- @PropertySource(IsisPresets.H2InMemory_withUniqueSchema),
- @PropertySource(IsisPresets.DatanucleusAutocreateNoValidate),
- @PropertySource(IsisPresets.UseLog4j2Test),
-})
-public class SimpleApplicationTestConfiguration_usingJdo {
-
-
-}
diff --git a/webapp/src/test/java/domainapp/webapp/integtests/WebAppIntegTestAbstract.java b/webapp/src/test/java/domainapp/webapp/integtests/WebAppIntegTestAbstract.java
new file mode 100644
index 0000000..ee44cbf
--- /dev/null
+++ b/webapp/src/test/java/domainapp/webapp/integtests/WebAppIntegTestAbstract.java
@@ -0,0 +1,56 @@
+package domainapp.webapp.integtests;
+
+import org.springframework.boot.SpringBootConfiguration;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.Import;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.context.annotation.PropertySources;
+import org.springframework.test.context.ActiveProfiles;
+
+import org.apache.isis.core.config.presets.IsisPresets;
+import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
+import org.apache.isis.persistence.jdo.datanucleus.IsisModuleJdoDatanucleus;
+import org.apache.isis.security.bypass.IsisModuleSecurityBypass;
+import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
+import org.apache.isis.testing.integtestsupport.applib.IsisIntegrationTestAbstract;
+
+import domainapp.modules.simple.SimpleModule;
+import domainapp.webapp.application.ApplicationModule;
+import domainapp.webapp.bdd.stepdefs.BddStepDefsModule;
+
+@SpringBootTest(
+ classes = {
+ // we use a slightly different configuration compared to the production (AppManifest/webapp)
+ WebAppIntegTestAbstract.TestApp.class,
+ BddStepDefsModule.class,
+ ApplicationModule.class,
+ }
+)
+@ActiveProfiles("test")
+public abstract class WebAppIntegTestAbstract extends IsisIntegrationTestAbstract {
+
+ /**
+ * Compared to the production app manifest <code>domainapp.webapp.AppManifest</code>,
+ * here we in effect disable security checks, and we exclude any web/UI modules.
+ */
+ @SpringBootConfiguration
+ @EnableAutoConfiguration
+ @Import({
+
+ IsisModuleCoreRuntimeServices.class,
+ IsisModuleSecurityBypass.class,
+ IsisModuleJdoDatanucleus.class,
+ IsisModuleTestingFixturesApplib.class,
+
+ SimpleModule.class
+ })
+ @PropertySources({
+ @PropertySource(IsisPresets.H2InMemory_withUniqueSchema),
+ @PropertySource(IsisPresets.DatanucleusAutocreateNoValidate),
+ @PropertySource(IsisPresets.UseLog4j2Test),
+ })
+ public static class TestApp {
+
+ }
+}
diff --git a/webapp/src/test/java/domainapp/webapp/integtests/metamodel/SwaggerExport_IntegTest.java b/webapp/src/test/java/domainapp/webapp/integtests/metamodel/SwaggerExport_IntegTest.java
index d27c0b9..8b7dea9 100644
--- a/webapp/src/test/java/domainapp/webapp/integtests/metamodel/SwaggerExport_IntegTest.java
+++ b/webapp/src/test/java/domainapp/webapp/integtests/metamodel/SwaggerExport_IntegTest.java
@@ -15,13 +15,13 @@ import org.apache.isis.viewer.restfulobjects.jaxrsresteasy4.IsisModuleViewerRest
import lombok.val;
-import domainapp.webapp.integtests.ApplicationIntegTestAbstract;
+import domainapp.webapp.integtests.WebAppIntegTestAbstract;
@Import({
- IsisModuleViewerRestfulObjectsJaxrsResteasy4.class
+ IsisModuleViewerRestfulObjectsJaxrsResteasy4.class
})
-class SwaggerExport_IntegTest extends ApplicationIntegTestAbstract {
-
+class SwaggerExport_IntegTest extends WebAppIntegTestAbstract {
+
@Inject ServiceRegistry serviceRegistry;
@Test
@@ -29,4 +29,4 @@ class SwaggerExport_IntegTest extends ApplicationIntegTestAbstract {
val swaggerExporter = new SwaggerExporter(serviceRegistry);
swaggerExporter.export(Visibility.PRIVATE, Format.JSON);
}
-}
\ No newline at end of file
+}
diff --git a/webapp/src/test/java/domainapp/webapp/integtests/metamodel/ValidateDomainModel_IntegTest.java b/webapp/src/test/java/domainapp/webapp/integtests/metamodel/ValidateDomainModel_IntegTest.java
index 80bf4aa..84b9b0c 100644
--- a/webapp/src/test/java/domainapp/webapp/integtests/metamodel/ValidateDomainModel_IntegTest.java
+++ b/webapp/src/test/java/domainapp/webapp/integtests/metamodel/ValidateDomainModel_IntegTest.java
@@ -4,15 +4,13 @@ import javax.inject.Inject;
import org.junit.jupiter.api.Test;
-import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.testing.integtestsupport.applib.validate.DomainModelValidator;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import domainapp.webapp.integtests.ApplicationIntegTestAbstract;
+import domainapp.webapp.integtests.WebAppIntegTestAbstract;
+
+class ValidateDomainModel_IntegTest extends WebAppIntegTestAbstract {
-class ValidateDomainModel_IntegTest extends ApplicationIntegTestAbstract {
-
@Inject ServiceRegistry serviceRegistry;
@Test
@@ -21,4 +19,4 @@ class ValidateDomainModel_IntegTest extends ApplicationIntegTestAbstract {
}
-}
\ No newline at end of file
+}
diff --git a/webapp/src/test/java/domainapp/webapp/integtests/metamodel/lockdown/LockDownMetaModel_IntegTest.java b/webapp/src/test/java/domainapp/webapp/integtests/metamodel/lockdown/LockDownMetaModel_IntegTest.java
index 97dc0b9..b59d5d8 100644
--- a/webapp/src/test/java/domainapp/webapp/integtests/metamodel/lockdown/LockDownMetaModel_IntegTest.java
+++ b/webapp/src/test/java/domainapp/webapp/integtests/metamodel/lockdown/LockDownMetaModel_IntegTest.java
@@ -22,10 +22,10 @@ import org.apache.isis.applib.services.metamodel.MetaModelService;
import org.apache.isis.schema.metamodel.v2.DomainClassDto;
import org.apache.isis.schema.metamodel.v2.MetamodelDto;
-import domainapp.webapp.integtests.ApplicationIntegTestAbstract;
+import domainapp.webapp.integtests.WebAppIntegTestAbstract;
import domainapp.webapp.util.CurrentVsApprovedApprovalTextWriter;
-class LockDownMetaModel_IntegTest extends ApplicationIntegTestAbstract {
+class LockDownMetaModel_IntegTest extends WebAppIntegTestAbstract {
@Inject MetaModelService metaModelService;
@Inject JaxbService jaxbService;
@@ -77,4 +77,4 @@ class LockDownMetaModel_IntegTest extends ApplicationIntegTestAbstract {
}, getReporter());
}
-}
\ No newline at end of file
+}
diff --git a/webapp/src/test/java/domainapp/webapp/integtests/smoke/Smoke_IntegTest.java b/webapp/src/test/java/domainapp/webapp/integtests/smoke/Smoke_IntegTest.java
index 94465ee..f8c5b56 100644
--- a/webapp/src/test/java/domainapp/webapp/integtests/smoke/Smoke_IntegTest.java
+++ b/webapp/src/test/java/domainapp/webapp/integtests/smoke/Smoke_IntegTest.java
@@ -13,12 +13,12 @@ import org.apache.isis.applib.services.xactn.TransactionService;
import static org.assertj.core.api.Assertions.assertThat;
-import domainapp.webapp.integtests.ApplicationIntegTestAbstract;
+import domainapp.webapp.integtests.WebAppIntegTestAbstract;
import domainapp.modules.simple.dom.so.SimpleObject;
import domainapp.modules.simple.dom.so.SimpleObjects;
@Transactional
-class Smoke_IntegTest extends ApplicationIntegTestAbstract {
+class Smoke_IntegTest extends WebAppIntegTestAbstract {
@Inject SimpleObjects menu;
@Inject TransactionService transactionService;
diff --git a/webapp/src/test/java/domainapp/webapp/util/CurrentVsApprovedApprovalTextWriter.java b/webapp/src/test/java/domainapp/webapp/util/CurrentVsApprovedApprovalTextWriter.java
index 55ac7d5..85e5073 100644
--- a/webapp/src/test/java/domainapp/webapp/util/CurrentVsApprovedApprovalTextWriter.java
+++ b/webapp/src/test/java/domainapp/webapp/util/CurrentVsApprovedApprovalTextWriter.java
@@ -5,31 +5,9 @@ import org.approvaltests.writers.ApprovalTextWriter;
public class CurrentVsApprovedApprovalTextWriter extends ApprovalTextWriter {
- //private final String fileExtensionWithoutDot;
-
public CurrentVsApprovedApprovalTextWriter(String received, String fileExtensionWithoutDot) {
super(received, new Options().forFile()
.withExtension(fileExtensionWithoutDot));
- //this.fileExtensionWithoutDot = fileExtensionWithoutDot;
}
-// @Override
-// public String getReceivedFilename(final String base) {
-// return toFilename("current", base);
-// }
-//
-// @Override
-// public String getApprovalFilename(final String base) {
-// return toFilename("approved", base);
-// }
-//
-// private String toFilename(final String prefix, final String base) {
-// final File file = new File(base);
-// final File parentFile = file.getParentFile();
-// final String localName = file.getName();
-// final File newDir = new File(parentFile, prefix);
-// final File newFile = new File(newDir, localName + "." + fileExtensionWithoutDot);
-// return newFile.toString();
-// }
-
}
diff --git a/webapp/src/test/resources/application-test.yml b/webapp/src/test/resources/application-test.yml
new file mode 100644
index 0000000..3a68cae
--- /dev/null
+++ b/webapp/src/test/resources/application-test.yml
@@ -0,0 +1,4 @@
+isis:
+ persistence:
+ schema:
+ auto-create-schemas: "simple"