aboutsummaryrefslogtreecommitdiffstats
path: root/src/test/java
diff options
context:
space:
mode:
authorajay_dp001 <ajay.deep.singh@est.tech>2021-01-23 14:50:45 +0530
committerajay_dp001 <ajay.deep.singh@est.tech>2021-02-09 18:00:23 +0530
commit1a88d861bffa7ea1da254f43948111b6c7c821ac (patch)
treeb89ce69ca15b7a47ecf7ab0be20cee03b1fc9b53 /src/test/java
parentd55cc18eb1b47c397157102d3395d4e1ce8f74a1 (diff)
[DMaap-dbcapi] Updated Outdated Packages
- Log4j Version 1.2.17 to 2.13.3 - commons-codec version 1.11 to 1.15 - postgresql version 42.2.5 to 42.2.14 - jetty-servlets version 9.4.24.v20191120 to 9.4.36.v20210114 Issue-ID: DMAAP-1515 Signed-off-by: ajay_dp001 <ajay.deep.singh@est.tech> Change-Id: I1716c8c78d4c3ca4f75159b3de98d9c799bae929
Diffstat (limited to 'src/test/java')
-rw-r--r--src/test/java/org/onap/dmaap/dbcapi/database/DBFieldHandlerTest.java6
-rw-r--r--src/test/java/org/onap/dmaap/dbcapi/model/JUnitTestSuite.java26
-rw-r--r--src/test/java/org/onap/dmaap/dbcapi/model/TestRunner.java31
3 files changed, 35 insertions, 28 deletions
diff --git a/src/test/java/org/onap/dmaap/dbcapi/database/DBFieldHandlerTest.java b/src/test/java/org/onap/dmaap/dbcapi/database/DBFieldHandlerTest.java
index 5171aaa..23745ac 100644
--- a/src/test/java/org/onap/dmaap/dbcapi/database/DBFieldHandlerTest.java
+++ b/src/test/java/org/onap/dmaap/dbcapi/database/DBFieldHandlerTest.java
@@ -27,8 +27,8 @@ import static org.junit.Assert.assertNull;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
-
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.junit.Test;
import org.onap.dmaap.dbcapi.authentication.AafLurAndFish;
import org.onap.dmaap.dbcapi.model.ReplicationType;
@@ -36,7 +36,7 @@ import org.onap.dmaap.dbcapi.testframework.ReflectionHarness;
public class DBFieldHandlerTest {
- private static final Logger logger = Logger.getLogger(AafLurAndFish.class);
+ private static final Logger logger = LogManager.getLogger(AafLurAndFish.class);
private static final String fmt = "%24s: %s%n";
diff --git a/src/test/java/org/onap/dmaap/dbcapi/model/JUnitTestSuite.java b/src/test/java/org/onap/dmaap/dbcapi/model/JUnitTestSuite.java
index 1c8edc0..a55e420 100644
--- a/src/test/java/org/onap/dmaap/dbcapi/model/JUnitTestSuite.java
+++ b/src/test/java/org/onap/dmaap/dbcapi/model/JUnitTestSuite.java
@@ -7,9 +7,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.
@@ -21,20 +21,22 @@
package org.onap.dmaap.dbcapi.model;
import junit.framework.TestSuite;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
-import org.apache.log4j.Logger;
@RunWith(Suite.class)
-@SuiteClasses({ DmaapTest.class
- })
+@SuiteClasses({DmaapTest.class})
public class JUnitTestSuite {
- private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class);
- public static void main(String[] args) {
- LOGGER.info("Running the test suite");
-
- TestSuite tstSuite = new TestSuite();
- LOGGER.info("Total Test Counts " + tstSuite.countTestCases());
- }
+
+ private static final Logger logger = LogManager.getLogger(JUnitTestSuite.class);
+
+ public static void main(String[] args) {
+ logger.info("Running the test suite");
+
+ TestSuite tstSuite = new TestSuite();
+ logger.info("Total Test Counts " + tstSuite.countTestCases());
+ }
}
diff --git a/src/test/java/org/onap/dmaap/dbcapi/model/TestRunner.java b/src/test/java/org/onap/dmaap/dbcapi/model/TestRunner.java
index fcab3e1..66cec35 100644
--- a/src/test/java/org/onap/dmaap/dbcapi/model/TestRunner.java
+++ b/src/test/java/org/onap/dmaap/dbcapi/model/TestRunner.java
@@ -7,9 +7,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.
@@ -18,19 +18,24 @@
* ============LICENSE_END=========================================================
*/
package org.onap.dmaap.dbcapi.model;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.junit.runner.JUnitCore;
import org.junit.runner.Result;
import org.junit.runner.notification.Failure;
-import org.apache.log4j.Logger;
+
public class TestRunner {
- private static final Logger LOGGER = Logger.getLogger(TestRunner.class);
- public static void main(String[] args) {
-
- Result result = JUnitCore.runClasses(JUnitTestSuite.class);
- for (Failure failure : result.getFailures()) {
- LOGGER.info(failure.toString());
-
- }
- LOGGER.info(result.wasSuccessful());
- }
+
+ private static final Logger logger = LogManager.getLogger(TestRunner.class);
+
+ public static void main(String[] args) {
+
+ Result result = JUnitCore.runClasses(JUnitTestSuite.class);
+ for (Failure failure : result.getFailures()) {
+ logger.info(failure.toString());
+
+ }
+ logger.info(result.wasSuccessful());
+ }
}