summaryrefslogtreecommitdiffstats
path: root/rulemgt/src/test/java/org/onap
diff options
context:
space:
mode:
authorShiwei Tian <tian.shiwei@zte.com.cn>2018-03-06 08:56:31 +0800
committerShiwei Tian <tian.shiwei@zte.com.cn>2018-03-06 09:47:56 +0800
commit3a2c70f1ee024dbad4dc091d3105064641908e1d (patch)
tree7e720d1a0c8a0d60c1736a1d16006f1e1b62ba47 /rulemgt/src/test/java/org/onap
parent61785d9b87afee1ee0bddd3507fcb7b7308be944 (diff)
Change HTTP Requests into HTTPS Ones
Issue-ID: HOLMES-104 Change-Id: I73d23418fbfaa23121ec825b11bbb46e55b2058c Signed-off-by: Shiwei Tian <tian.shiwei@zte.com.cn>
Diffstat (limited to 'rulemgt/src/test/java/org/onap')
-rw-r--r--rulemgt/src/test/java/org/onap/holmes/rulemgt/bolt/enginebolt/EngineWrapperTest.java82
-rw-r--r--rulemgt/src/test/java/org/onap/holmes/rulemgt/dcae/DcaeConfigurationPollingTest.java12
-rw-r--r--rulemgt/src/test/java/org/onap/holmes/rulemgt/resources/RuleMgtResourcesTest.java1
3 files changed, 58 insertions, 37 deletions
diff --git a/rulemgt/src/test/java/org/onap/holmes/rulemgt/bolt/enginebolt/EngineWrapperTest.java b/rulemgt/src/test/java/org/onap/holmes/rulemgt/bolt/enginebolt/EngineWrapperTest.java
index b63b106..cc8c047 100644
--- a/rulemgt/src/test/java/org/onap/holmes/rulemgt/bolt/enginebolt/EngineWrapperTest.java
+++ b/rulemgt/src/test/java/org/onap/holmes/rulemgt/bolt/enginebolt/EngineWrapperTest.java
@@ -20,32 +20,40 @@ package org.onap.holmes.rulemgt.bolt.enginebolt;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;
-import javax.ws.rs.core.Response;
+import org.apache.http.HttpResponse;
import org.apache.http.StatusLine;
import org.easymock.EasyMock;
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.utils.HttpsUtils;
import org.onap.holmes.rulemgt.bean.request.CorrelationCheckRule4Engine;
import org.onap.holmes.rulemgt.bean.request.CorrelationDeployRule4Engine;
import org.onap.holmes.common.exception.CorrelationException;
import org.powermock.api.easymock.PowerMock;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
import org.powermock.reflect.Whitebox;
+@PrepareForTest({EngineWrapper.class, EngineService.class, HttpsUtils.class, HttpResponse.class,
+ StatusLine.class})
+@RunWith(PowerMockRunner.class)
public class EngineWrapperTest {
@Rule
public ExpectedException thrown = ExpectedException.none();
private EngineWrapper engineWrapper = new EngineWrapper();
private EngineService engineServiceMock;
- private Response response;
+ private HttpResponse httpResponse;
private StatusLine statusLineMock;
@Before
public void setUp() throws Exception {
engineServiceMock = PowerMock.createMock(EngineService.class);
- response = PowerMock.createMock(Response.class);
+ httpResponse = PowerMock.createMock(HttpResponse.class);
statusLineMock = PowerMock.createMock(StatusLine.class);
Whitebox.setInternalState(engineWrapper, "engineService", engineServiceMock);
}
@@ -55,8 +63,10 @@ public class EngineWrapperTest {
thrown.expect(CorrelationException.class);
thrown.expectMessage("Failed to call the rule deployment RESTful API.");
- EasyMock.expect(engineServiceMock.deploy(EasyMock.anyObject(CorrelationDeployRule4Engine.class))).andThrow(
- new RuntimeException(""));
+ EasyMock.expect(
+ engineServiceMock.deploy(EasyMock.anyObject(CorrelationDeployRule4Engine.class)))
+ .andThrow(
+ new RuntimeException(""));
PowerMock.replayAll();
engineWrapper.deployEngine(new CorrelationDeployRule4Engine());
@@ -69,9 +79,11 @@ public class EngineWrapperTest {
thrown.expect(CorrelationException.class);
thrown.expectMessage("Failed to deploy the rule!");
- EasyMock.expect(engineServiceMock.deploy(EasyMock.anyObject(CorrelationDeployRule4Engine.class)))
- .andReturn(response);
- EasyMock.expect(response.getStatus()).andReturn(400);
+ EasyMock.expect(
+ engineServiceMock.deploy(EasyMock.anyObject(CorrelationDeployRule4Engine.class)))
+ .andReturn(httpResponse);
+ EasyMock.expect(httpResponse.getStatusLine()).andReturn(statusLineMock);
+ EasyMock.expect(statusLineMock.getStatusCode()).andReturn(400);
PowerMock.replayAll();
engineWrapper.deployEngine(new CorrelationDeployRule4Engine());
@@ -81,14 +93,18 @@ public class EngineWrapperTest {
@Test
public void deployEngine_parse_content_exception() throws Exception {
+ PowerMock.resetAll();
String content = "";
-
+ PowerMockito.mockStatic(HttpsUtils.class);
thrown.expect(CorrelationException.class);
- thrown.expectMessage("Failed to parse the value returned by the engine management service.");
- EasyMock.expect(engineServiceMock.deploy(EasyMock.anyObject(CorrelationDeployRule4Engine.class)))
- .andReturn(response);
- EasyMock.expect(response.getStatus()).andReturn(200);
- EasyMock.expect(response.readEntity(String.class)).andReturn(content);
+ thrown.expectMessage(
+ "Failed to parse the value returned by the engine management service.");
+ EasyMock.expect(
+ engineServiceMock.deploy(EasyMock.anyObject(CorrelationDeployRule4Engine.class)))
+ .andReturn(httpResponse);
+ EasyMock.expect(httpResponse.getStatusLine()).andReturn(statusLineMock);
+ EasyMock.expect(statusLineMock.getStatusCode()).andReturn(200);
+ PowerMockito.when(HttpsUtils.extractResponseEntity(httpResponse)).thenReturn(content);
PowerMock.replayAll();
engineWrapper.deployEngine(new CorrelationDeployRule4Engine());
@@ -98,11 +114,15 @@ public class EngineWrapperTest {
@Test
public void deployEngine_success() throws Exception {
- String content = "{\"package\":\"test\"}";
- EasyMock.expect(engineServiceMock.deploy(EasyMock.anyObject(CorrelationDeployRule4Engine.class)))
- .andReturn(response);
- EasyMock.expect(response.getStatus()).andReturn(200);
- EasyMock.expect(response.readEntity(String.class)).andReturn(content);
+ PowerMock.resetAll();
+ String content = "{\"packageName\":\"test\"}";
+ PowerMockito.mockStatic(HttpsUtils.class);
+ EasyMock.expect(
+ engineServiceMock.deploy(EasyMock.anyObject(CorrelationDeployRule4Engine.class)))
+ .andReturn(httpResponse);
+ EasyMock.expect(httpResponse.getStatusLine()).andReturn(statusLineMock);
+ EasyMock.expect(statusLineMock.getStatusCode()).andReturn(200);
+ PowerMockito.when(HttpsUtils.extractResponseEntity(httpResponse)).thenReturn(content);
PowerMock.replayAll();
String result = engineWrapper.deployEngine(new CorrelationDeployRule4Engine());
@@ -131,8 +151,9 @@ public class EngineWrapperTest {
thrown.expectMessage("Failed to delete the rule!");
EasyMock.expect(engineServiceMock.delete(EasyMock.anyObject(String.class)))
- .andReturn(response);
- EasyMock.expect(response.getStatus()).andReturn(400);
+ .andReturn(httpResponse);
+ EasyMock.expect(httpResponse.getStatusLine()).andReturn(statusLineMock);
+ EasyMock.expect(statusLineMock.getStatusCode()).andReturn(400);
PowerMock.replayAll();
@@ -144,8 +165,9 @@ public class EngineWrapperTest {
@Test
public void deleteRuleFromEngine_success() throws Exception {
EasyMock.expect(engineServiceMock.delete(EasyMock.anyObject(String.class)))
- .andReturn(response);
- EasyMock.expect(response.getStatus()).andReturn(200);
+ .andReturn(httpResponse);
+ EasyMock.expect(httpResponse.getStatusLine()).andReturn(statusLineMock);
+ EasyMock.expect(statusLineMock.getStatusCode()).andReturn(200);
PowerMock.replayAll();
@@ -159,8 +181,10 @@ public class EngineWrapperTest {
thrown.expect(CorrelationException.class);
thrown.expectMessage("Failed to call the rule verification RESTful API.");
- EasyMock.expect(engineServiceMock.check(EasyMock.anyObject(CorrelationCheckRule4Engine.class))).andThrow(
- new RuntimeException(""));
+ EasyMock.expect(
+ engineServiceMock.check(EasyMock.anyObject(CorrelationCheckRule4Engine.class)))
+ .andThrow(
+ new RuntimeException(""));
PowerMock.replayAll();
engineWrapper.checkRuleFromEngine(new CorrelationCheckRule4Engine());
@@ -170,9 +194,11 @@ public class EngineWrapperTest {
@Test
public void checkRuleFromEngine_success() throws Exception {
- EasyMock.expect(engineServiceMock.check(EasyMock.anyObject(CorrelationCheckRule4Engine.class)))
- .andReturn(response);
- EasyMock.expect(response.getStatus()).andReturn(200);
+ EasyMock.expect(
+ engineServiceMock.check(EasyMock.anyObject(CorrelationCheckRule4Engine.class)))
+ .andReturn(httpResponse);
+ EasyMock.expect(httpResponse.getStatusLine()).andReturn(statusLineMock);
+ EasyMock.expect(statusLineMock.getStatusCode()).andReturn(200);
PowerMock.replayAll();
diff --git a/rulemgt/src/test/java/org/onap/holmes/rulemgt/dcae/DcaeConfigurationPollingTest.java b/rulemgt/src/test/java/org/onap/holmes/rulemgt/dcae/DcaeConfigurationPollingTest.java
index 8d16198..1037495 100644
--- a/rulemgt/src/test/java/org/onap/holmes/rulemgt/dcae/DcaeConfigurationPollingTest.java
+++ b/rulemgt/src/test/java/org/onap/holmes/rulemgt/dcae/DcaeConfigurationPollingTest.java
@@ -15,15 +15,9 @@
*/
package org.onap.holmes.rulemgt.dcae;
-import static org.easymock.EasyMock.anyObject;
-import static org.hamcrest.CoreMatchers.anyOf;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.junit.Assert.assertThat;
import static org.powermock.api.mockito.PowerMockito.when;
-
-import com.alibaba.fastjson.JSONException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import javax.ws.rs.ProcessingException;
import org.junit.Before;
import org.junit.Test;
import org.junit.rules.ExpectedException;
@@ -40,7 +34,7 @@ import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
import org.powermock.reflect.Whitebox;
-@PrepareForTest({DcaeConfigurationPolling.class, MicroServiceConfig.class, ObjectMapper.class})
+@PrepareForTest({DcaeConfigurationPolling.class, MicroServiceConfig.class})
@RunWith(PowerMockRunner.class)
public class DcaeConfigurationPollingTest {
@@ -64,7 +58,7 @@ public class DcaeConfigurationPollingTest {
.thenReturn("host");
PowerMock.createMock(DcaeConfigurationParser.class);
PowerMock.expectPrivate(DcaeConfigurationParser.class, "parse", "host")
- .andThrow(new CorrelationException("")).anyTimes();
+ .andThrow(new CorrelationException("tests")).anyTimes();
PowerMock.replayAll();
Whitebox.invokeMethod(daceConfigurationPolling, "getDcaeConfigurations");
@@ -94,7 +88,7 @@ public class DcaeConfigurationPollingTest {
public void testDaceConfigurationPolling_addAllCorrelationRules_connection_exception()
throws Exception {
PowerMock.resetAll();
- thrown.expect(ProcessingException.class);
+ thrown.expect(CorrelationException.class);
DcaeConfigurations dcaeConfigurations = new DcaeConfigurations();
Rule rule = new Rule("test", "test", "tset",1);
dcaeConfigurations.getDefaultRules().add(rule);
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 0c3bd89..a35f6b8 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
@@ -57,6 +57,7 @@ public class RuleMgtResourcesTest {
@Test
public void addCorrelationRule_correlation_exception() throws Exception {
+ PowerMock.resetAll();
thrown.expect(WebApplicationException.class);
final RuleCreateRequest ruleCreateRequest = new RuleCreateRequest();