Skip to content

Test fixes #441

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dubee merged 1 commit into from
Jun 5, 2019
Merged

Test fixes #441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions tests/src/test/scala/org/apache/openwhisk/core/cli/test/ApiGwCliBasicTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion tests/src/test/scala/org/apache/openwhisk/core/cli/test/ApiGwCliTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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._
Expand Down
10 changes: 5 additions & 5 deletions tests/src/test/scala/org/apache/openwhisk/core/cli/test/WskCliBasicUsageTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, _) =>
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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
}
Expand Down Expand Up @@ -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
}
Expand Down