Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue 230: refactored test class

This commit is contained in:
Adrian Cole 2010-06-15 23:02:30 -04:00
parent 80e22b0322
commit 449576cec9
1 changed files with 52 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
ibmdev/src/test/java/org/jclouds/ibmdev/IBMDeveloperCloudClientLiveTest.java
View File

@ -25,7 +25,7 @@ package org.jclouds.ibmdev;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
import static org.jclouds.ibmdev.options.CreateInstanceOptions.Builder.attachIp; import static org.jclouds.ibmdev.options.CreateInstanceOptions.Builder.attachIp;
import static org.jclouds.ibmdev.options.CreateInstanceOptions.Builder.configurationData; import static org.jclouds.ibmdev.options.CreateInstanceOptions.Builder.authorizePublicKey;
import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertNull; import static org.testng.Assert.assertNull;
@ -95,6 +95,13 @@ public class IBMDeveloperCloudClientLiveTest {
connection = (IBMDeveloperCloudClient) IBMDeveloperCloudContextFactory connection = (IBMDeveloperCloudClient) IBMDeveloperCloudContextFactory
.createContext(user, password, new Log4JLoggingModule()) .createContext(user, password, new Log4JLoggingModule())
.getProviderSpecificContext().getApi(); .getProviderSpecificContext().getApi();
for (Instance instance : connection.listInstances()) {
try {
connection.deleteInstance(instance.getId());
} catch (Exception e) {
}
}
} }
@Test @Test
@ -261,7 +268,7 @@ public class IBMDeveloperCloudClientLiveTest {
allAddresses); allAddresses);
} }
@Test(enabled = false, dependsOnMethods = "testGetLocation") @Test(dependsOnMethods = "testGetLocation")
public void testCreateVolume() throws Exception { public void testCreateVolume() throws Exception {
try { try {
volume = connection.createVolumeInLocation(location.getId(), TAG, volume = connection.createVolumeInLocation(location.getId(), TAG,
@ -312,26 +319,29 @@ public class IBMDeveloperCloudClientLiveTest {
private static final String IMAGE_ID = "11";// Rational Insight private static final String IMAGE_ID = "11";// Rational Insight
@Test(dependsOnMethods = { "testAddPublicKey", "testAllocateIpAddress" }) @Test(dependsOnMethods = { "testAddPublicKey" })
public void testCreateInstance() throws Exception { public void testCreateInstance() throws Exception {
for (Instance instance : connection.listInstances()) {
try {
connection.deleteInstance(instance.getId());
} catch (Exception e) {
}
}
System.err.println(connection.getImage(IMAGE_ID));
instance = connection.createInstanceInLocation(location.getId(), TAG, instance = connection.createInstanceInLocation(location.getId(), TAG,
IMAGE_ID, SIZE, configurationData( IMAGE_ID, SIZE, authorizePublicKey(key.getName())
ImmutableMap.of("insight_admin_password", "myPassword1", .configurationData(
"db2_admin_password", "myPassword2", ImmutableMap.of("insight_admin_password",
"report_user_password", "myPassword3")) "myPassword1", "db2_admin_password",
.authorizePublicKey(key.getName())); "myPassword2", "report_user_password",
"myPassword3")));
assertBeginState(instance, TAG);
blockUntilRunning(instance);
assertRunning(instance, TAG);
}
private void assertRunning(Instance instance, String name)
throws AssertionError {
instance = connection.getInstance(instance.getId());
try { try {
assertIpHostAndStatusNEW(instance); assertIpHostAndStatusACTIVE(instance);
assertConsistent(instance, TAG); assertConsistent(instance, name);
} catch (NullPointerException e) { } catch (NullPointerException e) {
System.err.println(instance); System.err.println(instance);
throw e; throw e;
@ -339,7 +349,9 @@ public class IBMDeveloperCloudClientLiveTest {
System.err.println(instance); System.err.println(instance);
throw e; throw e;
} }
}
private void blockUntilRunning(Instance instance) {
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
assert new RetryablePredicate<Instance>(new InstanceActive(connection), assert new RetryablePredicate<Instance>(new InstanceActive(connection),
15 * 60 * 1000).apply(instance) : connection.getInstance(instance 15 * 60 * 1000).apply(instance) : connection.getInstance(instance
@ -347,12 +359,13 @@ public class IBMDeveloperCloudClientLiveTest {
System.out.println(((System.currentTimeMillis() - start) / 1000) System.out.println(((System.currentTimeMillis() - start) / 1000)
+ " seconds"); + " seconds");
}
instance = connection.getInstance(instance.getId()); private void assertBeginState(Instance instance, String name)
throws AssertionError {
try { try {
assertIpHostAndStatusACTIVE(instance); assertIpHostAndStatusNEW(instance);
assertConsistent(instance, TAG); assertConsistent(instance, name);
} catch (NullPointerException e) { } catch (NullPointerException e) {
System.err.println(instance); System.err.println(instance);
throw e; throw e;
@ -360,12 +373,11 @@ public class IBMDeveloperCloudClientLiveTest {
System.err.println(instance); System.err.println(instance);
throw e; throw e;
} }
} }
private void assertConsistent(Instance instance, String TAG) { private void assertConsistent(Instance instance, String name) {
assertNotNull(instance.getId()); assertNotNull(instance.getId());
assertEquals(instance.getName(), TAG); assertEquals(instance.getName(), name);
assertEquals(instance.getInstanceType(), SIZE); assertEquals(instance.getInstanceType(), SIZE);
assertEquals(instance.getLocation(), location.getId()); assertEquals(instance.getLocation(), location.getId());
assertEquals(instance.getImageId(), IMAGE_ID); assertEquals(instance.getImageId(), IMAGE_ID);
@ -375,7 +387,7 @@ public class IBMDeveloperCloudClientLiveTest {
assertNotNull(instance.getExpirationTime()); assertNotNull(instance.getExpirationTime());
assertEquals(instance.getOwner(), user); assertEquals(instance.getOwner(), user);
assertEquals(instance.getProductCodes(), ImmutableSet.<String> of()); assertEquals(instance.getProductCodes(), ImmutableSet.<String> of());
assertEquals(instance.getRequestName(), TAG); assertEquals(instance.getRequestName(), name);
assertNotNull(instance.getRequestId()); assertNotNull(instance.getRequestId());
} }
@ -398,10 +410,11 @@ public class IBMDeveloperCloudClientLiveTest {
* .faces?guid={ * .faces?guid={
* DA689AEE-783C-6FE7-6F9F-DFEE9763F806}&v=1&fid=1068&tid=1523#topic * DA689AEE-783C-6FE7-6F9F-DFEE9763F806}&v=1&fid=1068&tid=1523#topic
*/ */
@Test(enabled = false, dependsOnMethods = { "testAddPublicKey", @Test(dependsOnMethods = { "testAddPublicKey", "testAllocateIpAddress",
"testAllocateIpAddress", "testCreateVolume" }) "testCreateVolume" })
public void testCreateInstanceWithVolume() throws Exception { public void testCreateInstanceWithVolume() throws Exception {
instance2 = connection.createInstanceInLocation(location.getId(), TAG, String name = TAG + "1";
instance2 = connection.createInstanceInLocation(location.getId(), name,
IMAGE_ID, SIZE, attachIp(ip.getId()).authorizePublicKey( IMAGE_ID, SIZE, attachIp(ip.getId()).authorizePublicKey(
key.getName()).mountVolume(volume.getId(), "/mnt") key.getName()).mountVolume(volume.getId(), "/mnt")
.configurationData( .configurationData(
@ -409,7 +422,10 @@ public class IBMDeveloperCloudClientLiveTest {
"myPassword1", "db2_admin_password", "myPassword1", "db2_admin_password",
"myPassword2", "report_user_password", "myPassword2", "report_user_password",
"myPassword3"))); "myPassword3")));
//
assertBeginState(instance2, name);
blockUntilRunning(instance2);
assertRunning(instance2, name);
volume = connection.getVolume(volume.getId()); volume = connection.getVolume(volume.getId());
assertEquals(volume.getInstanceId(), instance2.getId()); assertEquals(volume.getInstanceId(), instance2.getId());
@ -443,14 +459,12 @@ public class IBMDeveloperCloudClientLiveTest {
} catch (Exception e) { } catch (Exception e) {
} }
if (ip != null)
try {
connection.releaseAddress(ip.getId());
} catch (Exception e) {
// resource contention on ip addresses... lets save it }
// if (ip != null)
// try {
// connection.releaseAddress(ip.getId());
// } catch (Exception e) {
//
// }
if (key != null) if (key != null)
try { try {
connection.deleteKey(key.getName()); connection.deleteKey(key.getName());