[infinispan-commits] Infinispan SVN: r1474 - in trunk/cachestore/cloud: src/integrationtest/java/org/infinispan/loaders/cloud and 1 other directory.

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2010-02-09 07:43:16 -0500 (Tue, 09 Feb 2010)
New Revision: 1474

Modified:
   trunk/cachestore/cloud/README.txt
   trunk/cachestore/cloud/pom.xml
   trunk/cachestore/cloud/src/integrationtest/java/org/infinispan/loaders/cloud/CloudCacheStoreIntegrationTest.java
Log:
Updated integration tests

Modified: trunk/cachestore/cloud/README.txt
===================================================================
--- trunk/cachestore/cloud/README.txt	2010-02-09 11:54:37 UTC (rev 1473)
+++ trunk/cachestore/cloud/README.txt	2010-02-09 12:43:16 UTC (rev 1474)
@@ -1,3 +1,3 @@
- mvn test -Dtest=CloudCacheStoreFunctionalIntegrationTest -Dinfinispan.jclouds.username=$S3_USER -Dinfinispan.jclouds.password=$S3_PWD -Dinfinispan.jclouds.service=s3
- mvn test -Dtest=CloudCacheStoreFunctionalIntegrationTest -Dinfinispan.jclouds.username=$RACKSPACE_USER -Dinfinispan.jclouds.password=$RACKSPACE_PWD -Dinfinispan.jclouds.service=cloudfiles
- mvn test -Dtest=CloudCacheStoreFunctionalIntegrationTest -Dinfinispan.jclouds.username=$AZURE_USER -Dinfinispan.jclouds.password=$AZURE_PWD -Dinfinispan.jclouds.service=azureblob
+ mvn -Pintegration test -Dinfinispan.jclouds.username=$S3_USER -Dinfinispan.jclouds.password=$S3_PWD -Dinfinispan.jclouds.service=s3
+ mvn -Pintegration test -Dinfinispan.jclouds.username=$RACKSPACE_USER -Dinfinispan.jclouds.password=$RACKSPACE_PWD -Dinfinispan.jclouds.service=cloudfiles
+ mvn -Pintegration test -Dinfinispan.jclouds.username=$AZURE_USER -Dinfinispan.jclouds.password=$AZURE_PWD -Dinfinispan.jclouds.service=azureblob

Modified: trunk/cachestore/cloud/pom.xml
===================================================================
--- trunk/cachestore/cloud/pom.xml	2010-02-09 11:54:37 UTC (rev 1473)
+++ trunk/cachestore/cloud/pom.xml	2010-02-09 12:43:16 UTC (rev 1474)
@@ -14,8 +14,7 @@
    <description>Infinispan CloudCacheStore module</description>
 
    <properties>
-      <jclouds.aws.accesskeyid></jclouds.aws.accesskeyid>
-      <jclouds.aws.secretaccesskey></jclouds.aws.secretaccesskey>
+      <test.src.dir>src/test/java</test.src.dir>
       <version.jclouds>1.0-SNAPSHOT</version.jclouds>
    </properties>
 
@@ -84,6 +83,7 @@
    </repositories>
 
    <build>
+      <testSourceDirectory>${test.src.dir}</testSourceDirectory>
       <plugins>
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
@@ -110,4 +110,16 @@
          </plugin>
       </plugins>
    </build>
+
+   <profiles>
+      <profile>
+         <id>integration</id>
+         <activation>
+            <activeByDefault>false</activeByDefault>
+         </activation>
+         <properties>
+            <test.src.dir>src/integrationtest/java</test.src.dir>
+         </properties>
+      </profile>
+   </profiles>
 </project>

Modified: trunk/cachestore/cloud/src/integrationtest/java/org/infinispan/loaders/cloud/CloudCacheStoreIntegrationTest.java
===================================================================
--- trunk/cachestore/cloud/src/integrationtest/java/org/infinispan/loaders/cloud/CloudCacheStoreIntegrationTest.java	2010-02-09 11:54:37 UTC (rev 1473)
+++ trunk/cachestore/cloud/src/integrationtest/java/org/infinispan/loaders/cloud/CloudCacheStoreIntegrationTest.java	2010-02-09 12:43:16 UTC (rev 1474)
@@ -86,9 +86,7 @@
       cfg.setSecure(isSecure);
       cfg.setMaxConnections(maxConnections);
       cfg.setPurgeSynchronously(true); // for more accurate unit testing
-      StubBlobStoreContextBuilder cb = new StubBlobStoreContextBuilder();
-      BlobStoreContext ctx = cb.buildBlobStoreContext();
-      cs.init(cfg, new CacheDelegate("aName"), getMarshaller(), ctx, ctx.getBlobStore(), ctx.getAsyncBlobStore(), false);
+      cs.init(cfg, new CacheDelegate("aName"), getMarshaller());
       cs.start();
       return cs;
    }