You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by cs...@apache.org on 2017/11/19 22:49:28 UTC
[incubator-openwhisk-package-alarms] branch master updated: update
tests that use put on creation to now use post (#112)
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-package-alarms.git
The following commit(s) were added to refs/heads/master by this push:
new 9d712f5 update tests that use put on creation to now use post (#112)
9d712f5 is described below
commit 9d712f5f7fad210e57baf216745d2b3aa92d2346
Author: Jason Peterson <ja...@us.ibm.com>
AuthorDate: Sun Nov 19 17:49:27 2017 -0500
update tests that use put on creation to now use post (#112)
---
.../src/test/scala/system/packages/AlarmsFeedWebTests.scala | 12 ++++++------
.../test/scala/system/packages/AlarmsMultiWorkersTests.scala | 8 ++++----
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/tests/src/test/scala/system/packages/AlarmsFeedWebTests.scala b/tests/src/test/scala/system/packages/AlarmsFeedWebTests.scala
index a23b847..a1f3060 100644
--- a/tests/src/test/scala/system/packages/AlarmsFeedWebTests.scala
+++ b/tests/src/test/scala/system/packages/AlarmsFeedWebTests.scala
@@ -54,24 +54,24 @@ class AlarmsFeedWebTests
it should "reject put of a trigger due to missing triggerName argument" in {
val params = JsObject(originalParams.fields - "triggerName")
- makePutCallWithExpectedResult(params, JsObject("error" -> JsString("no trigger name parameter was provided")), 400)
+ makePostCallWithExpectedResult(params, JsObject("error" -> JsString("no trigger name parameter was provided")), 400)
}
it should "reject put of a trigger due to missing cron argument" in {
val params = JsObject(originalParams.fields - "cron")
- makePutCallWithExpectedResult(params, JsObject("error" -> JsString("alarms trigger feed is missing the cron parameter")), 400)
+ makePostCallWithExpectedResult(params, JsObject("error" -> JsString("alarms trigger feed is missing the cron parameter")), 400)
}
it should "reject put of a trigger due to invalid cron argument" in {
val params = JsObject(originalParams.fields + ("cron" -> JsString("***")))
- makePutCallWithExpectedResult(params, JsObject("error" -> JsString("cron pattern '***' is not valid")), 400)
+ makePostCallWithExpectedResult(params, JsObject("error" -> JsString("cron pattern '***' is not valid")), 400)
}
it should "reject put of a trigger when authentication fails" in {
val params = JsObject(originalParams.fields + ("cron" -> JsString("* * * * *")))
- makePutCallWithExpectedResult(params, JsObject("error" -> JsString("Trigger authentication request failed.")), 401)
+ makePostCallWithExpectedResult(params, JsObject("error" -> JsString("Trigger authentication request failed.")), 401)
}
it should "reject delete of a trigger due to missing triggerName argument" in {
@@ -84,12 +84,12 @@ class AlarmsFeedWebTests
makeDeleteCallWithExpectedResult(originalParams, JsObject("error" -> JsString("Trigger authentication request failed.")), 401)
}
- def makePutCallWithExpectedResult(params: JsObject, expectedResult: JsObject, expectedCode: Int) = {
+ def makePostCallWithExpectedResult(params: JsObject, expectedResult: JsObject, expectedCode: Int) = {
val response = RestAssured.given()
.contentType(ContentType.JSON)
.config(RestAssured.config().sslConfig(new SSLConfig().relaxedHTTPSValidation()))
.body(params.toString())
- .put(webActionURL)
+ .post(webActionURL)
assert(response.statusCode() == expectedCode)
response.body.asString.parseJson.asJsObject shouldBe expectedResult
}
diff --git a/tests/src/test/scala/system/packages/AlarmsMultiWorkersTests.scala b/tests/src/test/scala/system/packages/AlarmsMultiWorkersTests.scala
index 210b60b..83e4f6d 100644
--- a/tests/src/test/scala/system/packages/AlarmsMultiWorkersTests.scala
+++ b/tests/src/test/scala/system/packages/AlarmsMultiWorkersTests.scala
@@ -72,13 +72,13 @@ class AlarmsMultiWorkersTests extends FlatSpec
wsk.trigger.create(worker10Trigger)
//create trigger feed and assign to worker10
- makePutCallWithExpectedResult(worker10Params, 200)
+ makePostCallWithExpectedResult(worker10Params, 200)
wsk.trigger.create(worker11Trigger)
//create trigger feed and assign to worker10 or worker11
//the one with the least assigned triggers will be chosen
- makePutCallWithExpectedResult(worker11Params, 200)
+ makePostCallWithExpectedResult(worker11Params, 200)
val dbName = s"${dbPrefix}alarmservice"
val documents = getAllDocs(dbName)
@@ -99,12 +99,12 @@ class AlarmsMultiWorkersTests extends FlatSpec
}
}
- def makePutCallWithExpectedResult(params: JsObject, expectedCode: Int) = {
+ def makePostCallWithExpectedResult(params: JsObject, expectedCode: Int) = {
val response = RestAssured.given()
.contentType(ContentType.JSON)
.config(RestAssured.config().sslConfig(new SSLConfig().relaxedHTTPSValidation()))
.body(params.toString())
- .put(webActionURL)
+ .post(webActionURL)
assert(response.statusCode() == expectedCode)
}
--
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <co...@openwhisk.apache.org>'].