saml: fix tests and update method signature that generates random certs Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/aa02e30e Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/aa02e30e Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/aa02e30e Branch: refs/heads/master Commit: aa02e30e9502d0bbb175a5367bce0282b035d5b6 Parents: 249446d Author: Rohit Yadav <rohit.ya...@shapeblue.com> Authored: Thu Aug 28 18:40:51 2014 +0200 Committer: Rohit Yadav <rohit.ya...@shapeblue.com> Committed: Thu Aug 28 19:45:27 2014 +0200 ---------------------------------------------------------------------- .../cloudstack/api/command/GetServiceProviderMetaDataCmdTest.java | 2 +- .../cloudstack/api/command/SAML2LoginAPIAuthenticatorCmdTest.java | 2 +- .../cloudstack/api/command/SAML2LogoutAPIAuthenticatorCmdTest.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aa02e30e/plugins/user-authenticators/saml2/test/org/apache/cloudstack/api/command/GetServiceProviderMetaDataCmdTest.java ---------------------------------------------------------------------- diff --git a/plugins/user-authenticators/saml2/test/org/apache/cloudstack/api/command/GetServiceProviderMetaDataCmdTest.java b/plugins/user-authenticators/saml2/test/org/apache/cloudstack/api/command/GetServiceProviderMetaDataCmdTest.java index 0f956ae..fbd381d 100644 --- a/plugins/user-authenticators/saml2/test/org/apache/cloudstack/api/command/GetServiceProviderMetaDataCmdTest.java +++ b/plugins/user-authenticators/saml2/test/org/apache/cloudstack/api/command/GetServiceProviderMetaDataCmdTest.java @@ -71,7 +71,7 @@ public class GetServiceProviderMetaDataCmdTest { String spId = "someSPID"; String url = "someUrl"; - X509Certificate cert = SAMLUtils.generateRandomX509Certification(); + X509Certificate cert = SAMLUtils.generateRandomX509Certificate(); Mockito.when(samlAuthManager.getServiceProviderId()).thenReturn(spId); Mockito.when(samlAuthManager.getIdpSigningKey()).thenReturn(cert); Mockito.when(samlAuthManager.getIdpSingleLogOutUrl()).thenReturn(url); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aa02e30e/plugins/user-authenticators/saml2/test/org/apache/cloudstack/api/command/SAML2LoginAPIAuthenticatorCmdTest.java ---------------------------------------------------------------------- diff --git a/plugins/user-authenticators/saml2/test/org/apache/cloudstack/api/command/SAML2LoginAPIAuthenticatorCmdTest.java b/plugins/user-authenticators/saml2/test/org/apache/cloudstack/api/command/SAML2LoginAPIAuthenticatorCmdTest.java index 7747065..5769a8f 100644 --- a/plugins/user-authenticators/saml2/test/org/apache/cloudstack/api/command/SAML2LoginAPIAuthenticatorCmdTest.java +++ b/plugins/user-authenticators/saml2/test/org/apache/cloudstack/api/command/SAML2LoginAPIAuthenticatorCmdTest.java @@ -133,7 +133,7 @@ public class SAML2LoginAPIAuthenticatorCmdTest { String spId = "someSPID"; String url = "someUrl"; - X509Certificate cert = SAMLUtils.generateRandomX509Certification(); + X509Certificate cert = SAMLUtils.generateRandomX509Certificate(); Mockito.when(samlAuthManager.getServiceProviderId()).thenReturn(spId); Mockito.when(samlAuthManager.getIdpSigningKey()).thenReturn(null); Mockito.when(samlAuthManager.getIdpSingleSignOnUrl()).thenReturn(url); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aa02e30e/plugins/user-authenticators/saml2/test/org/apache/cloudstack/api/command/SAML2LogoutAPIAuthenticatorCmdTest.java ---------------------------------------------------------------------- diff --git a/plugins/user-authenticators/saml2/test/org/apache/cloudstack/api/command/SAML2LogoutAPIAuthenticatorCmdTest.java b/plugins/user-authenticators/saml2/test/org/apache/cloudstack/api/command/SAML2LogoutAPIAuthenticatorCmdTest.java index d309abe..820132b 100644 --- a/plugins/user-authenticators/saml2/test/org/apache/cloudstack/api/command/SAML2LogoutAPIAuthenticatorCmdTest.java +++ b/plugins/user-authenticators/saml2/test/org/apache/cloudstack/api/command/SAML2LogoutAPIAuthenticatorCmdTest.java @@ -73,7 +73,7 @@ public class SAML2LogoutAPIAuthenticatorCmdTest { String spId = "someSPID"; String url = "someUrl"; - X509Certificate cert = SAMLUtils.generateRandomX509Certification(); + X509Certificate cert = SAMLUtils.generateRandomX509Certificate(); Mockito.when(samlAuthManager.getServiceProviderId()).thenReturn(spId); Mockito.when(samlAuthManager.getIdpSigningKey()).thenReturn(cert); Mockito.when(samlAuthManager.getIdpSingleLogOutUrl()).thenReturn(url);