aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPamela Dragosh <pdragosh@research.att.com>2020-02-25 06:15:10 -0500
committerPamela Dragosh <pdragosh@research.att.com>2020-02-25 06:15:15 -0500
commit4de095c769c28f3f304d99f132a845993bf58dfa (patch)
tree8366cbf750e50d809fa61581d77ece558c588d42
parentad08c16e0b23de071a6a17c29a792dd808ff26c0 (diff)
Cleanup SQL output feature-state-mgt
use an in-memory database and not store temp files in the development directory. Upgrading to H2 1.4.200 seemed to expose the database issues. mvn clean does NOT remove the sql directory which makes it hard to figure out what is going on. Issue-ID: POLICY-2381 Change-Id: Icab5d9b6f62ed0f9c4e5be91c2b518ab2b442167 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
-rw-r--r--.gitignore1
-rw-r--r--feature-state-management/src/test/java/org/onap/policy/drools/statemanagement/test/StateManagementTest.java2
-rw-r--r--feature-state-management/src/test/resources/META-INF/persistence.xml4
-rw-r--r--feature-state-management/src/test/resources/feature-state-management.properties4
4 files changed, 5 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore
index 8b15fc55..123c6e21 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,6 @@
target/
*/config/
*/logs/
-*/sql/
*/testingLogs/
**/*.iml
.checkstyle
diff --git a/feature-state-management/src/test/java/org/onap/policy/drools/statemanagement/test/StateManagementTest.java b/feature-state-management/src/test/java/org/onap/policy/drools/statemanagement/test/StateManagementTest.java
index 86125069..1a34e65a 100644
--- a/feature-state-management/src/test/java/org/onap/policy/drools/statemanagement/test/StateManagementTest.java
+++ b/feature-state-management/src/test/java/org/onap/policy/drools/statemanagement/test/StateManagementTest.java
@@ -239,7 +239,7 @@ public class StateManagementTest {
Properties cleanProperties = new Properties();
cleanProperties.put(StateManagementProperties.DB_DRIVER,"org.h2.Driver");
- cleanProperties.put(StateManagementProperties.DB_URL, "jdbc:h2:file:./sql/statemanagement");
+ cleanProperties.put(StateManagementProperties.DB_URL, "jdbc:h2:mem:statemanagement");
cleanProperties.put(StateManagementProperties.DB_USER, "sa");
cleanProperties.put(StateManagementProperties.DB_PWD, "");
diff --git a/feature-state-management/src/test/resources/META-INF/persistence.xml b/feature-state-management/src/test/resources/META-INF/persistence.xml
index 24dabe1d..25f5e8f3 100644
--- a/feature-state-management/src/test/resources/META-INF/persistence.xml
+++ b/feature-state-management/src/test/resources/META-INF/persistence.xml
@@ -40,10 +40,10 @@
value="drop-and-create" />
<property
name="javax.persistence.schema-generation.scripts.create-target"
- value="./sql/generatedCreateStateManagement.ddl" />
+ value="target/classes/META-INF/generatedCreateStateManagement.ddl" />
<property
name="javax.persistence.schema-generation.scripts.drop-target"
- value="./sql/generatedDropStateManagement.ddl" />
+ value="target/classes/META-INF/generatedDropStateManagement.ddl" />
</properties>
</persistence-unit>
diff --git a/feature-state-management/src/test/resources/feature-state-management.properties b/feature-state-management/src/test/resources/feature-state-management.properties
index 56d18b54..b1ff12ea 100644
--- a/feature-state-management/src/test/resources/feature-state-management.properties
+++ b/feature-state-management/src/test/resources/feature-state-management.properties
@@ -20,7 +20,7 @@
# DB properties
javax.persistence.jdbc.driver = org.h2.Driver
-javax.persistence.jdbc.url = jdbc:h2:file:./sql/statemanagement
+javax.persistence.jdbc.url = jdbc:h2:mem:statemanagement
javax.persistence.jdbc.user = sa
javax.persistence.jdbc.password =
@@ -77,7 +77,7 @@ repository.audit.ignore.errors=true
# Timeout in seconds
repository.audit.timeout=5
repository.audit.id=statemanagement
-repository.audit.url=jdbc:h2:file:./sql/statemanagement
+repository.audit.url=jdbc:h2:mem:statemanagement
repository.audit.username=sa
repository.audit.password=