From 74891be16f7522becaba5e9a70d52644191da1e5 Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Thu, 15 Mar 2012 22:39:34 -0700 Subject: [PATCH] no need to check for writable catalog on vcloud 1.5 --- .../jclouds/vcloud/features/CatalogClientLiveTest.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/apis/vcloud/src/test/java/org/jclouds/vcloud/features/CatalogClientLiveTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/features/CatalogClientLiveTest.java index b9ea2a4eb8..adc2563eb8 100644 --- a/apis/vcloud/src/test/java/org/jclouds/vcloud/features/CatalogClientLiveTest.java +++ b/apis/vcloud/src/test/java/org/jclouds/vcloud/features/CatalogClientLiveTest.java @@ -20,6 +20,7 @@ package org.jclouds.vcloud.features; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertTrue; import org.jclouds.vcloud.VCloudMediaType; import org.jclouds.vcloud.domain.Org; @@ -42,8 +43,10 @@ public class CatalogClientLiveTest extends BaseVCloudClientLiveTest { } @Test - public void testFindCatalogIsWriteable() throws Exception { - // default catalog should be the public one, unless we are in vCloud 1.0.0 where public catalogs don't work - assertEquals(getVCloudApi().getCatalogClient().findCatalogInOrgNamed(null, null).isReadOnly(), buildVersion.startsWith("1.5")); + public void testFindCatalogIsWriteableIfNotVersion1_5() throws Exception { + // when we are in vCloud 1.0.0 public catalogs don't work, so our default + // catalog is private + if (!buildVersion.startsWith("1.5")) + assertTrue(getVCloudApi().getCatalogClient().findCatalogInOrgNamed(null, null).isReadOnly()); } } \ No newline at end of file