SAK-29519 - Fix Swift tests

* Fix package name * Disable tests by default * Add swift-tests profile to enable tests * Add a properties file to configure Swift account * Update README
DaweiXia · Jul 2, 2015 · 453c281 · 453c281
1 parent 8b4af01
commit 453c281
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 7 deletions.
diff --git a/cloud-content/README.md b/cloud-content/README.md
@@ -77,3 +77,14 @@ bodyPathDeleted@org.sakaiproject.content.api.ContentHostingService=/content/dele
 If you are not familiar with `sakai-configuration.xml`, it is placed in the same location
 as the properties files. See Confluence for an overview:
 [https://confluence.sakaiproject.org/display/REL/More+Flexible+Sakai+Configuration](More Flexible Sakai Configuration)
+
+
+## Testing
+
+Because the tests work against a real backend, they are disabled by default. To
+run them, you must activate the `swift-tests` profile (e.g.,
+`mvn -Pswift-tests install`) and set your configuration. The settings for the
+Swift tests is in `impl/src/test/resources/swift.properties`. These are
+straightforward and align with the names/values needed for real usage. The
+tests will clean up after themselves unless `deleteEmptyContainers` is set to
+false, which can be used to validate content in a container afterward.
diff --git a/cloud-content/impl/pom.xml b/cloud-content/impl/pom.xml
@@ -71,5 +71,34 @@
   <build>
     <sourceDirectory>src/main/java</sourceDirectory>
     <testSourceDirectory>src/test/java</testSourceDirectory>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.4.2</version>
+        <configuration>
+          <skipTests>true</skipTests>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
+
+  <profiles>
+    <profile>
+      <id>swift-tests</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <version>2.4.2</version>
+            <configuration>
+              <skipTests>false</skipTests>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
 </project>
diff --git a/...lab/sakai/swift/SwiftFileHandlerTest.java → ...ai/cloudcontent/SwiftFileHandlerTest.java b/...lab/sakai/swift/SwiftFileHandlerTest.java → ...ai/cloudcontent/SwiftFileHandlerTest.java
@@ -1,11 +1,12 @@
-package coza.opencollab.sakai.swift;
+package coza.opencollab.sakai.cloudcontent;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.lang.reflect.Method;
+import java.util.Properties;
 import java.util.Random;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -41,13 +42,23 @@ public SwiftFileHandlerTest() {
     }
 
     @BeforeClass
-    public static void setUpClass() {
-        swift.setEndpoint("http://196.252.231.49:35357/v2.0/");
-        swift.setRegion("regionOne");
-        swift.setIdentity("OC:ocsakai");
-        swift.setCredential("00sakai99");
-        swift.setDeleteEmptyContainers(true);
+    public static void setUpClass() throws IOException {
+        Properties props = new Properties();
+        try {
+            props.load(SwiftFileHandlerTest.class.getResourceAsStream("/swift.properties"));
+        } catch(IOException e) {
+            System.out.println("Cannot read Swift configuration (src/test/resources/swift.properties)... Bailing out.");
+            throw e;
+        }
+
+        swift.setEndpoint(props.getProperty("endpoint"));
+        swift.setRegion(props.getProperty("region"));
+        swift.setIdentity(props.getProperty("identity"));
+        swift.setCredential(props.getProperty("credential"));
+        swift.setDeleteEmptyContainers(Boolean.valueOf(props.getProperty("deleteEmptyContainers")));
+
         swift.init();
+
         Random r = new Random(System.currentTimeMillis());
         r.nextBytes(BINARY);
     }

diff --git a/cloud-content/impl/src/test/resources/swift.properties b/cloud-content/impl/src/test/resources/swift.properties
@@ -0,0 +1,5 @@
+endpoint=http://127.0.0.1:35357/v2.0/
+region=RegionOne
+identity=tenant:user
+credential=password
+deleteEmptyContainers=true