Migrate from DW to Springboot

[holmes/rule-management.git] / rulemgt / src / test / java / org / onap / holmes / rulemgt / resources / RuleMgtResourcesTest.java

diff --git a/rulemgt/src/test/java/org/onap/holmes/rulemgt/resources/RuleMgtResourcesTest.java b/rulemgt/src/test/java/org/onap/holmes/rulemgt/resources/RuleMgtResourcesTest.java
index a35f6b8..a515196 100644 (file)
--- a/rulemgt/src/test/java/org/onap/holmes/rulemgt/resources/RuleMgtResourcesTest.java
+++ b/rulemgt/src/test/java/org/onap/holmes/rulemgt/resources/RuleMgtResourcesTest.java
@@ -1,5 +1,5 @@
 /**\r
- * Copyright 2017 ZTE Corporation.\r
+ * Copyright 2017-2022 ZTE Corporation.\r
  *\r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
@@ -17,25 +17,28 @@
 package org.onap.holmes.rulemgt.resources;\r
 \r
 import com.google.gson.JsonSyntaxException;\r
-import javax.servlet.http.HttpServletRequest;\r
-import javax.ws.rs.WebApplicationException;\r
+import jakarta.ws.rs.WebApplicationException;\r
 import org.easymock.EasyMock;\r
-import org.eclipse.jetty.server.Request;\r
 import org.junit.Before;\r
 import org.junit.Rule;\r
 import org.junit.Test;\r
 import org.junit.rules.ExpectedException;\r
+import org.junit.runner.RunWith;\r
+import org.onap.holmes.common.exception.CorrelationException;\r
 import org.onap.holmes.rulemgt.bean.request.RuleCreateRequest;\r
 import org.onap.holmes.rulemgt.bean.request.RuleDeleteRequest;\r
-import org.onap.holmes.rulemgt.wrapper.RuleMgtWrapper;\r
-import org.onap.holmes.common.exception.CorrelationException;\r
 import org.onap.holmes.rulemgt.bean.request.RuleQueryCondition;\r
 import org.onap.holmes.rulemgt.bean.request.RuleUpdateRequest;\r
 import org.onap.holmes.rulemgt.bean.response.RuleAddAndUpdateResponse;\r
 import org.onap.holmes.rulemgt.bean.response.RuleQueryListResponse;\r
+import org.onap.holmes.rulemgt.wrapper.RuleMgtWrapper;\r
 import org.powermock.api.easymock.PowerMock;\r
+import org.powermock.modules.junit4.PowerMockRunner;\r
 import org.powermock.reflect.Whitebox;\r
 \r
+import javax.servlet.http.HttpServletRequest;\r
+\r
+@RunWith(PowerMockRunner.class)\r
 public class RuleMgtResourcesTest {\r
 \r
     @Rule\r
@@ -47,8 +50,6 @@ public class RuleMgtResourcesTest {
 \r
     private RuleMgtResources ruleMgtResources = new RuleMgtResources();\r
 \r
-    private Request requestMock = PowerMock.createMock(Request.class);\r
-\r
     @Before\r
     public void setUp() throws Exception {\r
         Whitebox.setInternalState(ruleMgtResources, "ruleMgtWrapper", ruleMgtWrapper);\r
@@ -63,7 +64,6 @@ public class RuleMgtResourcesTest {
         final RuleCreateRequest ruleCreateRequest = new RuleCreateRequest();\r
         EasyMock.expect(ruleMgtWrapper.addCorrelationRule("admin", ruleCreateRequest))\r
                 .andThrow(new CorrelationException(EasyMock.anyObject(String.class)));\r
-        EasyMock.expect(request.getHeader("language-option")).andReturn("en_US");\r
         EasyMock.expect(request.getHeader("username")).andReturn("admin");\r
         PowerMock.replayAll();\r
         ruleMgtResources.addCorrelationRule(request, ruleCreateRequest);\r
@@ -76,7 +76,6 @@ public class RuleMgtResourcesTest {
         final RuleCreateRequest ruleCreateRequest = new RuleCreateRequest();\r
         EasyMock.expect(ruleMgtWrapper.addCorrelationRule("admin",\r
                 ruleCreateRequest)).andReturn(new RuleAddAndUpdateResponse());\r
-        EasyMock.expect(request.getHeader("language-option")).andReturn("en_US");\r
         EasyMock.expect(request.getHeader("username")).andReturn("admin");\r
         PowerMock.replayAll();\r
         ruleMgtResources.addCorrelationRule(request, ruleCreateRequest);\r
@@ -90,7 +89,6 @@ public class RuleMgtResourcesTest {
         final RuleUpdateRequest ruleUpdateRequest = new RuleUpdateRequest();\r
         EasyMock.expect(ruleMgtWrapper.updateCorrelationRule("admin", ruleUpdateRequest))\r
                 .andThrow(new CorrelationException(EasyMock.anyObject(String.class)));\r
-        EasyMock.expect(request.getHeader("language-option")).andReturn("en_US");\r
         EasyMock.expect(request.getHeader("username")).andReturn("admin");\r
         PowerMock.replayAll();\r
         ruleMgtResources.updateCorrelationRule(request, ruleUpdateRequest);\r
@@ -102,7 +100,6 @@ public class RuleMgtResourcesTest {
         final RuleUpdateRequest ruleUpdateRequest = new RuleUpdateRequest();\r
         EasyMock.expect(ruleMgtWrapper.updateCorrelationRule("admin",\r
                 ruleUpdateRequest)).andReturn(new RuleAddAndUpdateResponse());\r
-        EasyMock.expect(request.getHeader("language-option")).andReturn("en_US");\r
         EasyMock.expect(request.getHeader("username")).andReturn("admin");\r
         PowerMock.replayAll();\r
         ruleMgtResources.updateCorrelationRule(request, ruleUpdateRequest);\r
@@ -115,10 +112,9 @@ public class RuleMgtResourcesTest {
 \r
         final String ruleId = "mockedRule";\r
         ruleMgtWrapper.deleteCorrelationRule(EasyMock.anyObject(RuleDeleteRequest.class));\r
-        EasyMock.expectLastCall().andThrow(new CorrelationException(EasyMock.anyObject(String.class)));\r
-        EasyMock.expect(request.getHeader("language-option")).andReturn("en_US");\r
+        EasyMock.expectLastCall().andThrow(new CorrelationException("any string"));\r
         PowerMock.replayAll();\r
-        ruleMgtResources.deleteCorrelationRule(request, ruleId);\r
+        ruleMgtResources.deleteCorrelationRule(ruleId);\r
         PowerMock.verifyAll();\r
     }\r
 \r
@@ -127,9 +123,8 @@ public class RuleMgtResourcesTest {
         final String ruleId = "mockedRule";\r
         ruleMgtWrapper.deleteCorrelationRule(EasyMock.anyObject(RuleDeleteRequest.class));\r
         EasyMock.expectLastCall();\r
-        EasyMock.expect(request.getHeader("language-option")).andReturn("en_US");\r
         PowerMock.replayAll();\r
-        ruleMgtResources.deleteCorrelationRule(request, ruleId);\r
+        ruleMgtResources.deleteCorrelationRule(ruleId);\r
         PowerMock.verifyAll();\r
     }\r
 \r
@@ -140,10 +135,9 @@ public class RuleMgtResourcesTest {
         final String requestStr = "{\"ruleid\":\"rule_001\",\"rulename\":\"Rule-001\","\r
                 + "\"enabled\":0,\"creator\":\"admin\"}";\r
         EasyMock.expect(ruleMgtWrapper.getCorrelationRuleByCondition(EasyMock.anyObject(RuleQueryCondition.class)))\r
-                .andThrow(new CorrelationException(EasyMock.anyObject(String.class)));\r
-        EasyMock.expect(request.getHeader("language-option")).andReturn("en_US").times(2);\r
+                .andThrow(new CorrelationException("any string"));\r
         PowerMock.replayAll();\r
-        ruleMgtResources.getCorrelationRules(request, requestStr);\r
+        ruleMgtResources.getCorrelationRules(requestStr);\r
         PowerMock.verifyAll();\r
     }\r
 \r
@@ -152,10 +146,9 @@ public class RuleMgtResourcesTest {
         thrown.expect(JsonSyntaxException.class);\r
 \r
         String queryRequest = "this is error param";\r
-        EasyMock.expect(request.getHeader("language-option")).andReturn("en_US").times(2);\r
 \r
         PowerMock.replayAll();\r
-        ruleMgtResources.getCorrelationRules(request, queryRequest);\r
+        ruleMgtResources.getCorrelationRules(queryRequest);\r
         PowerMock.verifyAll();\r
 \r
     }\r
@@ -164,9 +157,8 @@ public class RuleMgtResourcesTest {
     public void getCorrelationRules_normal_request_string_null() throws Exception {\r
         EasyMock.expect(ruleMgtWrapper.getCorrelationRuleByCondition(EasyMock.anyObject(RuleQueryCondition.class)))\r
                 .andReturn(new RuleQueryListResponse());\r
-        EasyMock.expect(request.getHeader("language-option")).andReturn("en_US").times(2);\r
         PowerMock.replayAll();\r
-        ruleMgtResources.getCorrelationRules(request, null);\r
+        ruleMgtResources.getCorrelationRules(null);\r
         PowerMock.verifyAll();\r
     }\r
 \r
@@ -176,9 +168,8 @@ public class RuleMgtResourcesTest {
                 + "\"creator\":\"admin\"}";\r
         EasyMock.expect(ruleMgtWrapper.getCorrelationRuleByCondition(EasyMock.anyObject(RuleQueryCondition.class)))\r
                 .andReturn(new RuleQueryListResponse());\r
-        EasyMock.expect(request.getHeader("language-option")).andReturn("en_US").times(2);\r
         PowerMock.replayAll();\r
-        ruleMgtResources.getCorrelationRules(request, requestStr);\r
+        ruleMgtResources.getCorrelationRules(requestStr);\r
         PowerMock.verifyAll();\r
     }\r
 }
\ No newline at end of file