From a617d3e1dcdcf63c38406e9bdb0e38834befb8d2 Mon Sep 17 00:00:00 2001 From: Pamela Dragosh Date: Tue, 24 Mar 2020 14:45:24 -0400 Subject: [PATCH] Bump patch 1.6.1 to fix JUnit issue The docker stage job is not succeeded, nor is the sonar job. Logging doesn't produce anything useful, so the best bet is to fix the order of the tests and hope that fixes the problem. Regardless must bump the patch to release it again. Issue-ID: POLICY-2378 Change-Id: I01ff47c8deb124e9fd6ffcb37407dc580ecd6b03 Signed-off-by: Pamela Dragosh --- BRMSGateway/pom.xml | 2 +- LogParser/pom.xml | 2 +- ONAP-PAP-REST/pom.xml | 2 +- ONAP-PDP-REST/pom.xml | 2 +- ONAP-PDP/pom.xml | 2 +- ONAP-REST/pom.xml | 2 +- ONAP-SDK-APP/pom.xml | 2 +- ONAP-XACML/pom.xml | 2 +- POLICY-SDK-APP/pom.xml | 2 +- .../policy/admin/PolicyManagerServletTest.java | 62 +++++++++++----------- PolicyEngineAPI/pom.xml | 2 +- PolicyEngineClient/pom.xml | 2 +- PolicyEngineUtils/pom.xml | 2 +- TestSuite/Performance/pom.xml | 2 +- TestSuite/Stability/pom.xml | 2 +- TestSuite/pom.xml | 2 +- packages/base/pom.xml | 2 +- packages/docker/pom.xml | 2 +- packages/install/pom.xml | 2 +- packages/pom.xml | 2 +- pom.xml | 2 +- version.properties | 2 +- 22 files changed, 53 insertions(+), 51 deletions(-) diff --git a/BRMSGateway/pom.xml b/BRMSGateway/pom.xml index 43ac9bd43..a68efa3b5 100644 --- a/BRMSGateway/pom.xml +++ b/BRMSGateway/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.6.0-SNAPSHOT + 1.6.1-SNAPSHOT BRMSGateway This application will take in BRMS rules and acts as interface between PR and PDP XACML diff --git a/LogParser/pom.xml b/LogParser/pom.xml index 24ebb6d38..1f77af82c 100644 --- a/LogParser/pom.xml +++ b/LogParser/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.6.0-SNAPSHOT + 1.6.1-SNAPSHOT LogParser diff --git a/ONAP-PAP-REST/pom.xml b/ONAP-PAP-REST/pom.xml index 795c34a5b..0d79b7455 100644 --- a/ONAP-PAP-REST/pom.xml +++ b/ONAP-PAP-REST/pom.xml @@ -28,7 +28,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.6.0-SNAPSHOT + 1.6.1-SNAPSHOT 4.3.10.Final diff --git a/ONAP-PDP-REST/pom.xml b/ONAP-PDP-REST/pom.xml index c4a1374cc..90f38ad29 100644 --- a/ONAP-PDP-REST/pom.xml +++ b/ONAP-PDP-REST/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.6.0-SNAPSHOT + 1.6.1-SNAPSHOT ONAP-PDP-REST ONAP PDP REST diff --git a/ONAP-PDP/pom.xml b/ONAP-PDP/pom.xml index 7613258f0..2272f5b74 100644 --- a/ONAP-PDP/pom.xml +++ b/ONAP-PDP/pom.xml @@ -27,7 +27,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.6.0-SNAPSHOT + 1.6.1-SNAPSHOT diff --git a/ONAP-REST/pom.xml b/ONAP-REST/pom.xml index e44d28703..b324af78c 100644 --- a/ONAP-REST/pom.xml +++ b/ONAP-REST/pom.xml @@ -26,7 +26,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.6.0-SNAPSHOT + 1.6.1-SNAPSHOT ONAP-REST ONAP REST diff --git a/ONAP-SDK-APP/pom.xml b/ONAP-SDK-APP/pom.xml index 45d105a06..7b33227db 100644 --- a/ONAP-SDK-APP/pom.xml +++ b/ONAP-SDK-APP/pom.xml @@ -22,7 +22,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.6.0-SNAPSHOT + 1.6.1-SNAPSHOT ONAP-SDK-APP war diff --git a/ONAP-XACML/pom.xml b/ONAP-XACML/pom.xml index 79b456dcd..4956911c5 100644 --- a/ONAP-XACML/pom.xml +++ b/ONAP-XACML/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.6.0-SNAPSHOT + 1.6.1-SNAPSHOT ONAP-XACML jar diff --git a/POLICY-SDK-APP/pom.xml b/POLICY-SDK-APP/pom.xml index 6c66bd7d2..8a8851c04 100644 --- a/POLICY-SDK-APP/pom.xml +++ b/POLICY-SDK-APP/pom.xml @@ -22,7 +22,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.6.0-SNAPSHOT + 1.6.1-SNAPSHOT POLICY-SDK-APP war diff --git a/POLICY-SDK-APP/src/test/java/org/onap/policy/admin/PolicyManagerServletTest.java b/POLICY-SDK-APP/src/test/java/org/onap/policy/admin/PolicyManagerServletTest.java index cf85186a0..746f2a960 100644 --- a/POLICY-SDK-APP/src/test/java/org/onap/policy/admin/PolicyManagerServletTest.java +++ b/POLICY-SDK-APP/src/test/java/org/onap/policy/admin/PolicyManagerServletTest.java @@ -52,8 +52,10 @@ import org.apache.commons.io.IOUtils; import org.json.JSONArray; import org.json.JSONObject; import org.junit.Before; +import org.junit.FixMethodOrder; import org.junit.Test; import org.junit.runner.RunWith; +import org.junit.runners.MethodSorters; import org.mockito.Mockito; import org.onap.policy.common.logging.flexlogger.FlexLogger; import org.onap.policy.common.logging.flexlogger.Logger; @@ -81,6 +83,7 @@ import org.springframework.mock.web.MockHttpServletResponse; @RunWith(PowerMockRunner.class) @PowerMockIgnore({"com.sun.org.apache.xerces.*", "jdk.internal.reflect.*", "javax.xml.*", "org.xml.*", "org.w3c.*"}) +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class PolicyManagerServletTest extends Mockito { private static Logger logger = FlexLogger.getLogger(PolicyManagerServletTest.class); @@ -180,7 +183,7 @@ public class PolicyManagerServletTest extends Mockito { } @Test - public void testInit() { + public void test01Init() { PolicyManagerServlet servlet = new PolicyManagerServlet(); ServletConfig servletConfig = mock(ServletConfig.class); try { @@ -201,7 +204,7 @@ public class PolicyManagerServletTest extends Mockito { } @Test - public void testBadInitJson() { + public void test02BadInitJson() { PolicyManagerServlet servlet = new PolicyManagerServlet(); ServletConfig servletConfig = mock(ServletConfig.class); try { @@ -218,7 +221,7 @@ public class PolicyManagerServletTest extends Mockito { } @Test - public void testBadInitJsonInvalidFile() { + public void test03BadInitJsonInvalidFile() { PolicyManagerServlet servlet = new PolicyManagerServlet(); ServletConfig servletConfig = mock(ServletConfig.class); try { @@ -236,7 +239,7 @@ public class PolicyManagerServletTest extends Mockito { @SuppressWarnings("static-access") @Test - public void testDescribePolicy() { + public void test04DescribePolicy() { PolicyManagerServlet servlet = new PolicyManagerServlet(); PolicyController controller = mock(PolicyController.class); BufferedReader reader = new BufferedReader( @@ -255,7 +258,7 @@ public class PolicyManagerServletTest extends Mockito { @SuppressWarnings("static-access") @Test - public void testPolicyScopeList() { + public void test05PolicyScopeList() { PolicyManagerServlet servlet = new PolicyManagerServlet(); PolicyController controller = mock(PolicyController.class); List list = new ArrayList<>(); @@ -283,7 +286,7 @@ public class PolicyManagerServletTest extends Mockito { @SuppressWarnings("static-access") @Test - public void editBasePolicyTest() { + public void test06editBasePolicyTest() { PolicyManagerServlet servlet = new PolicyManagerServlet(); PolicyController controller = mock(PolicyController.class); List list = new ArrayList<>(); @@ -307,7 +310,7 @@ public class PolicyManagerServletTest extends Mockito { @SuppressWarnings("static-access") @Test - public void editBRMSParamPolicyTest() { + public void test07editBRMSParamPolicyTest() { List policyData = new ArrayList<>(); String policyContent = ""; String configData = ""; @@ -355,7 +358,7 @@ public class PolicyManagerServletTest extends Mockito { @SuppressWarnings("static-access") @Test - public void editBRMSRawPolicyTest() { + public void test08editBRMSRawPolicyTest() { List policyData = new ArrayList<>(); String policyContent = ""; String configData = ""; @@ -403,7 +406,7 @@ public class PolicyManagerServletTest extends Mockito { @SuppressWarnings("static-access") @Test - public void editClosedLoopFaultPolicyTest() { + public void test09editClosedLoopFaultPolicyTest() { List policyData = new ArrayList<>(); String policyContent = ""; String configData = ""; @@ -451,7 +454,7 @@ public class PolicyManagerServletTest extends Mockito { @SuppressWarnings("static-access") @Test - public void editClosedLoopPMPolicyTest() { + public void test10editClosedLoopPMPolicyTest() { List policyData = new ArrayList<>(); String policyContent = ""; String configData = ""; @@ -498,7 +501,7 @@ public class PolicyManagerServletTest extends Mockito { @SuppressWarnings("static-access") @Test - public void editMicroServicePolicyTest() { + public void test11editMicroServicePolicyTest() { GroupPolicyScopeList groupData = new GroupPolicyScopeList(); groupData.setGroupName("Test"); groupData.setGroupList("resource=SampleResource,service=SampleService,type=SampleType," @@ -554,7 +557,7 @@ public class PolicyManagerServletTest extends Mockito { @SuppressWarnings("static-access") @Test - public void editFirewallPolicyTest() { + public void test12editFirewallPolicyTest() { List policyData = new ArrayList<>(); String policyContent = ""; String configData = ""; @@ -600,7 +603,7 @@ public class PolicyManagerServletTest extends Mockito { @SuppressWarnings("static-access") @Test - public void editActionPolicyTest() { + public void test13editActionPolicyTest() { List policyData = new ArrayList<>(); String policyContent = ""; String configData = ""; @@ -643,7 +646,7 @@ public class PolicyManagerServletTest extends Mockito { @SuppressWarnings("static-access") @Test - public void editDecisionPolicyTest() { + public void test14editDecisionPolicyTest() { List policyData = new ArrayList<>(); String policyContent = ""; try { @@ -681,7 +684,7 @@ public class PolicyManagerServletTest extends Mockito { } @Test - public void testAddScope() { + public void test15AddScope() { PolicyManagerServlet servlet = new PolicyManagerServlet(); PolicyController controller = mock(PolicyController.class); List readers = new ArrayList<>(); @@ -703,7 +706,7 @@ public class PolicyManagerServletTest extends Mockito { } @Test - public void testClone() { + public void test16Clone() { PolicyManagerServlet servlet = new PolicyManagerServlet(); PolicyController controller = mock(PolicyController.class); List readers = new ArrayList<>(); @@ -728,7 +731,7 @@ public class PolicyManagerServletTest extends Mockito { } @Test - public void testRename() { + public void test17Rename() { PolicyManagerServlet servlet = new PolicyManagerServlet(); PolicyController controller = mock(PolicyController.class); List readers = new ArrayList<>(); @@ -753,7 +756,7 @@ public class PolicyManagerServletTest extends Mockito { } @Test - public void testRenameScope() throws Exception { + public void test18RenameScope() throws Exception { PolicyManagerServlet servlet = new PolicyManagerServlet(); PolicyController controller = mock(PolicyController.class); List readers = new ArrayList<>(); @@ -781,14 +784,14 @@ public class PolicyManagerServletTest extends Mockito { } @Test - public void testSetPolicyNames() { + public void test19SetPolicyNames() { JsonArray mockJsonArray = Mockito.mock(JsonArray.class); PolicyManagerServlet.setPolicyNames(mockJsonArray); assertEquals(mockJsonArray, PolicyManagerServlet.getPolicyNames()); } @Test - public void testDoPostSetErrorException() throws IOException { + public void test20DoPostSetErrorException() throws IOException { PolicyManagerServlet servlet = new PolicyManagerServlet(); HttpServletRequest mockRequest = Mockito.mock(HttpServletRequest.class); HttpServletResponse mockResponse = Mockito.mock(HttpServletResponse.class); @@ -799,7 +802,7 @@ public class PolicyManagerServletTest extends Mockito { } @Test - public void testDoPostException() throws IOException { + public void test21DoPostException() throws IOException { PolicyManagerServlet servlet = new PolicyManagerServlet(); HttpServletRequest mockRequest = Mockito.mock(HttpServletRequest.class); HttpServletResponse mockResponse = Mockito.mock(HttpServletResponse.class); @@ -814,7 +817,7 @@ public class PolicyManagerServletTest extends Mockito { } @Test - public void testDoPostSuccess() throws IOException { + public void test22DoPostSuccess() throws IOException { PolicyManagerServlet servlet = new PolicyManagerServlet(); HttpServletRequest mockRequest = Mockito.mock(HttpServletRequest.class); HttpServletResponse mockResponse = Mockito.mock(HttpServletResponse.class); @@ -829,7 +832,7 @@ public class PolicyManagerServletTest extends Mockito { @PrepareForTest(ServletFileUpload.class) @Test - public void testDoPostUploadFileException() { + public void test23DoPostUploadFileException() { PolicyManagerServlet servlet = new PolicyManagerServlet(); HttpServletRequest mockRequest = Mockito.mock(HttpServletRequest.class); HttpServletResponse mockResponse = Mockito.mock(HttpServletResponse.class); @@ -838,10 +841,9 @@ public class PolicyManagerServletTest extends Mockito { servlet.doPost(mockRequest, mockResponse); } - @SuppressWarnings("unchecked") @PrepareForTest({PolicyController.class, IOUtils.class}) @Test - public void testProcessFormFile() throws Exception { + public void test24ProcessFormFile() throws Exception { PolicyManagerServlet servlet = new PolicyManagerServlet(); HttpServletRequest mockRequest = Mockito.mock(HttpServletRequest.class); FileItem mockFileItem = Mockito.mock(FileItem.class); @@ -873,7 +875,7 @@ public class PolicyManagerServletTest extends Mockito { } @Test - public void testSearchPolicyList() throws Exception { + public void test25SearchPolicyList() throws Exception { PolicyManagerServlet servlet = new PolicyManagerServlet(); HttpServletRequest mockRequest = Mockito.mock(HttpServletRequest.class); JSONObject mockJSONObject = Mockito.mock(JSONObject.class); @@ -887,7 +889,7 @@ public class PolicyManagerServletTest extends Mockito { @PrepareForTest({UserUtils.class, org.onap.policy.utils.UserUtils.class}) @Test - public void testLookupPolicyData() throws Exception { + public void test26LookupPolicyData() throws Exception { PowerMockito.mockStatic(UserUtils.class); PowerMockito.mockStatic(org.onap.policy.utils.UserUtils.class); PolicyManagerServlet servlet = new PolicyManagerServlet(); @@ -989,7 +991,7 @@ public class PolicyManagerServletTest extends Mockito { } @Test - public void testDeleteEntityFromEsAndPolicyEntityTable() throws Exception { + public void test27DeleteEntityFromEsAndPolicyEntityTable() throws Exception { PolicyManagerServlet servlet = new PolicyManagerServlet(); PolicyController mockPolicyController = Mockito.mock(PolicyController.class); PolicyRestController mockPolicyRestController = Mockito.mock(PolicyRestController.class); @@ -1043,7 +1045,7 @@ public class PolicyManagerServletTest extends Mockito { @PrepareForTest(UserUtils.class) @Test - public void testDelete() throws Exception { + public void test28Delete() throws Exception { PolicyManagerServlet servlet = new PolicyManagerServlet(); JSONObject mockJSONObject = Mockito.mock(JSONObject.class); HttpServletRequest mockRequest = Mockito.mock(HttpServletRequest.class); @@ -1092,7 +1094,7 @@ public class PolicyManagerServletTest extends Mockito { } @Test - public void testParsePolicyList() throws Exception { + public void test29ParsePolicyList() throws Exception { PolicyManagerServlet servlet = new PolicyManagerServlet(); List resultList = new ArrayList(); PolicyController mockPolicyController = Mockito.mock(PolicyController.class); diff --git a/PolicyEngineAPI/pom.xml b/PolicyEngineAPI/pom.xml index 123555289..e158ac379 100644 --- a/PolicyEngineAPI/pom.xml +++ b/PolicyEngineAPI/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.6.0-SNAPSHOT + 1.6.1-SNAPSHOT PolicyEngineAPI diff --git a/PolicyEngineClient/pom.xml b/PolicyEngineClient/pom.xml index 8bf4b1c5e..0897f5e8c 100644 --- a/PolicyEngineClient/pom.xml +++ b/PolicyEngineClient/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.6.0-SNAPSHOT + 1.6.1-SNAPSHOT PolicyEngineClient diff --git a/PolicyEngineUtils/pom.xml b/PolicyEngineUtils/pom.xml index 97cde29e8..fe3802d61 100644 --- a/PolicyEngineUtils/pom.xml +++ b/PolicyEngineUtils/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.6.0-SNAPSHOT + 1.6.1-SNAPSHOT PolicyEngineUtils diff --git a/TestSuite/Performance/pom.xml b/TestSuite/Performance/pom.xml index f285cabbb..30a611c1f 100644 --- a/TestSuite/Performance/pom.xml +++ b/TestSuite/Performance/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.engine TestSuite - 1.6.0-SNAPSHOT + 1.6.1-SNAPSHOT Performance diff --git a/TestSuite/Stability/pom.xml b/TestSuite/Stability/pom.xml index 3fb6d9d6b..25ad9bed1 100644 --- a/TestSuite/Stability/pom.xml +++ b/TestSuite/Stability/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.engine TestSuite - 1.6.0-SNAPSHOT + 1.6.1-SNAPSHOT Stability diff --git a/TestSuite/pom.xml b/TestSuite/pom.xml index d5feb5062..1826b771b 100644 --- a/TestSuite/pom.xml +++ b/TestSuite/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.6.0-SNAPSHOT + 1.6.1-SNAPSHOT TestSuite pom diff --git a/packages/base/pom.xml b/packages/base/pom.xml index b8b877109..c810b1452 100755 --- a/packages/base/pom.xml +++ b/packages/base/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.engine packages - 1.6.0-SNAPSHOT + 1.6.1-SNAPSHOT base diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml index 138d04f2c..75436ecd6 100644 --- a/packages/docker/pom.xml +++ b/packages/docker/pom.xml @@ -27,7 +27,7 @@ org.onap.policy.engine packages - 1.6.0-SNAPSHOT + 1.6.1-SNAPSHOT docker diff --git a/packages/install/pom.xml b/packages/install/pom.xml index 9ebac5a30..fb62415be 100644 --- a/packages/install/pom.xml +++ b/packages/install/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.engine packages - 1.6.0-SNAPSHOT + 1.6.1-SNAPSHOT install diff --git a/packages/pom.xml b/packages/pom.xml index e5bc814cf..642e84362 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.6.0-SNAPSHOT + 1.6.1-SNAPSHOT packages pom diff --git a/pom.xml b/pom.xml index cb1238a0b..4b7be41cf 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.6.0-SNAPSHOT + 1.6.1-SNAPSHOT pom policy-engine The ONAP Policy Engine main pom diff --git a/version.properties b/version.properties index c4476947f..33e08a499 100644 --- a/version.properties +++ b/version.properties @@ -24,7 +24,7 @@ major=1 minor=6 -patch=0 +patch=1 base_version=${major}.${minor}.${patch} -- 2.16.6