From 869a83f8f8d8a69f2029c3219bad180965adcb1c Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Fri, 14 Aug 2015 12:16:09 +0530 Subject: [PATCH] plugins: fix test case, interface usage and checkstyle import issue Signed-off-by: Rohit Yadav --- .../kvm/resource/LibvirtComputingResourceTest.java | 4 ++-- .../api/command/ListAndSwitchSAMLAccountCmd.java | 3 ++- .../api/command/SAML2LoginAPIAuthenticatorCmd.java | 2 -- .../command/ListAndSwitchSAMLAccountCmdTest.java | 13 +++++++------ 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java b/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java index 42ebf86b61b..1651299cfc6 100644 --- a/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java +++ b/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java @@ -1246,7 +1246,7 @@ public class LibvirtComputingResourceTest { when(conn.domainLookupByName(vmName)).thenReturn(dm); when(libvirtComputingResource.getPrivateIp()).thenReturn("127.0.0.1"); - when(dm.getXMLDesc(0)).thenReturn("host_domain"); + when(dm.getXMLDesc(8)).thenReturn("host_domain"); when(dm.isPersistent()).thenReturn(1); doNothing().when(dm).undefine(); @@ -1274,7 +1274,7 @@ public class LibvirtComputingResourceTest { verify(libvirtComputingResource, times(1)).getDisks(conn, vmName); try { verify(conn, times(1)).domainLookupByName(vmName); - verify(dm, times(1)).getXMLDesc(0); + verify(dm, times(1)).getXMLDesc(8); } catch (final LibvirtException e) { fail(e.getMessage()); } diff --git a/plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/command/ListAndSwitchSAMLAccountCmd.java b/plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/command/ListAndSwitchSAMLAccountCmd.java index 80aee1b4e6c..2fdf6a1a000 100644 --- a/plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/command/ListAndSwitchSAMLAccountCmd.java +++ b/plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/command/ListAndSwitchSAMLAccountCmd.java @@ -52,6 +52,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import java.io.IOException; +import java.net.InetAddress; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -99,7 +100,7 @@ public class ListAndSwitchSAMLAccountCmd extends BaseCmd implements APIAuthentic } @Override - public String authenticate(final String command, final Map params, final HttpSession session, final String remoteAddress, final String responseType, final StringBuilder auditTrailSb, final HttpServletRequest req, final HttpServletResponse resp) throws ServerApiException { + public String authenticate(final String command, final Map params, final HttpSession session, InetAddress remoteAddress, final String responseType, final StringBuilder auditTrailSb, final HttpServletRequest req, final HttpServletResponse resp) throws ServerApiException { if (session == null || session.isNew()) { throw new ServerApiException(ApiErrorCode.UNAUTHORIZED, _apiServer.getSerializedApiError(ApiErrorCode.UNAUTHORIZED.getHttpCode(), "Only authenticated saml users can request this API", diff --git a/plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/command/SAML2LoginAPIAuthenticatorCmd.java b/plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/command/SAML2LoginAPIAuthenticatorCmd.java index 7a1b83c320a..41005ab8f9c 100644 --- a/plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/command/SAML2LoginAPIAuthenticatorCmd.java +++ b/plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/command/SAML2LoginAPIAuthenticatorCmd.java @@ -70,8 +70,6 @@ import javax.xml.parsers.ParserConfigurationException; import javax.xml.stream.FactoryConfigurationError; import java.io.IOException; import java.net.InetAddress; -import java.net.URLEncoder; - import java.util.List; import java.util.Map; diff --git a/plugins/user-authenticators/saml2/test/org/apache/cloudstack/api/command/ListAndSwitchSAMLAccountCmdTest.java b/plugins/user-authenticators/saml2/test/org/apache/cloudstack/api/command/ListAndSwitchSAMLAccountCmdTest.java index 1423243cfe4..8985a0fbf3f 100644 --- a/plugins/user-authenticators/saml2/test/org/apache/cloudstack/api/command/ListAndSwitchSAMLAccountCmdTest.java +++ b/plugins/user-authenticators/saml2/test/org/apache/cloudstack/api/command/ListAndSwitchSAMLAccountCmdTest.java @@ -49,6 +49,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import java.lang.reflect.Field; +import java.net.InetAddress; import java.util.HashMap; import java.util.Map; @@ -121,7 +122,7 @@ public class ListAndSwitchSAMLAccountCmdTest extends TestCase { // invalid session test try { - cmd.authenticate("command", params, null, "random", HttpUtils.RESPONSE_TYPE_JSON, new StringBuilder(), req, resp); + cmd.authenticate("command", params, null, null, HttpUtils.RESPONSE_TYPE_JSON, new StringBuilder(), req, resp); } catch (ServerApiException exception) { assertEquals(exception.getErrorCode(), ApiErrorCode.UNAUTHORIZED); } finally { @@ -132,7 +133,7 @@ public class ListAndSwitchSAMLAccountCmdTest extends TestCase { params.put(ApiConstants.SESSIONKEY, new String[]{"someOtherValue"}); try { Mockito.when(session.isNew()).thenReturn(false); - cmd.authenticate("command", params, session, "random", HttpUtils.RESPONSE_TYPE_JSON, new StringBuilder(), req, resp); + cmd.authenticate("command", params, session, null, HttpUtils.RESPONSE_TYPE_JSON, new StringBuilder(), req, resp); } catch (ServerApiException exception) { assertEquals(exception.getErrorCode(), ApiErrorCode.UNAUTHORIZED); } finally { @@ -142,7 +143,7 @@ public class ListAndSwitchSAMLAccountCmdTest extends TestCase { // valid sessionkey value test params.put(ApiConstants.SESSIONKEY, new String[]{sessionKeyValue}); try { - cmd.authenticate("command", params, session, "random", HttpUtils.RESPONSE_TYPE_JSON, new StringBuilder(), req, resp); + cmd.authenticate("command", params, session, null, HttpUtils.RESPONSE_TYPE_JSON, new StringBuilder(), req, resp); } catch (ServerApiException exception) { assertEquals(exception.getErrorCode(), ApiErrorCode.ACCOUNT_ERROR); } finally { @@ -159,7 +160,7 @@ public class ListAndSwitchSAMLAccountCmdTest extends TestCase { mockedUserAccount.setSource(User.Source.UNKNOWN); Mockito.when(accountService.getUserAccountById(Mockito.anyLong())).thenReturn(mockedUserAccount); try { - cmd.authenticate("command", params, session, "random", HttpUtils.RESPONSE_TYPE_JSON, new StringBuilder(), req, resp); + cmd.authenticate("command", params, session, null, HttpUtils.RESPONSE_TYPE_JSON, new StringBuilder(), req, resp); } catch (ServerApiException exception) { assertEquals(exception.getErrorCode(), ApiErrorCode.ACCOUNT_ERROR); } finally { @@ -181,9 +182,9 @@ public class ListAndSwitchSAMLAccountCmdTest extends TestCase { loginCmdResponse.setLastName("lastName"); loginCmdResponse.setSessionKey("newSessionKeyString"); Mockito.when(apiServer.loginUser(Mockito.any(HttpSession.class), Mockito.anyString(), Mockito.anyString(), - Mockito.anyLong(), Mockito.anyString(), Mockito.anyString(), Mockito.anyMap())).thenReturn(loginCmdResponse); + Mockito.anyLong(), Mockito.anyString(), Mockito.any(InetAddress.class), Mockito.anyMap())).thenReturn(loginCmdResponse); try { - cmd.authenticate("command", params, session, "random", HttpUtils.RESPONSE_TYPE_JSON, new StringBuilder(), req, resp); + cmd.authenticate("command", params, session, null, HttpUtils.RESPONSE_TYPE_JSON, new StringBuilder(), req, resp); } catch (ServerApiException exception) { fail("SAML list and switch account API failed to pass for all valid data: " + exception.getMessage()); } finally {