diff options
author | 2019-04-16 11:20:08 +0000 | |
---|---|---|
committer | 2019-04-16 11:20:08 +0000 | |
commit | 3cb682fa71a1749fb99a47d7c8ede2b8984e2c07 (patch) | |
tree | 08aa6b83f985cfefcb0618d146b2e77428110055 /model/model-api/src/test/java/org | |
parent | 2ba499f11094cfd1321e59789869a0c475406b58 (diff) |
Fix Security and Unit Test DB issues
This review removes more links to the Zookeeper version 3.5.4-beta with
Zookeeper version 3.4.14.
It also replaces the Derby in-memory database with the H2 in memory
database for unit tests.
Issue-ID: POLICY-1540
Change-Id: Ic44f2e866644114b7c0cf66aac7e528017b8206b
Signed-off-by: liamfallon <liam.fallon@est.tech>
Diffstat (limited to 'model/model-api/src/test/java/org')
-rw-r--r-- | model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexModelApiTest.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexModelApiTest.java b/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexModelApiTest.java index 462b1cd8b..df5e54ca9 100644 --- a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexModelApiTest.java +++ b/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexModelApiTest.java @@ -5,15 +5,15 @@ * 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. * See the License for the specific language governing permissions and * limitations under the License. - * + * * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ @@ -48,14 +48,14 @@ public class ApexModelApiTest { @Before public void setup() throws Exception { - Class.forName("org.apache.derby.jdbc.EmbeddedDriver").newInstance(); - connection = DriverManager.getConnection("jdbc:derby:memory:apex_test;create=true"); + // Hold the h2 database up for entire tests + connection = DriverManager.getConnection("jdbc:h2:mem:testdb"); } @After public void teardown() throws Exception { + // Close the h2 database after tests connection.close(); - new File("derby.log").delete(); } @Test |