Bump patch 1.6.1 to fix JUnit issue 88/104288/1
authorPamela Dragosh <pdragosh@research.att.com>
Tue, 24 Mar 2020 18:45:24 +0000 (14:45 -0400)
committerPamela Dragosh <pdragosh@research.att.com>
Tue, 24 Mar 2020 18:45:30 +0000 (14:45 -0400)
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 <pdragosh@research.att.com>
22 files changed:
BRMSGateway/pom.xml
LogParser/pom.xml
ONAP-PAP-REST/pom.xml
ONAP-PDP-REST/pom.xml
ONAP-PDP/pom.xml
ONAP-REST/pom.xml
ONAP-SDK-APP/pom.xml
ONAP-XACML/pom.xml
POLICY-SDK-APP/pom.xml
POLICY-SDK-APP/src/test/java/org/onap/policy/admin/PolicyManagerServletTest.java
PolicyEngineAPI/pom.xml
PolicyEngineClient/pom.xml
PolicyEngineUtils/pom.xml
TestSuite/Performance/pom.xml
TestSuite/Stability/pom.xml
TestSuite/pom.xml
packages/base/pom.xml
packages/docker/pom.xml
packages/install/pom.xml
packages/pom.xml
pom.xml
version.properties

index 43ac9bd..a68efa3 100644 (file)
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
     </parent>
     <artifactId>BRMSGateway</artifactId>
     <description>This application will take in BRMS rules and acts as interface between PR and PDP XACML</description>
index 24ebb6d..1f77af8 100644 (file)
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
     </parent>
     <artifactId>LogParser</artifactId>
     <dependencies>
index 795c34a..0d79b74 100644 (file)
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
     </parent>
     <properties>
         <hibernate.version>4.3.10.Final</hibernate.version>
index c4a1374..90f38ad 100644 (file)
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
     </parent>
     <artifactId>ONAP-PDP-REST</artifactId>
     <description>ONAP PDP REST</description>
index 7613258..2272f5b 100644 (file)
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
     </parent>
     <dependencies>
         <dependency>
index e44d287..b324af7 100644 (file)
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
     </parent>
     <artifactId>ONAP-REST</artifactId>
     <description>ONAP REST</description>
index 45d105a..7b33227 100644 (file)
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
     </parent>
     <artifactId>ONAP-SDK-APP</artifactId>
     <packaging>war</packaging>
index 79b456d..4956911 100644 (file)
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
     </parent>
     <artifactId>ONAP-XACML</artifactId>
     <packaging>jar</packaging>
index 6c66bd7..8a8851c 100644 (file)
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
     </parent>
     <artifactId>POLICY-SDK-APP</artifactId>
     <packaging>war</packaging>
index cf85186..746f2a9 100644 (file)
@@ -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<String> 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<String> list = new ArrayList<>();
@@ -307,7 +310,7 @@ public class PolicyManagerServletTest extends Mockito {
 
     @SuppressWarnings("static-access")
     @Test
-    public void editBRMSParamPolicyTest() {
+    public void test07editBRMSParamPolicyTest() {
         List<Object> 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<Object> 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<Object> 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<Object> 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<Object> 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<Object> 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<Object> 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<BufferedReader> 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<BufferedReader> 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<BufferedReader> 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<BufferedReader> 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<JSONObject> resultList = new ArrayList<JSONObject>();
         PolicyController mockPolicyController = Mockito.mock(PolicyController.class);
index 1235552..e158ac3 100644 (file)
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
     </parent>
     <artifactId>PolicyEngineAPI</artifactId>
     <dependencies>
index 8bf4b1c..0897f5e 100644 (file)
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
     </parent>
     <artifactId>PolicyEngineClient</artifactId>
     <dependencies>
index 97cde29..fe3802d 100644 (file)
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
     </parent>
     <artifactId>PolicyEngineUtils</artifactId>
     <dependencies>
index f285cab..30a611c 100644 (file)
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.onap.policy.engine</groupId>
     <artifactId>TestSuite</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.6.1-SNAPSHOT</version>
   </parent>
   <artifactId>Performance</artifactId>
   <properties>
index 3fb6d9d..25ad9be 100644 (file)
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.onap.policy.engine</groupId>
     <artifactId>TestSuite</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.6.1-SNAPSHOT</version>
   </parent>
   <artifactId>Stability</artifactId>
   <properties>
index d5feb50..1826b77 100644 (file)
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
     </parent>
     <artifactId>TestSuite</artifactId>
     <packaging>pom</packaging>
index b8b8771..c810b14 100755 (executable)
@@ -25,7 +25,7 @@
        <parent>
                <groupId>org.onap.policy.engine</groupId>
                <artifactId>packages</artifactId>
-               <version>1.6.0-SNAPSHOT</version>
+               <version>1.6.1-SNAPSHOT</version>
        </parent>
 
        <artifactId>base</artifactId>
index 138d04f..75436ec 100644 (file)
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>packages</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>docker</artifactId>
index 9ebac5a..fb62415 100644 (file)
@@ -25,7 +25,7 @@
        <parent>
                <groupId>org.onap.policy.engine</groupId>
                <artifactId>packages</artifactId>
-               <version>1.6.0-SNAPSHOT</version>
+               <version>1.6.1-SNAPSHOT</version>
        </parent>
 
        <artifactId>install</artifactId>
index e5bc814..642e843 100644 (file)
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
     </parent>
     <artifactId>packages</artifactId>
     <packaging>pom</packaging>
diff --git a/pom.xml b/pom.xml
index cb1238a..4b7be41 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
     </parent>
     <groupId>org.onap.policy.engine</groupId>
     <artifactId>PolicyEngineSuite</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.6.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>policy-engine</name>
     <description>The ONAP Policy Engine main pom</description>
index c447694..33e08a4 100644 (file)
@@ -24,7 +24,7 @@
 
 major=1
 minor=6
-patch=0
+patch=1
 
 base_version=${major}.${minor}.${patch}