openwhisk-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From csantan...@apache.org
Subject [incubator-openwhisk-cli] 02/02: Fix trigger test
Date Thu, 22 Feb 2018 19:59:06 GMT
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

commit ad8ff7681eb330290a3a8d1c33aa1710da5cf73d
Author: dubeejw <jwdubee@us.ibm.com>
AuthorDate: Wed Feb 21 02:47:45 2018 -0500

    Fix trigger test
---
 tests/src/test/scala/system/basic/WskBasicTests.scala | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/tests/src/test/scala/system/basic/WskBasicTests.scala b/tests/src/test/scala/system/basic/WskBasicTests.scala
index a785559..c78d7f1 100644
--- a/tests/src/test/scala/system/basic/WskBasicTests.scala
+++ b/tests/src/test/scala/system/basic/WskBasicTests.scala
@@ -545,20 +545,18 @@ class WskBasicTests extends TestHelpers with WskTestHelpers {
       trigger.create(name, annotations = annots)
     }
 
-    val result = wsk.trigger.get(name)
+    val result = getJSONFromResponse(wsk.trigger.get(name).stdout, true)
     val ns = wsk.namespace.whois()
-    val annos = getJSONFromResponse(result.stdout, true).fields("annotations")
 
-    getJSONFromResponse(result.stdout, true).fields("name") shouldBe name.toJson
-    getJSONFromResponse(result.stdout, true).fields("namespace") shouldBe ns.toJson
-
-    annos shouldBe JsArray(
+    result.fields("name") shouldBe name.toJson
+    result.fields("namespace") shouldBe ns.toJson
+    result.fields("annotations") shouldBe JsArray(
       JsObject("key" -> JsString("description"), "value" -> JsString("Trigger description")),
       JsObject(
         "key" -> JsString("parameters"),
         "value" -> JsArray(
-          JsObject("name" -> JsString("paramName1"), "description" -> JsString("Parameter
description 1")),
-          JsObject("name" -> JsString("paramName2"), "description" -> JsString("Parameter
description 2")))))
+          JsObject("description" -> JsString("Parameter description 1"), "name" ->
JsString("paramName1")),
+          JsObject("description" -> JsString("Parameter description 2"), "name" ->
JsString("paramName2")))))
   }
 
   it should "create a trigger with a name that contains spaces" in withAssetCleaner(wskprops)
{ (wp, assetHelper) =>

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

Mime
View raw message