RestAssured fixes (#441)

Author: dubee

tests/src/test/scala/org/apache/openwhisk/core/cli/test/ApiGwCliBasicTests.scala

@@ -17,7 +17,7 @@
 
 package org.apache.openwhisk.core.cli.test
 
-import com.jayway.restassured.RestAssured
+import io.restassured.RestAssured
 
 import java.io.File
 import java.io.BufferedWriter
@@ -27,8 +27,8 @@ import org.junit.runner.RunWith
 
 import org.scalatest.junit.JUnitRunner
 
-import com.jayway.restassured.config.RestAssuredConfig
-import com.jayway.restassured.config.SSLConfig
+import io.restassured.config.RestAssuredConfig
+import io.restassured.config.SSLConfig
 
 import common.TestUtils._
 import common.TestUtils
@@ -222,7 +222,7 @@ abstract class ApiGwCliBasicTests extends BaseApiGwTests {
   def getSslConfig(): RestAssuredConfig = {
     // force RestAssured to allow all hosts in SSL certificates
     new RestAssuredConfig()
-      .sslConfig(new SSLConfig().keystore("keystore", WhiskProperties.getSslCertificateChallenge).allowAllHostnames())
+      .sslConfig(new SSLConfig().keyStore("keystore", WhiskProperties.getSslCertificateChallenge).allowAllHostnames())
   }
 
   def validateParameter(parameter: JsObject,

tests/src/test/scala/org/apache/openwhisk/core/cli/test/ApiGwCliTests.scala

@@ -17,7 +17,7 @@
 
 package org.apache.openwhisk.core.cli.test
 
-import com.jayway.restassured.RestAssured
+import io.restassured.RestAssured
 
 import common.{TestUtils, Wsk}
 import common.TestUtils._

tests/src/test/scala/org/apache/openwhisk/core/cli/test/WskCliBasicUsageTests.scala

@@ -525,7 +525,7 @@ class WskCliBasicUsageTests extends TestHelpers with WskTestHelpers {
         action.create(
           name,
           Some(TestUtils.getTestActionFilename("helloContext.js")),
-          annotations = Map(WhiskAction.provideApiKeyAnnotationName -> JsBoolean(true)))
+          annotations = Map(Annotations.ProvideApiKeyAnnotationName -> JsBoolean(true)))
       }
     } else {
       assetHelper.withCleaner(wsk.action, name) { (action, _) =>
@@ -629,7 +629,7 @@ class WskCliBasicUsageTests extends TestHelpers with WskTestHelpers {
           Parameters("final", JsBoolean(webEnabled || rawEnabled)) ++
           Parameters("exec", "nodejs:10")
         val testAnnotations = if (requireAPIKeyAnnotation) {
-          baseAnnotations ++ Parameters(WhiskAction.provideApiKeyAnnotationName, JsFalse)
+          baseAnnotations ++ Parameters(Annotations.ProvideApiKeyAnnotationName, JsFalse)
         } else baseAnnotations
 
         removeCLIHeader(action.stdout).parseJson.asJsObject
@@ -660,7 +660,7 @@ class WskCliBasicUsageTests extends TestHelpers with WskTestHelpers {
         Parameters("exec", "nodejs:10")
     val createAnnotations = if (requireAPIKeyAnnotation) {
       baseAnnotations ++
-        Parameters(WhiskAction.provideApiKeyAnnotationName, JsFalse) ++
+        Parameters(Annotations.ProvideApiKeyAnnotationName, JsFalse) ++
         Parameters(createKey, createValue) ++
         Parameters(origKey, origValue)
     } else {
@@ -715,7 +715,7 @@ class WskCliBasicUsageTests extends TestHelpers with WskTestHelpers {
 
       val testAnnotations = if (requireAPIKeyAnnotation) {
         baseAnnotations ++
-          Parameters(WhiskAction.provideApiKeyAnnotationName, JsFalse)
+          Parameters(Annotations.ProvideApiKeyAnnotationName, JsFalse)
       } else {
         baseAnnotations
       }
@@ -1228,7 +1228,7 @@ class WskCliBasicUsageTests extends TestHelpers with WskTestHelpers {
       Parameters("exec", "nodejs:10")
     val expectedAnnots = if (requireAPIKeyAnnotation) {
       baseAnnotations ++
-        Parameters(WhiskAction.provideApiKeyAnnotationName, JsFalse)
+        Parameters(Annotations.ProvideApiKeyAnnotationName, JsFalse)
     } else {
       baseAnnotations
     }