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

Issue 440: corrected test properties in pom

This commit is contained in:
Adrian Cole 2011-01-04 14:59:02 +01:00
parent ada49c2b3b
commit bebd2eef75
3 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
apis/elb/pom.xml
View File

@ -38,6 +38,11 @@
<test.elb.apiversion>2010-07-01</test.elb.apiversion>
<test.elb.identity>${test.aws.identity}</test.elb.identity>
<test.elb.credential>${test.aws.credential}</test.elb.credential>
<test.elb.compute.provider>ec2</test.elb.compute.provider>
<test.elb.compute.endpoint>https://ec2.us-east-1.amazonaws.com</test.elb.compute.endpoint>
<test.elb.compute.apiversion>2010-06-15</test.elb.compute.apiversion>
<test.elb.compute.identity>${test.aws.identity}</test.elb.compute.identity>
<test.elb.compute.credential>${test.aws.credential}</test.elb.compute.credential>
</properties>
<dependencies>
@ -79,6 +84,12 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.16</version>
<scope>test</scope>
</dependency>
</dependencies>
<profiles>
@ -114,6 +125,26 @@
<name>test.elb.credential</name>
<value>${test.elb.credential}</value>
</property>
<property>
<name>test.elb.compute.provider</name>
<value>${test.elb.compute.provider}</value>
</property>
<property>
<name>test.elb.compute.endpoint</name>
<value>${test.elb.compute.endpoint}</value>
</property>
<property>
<name>test.elb.compute.apiversion</name>
<value>${test.elb.compute.apiversion}</value>
</property>
<property>
<name>test.elb.compute.identity</name>
<value>${test.elb.compute.identity}</value>
</property>
<property>
<name>test.elb.compute.credential</name>
<value>${test.elb.compute.credential}</value>
</property>
</systemProperties>
</configuration>
</execution>

2
apis/elb/src/test/java/org/jclouds/elb/ELBClientLiveTest.java
View File

@ -108,7 +108,7 @@ public class ELBClientLiveTest {
Region.AP_SOUTHEAST_1)) {
Set<? extends LoadBalancer> allResults = client.describeLoadBalancersInRegion(region);
assertNotNull(allResults);
assert (allResults.size() >= 1);
assert (allResults.size() >= 1) : region;
}
}

9
loadbalancer/src/test/java/org/jclouds/loadbalancer/BaseLoadBalancerServiceLiveTest.java
View File

@ -89,11 +89,10 @@ public abstract class BaseLoadBalancerServiceLiveTest {
apiversion = System.getProperty("test." + provider + ".apiversion");
computeProvider = checkNotNull(System.getProperty("test." + provider + ".compute.provider"), "test." + provider
+ ".compute.provider");
computeIdentity = checkNotNull(System.getProperty("test." + computeProvider + ".identity"), "test."
+ computeProvider + ".identity");
computeCredential = System.getProperty("test." + computeProvider + ".credential");
computeEndpoint = System.getProperty("test." + computeProvider + ".endpoint");
computeApiversion = System.getProperty("test." + computeProvider + ".apiversion");
computeIdentity = checkNotNull(System.getProperty("test." + provider + ".compute.identity"), "test." + provider + ".compute.identity");
computeCredential = System.getProperty("test." + provider + ".compute.credential");
computeEndpoint = System.getProperty("test." + provider + ".compute.endpoint");
computeApiversion = System.getProperty("test." + provider + ".compute.apiversion");
}
protected Properties setupProperties() {