summaryrefslogtreecommitdiffstats
path: root/BRMSGateway
diff options
context:
space:
mode:
authorHOCKLA <ah999m@att.com>2020-01-17 16:20:01 -0600
committerHOCKLA <ah999m@att.com>2020-01-20 10:34:32 -0600
commite37f5a70bcf3fd8073418c13416cc79c0ef47d59 (patch)
tree4c9c9e0c4c341b2311e4c24311aa9cbffd5dedf1 /BRMSGateway
parentc8856ab39a6d8376e6ad700b6acabdc7736c714f (diff)
policy/engine jdk11 upgrades
Issue-ID: POLICY-1590 Change-Id: I4da8324a065ac9babe16368e69b76a4cbe9504ef Signed-off-by: HOCKLA <ah999m@att.com>
Diffstat (limited to 'BRMSGateway')
-rw-r--r--BRMSGateway/pom.xml6
-rw-r--r--BRMSGateway/src/test/java/org/onap/policy/brms/BrmsPushTest.java26
-rw-r--r--BRMSGateway/src/test/java/org/onap/policy/brms/api/BrmsHandlerTest.java10
-rw-r--r--BRMSGateway/src/test/java/org/onap/policy/brms/api/BrmsPushTest.java8
4 files changed, 27 insertions, 23 deletions
diff --git a/BRMSGateway/pom.xml b/BRMSGateway/pom.xml
index 5b344af8a..8f6a79df1 100644
--- a/BRMSGateway/pom.xml
+++ b/BRMSGateway/pom.xml
@@ -2,7 +2,7 @@
============LICENSE_START=======================================================
ONAP Policy Engine
================================================================================
- Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ Copyright (C) 2017-2018, 2020 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.
@@ -109,7 +109,7 @@
<configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
<!-- <sourceDirectory> is needed so that checkstyle
ignores the generated sources directory -->
- <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+ <sourceDirectories>${project.build.sourceDirectory}</sourceDirectories>
<includeResources>true</includeResources>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<includeTestResources>true</includeTestResources>
@@ -123,7 +123,7 @@
<dependency>
<groupId>org.onap.oparent</groupId>
<artifactId>checkstyle</artifactId>
- <version>0.1.1</version>
+ <version>${oparent.version}</version>
<scope>compile</scope>
</dependency>
</dependencies>
diff --git a/BRMSGateway/src/test/java/org/onap/policy/brms/BrmsPushTest.java b/BRMSGateway/src/test/java/org/onap/policy/brms/BrmsPushTest.java
index de1a7d6eb..994e97368 100644
--- a/BRMSGateway/src/test/java/org/onap/policy/brms/BrmsPushTest.java
+++ b/BRMSGateway/src/test/java/org/onap/policy/brms/BrmsPushTest.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP Policy Engine
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017, 2020 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.
@@ -81,7 +81,7 @@ public class BrmsPushTest {
}
@Test(expected = PolicyException.class)
- public void brmsHandlerFailTest2() throws PolicyException {
+ public void testBrmsHandlerFail2() throws PolicyException {
final PropertyChange prop = new PropertyChange();
prop.key = "defaultName";
prop.remove = true;
@@ -92,7 +92,7 @@ public class BrmsPushTest {
}
@Test(expected = PolicyException.class)
- public void brmsHandlerFailTest3() throws PolicyException {
+ public void testBrmsHandlerFail3() throws PolicyException {
PropertyChange prop = new PropertyChange();
prop.key = "repositoryID";
prop.remove = true;
@@ -107,7 +107,7 @@ public class BrmsPushTest {
}
@Test(expected = PolicyException.class)
- public void brmsHandlerFailTest4() throws PolicyException {
+ public void testBrmsHandlerFail4() throws PolicyException {
final PropertyChange prop = new PropertyChange();
prop.key = "repositoryURL";
prop.remove = true;
@@ -118,7 +118,7 @@ public class BrmsPushTest {
}
@Test(expected = PolicyException.class)
- public void brmsHandlerFailTest5() throws PolicyException {
+ public void testBrmsHandlerFail5() throws PolicyException {
final PropertyChange prop = new PropertyChange();
prop.key = "repositoryName";
prop.remove = true;
@@ -129,7 +129,7 @@ public class BrmsPushTest {
}
@Test(expected = PolicyException.class)
- public void brmsHandlerFailTest6() throws PolicyException {
+ public void testBrmsHandlerFail6() throws PolicyException {
PropertyChange prop = new PropertyChange();
prop.key = "repositoryURL";
prop.value = "http://nexus:8081/nexus/content/repositories/releases,"
@@ -146,7 +146,7 @@ public class BrmsPushTest {
}
@Test(expected = PolicyException.class)
- public void brmsHandlerFailTest7() throws PolicyException {
+ public void testBrmsHandlerFail7() throws PolicyException {
final PropertyChange prop = new PropertyChange();
prop.key = "repositoryPassword";
prop.remove = true;
@@ -157,7 +157,7 @@ public class BrmsPushTest {
}
@Test(expected = PolicyException.class)
- public void brmsHandlerFailTest8() throws PolicyException {
+ public void testBrmsHandlerFail8() throws PolicyException {
final PropertyChange prop = new PropertyChange();
prop.key = "policyKeyID";
prop.remove = true;
@@ -168,7 +168,7 @@ public class BrmsPushTest {
}
@Test(expected = PolicyException.class)
- public void brmsHandlerFailTest9() throws PolicyException {
+ public void testBrmsHandlerFail9() throws PolicyException {
PropertyChange prop = new PropertyChange();
prop.key = "sync";
prop.value = "true";
@@ -188,7 +188,7 @@ public class BrmsPushTest {
}
@Test(expected = PolicyException.class)
- public void brmsHandlerFailTest10() throws PolicyException {
+ public void testBrmsHandlerFail10() throws PolicyException {
final PropertyChange prop = new PropertyChange();
prop.key = "groupNames";
prop.value = "";
@@ -200,7 +200,7 @@ public class BrmsPushTest {
}
@Test(expected = PolicyException.class)
- public void brmsHandlerFailTest11() throws PolicyException {
+ public void testBrmsHandlerFail11() throws PolicyException {
final PropertyChange prop = new PropertyChange();
prop.key = "default.groupID";
prop.remove = true;
@@ -211,7 +211,7 @@ public class BrmsPushTest {
}
@Test(expected = PolicyException.class)
- public void brmsHandlerFailTest12() throws PolicyException {
+ public void testBrmsHandlerFail12() throws PolicyException {
final PropertyChange prop = new PropertyChange();
prop.key = "default.artifactID";
prop.remove = true;
@@ -222,7 +222,7 @@ public class BrmsPushTest {
}
@Test(expected = PolicyException.class)
- public void brmsHandlerFailTest13() throws PolicyException {
+ public void testBrmsHandlerFail13() throws PolicyException {
PropertyChange prop = new PropertyChange();
prop.key = "NOTIFICATION_TYPE";
prop.value = "dmaap";
diff --git a/BRMSGateway/src/test/java/org/onap/policy/brms/api/BrmsHandlerTest.java b/BRMSGateway/src/test/java/org/onap/policy/brms/api/BrmsHandlerTest.java
index 8fda22e26..079db2109 100644
--- a/BRMSGateway/src/test/java/org/onap/policy/brms/api/BrmsHandlerTest.java
+++ b/BRMSGateway/src/test/java/org/onap/policy/brms/api/BrmsHandlerTest.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP Policy Engine
* ================================================================================
- * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2018, 2020 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.
@@ -23,7 +23,7 @@ package org.onap.policy.brms.api;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
@@ -38,14 +38,16 @@ import org.onap.policy.api.NotificationType;
import org.onap.policy.std.StdPDPNotification;
import org.onap.policy.utils.BackUpMonitor;
import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
@RunWith(PowerMockRunner.class)
+@PowerMockIgnore({"com.sun.org.apache.xerces.*", "jdk.internal.reflect.*", "javax.xml.*", "org.xml.*", "org.w3c.*"})
+@PrepareForTest({Persistence.class, BackUpMonitor.class})
public class BrmsHandlerTest {
- @PrepareForTest({Persistence.class, BackUpMonitor.class})
@Test
- public void negativeTestNotifications() throws Exception {
+ public void testNegativeTestNotifications() throws Exception {
// Mock emf, persistence, and query
final EntityManagerFactory emf = Mockito.mock(EntityManagerFactory.class);
final EntityManager em = Mockito.mock(EntityManager.class);
diff --git a/BRMSGateway/src/test/java/org/onap/policy/brms/api/BrmsPushTest.java b/BRMSGateway/src/test/java/org/onap/policy/brms/api/BrmsPushTest.java
index 4141a8bd2..3adc55700 100644
--- a/BRMSGateway/src/test/java/org/onap/policy/brms/api/BrmsPushTest.java
+++ b/BRMSGateway/src/test/java/org/onap/policy/brms/api/BrmsPushTest.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP Policy Engine
* ================================================================================
- * Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2018-2020 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.
@@ -23,7 +23,7 @@ package org.onap.policy.brms.api;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import java.util.HashMap;
import java.util.List;
@@ -46,15 +46,17 @@ import org.onap.policy.utils.BackUpHandler;
import org.onap.policy.utils.BackUpMonitor;
import org.onap.policy.utils.BackUpMonitorException;
import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
@RunWith(PowerMockRunner.class)
+@PowerMockIgnore({"com.sun.org.apache.xerces.*", "jdk.internal.reflect.*", "javax.xml.*", "org.xml.*", "org.w3c.*"})
+@PrepareForTest({Persistence.class, BackUpMonitor.class})
public class BrmsPushTest {
@Rule
public ExpectedException thrown = ExpectedException.none();
- @PrepareForTest({Persistence.class, BackUpMonitor.class})
@Test
public void testPush() throws BackUpMonitorException, PolicyException {
// Mock emf, persistence, and query