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

update live test to take static catalog reference (worry about injecting this later)

This commit is contained in:
danikov 2012-03-06 11:01:23 +00:00
parent aa80bfbff1
commit 53c8222eac
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminCatalogClientLiveTest.java
View File

@ -18,19 +18,19 @@
*/ */
package org.jclouds.vcloud.director.v1_5.features; package org.jclouds.vcloud.director.v1_5.features;
import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.MUST_EXIST_FMT; import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.REF_REQ_LIVE;
import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull;
import java.net.URI;
import org.jclouds.vcloud.director.v1_5.domain.AdminCatalog; import org.jclouds.vcloud.director.v1_5.domain.AdminCatalog;
import org.jclouds.vcloud.director.v1_5.domain.Checks; import org.jclouds.vcloud.director.v1_5.domain.Checks;
import org.jclouds.vcloud.director.v1_5.domain.Reference;
import org.jclouds.vcloud.director.v1_5.domain.ReferenceType; import org.jclouds.vcloud.director.v1_5.domain.ReferenceType;
import org.jclouds.vcloud.director.v1_5.domain.query.CatalogReferences;
import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorClientLiveTest; import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorClientLiveTest;
import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import com.google.common.collect.Iterables;
/** /**
* Tests live behavior of {@link AdminCatalogClient}. * Tests live behavior of {@link AdminCatalogClient}.
* *
@ -44,7 +44,6 @@ public class AdminCatalogClientLiveTest extends BaseVCloudDirectorClientLiveTest
*/ */
private AdminCatalogClient catalogClient; private AdminCatalogClient catalogClient;
private QueryClient queryClient;
/* /*
* Shared state between dependant tests. * Shared state between dependant tests.
@ -55,16 +54,15 @@ public class AdminCatalogClientLiveTest extends BaseVCloudDirectorClientLiveTest
@BeforeClass(inheritGroups = true) @BeforeClass(inheritGroups = true)
public void setupRequiredClients() { public void setupRequiredClients() {
catalogClient = context.getApi().getAdminCatalogClient(); catalogClient = context.getApi().getAdminCatalogClient();
queryClient = context.getApi().getQueryClient(); catalogRef = Reference.builder()
.href(URI.create("https://vcloudbeta.bluelock.com/api/admin/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4"))
.build();
} }
@Test(testName = "GET /catalog/{id}") @Test(testName = "GET /admin/catalog/{id}")
public void testGetCatalog() { public void testGetCatalog() {
// TODO use property from default property set assertNotNull(catalogRef, String.format(REF_REQ_LIVE, "Catalog"));
CatalogReferences catalogReferences = queryClient.catalogReferencesQuery(String.format("name==%s", catalogName)); catalog = catalogClient.getCatalog(catalogRef.getURI());
assertEquals(Iterables.size(catalogReferences.getReferences()), 1, String.format(MUST_EXIST_FMT, catalogName, "Catalog"));
catalogRef = Iterables.getOnlyElement(catalogReferences.getReferences());
catalog = catalogClient.getCatalog(catalogRef);
Checks.checkAdminCatalog(catalog); Checks.checkAdminCatalog(catalog);
} }