Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated to new providers, removed unnecessary property 'blobs' and 'sequential' -> 'singleThreaded' in @Test

This commit is contained in:
Andrew Phillips 2011-05-29 19:49:14 +01:00
parent 6524390f4b
commit 785ad0699d
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/integration/TweetStoreLiveTest.java
View File

@ -62,7 +62,7 @@ import com.google.inject.Module;
* *
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = "live", sequential = true) @Test(groups = "live", singleThreaded = true)
public class TweetStoreLiveTest { public class TweetStoreLiveTest {
GoogleDevServer server; GoogleDevServer server;
@ -70,19 +70,17 @@ public class TweetStoreLiveTest {
private Map<String, BlobStoreContext> contexts; private Map<String, BlobStoreContext> contexts;
private String container; private String container;
private static final String blobs = System.getProperty("jclouds.tweetstore.blobstores", private static final Iterable<String> blobstores =
"cloudfiles,googlestorage,s3,azureblob"); Splitter.on(',').split(System.getProperty("jclouds.tweetstore.blobstores",
private static final Iterable<String> blobstores = Splitter.on(',').split(blobs); "cloudfiles-us,aws-s3,azureblob"));
private static final Properties props = new Properties(); private static final Properties props = new Properties();
@BeforeTest @BeforeTest
void clearAndCreateContainers() throws InterruptedException, ExecutionException, TimeoutException, IOException, void clearAndCreateContainers() throws InterruptedException, ExecutionException, TimeoutException, IOException,
TwitterException { TwitterException {
container = checkNotNull(System.getProperty(PROPERTY_TWEETSTORE_CONTAINER)); container = checkNotNull(System.getProperty(PROPERTY_TWEETSTORE_CONTAINER), PROPERTY_TWEETSTORE_CONTAINER);
props.setProperty(PROPERTY_TWEETSTORE_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)); props.setProperty(SpringServletConfig.PROPERTY_BLOBSTORE_CONTEXTS, Joiner.on(',').join(blobstores));
// put all identity/credential pairs into the client // put all identity/credential pairs into the client

16
demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/integration/TweetStoreLiveTest.java
View File

@ -63,26 +63,24 @@ import com.google.inject.Module;
* *
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = "live", sequential = true) @Test(groups = "live", singleThreaded = true)
public class TweetStoreLiveTest { public class TweetStoreLiveTest {
GoogleDevServer server; GoogleDevServer server;
private URL url; private URL url;
private Map<String, BlobStoreContext> contexts; private Map<String, BlobStoreContext> contexts;
private String container; private String container;
private static final String blobs = System.getProperty("jclouds.tweetstore.blobstores", private static final Iterable<String> blobstores =
"cloudfiles,googlestorage,s3,azureblob"); Splitter.on(',').split(System.getProperty("jclouds.tweetstore.blobstores",
private static final Iterable<String> blobstores = Splitter.on(',').split(blobs); "cloudfiles-us,aws-s3,azureblob"));
private static final Properties props = new Properties(); private static final Properties props = new Properties();
@BeforeTest @BeforeTest
void clearAndCreateContainers() throws InterruptedException, ExecutionException, TimeoutException, IOException, void clearAndCreateContainers() throws InterruptedException, ExecutionException, TimeoutException, IOException,
TwitterException { TwitterException {
container = checkNotNull(System.getProperty(PROPERTY_TWEETSTORE_CONTAINER)); container = checkNotNull(System.getProperty(PROPERTY_TWEETSTORE_CONTAINER),
PROPERTY_TWEETSTORE_CONTAINER);
props.setProperty(PROPERTY_TWEETSTORE_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)); props.setProperty(GuiceServletConfig.PROPERTY_BLOBSTORE_CONTEXTS, Joiner.on(',').join(blobstores));
// put all identity/credential pairs into the client // put all identity/credential pairs into the client