add junit cases in AppcDatabaseConnectionPool

Change-Id: I978d9db8aa5f459c578d4080bee5365af187a7cd
Issue-ID: APPC-531
Signed-off-by: Taka <tc012c@att.com>

diff --git a/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/onap/appc/dao/util/AppcDatabaseConnectionPool.java b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/onap/appc/dao/util/AppcDatabaseConnectionPool.java
index 2197397..958001c 100644 (file)
--- a/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/onap/appc/dao/util/AppcDatabaseConnectionPool.java
+++ b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/onap/appc/dao/util/AppcDatabaseConnectionPool.java
@@ -9,9 +9,9 @@
  * 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.
@@ -48,22 +48,6 @@ import java.util.Map;
  * An example is shown in the {@link DBConnectionPoolService}
  */
 public class AppcDatabaseConnectionPool implements DBConnectionPoolService {
-    enum PropertyPattern {
-        DBURL("org.onap.appc.db.url.%s"),
-        USERNAME("org.onap.appc.db.user.%s"),
-        PASSWORD("org.onap.appc.db.pass.%s"),
-        DRIVER("org.onap.appc.db.jdbc.driver");
-
-        private String pattern;
-
-        PropertyPattern(String pattern) {
-            this.pattern = pattern;
-        }
-
-        public String getPattern() {
-            return pattern;
-        }
-    }
 
     private final EELFLogger logger = EELFManager.getInstance().getLogger(AppcDatabaseConnectionPool.class);
 

diff --git a/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/onap/appc/dao/util/PropertyPattern.java b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/onap/appc/dao/util/PropertyPattern.java
new file mode 100644 (file)
index 0000000..f02e50c
--- /dev/null
+++ b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/onap/appc/dao/util/PropertyPattern.java
@@ -0,0 +1,42 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : APPC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
+ * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.appc.dao.util;
+
+public enum PropertyPattern {
+     DBURL("org.onap.appc.db.url.%s"),
+     USERNAME("org.onap.appc.db.user.%s"),
+     PASSWORD("org.onap.appc.db.pass.%s"),
+     DRIVER("org.onap.appc.db.jdbc.driver");
+
+     private String pattern;
+
+     PropertyPattern(String pattern) {
+         this.pattern = pattern;
+     }
+
+     public String getPattern() {
+         return pattern;
+     }
+}
\ No newline at end of file

diff --git a/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/test/java/org/onap/appc/dao/util/AppcDatabaseConnectionPoolTest.java b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/test/java/org/onap/appc/dao/util/AppcDatabaseConnectionPoolTest.java
index faee99d..c3eada8 100644 (file)
--- a/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/test/java/org/onap/appc/dao/util/AppcDatabaseConnectionPoolTest.java
+++ b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/test/java/org/onap/appc/dao/util/AppcDatabaseConnectionPoolTest.java
@@ -9,15 +9,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.
- * 
+ *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
@@ -80,6 +80,41 @@ public class AppcDatabaseConnectionPoolTest {
         Whitebox.setInternalState(appcDatabaseConnectionPool, "dbConnectionPool", dbConnectionPool);
     }
 
+    @Test
+    public void testDBURL() {
+        String dbString;
+
+        dbString = PropertyPattern.DBURL.getPattern();
+        dbString = String.format(dbString, "test");
+        Assert.assertEquals("org.onap.appc.db.url.test", dbString);
+    }
+
+    @Test
+    public void testUSERNAME() {
+        String dbString;
+
+        dbString = PropertyPattern.USERNAME.getPattern();
+        dbString = String.format(dbString, "test");
+        Assert.assertEquals("org.onap.appc.db.user.test", dbString);
+    }
+
+    @Test
+    public void testPASSWORD() {
+        String dbString;
+
+        dbString = PropertyPattern.PASSWORD.getPattern();
+        dbString = String.format(dbString, "test");
+        Assert.assertEquals("org.onap.appc.db.pass.test", dbString);
+    }
+
+    @Test
+    public void testDRIVER() {
+        String dbString;
+
+        dbString = PropertyPattern.DRIVER.getPattern();
+        Assert.assertEquals("org.onap.appc.db.jdbc.driver", dbString);
+    }
+
     @Test
     public void testArgumentConstructor() {
         AppcDatabaseConnectionPool appcDatabaseConnectionPool = new AppcDatabaseConnectionPool(dbUrl, username,