[incubator-openwhisk-cli] branch master updated: update commons-io to 2.6

[csantanapr]

This is an automated email from the ASF dual-hosted git repository.

csantanapr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-cli.git


The following commit(s) were added to refs/heads/master by this push:
     new 30b10b5  update commons-io to 2.6
30b10b5 is described below

commit 30b10b5cc8b38f7d6b3ce1c291926b629cb5420b
Author: Tyson Norris <tysonnor...@gmail.com>
AuthorDate: Fri Jan 12 13:54:34 2018 -0800

    update commons-io to 2.6
---
 tests/src/test/scala/system/basic/WskSdkTests.scala           | 5 +++--
 tests/src/test/scala/whisk/core/cli/test/WskConfigTests.scala | 7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/tests/src/test/scala/system/basic/WskSdkTests.scala 
b/tests/src/test/scala/system/basic/WskSdkTests.scala
index b36c823..87fe1f6 100644
--- a/tests/src/test/scala/system/basic/WskSdkTests.scala
+++ b/tests/src/test/scala/system/basic/WskSdkTests.scala
@@ -30,6 +30,7 @@ import common.TestUtils.SUCCESS_EXIT
 import common.Wsk
 import common.WskProps
 import common.WskTestHelpers
+import java.nio.charset.StandardCharsets
 
 @RunWith(classOf[JUnitRunner])
 class WskSdkTests extends TestHelpers with WskTestHelpers {
@@ -71,7 +72,7 @@ class WskSdkTests extends TestHelpers with WskTestHelpers {
       val dockerfile = new File(sdk, "Dockerfile")
       dockerfile.exists() should be(true)
       dockerfile.isFile() should be(true)
-      val lines = FileUtils.readLines(dockerfile)
+      val lines = FileUtils.readLines(dockerfile, StandardCharsets.UTF_8)
       // confirm that the image is correct
       lines.get(1) shouldBe "FROM openwhisk/dockerskeleton"
 
@@ -108,7 +109,7 @@ class WskSdkTests extends TestHelpers with WskTestHelpers {
     try {
       val stdout = wsk.cli(Seq("sdk", "install", "bashauto"), workingDir = 
dir, expectedExitCode = SUCCESS_EXIT).stdout
       stdout should include("is installed in the current directory")
-      val fileContent = FileUtils.readFileToString(scriptfile)
+      val fileContent = FileUtils.readFileToString(scriptfile, 
StandardCharsets.UTF_8)
       fileContent should include("bash completion for wsk")
     } finally {
       scriptfile.delete()
diff --git a/tests/src/test/scala/whisk/core/cli/test/WskConfigTests.scala 
b/tests/src/test/scala/whisk/core/cli/test/WskConfigTests.scala
index 220953b..f69ddd0 100644
--- a/tests/src/test/scala/whisk/core/cli/test/WskConfigTests.scala
+++ b/tests/src/test/scala/whisk/core/cli/test/WskConfigTests.scala
@@ -31,6 +31,7 @@ import common.TestUtils._
 import common.Wsk
 import common.WskProps
 import common.WskTestHelpers
+import java.nio.charset.StandardCharsets
 
 @RunWith(classOf[JUnitRunner])
 class WskConfigTests extends TestHelpers with WskTestHelpers {
@@ -356,7 +357,7 @@ class WskConfigTests extends TestHelpers with 
WskTestHelpers {
             val rr = wsk.cli(Seq("property", "set", "--apihost", apihost), env 
= env)
             rr.stdout.trim shouldBe s"ok: whisk API host set to $apihost"
             rr.stderr shouldBe 'empty
-            val fileContent = FileUtils.readFileToString(tmpwskprops)
+            val fileContent = FileUtils.readFileToString(tmpwskprops, 
StandardCharsets.UTF_8)
             fileContent should include(s"APIHOST=$apihost")
           }
         }
@@ -371,7 +372,7 @@ class WskConfigTests extends TestHelpers with 
WskTestHelpers {
     val env = Map("WSK_CONFIG_FILE" -> tmpwskprops.getAbsolutePath())
     wsk.cli(Seq("property", "set", "--auth", "testKey"), env = env)
     try {
-      val fileContent = FileUtils.readFileToString(tmpwskprops)
+      val fileContent = FileUtils.readFileToString(tmpwskprops, 
StandardCharsets.UTF_8)
       fileContent should include("AUTH=testKey")
     } finally {
       tmpwskprops.delete()
@@ -404,7 +405,7 @@ class WskConfigTests extends TestHelpers with 
WskTestHelpers {
       stdout should include regex ("ok: client key set")
       stdout should include regex ("ok: whisk API host set")
       stdout should include regex ("ok: whisk API version set")
-      val fileContent = FileUtils.readFileToString(tmpwskprops)
+      val fileContent = FileUtils.readFileToString(tmpwskprops, 
StandardCharsets.UTF_8)
       fileContent should include("AUTH=testKey")
       fileContent should include("APIHOST=openwhisk.ng.bluemix.net")
       fileContent should include("APIVERSION=v1")

-- 
To stop receiving notification emails like this one, please contact
csantan...@apache.org.