commit 345368feb0f6e1496e25fb37a8ba6f3655a1ef40
author Paul Castro <castrop@us.ibm.com> Tue Apr 18 22:11:09 2017 -0400
committer rodric rabbah <rodric@gmail.com> Tue Apr 18 22:11:09 2017 -0400
tree b46f634c5e12b186ff33a5399d4fad1528bf0461
parent f8bb6f73f8a285ce4a2203182fc1ff4c288494c6

Adds multiple file support for Swift actions with zip files. (#1993)

Also fixes bad redirect in build script.

tests/src/test/scala/actionContainers/SwiftActionContainerTests.scala

diff --git a/tests/src/test/scala/actionContainers/SwiftActionContainerTests.scala b/tests/src/test/scala/actionContainers/SwiftActionContainerTests.scala
index 3369e2a..a0c074d 100644
--- a/tests/src/test/scala/actionContainers/SwiftActionContainerTests.scala
+++ b/tests/src/test/scala/actionContainers/SwiftActionContainerTests.scala
@@ -214,6 +214,28 @@
         })
     }
 
+    it should "support support multiple files in a zip file" in {
+        val zip = new File(TestUtils.getTestActionFilename("multiSwift.zip")).toPath
+        val code = ResourceHelpers.readAsBase64(zip)
+
+        val (out, err) = withActionContainer() { c =>
+            val (initCode, initRes) = c.init(initPayload(code))
+            initCode should be(200)
+
+            val args = JsObject()
+            val (runCode, runRes) = c.run(runPayload(args))
+
+            runCode should be(200)
+            runRes.get shouldBe JsObject("greeting" -> (JsString("Hello stranger!")))
+        }
+
+        checkStreams(out, err, {
+            case (o, e) =>
+            	if (enforceEmptyOutputStream) o shouldBe empty
+                e shouldBe empty
+        })
+    }
+
     it should "support pre-compiled binary in a zip file" in {
         val zip = new File(TestUtils.getTestActionFilename("helloSwift.zip")).toPath
         val code = ResourceHelpers.readAsBase64(zip)
@@ -231,7 +253,7 @@
 
         checkStreams(out, err, {
             case (o, e) =>
-                o shouldBe empty
+                if (enforceEmptyOutputStream) o shouldBe empty
                 e shouldBe empty
         })
     }
@@ -301,7 +323,7 @@
 
         checkStreams(out, err, {
             case (o, e) =>
-                //o shouldBe empty
+                if (enforceEmptyOutputStream) o shouldBe empty
                 e shouldBe empty
         })
     }
@@ -328,7 +350,7 @@
 
         checkStreams(out, err, {
             case (o, e) =>
-                //o shouldBe empty
+                if (enforceEmptyOutputStream) o shouldBe empty
                 e shouldBe empty
         })
     }