From db88ec1696b40f3e308623e47f8d64321e12fe35 Mon Sep 17 00:00:00 2001 From: Andrei Savu Date: Thu, 9 Feb 2012 16:16:26 +0200 Subject: [PATCH] Fixed and improved live tests for SSHKeyPairClient --- .../cloudstack/features/SSHKeyPairClientLiveTest.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SSHKeyPairClientLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SSHKeyPairClientLiveTest.java index dfd61fcf01..e6f38c08d4 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SSHKeyPairClientLiveTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SSHKeyPairClientLiveTest.java @@ -28,6 +28,8 @@ import java.util.Map; import java.util.Set; import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertNull; /** * Tests behavior of {@code SSHKeyPairClient} @@ -58,6 +60,7 @@ public class SSHKeyPairClientLiveTest extends BaseCloudStackClientLiveTest { @Test public void testCreateDeleteSSHKeyPair() { sshKeyPair = client.getSSHKeyPairClient().createSSHKeyPair(keyPairName); + assertNotNull(sshKeyPair.getPrivateKey()); checkSSHKeyPair(sshKeyPair); client.getSSHKeyPairClient().deleteSSHKeyPair(sshKeyPair.getName()); @@ -73,6 +76,7 @@ public class SSHKeyPairClientLiveTest extends BaseCloudStackClientLiveTest { final String publicKey = sshKey.get("public"); sshKeyPair = client.getSSHKeyPairClient().registerSSHKeyPair(keyPairName, publicKey); + assertNull(sshKeyPair.getPrivateKey()); checkSSHKeyPair(sshKeyPair); client.getSSHKeyPairClient().deleteSSHKeyPair(keyPairName); @@ -84,7 +88,8 @@ public class SSHKeyPairClientLiveTest extends BaseCloudStackClientLiveTest { protected void checkSSHKeyPair(SshKeyPair pair) { assert pair.getName() != null : pair; - assertEquals(pair.toString(), client.getSSHKeyPairClient().getSSHKeyPair(pair.getName()).toString()); + assertEquals(pair.getFingerprint(), + client.getSSHKeyPairClient().getSSHKeyPair(pair.getName()).getFingerprint()); } }