Apache/jclouds
1
0
Fork 0
mirror of https://github.com/apache/jclouds.git synced 2025-02-26 12:35:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Issue 830 vcloud-director: re-enable fixed tests, except for VAppClientExpectTest

Browse Source
This commit is contained in:
Aled Sage 2012-03-15 12:48:01 +00:00
parent 50c7cf62b2
commit f307308ca6
5 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminCatalogClientExpectTest.java
View File

@ -74,7 +74,7 @@ public class AdminCatalogClientExpectTest extends BaseVCloudDirectorRestClientEx
assertEquals(client.getAdminCatalogClient().createCatalog(catalogRef.getHref(), source), expected);
}
@Test(enabled = false)//TODO
@Test
public void testGetCatalog() {
VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse,
new VcloudHttpRequestPrimer()
@ -104,7 +104,7 @@ public class AdminCatalogClientExpectTest extends BaseVCloudDirectorRestClientEx
assertEquals(client.getAdminCatalogClient().getCatalog(catalogRef.getHref()), expected);
}
@Test(enabled = false)//TODO
@Test
public void testModifyCatalog() {
VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse,
new VcloudHttpRequestPrimer()
@ -121,7 +121,7 @@ public class AdminCatalogClientExpectTest extends BaseVCloudDirectorRestClientEx
assertEquals(client.getAdminCatalogClient().updateCatalog(catalogRef.getHref(), expected), expected);
}
@Test(enabled = false)//TODO
@Test
public void testGetOwner() {
VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse,
new VcloudHttpRequestPrimer()

10
labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/MediaClientExpectTest.java
View File

@ -50,7 +50,7 @@ import com.google.common.collect.ImmutableSet;
@Test(groups = { "unit", "media" }, singleThreaded = true, testName = "MediaClientExpectTest")
public class MediaClientExpectTest extends BaseVCloudDirectorRestClientExpectTest {
@Test(enabled = false)//TODO
@Test
public void testCreateMedia() {
URI uploadLink = URI.create(endpoint + "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/media");
@ -76,7 +76,7 @@ public class MediaClientExpectTest extends BaseVCloudDirectorRestClientExpectTes
assertEquals(client.getMediaClient().createMedia(uploadLink, source), expected);
}
@Test(enabled = false)//TODO
@Test
public void testCloneMedia() {
URI cloneUri = URI.create(endpoint + "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/action/cloneMedia");
@ -106,7 +106,7 @@ public class MediaClientExpectTest extends BaseVCloudDirectorRestClientExpectTes
assertEquals(client.getMediaClient().cloneMedia(cloneUri, params), expected);
}
@Test(enabled = false)//TODO
@Test
public void testGetMedia() {
URI mediaUri = URI.create(endpoint + "/media/794eb334-754e-4917-b5a0-5df85cbd61d1");
@ -210,7 +210,7 @@ public class MediaClientExpectTest extends BaseVCloudDirectorRestClientExpectTes
}
}
@Test(enabled = false)//TODO
@Test
public void testUpdateMedia() {
URI mediaUri = URI.create(endpoint + "/media/794eb334-754e-4917-b5a0-5df85cbd61d1");
@ -344,7 +344,7 @@ public class MediaClientExpectTest extends BaseVCloudDirectorRestClientExpectTes
assertEquals(client.getMediaClient().getMetadataClient().deleteMetadataEntry(mediaUri, "key"), expectedTask);
}
@Test(enabled = false)//TODO
@Test
public void testGetOwner() {
URI mediaUri = URI.create(endpoint + "/media/794eb334-754e-4917-b5a0-5df85cbd61d1");

2
labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/QueryClientExpectTest.java
View File

@ -120,7 +120,7 @@ public class QueryClientExpectTest extends BaseVCloudDirectorRestClientExpectTes
assertEquals(client.getQueryClient().catalogsQueryAll(), expected);
}
@Test(enabled = false)//TODO
@Test
public void testQueryAllCatalogReferences() {
HttpRequest queryRequest = HttpRequest.builder()
.method("GET")

10
labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateClientExpectTest.java
View File

@ -80,7 +80,7 @@ public class VAppTemplateClientExpectTest extends BaseVCloudDirectorRestClientEx
TimeZone.setDefault(TimeZone.getTimeZone("America/Los_Angeles"));
}
@Test(enabled = false)//TODO
@Test
public void testVAppTemplate() {
final String templateId = "/vAppTemplate/vappTemplate-ef4415e6-d413-4cbb-9262-f9bbec5f2ea9";
URI uri = URI.create(endpoint + templateId);
@ -118,8 +118,7 @@ public class VAppTemplateClientExpectTest extends BaseVCloudDirectorRestClientEx
client.getVAppTemplate(uri);
}
//TODO
@Test(enabled = false, expectedExceptions = VCloudDirectorException.class)
@Test(expectedExceptions = VCloudDirectorException.class)
public void testErrorEditVAppTemplate() {
final String templateId = "/vAppTemplate/vappTemplate-ef4415e6-d413-4cbb-9262-f9bbec5f2ea9";
URI uri = URI.create(endpoint + templateId);
@ -254,7 +253,7 @@ public class VAppTemplateClientExpectTest extends BaseVCloudDirectorRestClientEx
client.relocateVappTemplate(uri, params);
}
@Test(enabled = false)//TODO
@Test
public void testCustomizationSection() {
final String templateId = "/vAppTemplate/vappTemplate-ef4415e6-d413-4cbb-9262-f9bbec5f2ea9";
URI uri = URI.create(endpoint + templateId);
@ -275,8 +274,7 @@ public class VAppTemplateClientExpectTest extends BaseVCloudDirectorRestClientEx
assertNotNull(task);
}
//TODO
@Test(enabled = false, expectedExceptions = VCloudDirectorException.class)
@Test(expectedExceptions = VCloudDirectorException.class)
public void testErrorGetCustomizationSection() {
final String templateId = "/vAppTemplate/vappTemplate-ef4415e6-d413-4cbb-9262-f9bbec5f2ea9";
URI uri = URI.create(endpoint + templateId);

4
labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VdcClientExpectTest.java
View File

@ -293,7 +293,7 @@ public class VdcClientExpectTest extends BaseVCloudDirectorRestClientExpectTest
assertEquals(client.getVdcClient().uploadVAppTemplate(vdcURI, params), expected);
}
@Test(enabled = false)//TODO
@Test
public void testCreateMedia() {
URI vdcUri = URI.create(endpoint + "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f");
@ -319,7 +319,7 @@ public class VdcClientExpectTest extends BaseVCloudDirectorRestClientExpectTest
assertEquals(client.getVdcClient().createMedia(vdcUri, source), expected);
}
@Test(enabled = false)//TODO
@Test
public void testCloneMedia() {
URI vdcUri = URI.create(endpoint + "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f");