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

fixed the tests

This commit is contained in:
Alex Yarmula 2010-04-08 13:49:50 -07:00
parent 214aee6626
commit d4d9d76388
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
aws/core/src/main/java/org/jclouds/aws/ec2/compute/functions/ImageParser.java
View File

@ -60,7 +60,11 @@ public class ImageParser implements Function<org.jclouds.aws.ec2.domain.Image, I
@Inject @Inject
private PopulateDefaultLoginCredentialsForImageStrategy authenticator; private PopulateDefaultLoginCredentialsForImageStrategy authenticator;
@Override public void setAuthenticator(PopulateDefaultLoginCredentialsForImageStrategy authenticator) {
this.authenticator = authenticator;
}
@Override
public Image apply(org.jclouds.aws.ec2.domain.Image from) { public Image apply(org.jclouds.aws.ec2.domain.Image from) {
if (from.getImageLocation().indexOf("test") != -1) { if (from.getImageLocation().indexOf("test") != -1) {
logger.trace("skipping test image(%s)", from.getId()); logger.trace("skipping test image(%s)", from.getId());

3
aws/core/src/test/java/org/jclouds/aws/ec2/functions/ImageParserTest.java
View File

@ -28,6 +28,7 @@ import java.util.Set;
import org.jclouds.aws.domain.Region; import org.jclouds.aws.domain.Region;
import org.jclouds.aws.ec2.compute.functions.ImageParser; import org.jclouds.aws.ec2.compute.functions.ImageParser;
import org.jclouds.aws.ec2.compute.strategy.EC2PopulateDefaultLoginCredentialsForImageStrategy;
import org.jclouds.aws.ec2.domain.Image; import org.jclouds.aws.ec2.domain.Image;
import org.jclouds.aws.ec2.xml.DescribeImagesResponseHandler; import org.jclouds.aws.ec2.xml.DescribeImagesResponseHandler;
import org.jclouds.compute.domain.OsFamily; import org.jclouds.compute.domain.OsFamily;
@ -52,6 +53,7 @@ public class ImageParserTest extends BaseHandlerTest {
assertEquals(result.size(), 6); assertEquals(result.size(), 6);
ImageParser parser = new ImageParser(); ImageParser parser = new ImageParser();
parser.setAuthenticator(new EC2PopulateDefaultLoginCredentialsForImageStrategy());
org.jclouds.compute.domain.Image ubuntuHardy = parser.apply(Iterables.get(result, 0)); org.jclouds.compute.domain.Image ubuntuHardy = parser.apply(Iterables.get(result, 0));
assertEquals(ubuntuHardy.getArchitecture(), org.jclouds.compute.domain.Architecture.X86_32); assertEquals(ubuntuHardy.getArchitecture(), org.jclouds.compute.domain.Architecture.X86_32);
@ -125,6 +127,7 @@ public class ImageParserTest extends BaseHandlerTest {
Set<Image> result = parseImages(is); Set<Image> result = parseImages(is);
ImageParser parser = new ImageParser(); ImageParser parser = new ImageParser();
parser.setAuthenticator(new EC2PopulateDefaultLoginCredentialsForImageStrategy());
org.jclouds.compute.domain.Image image = parser.apply(Iterables.get(result, 0)); org.jclouds.compute.domain.Image image = parser.apply(Iterables.get(result, 0));