From 489145aa01dec6df5d9c408994433541f24d96fc Mon Sep 17 00:00:00 2001
From: Alex Yarmula <oleksiy.yarmula+hosting@gmail.com>
Date: Wed, 10 Mar 2010 23:31:30 -0800
Subject: [PATCH] more work on gogrid tests

---
 .../gogrid/GoGridComputeServiceLiveTest.java  | 20 +++++++++++++++----
 .../org/jclouds/gogrid/GoGridLiveTest.java    | 10 +++++-----
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/gogrid/src/test/java/org/jclouds/gogrid/GoGridComputeServiceLiveTest.java b/gogrid/src/test/java/org/jclouds/gogrid/GoGridComputeServiceLiveTest.java
index a4f3347db8..47e943ad20 100644
--- a/gogrid/src/test/java/org/jclouds/gogrid/GoGridComputeServiceLiveTest.java
+++ b/gogrid/src/test/java/org/jclouds/gogrid/GoGridComputeServiceLiveTest.java
@@ -23,6 +23,7 @@ import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 import java.util.Map;
 
+import com.google.common.base.Predicate;
 import org.jclouds.compute.BaseComputeServiceLiveTest;
 import org.jclouds.compute.ComputeService;
 import org.jclouds.compute.ComputeServiceContextFactory;
@@ -33,11 +34,14 @@ import org.jclouds.compute.domain.Template;
 import org.jclouds.compute.domain.TemplateBuilder;
 import org.jclouds.rest.RestContext;
 import org.jclouds.ssh.jsch.config.JschSshClientModule;
+import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 import com.google.common.collect.Iterables;
 
+import javax.annotation.Nullable;
+
 /**
  * @author Oleksiy Yarmula
  */
@@ -79,19 +83,27 @@ public class GoGridComputeServiceLiveTest extends BaseComputeServiceLiveTest {
                 .createContext(service, user, password).getProviderSpecificContext();
     }
 
-    @Test(enabled = false)
+    @Test(enabled = true)
     public void endToEndComputeServiceTest() {
         ComputeService service = context.getComputeService();
         Template t = service.templateBuilder().minRam(1024).imageId(
                 "GSI-6890f8b6-c8fb-4ac1-bc33-2563eb4e29d2").build();
 
+        int originalSize = service.getNodes().size();
+
         assertEquals(t.getImage().getId(), "GSI-6890f8b6-c8fb-4ac1-bc33-2563eb4e29d2");
-        service.runNodesWithTag("testTag", 1, t);
+        service.runNodesWithTag(this.service, 1, t);
 
         Map<String, ? extends ComputeMetadata> nodes = service.getNodes();
-        assertEquals(nodes.size(), 1);
+        assertEquals(nodes.size(), originalSize + 1, "size should've been larger by 1");
 
-        NodeMetadata nodeMetadata = service.getNodeMetadata(Iterables.getOnlyElement(nodes.values()));
+        ComputeMetadata node = Iterables.find(nodes.values(), new Predicate<ComputeMetadata>() {
+            @Override public boolean apply(ComputeMetadata computeMetadata) {
+                return computeMetadata.getName().startsWith(GoGridComputeServiceLiveTest.this.service);
+            }
+        });
+
+        NodeMetadata nodeMetadata = service.getNodeMetadata(node);
         assertEquals(nodeMetadata.getPublicAddresses().size(), 1,
                 "There must be 1 public address for the node");
         assertTrue(nodeMetadata.getName().startsWith("testTag"));
diff --git a/gogrid/src/test/java/org/jclouds/gogrid/GoGridLiveTest.java b/gogrid/src/test/java/org/jclouds/gogrid/GoGridLiveTest.java
index 903556e86c..371102c3b0 100644
--- a/gogrid/src/test/java/org/jclouds/gogrid/GoGridLiveTest.java
+++ b/gogrid/src/test/java/org/jclouds/gogrid/GoGridLiveTest.java
@@ -89,7 +89,7 @@ public class GoGridLiveTest {
      * Tests server start, reboot and deletion.
      * Also verifies IP services and job services.
      */
-    @Test(enabled=false)
+    @Test(enabled=true)
     public void testServerLifecycle() {
         int serverCountBeforeTest = client.getServerServices().getServerList().size();
 
@@ -142,7 +142,7 @@ public class GoGridLiveTest {
      * Starts a servers, verifies that jobs are created correctly and
      * an be retrieved from the job services
      */
-    @Test(dependsOnMethods = "testServerLifecycle", enabled=false)
+    @Test(dependsOnMethods = "testServerLifecycle", enabled=true)
     public void testJobs() {
         final String nameOfServer = "Server" + String.valueOf(new Date().getTime()).substring(6);
         serversToDeleteAfterTheTests.add(nameOfServer);
@@ -187,7 +187,7 @@ public class GoGridLiveTest {
      * Tests common load balancer operations.
      * Also verifies IP services and job services.
      */
-    @Test(enabled=false)
+    @Test(enabled=true)
     public void testLoadBalancerLifecycle() {
         int lbCountBeforeTest = client.getLoadBalancerServices().getLoadBalancerList().size();
 
@@ -249,7 +249,7 @@ public class GoGridLiveTest {
     /**
      * Tests common server image operations.
      */
-    @Test(enabled=false)
+    @Test(enabled=true)
     public void testImageLifecycle() {
         GetImageListOptions options = new GetImageListOptions.Builder().publicDatabaseServers();
         Set<ServerImage> images = client.getImageServices().getImageList(options);
@@ -278,7 +278,7 @@ public class GoGridLiveTest {
 
     }
 
-    @Test(enabled=false)
+    @Test(enabled=true)
     private void testShellAccess() throws IOException {
         final String nameOfServer = "Server" + String.valueOf(new Date().getTime()).substring(6);
         serversToDeleteAfterTheTests.add(nameOfServer);