Repository: jclouds-labs-google Updated Branches: refs/heads/master a7c90e7fb -> b29a00e69
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-labs-google/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/commit/b29a00e6 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/tree/b29a00e6 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/diff/b29a00e6 Branch: refs/heads/master Commit: b29a00e69aa399679a2441b0731fc96d514447ef Parents: a7c90e7 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-labs-google/blob/b29a00e6/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/blobstore/integration/GoogleCloudStorageContainerIntegrationLiveTest.java ---------------------------------------------------------------------- diff --git a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/blobstore/integration/GoogleCloudStorageContainerIntegrationLiveTest.java b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/blobstore/integration/GoogleCloudStorageContainerIntegrationLiveTest.java index c129ae8..d4f5fb8 100644 --- a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/blobstore/integration/GoogleCloudStorageContainerIntegrationLiveTest.java +++ b/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-labs-google/blob/b29a00e6/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/blobstore/integration/GoogleCloudStorageContainerLiveTest.java ---------------------------------------------------------------------- diff --git a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/blobstore/integration/GoogleCloudStorageContainerLiveTest.java b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/blobstore/integration/GoogleCloudStorageContainerLiveTest.java index 490ee35..559713b 100644 --- a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/blobstore/integration/GoogleCloudStorageContainerLiveTest.java +++ b/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"); - } }
