diff options
Diffstat (limited to 'controlloop/templates/template.demo.clc/src/test')
3 files changed, 22 insertions, 26 deletions
diff --git a/controlloop/templates/template.demo.clc/src/test/java/org/onap/policy/template/demo/clc/SupportUtil.java b/controlloop/templates/template.demo.clc/src/test/java/org/onap/policy/template/demo/clc/SupportUtil.java index a9f0a04e4..8a8dd894a 100644 --- a/controlloop/templates/template.demo.clc/src/test/java/org/onap/policy/template/demo/clc/SupportUtil.java +++ b/controlloop/templates/template.demo.clc/src/test/java/org/onap/policy/template/demo/clc/SupportUtil.java @@ -325,7 +325,7 @@ public final class SupportUtil { * Set the operation history properties. */ public static void setPuProp() { - System.setProperty(OPSHISTPUPROP, "TestOperationsHistoryPU"); + System.setProperty(OPSHISTPUPROP, "OperationsHistoryPUTest"); } /** @@ -337,12 +337,12 @@ public final class SupportUtil { // // Connect to in-mem db // - EntityManagerFactory emf = Persistence.createEntityManagerFactory("TestOperationsHistoryPU"); + EntityManagerFactory emf = Persistence.createEntityManagerFactory("OperationsHistoryPUTest"); EntityManager em = emf.createEntityManager(); // // Create query // - String sql = "select * from operationshistory10"; + String sql = "select * from operationshistory"; Query nq = em.createNativeQuery(sql); List<?> results = null; // diff --git a/controlloop/templates/template.demo.clc/src/test/resources/META-INF/persistence.xml b/controlloop/templates/template.demo.clc/src/test/resources/META-INF/persistence.xml index 808cef9b6..e1aa93f51 100644 --- a/controlloop/templates/template.demo.clc/src/test/resources/META-INF/persistence.xml +++ b/controlloop/templates/template.demo.clc/src/test/resources/META-INF/persistence.xml @@ -3,14 +3,14 @@ ============LICENSE_START=======================================================
drools-applications
================================================================================
- Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.
================================================================================
Licensed 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.
@@ -18,31 +18,26 @@ limitations under the License.
============LICENSE_END=========================================================
-->
-<persistence version="2.1"
- xmlns="http://xmlns.jcp.org/xml/ns/persistence"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
+<persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence persistence_1_0.xsd" version="1.0">
<!-- In-mem DB for junit -->
- <persistence-unit name="TestOperationsHistoryPU"
+ <persistence-unit name="OperationsHistoryPUTest"
transaction-type="RESOURCE_LOCAL">
<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
- <class>org.onap.policy.controlloop.eventmanager.OperationsHistoryDbEntry</class>
+
+ <class>org.onap.policy.database.operationshistory.Dbao</class>
+
<properties>
- <property name="eclipselink.ddl-generation"
- value="create-tables" />
- <property name="javax.persistence.jdbc.driver"
- value="org.h2.Driver" />
- <property name="javax.persistence.jdbc.url"
- value="jdbc:h2:mem:test" />
- <property name="javax.persistence.jdbc.user"
- value="sa" />
- <property name="javax.persistence.jdbc.password"
- value="" />
- <property name="eclipselink.logging.level"
- value="CONFIG" />
+ <property name="eclipselink.ddl-generation" value="create-tables" />
+ <property name="eclipselink.logging.level" value="FINE" />
+ <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/>
+ <property name="javax.persistence.jdbc.driver" value="org.h2.Driver" />
+ <property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:testdb;DATABASE_TO_UPPER=FALSE" />
+ <property name="javax.persistence.jdbc.user" value="policy" />
+ <property name="javax.persistence.jdbc.password" value="P01icY" />
+ <property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
+ <property name="javax.persistence.schema-generation.create-source" value="metadata"/>
</properties>
</persistence-unit>
-
</persistence>
diff --git a/controlloop/templates/template.demo.clc/src/test/resources/properties/prototype/xacml_guard_clc.properties b/controlloop/templates/template.demo.clc/src/test/resources/properties/prototype/xacml_guard_clc.properties index edc76517a..fa9568b5c 100644 --- a/controlloop/templates/template.demo.clc/src/test/resources/properties/prototype/xacml_guard_clc.properties +++ b/controlloop/templates/template.demo.clc/src/test/resources/properties/prototype/xacml_guard_clc.properties @@ -42,5 +42,6 @@ xacml.att.policyFinderFactory=com.att.research.xacmlatt.pdp.std.StdPolicyFinderF # # In case we have multiple applicable Guard policies, we will deny if any of them denies. -#xacml.att.policyFinderFactory.combineRootPolicies=urn:com:att:xacml:3.0:policy-combining-algorithm:combined-deny-overrides xacml.att.policyFinderFactory.combineRootPolicies=urn:oasis:names:tc:xacml:3.0:policy-combining-algorithm:permit-unless-deny + +get-operation-outcome.persistenceunit=OperationsHistoryPUTest
\ No newline at end of file |