diff options
Diffstat (limited to 'holmes-actions/src/test/java/org/onap/holmes')
4 files changed, 21 insertions, 16 deletions
diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQueryMdonsTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQueryMdonsTest.java index 21dd44a..09dce8e 100644 --- a/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQueryMdonsTest.java +++ b/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQueryMdonsTest.java @@ -1,5 +1,5 @@ /** - * Copyright 2020 Fujitsu Limited. + * Copyright 2020 - 2021 Fujitsu, ZTE Limited. * <p> * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at @@ -42,7 +42,7 @@ import static org.onap.holmes.common.config.MicroServiceConfig.MSB_ADDR; @RunWith(PowerMockRunner.class) @PowerMockIgnore("javax.net.ssl.*") -@PrepareForTest({AaiQueryMdons.class, MicroServiceConfig.class}) +@PrepareForTest({AaiQueryMdons.class, MicroServiceConfig.class, JerseyClient.class}) public class AaiQueryMdonsTest { @Rule diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQueryTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQueryTest.java index 0eec082..a9f3cea 100644 --- a/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQueryTest.java +++ b/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQueryTest.java @@ -43,7 +43,7 @@ import static org.hamcrest.core.IsNull.nullValue; import static org.junit.Assert.assertThat; -@PrepareForTest({AaiQuery.class, MicroServiceConfig.class}) +@PrepareForTest({AaiQuery.class, MicroServiceConfig.class, JerseyClient.class}) @PowerMockIgnore("javax.net.ssl.*") @RunWith(PowerMockRunner.class) public class AaiQueryTest { diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/utils/JerseyClientTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/utils/JerseyClientTest.java index 0183740..df1e2a2 100644 --- a/holmes-actions/src/test/java/org/onap/holmes/common/utils/JerseyClientTest.java +++ b/holmes-actions/src/test/java/org/onap/holmes/common/utils/JerseyClientTest.java @@ -44,8 +44,9 @@ import static org.junit.Assert.assertThat; public class JerseyClientTest { private final String ERROR_MSG = "Status code: <404>. Message: Failed to get response from the server. Info: Error"; - private JerseyClient jerseyClient = new JerseyClient(); + private JerseyClient jerseyClient = JerseyClient.newInstance(); private String url = "http://www.onap.org/holmes/test"; + @Rule private ExpectedException exception = ExpectedException.none(); @@ -62,7 +63,7 @@ public class JerseyClientTest { EasyMock.expect(mockedTarget.request()).andReturn(mockedBuilder); EasyMock.expect(mockedBuilder.header("Accept", MediaType.APPLICATION_JSON)).andReturn(mockedBuilder); EasyMock.expect(mockedBuilder.get()).andReturn(mockedResponse); - EasyMock.expect(mockedResponse.getStatus()).andReturn(200); + EasyMock.expect(mockedResponse.getStatusInfo()).andReturn(Response.Status.OK); EasyMock.expect(mockedResponse.readEntity(String.class)).andReturn("Normal"); WhiteboxImpl.setInternalState(jerseyClient, "client", mockedClient); @@ -88,7 +89,7 @@ public class JerseyClientTest { EasyMock.expect(mockedClient.target(url)).andReturn(mockedTarget); EasyMock.expect(mockedTarget.request()).andReturn(mockedBuilder); EasyMock.expect(mockedBuilder.get()).andReturn(mockedResponse); - EasyMock.expect(mockedResponse.getStatus()).andReturn(200); + EasyMock.expect(mockedResponse.getStatusInfo()).andReturn(Response.Status.OK); EasyMock.expect(mockedResponse.readEntity(String.class)).andReturn(GsonUtil.beanToJson(bean)); WhiteboxImpl.setInternalState(jerseyClient, "client", mockedClient); @@ -110,7 +111,7 @@ public class JerseyClientTest { EasyMock.expect(mockedClient.target(url)).andReturn(mockedTarget); EasyMock.expect(mockedTarget.request()).andReturn(mockedBuilder); EasyMock.expect(mockedBuilder.get()).andReturn(mockedResponse); - EasyMock.expect(mockedResponse.getStatus()).andReturn(200); + EasyMock.expect(mockedResponse.getStatusInfo()).andReturn(Response.Status.OK); EasyMock.expect(mockedResponse.readEntity(String.class)).andReturn("Normal"); WhiteboxImpl.setInternalState(jerseyClient, "client", mockedClient); @@ -133,6 +134,7 @@ public class JerseyClientTest { EasyMock.expect(mockedTarget.request()).andReturn(mockedBuilder); EasyMock.expect(mockedBuilder.get()).andReturn(mockedResponse); EasyMock.expect(mockedResponse.getStatus()).andReturn(404); + EasyMock.expect(mockedResponse.getStatusInfo()).andReturn(Response.Status.NOT_FOUND); EasyMock.expect(mockedResponse.readEntity(String.class)).andReturn("Error"); WhiteboxImpl.setInternalState(jerseyClient, "client", mockedClient); @@ -157,7 +159,7 @@ public class JerseyClientTest { EasyMock.expect(mockedClient.target(url)).andReturn(mockedTarget); EasyMock.expect(mockedTarget.request()).andReturn(mockedBuilder); EasyMock.expect(mockedBuilder.post(null)).andReturn(mockedResponse); - EasyMock.expect(mockedResponse.getStatus()).andReturn(200); + EasyMock.expect(mockedResponse.getStatusInfo()).andReturn(Response.Status.OK); EasyMock.expect(mockedResponse.readEntity(String.class)).andReturn("Normal"); WhiteboxImpl.setInternalState(jerseyClient, "client", mockedClient); @@ -180,6 +182,7 @@ public class JerseyClientTest { EasyMock.expect(mockedTarget.request()).andReturn(mockedBuilder); EasyMock.expect(mockedBuilder.post(null)).andReturn(mockedResponse); EasyMock.expect(mockedResponse.getStatus()).andReturn(404); + EasyMock.expect(mockedResponse.getStatusInfo()).andReturn(Response.Status.NOT_FOUND); EasyMock.expect(mockedResponse.readEntity(String.class)).andReturn("Error"); WhiteboxImpl.setInternalState(jerseyClient, "client", mockedClient); @@ -205,7 +208,7 @@ public class JerseyClientTest { EasyMock.expect(mockedClient.target(url)).andReturn(mockedTarget); EasyMock.expect(mockedTarget.request()).andReturn(mockedBuilder); EasyMock.expect(mockedBuilder.post(null)).andReturn(mockedResponse); - EasyMock.expect(mockedResponse.getStatus()).andReturn(200); + EasyMock.expect(mockedResponse.getStatusInfo()).andReturn(Response.Status.OK); EasyMock.expect(mockedResponse.readEntity(String.class)).andReturn(GsonUtil.beanToJson(bean)); WhiteboxImpl.setInternalState(jerseyClient, "client", mockedClient); @@ -228,7 +231,7 @@ public class JerseyClientTest { EasyMock.expect(mockedClient.target(url)).andReturn(mockedTarget); EasyMock.expect(mockedTarget.request()).andReturn(mockedBuilder); EasyMock.expect(mockedBuilder.put(null)).andReturn(mockedResponse); - EasyMock.expect(mockedResponse.getStatus()).andReturn(200); + EasyMock.expect(mockedResponse.getStatusInfo()).andReturn(Response.Status.OK); EasyMock.expect(mockedResponse.readEntity(String.class)).andReturn("Normal"); WhiteboxImpl.setInternalState(jerseyClient, "client", mockedClient); @@ -251,7 +254,7 @@ public class JerseyClientTest { EasyMock.expect(mockedClient.target(url)).andReturn(mockedTarget); EasyMock.expect(mockedTarget.request()).andReturn(mockedBuilder); EasyMock.expect(mockedBuilder.put(null)).andReturn(mockedResponse); - EasyMock.expect(mockedResponse.getStatus()).andReturn(200); + EasyMock.expect(mockedResponse.getStatusInfo()).andReturn(Response.Status.OK); EasyMock.expect(mockedResponse.readEntity(String.class)).andReturn(GsonUtil.beanToJson(bean)); WhiteboxImpl.setInternalState(jerseyClient, "client", mockedClient); @@ -274,7 +277,7 @@ public class JerseyClientTest { EasyMock.expect(mockedClient.target(url)).andReturn(mockedTarget); EasyMock.expect(mockedTarget.request()).andReturn(mockedBuilder); EasyMock.expect(mockedBuilder.put(null)).andReturn(mockedResponse); - EasyMock.expect(mockedResponse.getStatus()).andReturn(200); + EasyMock.expect(mockedResponse.getStatusInfo()).andReturn(Response.Status.OK); EasyMock.expect(mockedResponse.readEntity(String.class)).andReturn(GsonUtil.beanToJson(bean)); WhiteboxImpl.setInternalState(jerseyClient, "client", mockedClient); @@ -297,6 +300,7 @@ public class JerseyClientTest { EasyMock.expect(mockedTarget.request()).andReturn(mockedBuilder); EasyMock.expect(mockedBuilder.put(null)).andReturn(mockedResponse); EasyMock.expect(mockedResponse.getStatus()).andReturn(404); + EasyMock.expect(mockedResponse.getStatusInfo()).andReturn(Response.Status.NOT_FOUND); EasyMock.expect(mockedResponse.readEntity(String.class)).andReturn("Error"); WhiteboxImpl.setInternalState(jerseyClient, "client", mockedClient); @@ -322,7 +326,7 @@ public class JerseyClientTest { EasyMock.expect(mockedClient.target(url)).andReturn(mockedTarget); EasyMock.expect(mockedTarget.request()).andReturn(mockedBuilder); EasyMock.expect(mockedBuilder.delete()).andReturn(mockedResponse); - EasyMock.expect(mockedResponse.getStatus()).andReturn(200); + EasyMock.expect(mockedResponse.getStatusInfo()).andReturn(Response.Status.OK); EasyMock.expect(mockedResponse.readEntity(String.class)).andReturn("Normal"); WhiteboxImpl.setInternalState(jerseyClient, "client", mockedClient); @@ -345,7 +349,7 @@ public class JerseyClientTest { EasyMock.expect(mockedClient.target(url)).andReturn(mockedTarget); EasyMock.expect(mockedTarget.request()).andReturn(mockedBuilder); EasyMock.expect(mockedBuilder.delete()).andReturn(mockedResponse); - EasyMock.expect(mockedResponse.getStatus()).andReturn(200); + EasyMock.expect(mockedResponse.getStatusInfo()).andReturn(Response.Status.OK); EasyMock.expect(mockedResponse.readEntity(String.class)).andReturn(GsonUtil.beanToJson(bean)); WhiteboxImpl.setInternalState(jerseyClient, "client", mockedClient); @@ -367,7 +371,7 @@ public class JerseyClientTest { EasyMock.expect(mockedClient.target(url)).andReturn(mockedTarget); EasyMock.expect(mockedTarget.request()).andReturn(mockedBuilder); EasyMock.expect(mockedBuilder.delete()).andReturn(mockedResponse); - EasyMock.expect(mockedResponse.getStatus()).andReturn(200); + EasyMock.expect(mockedResponse.getStatusInfo()).andReturn(Response.Status.OK); EasyMock.expect(mockedResponse.readEntity(String.class)).andReturn("Normal"); WhiteboxImpl.setInternalState(jerseyClient, "client", mockedClient); @@ -390,6 +394,7 @@ public class JerseyClientTest { EasyMock.expect(mockedTarget.request()).andReturn(mockedBuilder); EasyMock.expect(mockedBuilder.delete()).andReturn(mockedResponse); EasyMock.expect(mockedResponse.getStatus()).andReturn(404); + EasyMock.expect(mockedResponse.getStatusInfo()).andReturn(Response.Status.NOT_FOUND); EasyMock.expect(mockedResponse.readEntity(String.class)).andReturn("Error"); WhiteboxImpl.setInternalState(jerseyClient, "client", mockedClient); diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/utils/MsbRegisterTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/utils/MsbRegisterTest.java index 1a12f85..19b3251 100644 --- a/holmes-actions/src/test/java/org/onap/holmes/common/utils/MsbRegisterTest.java +++ b/holmes-actions/src/test/java/org/onap/holmes/common/utils/MsbRegisterTest.java @@ -35,7 +35,7 @@ import static org.easymock.EasyMock.anyObject; import static org.easymock.EasyMock.expect; import static org.powermock.api.easymock.PowerMock.createPartialMock; -@PrepareForTest({MicroServiceConfig.class}) +@PrepareForTest({MicroServiceConfig.class, JerseyClient.class}) @RunWith(PowerMockRunner.class) @PowerMockIgnore({"javax.net.ssl.*", "javax.security.*"}) public class MsbRegisterTest { |