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