diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminCatalogClientLiveTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminCatalogClientLiveTest.java index 6c9d092c0b..0d695b753b 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminCatalogClientLiveTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminCatalogClientLiveTest.java @@ -166,7 +166,7 @@ public class AdminCatalogClientLiveTest extends BaseVCloudDirectorClientLiveTest } @Test(testName = "POST /admin/catalog/{id}/action/publish", - dependsOnMethods = { "testUpdateCatalog" }, enabled = false ) // FIXME: fails with a 403 + dependsOnMethods = { "testUpdateCatalog" } ) // FIXME: fails with a 403 public void testPublishCatalog() { assertTrue(!catalog.isPublished(), String.format(OBJ_FIELD_EQ, CATALOG, "isPublished", false, catalog.isPublished())); diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminOrgClientLiveTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminOrgClientLiveTest.java index 7c974da702..2693458444 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminOrgClientLiveTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminOrgClientLiveTest.java @@ -167,9 +167,9 @@ public class AdminOrgClientLiveTest extends BaseVCloudDirectorClientLiveTest { } @Test(testName = "PUT /admin/org/{id}/settings/generalSettings", - dependsOnMethods = { "testGetGeneralSettings" }, enabled = false ) + dependsOnMethods = { "testGetGeneralSettings" } ) public void testUpdateGeneralSettings() { -// boolean canPublishCatalogs = generalSettings.canPublishCatalogs(); // FIXME: did not update + boolean canPublishCatalogs = generalSettings.canPublishCatalogs(); // FIXME: did not update Integer deployedVMQuota = generalSettings.getDeployedVMQuota(); Integer storedVmQuota = generalSettings.getStoredVmQuota(); boolean useServerBootSequence = generalSettings.useServerBootSequence(); @@ -177,7 +177,7 @@ public class AdminOrgClientLiveTest extends BaseVCloudDirectorClientLiveTest { try { newGeneralSettings = generalSettings.toBuilder() -// .canPublishCatalogs(!canPublishCatalogs) + .canPublishCatalogs(!canPublishCatalogs) .deployedVMQuota(deployedVMQuota+1) .storedVmQuota(storedVmQuota+1) .useServerBootSequence(!useServerBootSequence) @@ -187,9 +187,9 @@ public class AdminOrgClientLiveTest extends BaseVCloudDirectorClientLiveTest { generalSettings = orgClient.updateGeneralSettings( orgRef.getHref(), newGeneralSettings); -// assertTrue(equal(generalSettings.canPublishCatalogs(), !canPublishCatalogs), -// String.format(OBJ_FIELD_UPDATABLE, -// "generalSettings", "canPublishCatalogs")); + assertTrue(equal(generalSettings.canPublishCatalogs(), !canPublishCatalogs), + String.format(OBJ_FIELD_UPDATABLE, + "generalSettings", "canPublishCatalogs")); assertTrue(equal(generalSettings.getDeployedVMQuota(), deployedVMQuota+1), String.format(OBJ_FIELD_UPDATABLE, "generalSettings", "deployedVMQuota")); @@ -208,7 +208,7 @@ public class AdminOrgClientLiveTest extends BaseVCloudDirectorClientLiveTest { Checks.checkGeneralSettings(generalSettings); } finally { generalSettings = generalSettings.toBuilder() -// .canPublishCatalogs(canPublishCatalogs) + .canPublishCatalogs(canPublishCatalogs) .deployedVMQuota(deployedVMQuota) .storedVmQuota(storedVmQuota) .useServerBootSequence(useServerBootSequence) @@ -284,7 +284,7 @@ public class AdminOrgClientLiveTest extends BaseVCloudDirectorClientLiveTest { } @Test(testName = "PUT /admin/org/{id}/settings/vAppLeaseSettings", - dependsOnMethods = { "testGetVAppLeaseSettings" }, enabled = false) // FIXME: fails with 403 forbidden + dependsOnMethods = { "testGetVAppLeaseSettings" } ) // FIXME: fails with 403 forbidden public void testUpdateVAppLeaseSettings() { boolean deleteOnStorageLeaseExpiration = vAppLeaseSettings.deleteOnStorageLeaseExpiration(); Integer storageLeaseSeconds = vAppLeaseSettings.getStorageLeaseSeconds(); @@ -333,7 +333,7 @@ public class AdminOrgClientLiveTest extends BaseVCloudDirectorClientLiveTest { } @Test(testName = "PUT /admin/org/{id}/settings/vAppTemplateLeaseSettings", - dependsOnMethods = { "testGetVAppTemplateLeaseSettings" }, enabled = false) // FIXME: fails with 403 forbidden + dependsOnMethods = { "testGetVAppTemplateLeaseSettings" }) // FIXME: fails with 403 forbidden public void testUpdateVAppTemplateLeaseSettings() { boolean deleteOnStorageLeaseExpiration = vAppTemplateLeaseSettings.deleteOnStorageLeaseExpiration(); Integer storageLeaseSeconds = vAppTemplateLeaseSettings.getStorageLeaseSeconds(); @@ -386,8 +386,7 @@ public class AdminOrgClientLiveTest extends BaseVCloudDirectorClientLiveTest { "testUpdateVAppLeaseSettings", "testUpdateVAppTemplateLeaseSettings", "testUpdateEmailSettings", - "testUpdatePasswordPolicy"}, - enabled = false ) + "testUpdatePasswordPolicy"} ) public void testUpdateSettings() { try { newSettings = settings.toBuilder() diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminVdcClientLiveTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminVdcClientLiveTest.java index 60f34d787c..e6cfbfd1dc 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminVdcClientLiveTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminVdcClientLiveTest.java @@ -49,7 +49,7 @@ public class AdminVdcClientLiveTest extends BaseVCloudDirectorClientLiveTest { vdcClient = context.getApi().getAdminVdcClient(); } - @Test(testName = "GET /admin/vdc/{id}", enabled = false) + @Test(testName = "GET /admin/vdc/{id}") public void testGetNetwork() { // required for testing assertNotNull(vdcURI, String.format(REF_REQ_LIVE, VDC)); diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/CatalogClientLiveTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/CatalogClientLiveTest.java index 0fecf152fa..a6d3f819ad 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/CatalogClientLiveTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/CatalogClientLiveTest.java @@ -106,7 +106,7 @@ public class CatalogClientLiveTest extends BaseVCloudDirectorClientLiveTest { // NOTE for this test to work, we need to be able to upload a new vAppTemplate to a vDC first // NOTE we could do this with a test environment property -Dtest.vcloud-director.vappTemplateId=vapptemplate-abcd - @Test(testName = "POST /catalog/{id}/catalogItems", dependsOnMethods = { "testGetCatalog" }, enabled = false) + @Test(testName = "POST /catalog/{id}/catalogItems", dependsOnMethods = { "testGetCatalog" }) public void testAddCatalogItem() { CatalogItem editedCatalogItem = CatalogItem.builder() .name("newitem") @@ -121,7 +121,7 @@ public class CatalogClientLiveTest extends BaseVCloudDirectorClientLiveTest { assertEquals(newCatalogItem.getName(), "newitem"); } - @Test(testName = "PUT /catalogItem/{id}", dependsOnMethods = { "testAddCatalogItem" }, enabled = false) + @Test(testName = "PUT /catalogItem/{id}", dependsOnMethods = { "testAddCatalogItem" }) public void testUpdateCatalogItem() { CatalogType catalog = catalogClient.getCatalog(catalogRef.getHref()); newCatalogItemRef = Iterables.find(catalog.getCatalogItems().getCatalogItems(), new Predicate() { @@ -136,7 +136,7 @@ public class CatalogClientLiveTest extends BaseVCloudDirectorClientLiveTest { assertEquals(newCatalogItem.getName(), "UPDATEDNAME"); } - @Test(testName = "DELETE /catalogItem/{id}", dependsOnMethods = { "testAddCatalogItem" }, enabled = false) + @Test(testName = "DELETE /catalogItem/{id}", dependsOnMethods = { "testAddCatalogItem" }) public void testDeleteCatalogItem() { catalogClient.deleteCatalogItem(newCatalogItemRef.getHref()); try { @@ -150,14 +150,14 @@ public class CatalogClientLiveTest extends BaseVCloudDirectorClientLiveTest { } // NOTE for this test to work, we need to be able to create metadata on a Catalog, specifically { "KEY", "VALUE" } - @Test(testName = "GET /catalog/{id}/metadata", dependsOnMethods = { "testGetCatalog" }, enabled = false) + @Test(testName = "GET /catalog/{id}/metadata", dependsOnMethods = { "testGetCatalog" }) public void testGetCatalogMetadata() { catalogMetadata = catalogClient.getMetadataClient().getMetadata(catalogRef.getHref()); checkMetadata(catalogMetadata); } // NOTE for this test to work, we need to be able to create metadata on a Catalog, specifically { "KEY", "VALUE" } - @Test(testName = "GET /catalog/{id}/metadata/{key}", dependsOnMethods = { "testGetCatalogMetadata" }, enabled = false) + @Test(testName = "GET /catalog/{id}/metadata/{key}", dependsOnMethods = { "testGetCatalogMetadata" }) public void testGetCatalogMetadataValue() { MetadataEntry existingMetadataEntry = Iterables.find(catalogMetadata.getMetadataEntries(), new Predicate() { @Override diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/GroupClientLiveTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/GroupClientLiveTest.java index d77b44674e..d12b56f1e3 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/GroupClientLiveTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/GroupClientLiveTest.java @@ -66,7 +66,7 @@ public class GroupClientLiveTest extends BaseVCloudDirectorClientLiveTest { .build(); } - @Test(testName = "GET /admin/group/{id}", enabled = false) + @Test(testName = "GET /admin/group/{id}") public void testGetGroup() { assertNotNull(groupRef, String.format(REF_REQ_LIVE, "Group")); group = groupClient.getGroup(groupRef.getHref()); @@ -107,7 +107,7 @@ public class GroupClientLiveTest extends BaseVCloudDirectorClientLiveTest { } } - @Test(testName = "DELETE /admin/group/{id}", dependsOnMethods = { "testUpdateGroup" }, enabled = false ) + @Test(testName = "DELETE /admin/group/{id}", dependsOnMethods = { "testUpdateGroup" } ) public void testDeleteCatalog() { groupClient.deleteGroup(groupRef.getHref()); diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppClientLiveTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppClientLiveTest.java index 4922c2ef16..de25fae415 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppClientLiveTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppClientLiveTest.java @@ -421,7 +421,7 @@ public class VAppClientLiveTest extends BaseVCloudDirectorClientLiveTest { } // NOTE This test is disabled, as it is not possible to look up datastores using the User API - @Test(enabled = false, testName = "POST /vApp/{id}/action/relocate", dependsOnMethods = { "testGetVApp" }) + @Test(testName = "POST /vApp/{id}/action/relocate", dependsOnMethods = { "testGetVApp" }) public void testRelocate() { // Relocate to the last of the available datastores QueryResultRecords records = context.getApi().getQueryClient().queryAll("datastore"); diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateClientLiveTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateClientLiveTest.java index 9ff1abd415..94fb12d3fa 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateClientLiveTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateClientLiveTest.java @@ -177,7 +177,7 @@ public class VAppTemplateClientLiveTest extends BaseVCloudDirectorClientLiveTest Checks.checkMetadata(metadata); } - @Test(enabled=false) // implicitly tested by testEditVAppTemplateMetadataValue, which first creates the metadata entry; otherwise no entry may exist + @Test // implicitly tested by testEditVAppTemplateMetadataValue, which first creates the metadata entry; otherwise no entry may exist public void testGetMetadataValue() { Metadata metadata = vappTemplateClient.getVAppTemplateMetadata(vAppTemplateURI); MetadataEntry entry = Iterables.get(metadata.getMetadataEntries(), 0); @@ -476,7 +476,7 @@ public class VAppTemplateClientLiveTest extends BaseVCloudDirectorClientLiveTest // This failed previously, but is passing now. // However, it's not part of the official API so not necessary to assert it. - @Test(enabled = false) + @Test public void testCompletedTaskNotIncludedInVAppTemplate() throws Exception { // Kick off a task, and wait for it to complete vappTemplateClient.disableDownloadVappTemplate(vAppTemplateURI);