Move the skipped tests. Since the delimiter and prefix tests were moved to BaseContainerIntegrationTest (from BaseContainerLiveTest), need to do the same for google.
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/428d9095 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/428d9095 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/428d9095 Branch: refs/heads/master Commit: 428d909562af035206fc4ce168bafb4b2835903e Parents: e492ba6 Author: Timur Alperovich <[email protected]> Authored: Tue Jul 14 15:06:16 2015 -0700 Committer: Timur Alperovich <[email protected]> Committed: Tue Jul 14 15:06:16 2015 -0700 ---------------------------------------------------------------------- .../GoogleCloudStorageContainerIntegrationLiveTest.java | 10 ++++++++++ .../integration/GoogleCloudStorageContainerLiveTest.java | 11 ----------- 2 files changed, 10 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/428d9095/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/blobstore/integration/GoogleCloudStorageContainerIntegrationLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/blobstore/integration/GoogleCloudStorageContainerIntegrationLiveTest.java b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/blobstore/integration/GoogleCloudStorageContainerIntegrationLiveTest.java index c129ae8..d4f5fb8 100644 --- a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/blobstore/integration/GoogleCloudStorageContainerIntegrationLiveTest.java +++ b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/blobstore/integration/GoogleCloudStorageContainerIntegrationLiveTest.java @@ -105,4 +105,14 @@ public class GoogleCloudStorageContainerIntegrationLiveTest extends BaseContaine public void testListMarkerAfterLastKey() throws Exception { throw new SkipException("cannot specify arbitrary markers"); } + + @Override + public void testContainerListWithPrefix() { + throw new SkipException("Prefix option has not been plumbed down to GCS"); + } + + @Override + public void testDelimiterList() { + throw new SkipException("Prefix option has not been plumbed down to GCS"); + } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/428d9095/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/blobstore/integration/GoogleCloudStorageContainerLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/blobstore/integration/GoogleCloudStorageContainerLiveTest.java b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/blobstore/integration/GoogleCloudStorageContainerLiveTest.java index 490ee35..559713b 100644 --- a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/blobstore/integration/GoogleCloudStorageContainerLiveTest.java +++ b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/blobstore/integration/GoogleCloudStorageContainerLiveTest.java @@ -20,7 +20,6 @@ import java.util.Properties; import org.jclouds.blobstore.integration.internal.BaseContainerLiveTest; import org.jclouds.googlecloud.internal.TestProperties; -import org.testng.SkipException; import org.testng.annotations.Test; @Test(groups = { "live" }) @@ -34,14 +33,4 @@ public class GoogleCloudStorageContainerLiveTest extends BaseContainerLiveTest { TestProperties.setGoogleCredentialsFromJson(provider); return TestProperties.apply(provider, super.setupProperties()); } - - @Override - public void testContainerListWithPrefix() { - throw new SkipException("Prefix option has not been plumbed down to GCS"); - } - - @Override - public void testDelimiterList() { - throw new SkipException("Prefix option has not been plumbed down to GCS"); - } }
