Repository: jclouds-labs Updated Branches: refs/heads/master 1c4c925ba -> c005ff7d0
Use an image known to exist in all regions in the DigitalOcean Live tests Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/c005ff7d Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/c005ff7d Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/c005ff7d Branch: refs/heads/master Commit: c005ff7d08332a1e32d5f75bd9442f6b15d45c16 Parents: 1c4c925 Author: Ignasi Barrera <[email protected]> Authored: Fri Oct 17 12:42:13 2014 +0200 Committer: Ignasi Barrera <[email protected]> Committed: Fri Oct 17 15:58:16 2014 +0200 ---------------------------------------------------------------------- .../internal/BaseDigitalOceanLiveTest.java | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/c005ff7d/digitalocean/src/test/java/org/jclouds/digitalocean/internal/BaseDigitalOceanLiveTest.java ---------------------------------------------------------------------- diff --git a/digitalocean/src/test/java/org/jclouds/digitalocean/internal/BaseDigitalOceanLiveTest.java b/digitalocean/src/test/java/org/jclouds/digitalocean/internal/BaseDigitalOceanLiveTest.java index 076d551..366a95b 100644 --- a/digitalocean/src/test/java/org/jclouds/digitalocean/internal/BaseDigitalOceanLiveTest.java +++ b/digitalocean/src/test/java/org/jclouds/digitalocean/internal/BaseDigitalOceanLiveTest.java @@ -16,9 +16,7 @@ */ package org.jclouds.digitalocean.internal; -import static com.google.common.collect.Iterables.filter; -import static com.google.common.collect.Lists.newArrayList; -import static org.testng.Assert.assertFalse; +import static com.google.common.base.Preconditions.checkNotNull; import static org.testng.Assert.assertTrue; import java.util.List; @@ -43,9 +41,9 @@ public class BaseDigitalOceanLiveTest extends BaseApiLiveTest<DigitalOceanApi> { protected static final int DEFAULT_TIMEOUT_SECONDS = 600; protected static final int DEFAULT_POLL_SECONDS = 1; + protected static final String DEFAULT_IMAGE = "ubuntu-14-04-x64"; protected List<Size> sizes; - protected List<Image> images; protected List<Region> regions; protected Size defaultSize; @@ -59,20 +57,15 @@ public class BaseDigitalOceanLiveTest extends BaseApiLiveTest<DigitalOceanApi> { protected void initializeImageSizeAndRegion() { sizes = sortedSizes().sortedCopy(api.getSizesApi().list()); regions = api.getRegionApi().list(); - images = newArrayList(filter(api.getImageApi().list(), new Predicate<Image>() { - @Override - public boolean apply(Image input) { - return input.isPublicImage(); - } - })); assertTrue(sizes.size() > 1, "There must be at least two sizes"); assertTrue(regions.size() > 1, "There must be at least two regions"); - assertFalse(images.isEmpty(), "Image list should not be empty"); + + defaultImage = api.getImageApi().get(DEFAULT_IMAGE); + checkNotNull(defaultImage, "Image %s not found", DEFAULT_IMAGE); defaultSize = sizes.get(0); defaultRegion = regions.get(0); - defaultImage = images.get(0); } protected void waitForEvent(Integer eventId) {
