From 785ad0699d760ab8e5b02983ac9cfdb2f2e9362b Mon Sep 17 00:00:00 2001 From: Andrew Phillips Date: Sun, 29 May 2011 19:49:14 +0100 Subject: [PATCH] Updated to new providers, removed unnecessary property 'blobs' and 'sequential' -> 'singleThreaded' in @Test --- .../integration/TweetStoreLiveTest.java | 14 ++++++-------- .../integration/TweetStoreLiveTest.java | 16 +++++++--------- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/integration/TweetStoreLiveTest.java b/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/integration/TweetStoreLiveTest.java index d3f43e7a02..a76f004412 100644 --- a/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/integration/TweetStoreLiveTest.java +++ b/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/integration/TweetStoreLiveTest.java @@ -62,7 +62,7 @@ import com.google.inject.Module; * * @author Adrian Cole */ -@Test(groups = "live", sequential = true) +@Test(groups = "live", singleThreaded = true) public class TweetStoreLiveTest { GoogleDevServer server; @@ -70,19 +70,17 @@ public class TweetStoreLiveTest { private Map contexts; private String container; - private static final String blobs = System.getProperty("jclouds.tweetstore.blobstores", - "cloudfiles,googlestorage,s3,azureblob"); - private static final Iterable blobstores = Splitter.on(',').split(blobs); + private static final Iterable blobstores = + Splitter.on(',').split(System.getProperty("jclouds.tweetstore.blobstores", + "cloudfiles-us,aws-s3,azureblob")); private static final Properties props = new Properties(); @BeforeTest void clearAndCreateContainers() throws InterruptedException, ExecutionException, TimeoutException, IOException, TwitterException { - container = checkNotNull(System.getProperty(PROPERTY_TWEETSTORE_CONTAINER)); - - props.setProperty(PROPERTY_TWEETSTORE_CONTAINER, - checkNotNull(System.getProperty(PROPERTY_TWEETSTORE_CONTAINER), PROPERTY_TWEETSTORE_CONTAINER)); + container = checkNotNull(System.getProperty(PROPERTY_TWEETSTORE_CONTAINER), PROPERTY_TWEETSTORE_CONTAINER); + props.setProperty(PROPERTY_TWEETSTORE_CONTAINER, container); props.setProperty(SpringServletConfig.PROPERTY_BLOBSTORE_CONTEXTS, Joiner.on(',').join(blobstores)); // put all identity/credential pairs into the client diff --git a/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/integration/TweetStoreLiveTest.java b/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/integration/TweetStoreLiveTest.java index 7bda7b5d6b..772d891934 100755 --- a/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/integration/TweetStoreLiveTest.java +++ b/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/integration/TweetStoreLiveTest.java @@ -63,26 +63,24 @@ import com.google.inject.Module; * * @author Adrian Cole */ -@Test(groups = "live", sequential = true) +@Test(groups = "live", singleThreaded = true) public class TweetStoreLiveTest { - GoogleDevServer server; private URL url; private Map contexts; private String container; - private static final String blobs = System.getProperty("jclouds.tweetstore.blobstores", - "cloudfiles,googlestorage,s3,azureblob"); - private static final Iterable blobstores = Splitter.on(',').split(blobs); + private static final Iterable blobstores = + Splitter.on(',').split(System.getProperty("jclouds.tweetstore.blobstores", + "cloudfiles-us,aws-s3,azureblob")); private static final Properties props = new Properties(); @BeforeTest void clearAndCreateContainers() throws InterruptedException, ExecutionException, TimeoutException, IOException, TwitterException { - container = checkNotNull(System.getProperty(PROPERTY_TWEETSTORE_CONTAINER)); - - props.setProperty(PROPERTY_TWEETSTORE_CONTAINER, - checkNotNull(System.getProperty(PROPERTY_TWEETSTORE_CONTAINER), PROPERTY_TWEETSTORE_CONTAINER)); + container = checkNotNull(System.getProperty(PROPERTY_TWEETSTORE_CONTAINER), + PROPERTY_TWEETSTORE_CONTAINER); + props.setProperty(PROPERTY_TWEETSTORE_CONTAINER, container); props.setProperty(GuiceServletConfig.PROPERTY_BLOBSTORE_CONTEXTS, Joiner.on(',').join(blobstores)); // put all identity/credential pairs into the client