From 7081b69b3f60ea7cbbfad0d4f421dbdd55674731 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Tue, 9 Feb 2021 13:01:55 -0500 Subject: Upgrade dependencies Added target-database property. Also moved the db-driver value out of persistence.xml and into properties. Issue-ID: POLICY-3005 Change-Id: I2c9e53c099e400c32d11632f8732e770a7abba9f Signed-off-by: Jim Hahn --- .../ophistory/OperationHistoryDataManagerParamsTest.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'controlloop/common/eventmanager/src/test') diff --git a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/ophistory/OperationHistoryDataManagerParamsTest.java b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/ophistory/OperationHistoryDataManagerParamsTest.java index aeeac4796..97f306528 100644 --- a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/ophistory/OperationHistoryDataManagerParamsTest.java +++ b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/ophistory/OperationHistoryDataManagerParamsTest.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * ONAP * ================================================================================ - * Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2020-2021 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. @@ -37,6 +37,8 @@ public class OperationHistoryDataManagerParamsTest { private static final int MAX_QUEUE_LENGTH = 20; private static final String MY_PASS = "my-pass"; private static final String MY_PU = "my-pu"; + private static final String MY_DRIVER = "my-driver"; + private static final String MY_DB_TYPE = "my-db-type"; private static final String MY_URL = "my-url"; private static final String MY_USER = "my-user"; @@ -53,11 +55,19 @@ public class OperationHistoryDataManagerParamsTest { assertEquals(MAX_QUEUE_LENGTH, params.getMaxQueueLength()); assertEquals(MY_PASS, params.getPassword()); assertEquals(OperationHistoryDataManagerParams.DEFAULT_PU, params.getPersistenceUnit()); + assertEquals(OperationHistoryDataManagerParams.DEFAULT_DRIVER, params.getDriver()); + assertEquals(OperationHistoryDataManagerParams.DEFAULT_TYPE, params.getDbType()); assertEquals(MY_URL, params.getUrl()); assertEquals(MY_USER, params.getUserName()); // use specified PU assertEquals(MY_PU, makeBuilder().persistenceUnit(MY_PU).build().getPersistenceUnit()); + + // use specified driver + assertEquals(MY_DRIVER, makeBuilder().driver(MY_DRIVER).build().getDriver()); + + // use specified DB type + assertEquals(MY_DB_TYPE, makeBuilder().dbType(MY_DB_TYPE).build().getDbType()); } @Test @@ -68,6 +78,8 @@ public class OperationHistoryDataManagerParamsTest { testValidateField("userName", "null", params2 -> params2.setUserName(null)); testValidateField("password", "null", params2 -> params2.setPassword(null)); testValidateField("persistenceUnit", "null", params2 -> params2.setPersistenceUnit(null)); + testValidateField("driver", "null", params2 -> params2.setDriver(null)); + testValidateField("dbType", "null", params2 -> params2.setDbType(null)); // check edge cases params.setBatchSize(0); -- cgit 1.2.3-korg