RestAssured fixes (#441)
diff --git a/tests/src/test/scala/org/apache/openwhisk/core/cli/test/ApiGwCliBasicTests.scala b/tests/src/test/scala/org/apache/openwhisk/core/cli/test/ApiGwCliBasicTests.scala
index ea08716..f80b947 100644
--- a/tests/src/test/scala/org/apache/openwhisk/core/cli/test/ApiGwCliBasicTests.scala
+++ b/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.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 @@
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,
diff --git a/tests/src/test/scala/org/apache/openwhisk/core/cli/test/ApiGwCliTests.scala b/tests/src/test/scala/org/apache/openwhisk/core/cli/test/ApiGwCliTests.scala
index 4e5f3a5..f57b87d 100644
--- a/tests/src/test/scala/org/apache/openwhisk/core/cli/test/ApiGwCliTests.scala
+++ b/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._
diff --git a/tests/src/test/scala/org/apache/openwhisk/core/cli/test/WskCliBasicUsageTests.scala b/tests/src/test/scala/org/apache/openwhisk/core/cli/test/WskCliBasicUsageTests.scala
index d8673e4..02c2ec9 100644
--- a/tests/src/test/scala/org/apache/openwhisk/core/cli/test/WskCliBasicUsageTests.scala
+++ b/tests/src/test/scala/org/apache/openwhisk/core/cli/test/WskCliBasicUsageTests.scala
@@ -525,7 +525,7 @@
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 @@
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 @@
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 @@
val testAnnotations = if (requireAPIKeyAnnotation) {
baseAnnotations ++
- Parameters(WhiskAction.provideApiKeyAnnotationName, JsFalse)
+ Parameters(Annotations.ProvideApiKeyAnnotationName, JsFalse)
} else {
baseAnnotations
}
@@ -1228,7 +1228,7 @@
Parameters("exec", "nodejs:10")
val expectedAnnots = if (requireAPIKeyAnnotation) {
baseAnnotations ++
- Parameters(WhiskAction.provideApiKeyAnnotationName, JsFalse)
+ Parameters(Annotations.ProvideApiKeyAnnotationName, JsFalse)
} else {
baseAnnotations
}
