From 25d3e43f27fb4d055af69c6934f3531fef115a02 Mon Sep 17 00:00:00 2001 From: "Hockla, Ali (ah999m)" Date: Wed, 15 Jan 2020 15:04:09 -0600 Subject: policy/drools-apps jdk11 upgrades Issue-ID: POLICY-1587 Change-Id: I02bef6c829f2f24954ae73fb0c540ab7198775ce Signed-off-by: Hockla, Ali (ah999m) --- .../org/onap/policy/template/demo/CcvpnBwControlLoopTest.java | 6 +++--- .../java/org/onap/policy/template/demo/CcvpnControlLoopTest.java | 6 +++--- .../java/org/onap/policy/template/demo/VcpeControlLoopTest.java | 9 ++++++--- .../org/onap/policy/template/demo/VdnsControlLoopCqTest.java | 6 +++--- .../java/org/onap/policy/template/demo/VdnsControlLoopTest.java | 8 ++++---- .../java/org/onap/policy/template/demo/VfcControlLoopTest.java | 6 +++--- .../org/onap/policy/template/demo/VfwControlLoopCdsTest.java | 3 ++- .../java/org/onap/policy/template/demo/VfwControlLoopTest.java | 9 ++++++--- .../java/org/onap/policy/template/demo/VpciControlLoopTest.java | 6 +++--- .../java/org/onap/policy/template/demo/VsonhControlLoopTest.java | 6 +++--- 10 files changed, 36 insertions(+), 29 deletions(-) (limited to 'controlloop/templates/template.demo') diff --git a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/CcvpnBwControlLoopTest.java b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/CcvpnBwControlLoopTest.java index bf81c2d19..ab0070724 100644 --- a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/CcvpnBwControlLoopTest.java +++ b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/CcvpnBwControlLoopTest.java @@ -1,7 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2019 Huawei Technologies Co., Ltd. All rights reserved. - * Modifications Copyright (C) 2019 AT&T Intellectual Property. + * Modifications Copyright (C) 2019-2020 AT&T Intellectual Property. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -57,7 +57,7 @@ public class CcvpnBwControlLoopTest extends ControlLoopBase implements TopicList } @Test - public void successTest() throws IOException { + public void testSuccess() throws IOException { /* * Allows the PolicyEngine to callback to this object to notify that there is an event ready @@ -91,7 +91,7 @@ public class CcvpnBwControlLoopTest extends ControlLoopBase implements TopicList } @Test - public void nullRequestTest() throws IOException { + public void testNullRequest() throws IOException { /* * Allows the PolicyEngine to callback to this object to notify that there is an event ready diff --git a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/CcvpnControlLoopTest.java b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/CcvpnControlLoopTest.java index 8fda5b4df..3599d47d0 100644 --- a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/CcvpnControlLoopTest.java +++ b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/CcvpnControlLoopTest.java @@ -1,7 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2018 Huawei. All rights reserved. - * Modifications Copyright (C) 2019 AT&T Intellectual Property. + * Modifications Copyright (C) 2019-2020 AT&T Intellectual Property. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -58,7 +58,7 @@ public class CcvpnControlLoopTest extends ControlLoopBase implements TopicListen } @Test - public void successTest() throws IOException { + public void testSuccess() throws IOException { /* * Allows the PolicyEngine to callback to this object to notify that there is an event ready @@ -92,7 +92,7 @@ public class CcvpnControlLoopTest extends ControlLoopBase implements TopicListen } @Test - public void nullRequestTest() throws IOException { + public void testNullRequest() throws IOException { /* * Allows the PolicyEngine to callback to this object to notify that there is an event ready diff --git a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VcpeControlLoopTest.java b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VcpeControlLoopTest.java index f41bd874b..e0cb0ef1f 100644 --- a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VcpeControlLoopTest.java +++ b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VcpeControlLoopTest.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * demo * ================================================================================ - * Copyright (C) 2017-2019 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. @@ -29,7 +29,9 @@ import java.time.Instant; import java.util.HashMap; import java.util.UUID; import org.junit.BeforeClass; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; import org.onap.policy.appclcm.AppcLcmBody; import org.onap.policy.appclcm.AppcLcmDmaapWrapper; import org.onap.policy.appclcm.AppcLcmInput; @@ -44,6 +46,7 @@ import org.onap.policy.controlloop.VirtualControlLoopEvent; import org.onap.policy.controlloop.VirtualControlLoopNotification; import org.onap.policy.controlloop.policy.ControlLoopPolicy; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class VcpeControlLoopTest extends ControlLoopBase implements TopicListener { /** @@ -60,7 +63,7 @@ public class VcpeControlLoopTest extends ControlLoopBase implements TopicListene } @Test - public void successTest() { + public void testASuccess() { /* * Allows the PolicyEngine to callback to this object to notify that there is an event ready @@ -99,7 +102,7 @@ public class VcpeControlLoopTest extends ControlLoopBase implements TopicListene } @Test - public void aaiGetFailTest() { + public void testBAaiGetFail() { /* * Allows the PolicyEngine to callback to this object to notify that there is an event ready diff --git a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VdnsControlLoopCqTest.java b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VdnsControlLoopCqTest.java index 0e05a0c6d..88c9e6ef7 100644 --- a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VdnsControlLoopCqTest.java +++ b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VdnsControlLoopCqTest.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * demo * ================================================================================ - * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2019-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. @@ -57,7 +57,7 @@ public class VdnsControlLoopCqTest extends ControlLoopBase implements TopicListe } @Test - public void successTest() { + public void testSuccess() { /* * Allows the PolicyEngine to callback to this object to notify that there is an event ready @@ -96,7 +96,7 @@ public class VdnsControlLoopCqTest extends ControlLoopBase implements TopicListe } @Test - public void aaiGetFailTest() { + public void testAaiGetFail() { /* * Allows the PolicyEngine to callback to this object to notify that there is an event ready diff --git a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VdnsControlLoopTest.java b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VdnsControlLoopTest.java index da237fa05..b7b034a9c 100644 --- a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VdnsControlLoopTest.java +++ b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VdnsControlLoopTest.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * demo * ================================================================================ - * Copyright (C) 2017-2019 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. @@ -58,7 +58,7 @@ public class VdnsControlLoopTest extends ControlLoopBase implements TopicListene } @Test - public void successTest() { + public void testSuccessTest() { /* * Allows the PolicyEngine to callback to this object to notify that there is an event ready @@ -97,7 +97,7 @@ public class VdnsControlLoopTest extends ControlLoopBase implements TopicListene } @Test - public void namedQueryFailTest() { + public void testNamedQueryFail() { /* * Allows the PolicyEngine to callback to this object to notify that there is an event ready @@ -136,7 +136,7 @@ public class VdnsControlLoopTest extends ControlLoopBase implements TopicListene } @Test - public void aaiGetFailTest() { + public void testAaiGetFail() { /* * Allows the PolicyEngine to callback to this object to notify that there is an event ready diff --git a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VfcControlLoopTest.java b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VfcControlLoopTest.java index 4f47bd0a9..4f472a07b 100644 --- a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VfcControlLoopTest.java +++ b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VfcControlLoopTest.java @@ -3,7 +3,7 @@ * demo * ================================================================================ * Copyright (C) 2017-2018 Intel Corp. All rights reserved. - * Modifications Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved. + * Modifications 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. @@ -61,7 +61,7 @@ public class VfcControlLoopTest extends ControlLoopBase implements TopicListener } @Test - public void successTest() throws IOException { + public void testSuccess() throws IOException { /* * Allows the PolicyEngine to callback to this object to notify that there is an event ready @@ -100,7 +100,7 @@ public class VfcControlLoopTest extends ControlLoopBase implements TopicListener } @Test - public void nullRequestTest() throws IOException { + public void testNullRequest() throws IOException { /* * Allows the PolicyEngine to callback to this object to notify that there is an event ready diff --git a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VfwControlLoopCdsTest.java b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VfwControlLoopCdsTest.java index a86f97d05..c480db71e 100644 --- a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VfwControlLoopCdsTest.java +++ b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VfwControlLoopCdsTest.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2019 Bell Canada. + * Modifications Copyright (C) 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. @@ -145,7 +146,7 @@ public class VfwControlLoopCdsTest extends ControlLoopBase implements TopicListe } @Test - public void successTest() { + public void testSuccess() { /* * Allows the PolicyEngine to callback to this object to notify that there is an event ready diff --git a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VfwControlLoopTest.java b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VfwControlLoopTest.java index cbdf09c8d..09c5927a8 100644 --- a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VfwControlLoopTest.java +++ b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VfwControlLoopTest.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * demo * ================================================================================ - * Copyright (C) 2017-2019 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. @@ -29,7 +29,9 @@ import java.time.Instant; import java.util.HashMap; import java.util.UUID; import org.junit.BeforeClass; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; import org.onap.policy.appc.Request; import org.onap.policy.appc.Response; import org.onap.policy.appc.ResponseCode; @@ -43,6 +45,7 @@ import org.onap.policy.controlloop.VirtualControlLoopEvent; import org.onap.policy.controlloop.VirtualControlLoopNotification; import org.onap.policy.controlloop.policy.ControlLoopPolicy; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class VfwControlLoopTest extends ControlLoopBase implements TopicListener { /** @@ -60,7 +63,7 @@ public class VfwControlLoopTest extends ControlLoopBase implements TopicListener } @Test - public void successTest() { + public void testASuccess() { /* * Allows the PolicyEngine to callback to this object to notify that there is an event ready @@ -107,7 +110,7 @@ public class VfwControlLoopTest extends ControlLoopBase implements TopicListener } @Test - public void aaiFailTests() { + public void testBAaiFail() { /* * Allows the PolicyEngine to callback to this object to notify that there is an event ready diff --git a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VpciControlLoopTest.java b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VpciControlLoopTest.java index d3aedd68f..e57af7760 100644 --- a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VpciControlLoopTest.java +++ b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VpciControlLoopTest.java @@ -3,7 +3,7 @@ * demo * ================================================================================ * Copyright (C) 2018 Wipro Limited Intellectual Property. All rights reserved. - * Modifications Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved. + * Modifications 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. @@ -62,7 +62,7 @@ public class VpciControlLoopTest extends ControlLoopBase implements TopicListene } @Test - public void successTest() { + public void testSuccess() { /* * Allows the PolicyEngine to callback to this object to notify that there is an @@ -102,7 +102,7 @@ public class VpciControlLoopTest extends ControlLoopBase implements TopicListene } @Test - public void aaiGetFailTest() { + public void testAaiGetFail() { /* * Allows the PolicyEngine to callback to this object to notify that there is an diff --git a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VsonhControlLoopTest.java b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VsonhControlLoopTest.java index 527fd298d..5aaab40bb 100644 --- a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VsonhControlLoopTest.java +++ b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VsonhControlLoopTest.java @@ -3,7 +3,7 @@ * demo * ================================================================================ * Copyright (C) 2019 Wipro Limited Intellectual Property. All rights reserved. - * Modifications Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * Modifications Copyright (C) 2019-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. @@ -62,7 +62,7 @@ public class VsonhControlLoopTest extends ControlLoopBase implements TopicListen } @Test - public void successTest() { + public void testSuccess() { /* * Allows the PolicyEngine to callback to this object to notify that there is an @@ -102,7 +102,7 @@ public class VsonhControlLoopTest extends ControlLoopBase implements TopicListen } @Test - public void aaiGetFailTest() { + public void testAaiGetFailTest() { /* * Allows the PolicyEngine to callback to this object to notify that there is an -- cgit 1.2.3-korg