drcariel closed pull request #270: use utils from open and rename duplicate tests to be accurate URL: https://github.com/apache/incubator-openwhisk-cli/pull/270
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/tests/src/test/scala/common/TestCLIUtils.scala b/tests/src/test/scala/common/TestCLIUtils.scala deleted file mode 100644 index de824b15..00000000 --- a/tests/src/test/scala/common/TestCLIUtils.scala +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package common - -object TestCLIUtils { - - def getTestActionFilename(fileName: String): String = { - val testDir = scala.util.Properties.userDir.toString() - s"$testDir/dat/actions/$fileName" - } - - def getTestApiGwFilename(fileName: String): String = { - val testDir = scala.util.Properties.userDir.toString() - s"$testDir/dat/apigw/$fileName" - } - -} diff --git a/tests/src/test/scala/system/basic/WskCliActionTests.scala b/tests/src/test/scala/system/basic/WskCliActionTests.scala index 7e008bfc..042f0bd3 100644 --- a/tests/src/test/scala/system/basic/WskCliActionTests.scala +++ b/tests/src/test/scala/system/basic/WskCliActionTests.scala @@ -20,7 +20,7 @@ package system.basic import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner -import common.TestCLIUtils +import common.TestUtils import common.TestUtils.NOT_ALLOWED import common.Wsk @@ -29,7 +29,7 @@ class WskCliActionTests extends WskActionTests { override val wsk = new Wsk it should "not be able to use --kind and --docker at the same time when running action create or update" in { - val file = TestCLIUtils.getTestActionFilename(s"echo.js") + val file = TestUtils.getTestActionFilename(s"echo.js") Seq(false, true).foreach { updateValue => val out = wsk.action.create(name = "kindAndDockerAction", artifact = Some(file), expectedExitCode = NOT_ALLOWED, kind = Some("nodejs:6"), docker = Some("mydockerimagename"), update = updateValue) diff --git a/tests/src/test/scala/system/basic/WskBasicTests.scala b/tests/src/test/scala/system/basic/WskCliBasicTests.scala similarity index 94% rename from tests/src/test/scala/system/basic/WskBasicTests.scala rename to tests/src/test/scala/system/basic/WskCliBasicTests.scala index 27595784..b39ef39e 100644 --- a/tests/src/test/scala/system/basic/WskBasicTests.scala +++ b/tests/src/test/scala/system/basic/WskCliBasicTests.scala @@ -27,7 +27,6 @@ import org.scalatest.junit.JUnitRunner import common.ActivationResult import common.TestHelpers -import common.TestCLIUtils import common.TestUtils import common.TestUtils._ import common.Wsk @@ -39,20 +38,12 @@ import spray.json.pimpAny import whisk.http.Messages -object WskCliTestHelpers { - /** - * Append the current timestamp in ms - */ - def withTimestamp(text: String) = s"${text}-${System.currentTimeMillis}" - -} - @RunWith(classOf[JUnitRunner]) -class WskBasicTests extends TestHelpers with WskTestHelpers { +class WskCliBasicTests extends TestHelpers with WskTestHelpers { implicit val wskprops = WskProps() val wsk = new Wsk - val defaultAction = Some(TestCLIUtils.getTestActionFilename("hello.js")) + val defaultAction = Some(TestUtils.getTestActionFilename("hello.js")) behavior of "Wsk CLI" @@ -197,7 +188,7 @@ class WskBasicTests extends TestHelpers with WskTestHelpers { it should "create, update, get and list an action" in withAssetCleaner(wskprops) { (wp, assetHelper) => val name = "createAndUpdate" - val file = Some(TestCLIUtils.getTestActionFilename("hello.js")) + val file = Some(TestUtils.getTestActionFilename("hello.js")) val params = Map("a" -> "A".toJson) assetHelper.withCleaner(wsk.action, name) { (action, _) => action.create(name, file, parameters = params) @@ -216,7 +207,7 @@ class WskBasicTests extends TestHelpers with WskTestHelpers { it should "reject create of an action that already exists" in withAssetCleaner(wskprops) { val name = "dupeAction" - val file = Some(TestCLIUtils.getTestActionFilename("echo.js")) + val file = Some(TestUtils.getTestActionFilename("echo.js")) (wp, assetHelper) => assetHelper.withCleaner(wsk.action, name) { (action, _) => @@ -268,7 +259,7 @@ class WskBasicTests extends TestHelpers with WskTestHelpers { assetHelper.withCleaner(wsk.action, name) { // this docker image will be need to be pulled from dockerhub and hence has to be published there first (action, _) => - action.create(name, Some(TestCLIUtils.getTestActionFilename("blackbox.zip")), kind = Some("native")) + action.create(name, Some(TestUtils.getTestActionFilename("blackbox.zip")), kind = Some("native")) } val run = wsk.action.invoke(name, Map()) @@ -283,8 +274,8 @@ class WskBasicTests extends TestHelpers with WskTestHelpers { it should "create, and invoke an action using a parameter file" in withAssetCleaner(wskprops) { val name = "paramFileAction" - val file = Some(TestCLIUtils.getTestActionFilename("argCheck.js")) - val argInput = Some(TestCLIUtils.getTestActionFilename("validInput2.json")) + val file = Some(TestUtils.getTestActionFilename("argCheck.js")) + val argInput = Some(TestUtils.getTestActionFilename("validInput2.json")) (wp, assetHelper) => assetHelper.withCleaner(wsk.action, name) { (action, _) => @@ -344,7 +335,7 @@ class WskBasicTests extends TestHelpers with WskTestHelpers { (wp, assetHelper) => val name = "MALFORMED" assetHelper.withCleaner(wsk.action, name) { (action, _) => - action.create(name, Some(TestCLIUtils.getTestActionFilename("malformed.js"))) + action.create(name, Some(TestUtils.getTestActionFilename("malformed.js"))) } val run = wsk.action.invoke(name, Map("payload" -> "whatever".toJson)) @@ -363,7 +354,7 @@ class WskBasicTests extends TestHelpers with WskTestHelpers { val boolErrInput = Map("error" -> true.toJson) assetHelper.withCleaner(wsk.action, name) { (action, _) => - action.create(name, Some(TestCLIUtils.getTestActionFilename("echo.js"))) + action.create(name, Some(TestUtils.getTestActionFilename("echo.js"))) } Seq(strErrInput, numErrInput, boolErrInput) foreach { input => @@ -387,7 +378,7 @@ class WskBasicTests extends TestHelpers with WskTestHelpers { (wp, assetHelper) => val name = "errorResponseObject" assetHelper.withCleaner(wsk.action, name) { (action, _) => - action.create(name, Some(TestCLIUtils.getTestActionFilename("asyncError.js"))) + action.create(name, Some(TestUtils.getTestActionFilename("asyncError.js"))) } val stderr = wsk.action.invoke(name, blocking = true, expectedExitCode = 246).stderr @@ -399,7 +390,7 @@ class WskBasicTests extends TestHelpers with WskTestHelpers { it should "invoke a blocking action and get only the result" in withAssetCleaner(wskprops) { (wp, assetHelper) => val name = "basicInvoke" assetHelper.withCleaner(wsk.action, name) { (action, _) => - action.create(name, Some(TestCLIUtils.getTestActionFilename("wc.js"))) + action.create(name, Some(TestUtils.getTestActionFilename("wc.js"))) } wsk.action @@ -440,7 +431,7 @@ class WskBasicTests extends TestHelpers with WskTestHelpers { val name = "emptyJSONAction" assetHelper.withCleaner(wsk.action, name) { (action, _) => - action.create(name, Some(TestCLIUtils.getTestActionFilename("emptyJSONResult.js"))) + action.create(name, Some(TestUtils.getTestActionFilename("emptyJSONResult.js"))) } val stdout = wsk.action.invoke(name, result = true).stdout @@ -453,7 +444,7 @@ class WskBasicTests extends TestHelpers with WskTestHelpers { val params = Map("payload" -> "100000".toJson) val allowedActionDuration = 120 seconds val res = assetHelper.withCleaner(wsk.action, name) { (action, _) => - action.create(name, Some(TestCLIUtils.getTestActionFilename("timeout.js")), timeout = Some(allowedActionDuration)) + action.create(name, Some(TestUtils.getTestActionFilename("timeout.js")), timeout = Some(allowedActionDuration)) action.invoke(name, parameters = params, result = true, expectedExitCode = ACCEPTED) } @@ -473,9 +464,9 @@ class WskBasicTests extends TestHelpers with WskTestHelpers { behavior of "Wsk Trigger CLI" it should "create, update, get, fire and list trigger" in withAssetCleaner(wskprops) { (wp, assetHelper) => - val ruleName = WskCliTestHelpers.withTimestamp("r1toa1") - val triggerName = WskCliTestHelpers.withTimestamp("t1tor1") - val actionName = WskCliTestHelpers.withTimestamp("a1") + val ruleName = withTimestamp("r1toa1") + val triggerName = withTimestamp("t1tor1") + val actionName = withTimestamp("a1") val params = Map("a" -> "A".toJson) val ns = wsk.namespace.whois() @@ -575,9 +566,9 @@ class WskBasicTests extends TestHelpers with WskTestHelpers { } it should "create, and fire a trigger using a parameter file" in withAssetCleaner(wskprops) { - val ruleName = WskCliTestHelpers.withTimestamp("r1toa1") - val triggerName = WskCliTestHelpers.withTimestamp("paramFileTrigger") - val actionName = WskCliTestHelpers.withTimestamp("a1") + val ruleName = withTimestamp("r1toa1") + val triggerName = withTimestamp("paramFileTrigger") + val actionName = withTimestamp("a1") val argInput = Some(TestUtils.getTestActionFilename("validInput2.json")) (wp, assetHelper) => @@ -643,9 +634,9 @@ class WskBasicTests extends TestHelpers with WskTestHelpers { } it should "create, and fire a trigger to ensure result is empty" in withAssetCleaner(wskprops) { (wp, assetHelper) => - val ruleName = WskCliTestHelpers.withTimestamp("r1toa1") - val triggerName = WskCliTestHelpers.withTimestamp("emptyResultTrigger") - val actionName = WskCliTestHelpers.withTimestamp("a1") + val ruleName = withTimestamp("r1toa1") + val triggerName = withTimestamp("emptyResultTrigger") + val actionName = withTimestamp("a1") assetHelper.withCleaner(wsk.trigger, triggerName) { (trigger, _) => trigger.create(triggerName) @@ -697,11 +688,11 @@ class WskBasicTests extends TestHelpers with WskTestHelpers { it should "create and fire a trigger with a rule whose action has been deleted" in withAssetCleaner(wskprops) { (wp, assetHelper) => - val ruleName1 = WskCliTestHelpers.withTimestamp("r1toa1") - val ruleName2 = WskCliTestHelpers.withTimestamp("r2toa2") - val triggerName = WskCliTestHelpers.withTimestamp("t1tor1r2") - val actionName1 = WskCliTestHelpers.withTimestamp("a1") - val actionName2 = WskCliTestHelpers.withTimestamp("a2") + val ruleName1 = withTimestamp("r1toa1") + val ruleName2 = withTimestamp("r2toa2") + val triggerName = withTimestamp("t1tor1r2") + val actionName1 = withTimestamp("a1") + val actionName2 = withTimestamp("a2") val ns = wsk.namespace.whois() assetHelper.withCleaner(wsk.trigger, triggerName) { (trigger, _) => @@ -929,9 +920,9 @@ class WskBasicTests extends TestHelpers with WskTestHelpers { it should "create a trigger, and fire a trigger to get its individual fields from an activation" in withAssetCleaner( wskprops) { (wp, assetHelper) => - val ruleName = WskCliTestHelpers.withTimestamp("r1toa1") - val triggerName = WskCliTestHelpers.withTimestamp("activationFields") - val actionName = WskCliTestHelpers.withTimestamp("a1") + val ruleName = withTimestamp("r1toa1") + val triggerName = withTimestamp("activationFields") + val actionName = withTimestamp("a1") assetHelper.withCleaner(wsk.trigger, triggerName) { (trigger, _) => trigger.create(triggerName) diff --git a/tests/src/test/scala/whisk/core/cli/test/ApiGwTests.scala b/tests/src/test/scala/whisk/core/cli/test/ApiGwCliBasicTests.scala similarity index 96% rename from tests/src/test/scala/whisk/core/cli/test/ApiGwTests.scala rename to tests/src/test/scala/whisk/core/cli/test/ApiGwCliBasicTests.scala index c9aa5506..0a44abe1 100644 --- a/tests/src/test/scala/whisk/core/cli/test/ApiGwTests.scala +++ b/tests/src/test/scala/whisk/core/cli/test/ApiGwCliBasicTests.scala @@ -33,7 +33,7 @@ import com.jayway.restassured.config.SSLConfig import common.TestUtils._ import common.TestUtils import common.WhiskProperties -import common.{TestCLIUtils, WhiskProperties, WskProps} +import common.{TestUtils, WhiskProperties, WskProps} import scala.concurrent.duration.DurationInt import scala.util.parsing.json.JSON @@ -45,7 +45,7 @@ import org.apache.commons.io.FileUtils * Tests for testing the CLI "api" subcommand. Most of these tests require a deployed backend. */ @RunWith(classOf[JUnitRunner]) -abstract class ApiGwTests extends BaseApiGwTests { +abstract class ApiGwCliBasicTests extends BaseApiGwTests { val clinamespace = wsk.namespace.whois() val createCode: Int @@ -402,7 +402,7 @@ abstract class ApiGwTests extends BaseApiGwTests { try { println("cli namespace: " + clinamespace) // Create the action for the API. It must be a "web-action" action. - val file = TestCLIUtils.getTestActionFilename(s"echo.js") + val file = TestUtils.getTestActionFilename(s"echo.js") wsk.action.create(name = actionName, artifact = Some(file), expectedExitCode = createCode, web = Some("true")) var rr = apiCreate( @@ -438,7 +438,7 @@ abstract class ApiGwTests extends BaseApiGwTests { println("cli namespace: " + clinamespace) // Create the action for the API. It must be a "web-action" action. - val file = TestCLIUtils.getTestActionFilename(s"echo.js") + val file = TestUtils.getTestActionFilename(s"echo.js") wsk.action.create(name = actionName, artifact = Some(file), expectedExitCode = createCode, web = Some("true")) var rr = apiCreate( @@ -470,7 +470,7 @@ abstract class ApiGwTests extends BaseApiGwTests { val actionName = testName + "_action" try { // Create the action for the API. It must be a "web-action" action. - val file = TestCLIUtils.getTestActionFilename(s"echo.js") + val file = TestUtils.getTestActionFilename(s"echo.js") wsk.action.create(name = actionName, artifact = Some(file), expectedExitCode = createCode, web = Some("true")) var rr = apiCreate( @@ -498,7 +498,7 @@ abstract class ApiGwTests extends BaseApiGwTests { val actionName = testName + "_action" try { // Create the action for the API. It must be a "web-action" action. - val file = TestCLIUtils.getTestActionFilename(s"echo.js") + val file = TestUtils.getTestActionFilename(s"echo.js") wsk.action.create(name = actionName, artifact = Some(file), expectedExitCode = createCode, web = Some("true")) var rr = apiCreate( @@ -526,7 +526,7 @@ abstract class ApiGwTests extends BaseApiGwTests { val actionName = testName + "_action" try { // Create the action for the API. It must be a "web-action" action. - val file = TestCLIUtils.getTestActionFilename(s"echo.js") + val file = TestUtils.getTestActionFilename(s"echo.js") wsk.action.create(name = actionName, artifact = Some(file), expectedExitCode = createCode, web = Some("true")) var rr = apiCreate( @@ -555,7 +555,7 @@ abstract class ApiGwTests extends BaseApiGwTests { val newEndpoint = "/newEndpoint" try { // Create the action for the API. It must be a "web-action" action. - val file = TestCLIUtils.getTestActionFilename(s"echo.js") + val file = TestUtils.getTestActionFilename(s"echo.js") wsk.action.create(name = actionName, artifact = Some(file), expectedExitCode = createCode, web = Some("true")) var rr = apiCreate( @@ -596,7 +596,7 @@ abstract class ApiGwTests extends BaseApiGwTests { val testurlop = "get" val testapiname = testName + " API Name" val actionName = testName + "_action" - val swaggerPath = TestCLIUtils.getTestApiGwFilename("testswaggerdoc1") + val swaggerPath = TestUtils.getTestApiGwFilename("testswaggerdoc1") try { var rr = apiCreate(swagger = Some(swaggerPath)) verifyApiCreated(rr) @@ -623,7 +623,7 @@ abstract class ApiGwTests extends BaseApiGwTests { val newEndpoint = "/newEndpoint" try { // Create the action for the API. It must be a "web-action" action. - val file = TestCLIUtils.getTestActionFilename(s"echo.js") + val file = TestUtils.getTestActionFilename(s"echo.js") wsk.action.create(name = actionName, artifact = Some(file), expectedExitCode = createCode, web = Some("true")) var rr = apiCreate( @@ -696,7 +696,7 @@ abstract class ApiGwTests extends BaseApiGwTests { println("cli namespace: " + clinamespace) // Create the action for the API. It must be a "web-action" action. - val file = TestCLIUtils.getTestActionFilename(s"echo.js") + val file = TestUtils.getTestActionFilename(s"echo.js") wsk.action.create(name = actionName, artifact = Some(file), expectedExitCode = createCode, web = Some("true")) var rr = apiCreate( @@ -724,7 +724,7 @@ abstract class ApiGwTests extends BaseApiGwTests { val testurlop = "get" val testapiname = testName + " API Name" val actionName = testName + "_action" - val swaggerPath = TestCLIUtils.getTestApiGwFilename(s"testswaggerdocinvalid") + val swaggerPath = TestUtils.getTestApiGwFilename(s"testswaggerdocinvalid") try { val rr = apiCreate(swagger = Some(swaggerPath), expectedExitCode = ANY_ERROR_EXIT) println("api create stdout: " + rr.stdout) @@ -745,7 +745,7 @@ abstract class ApiGwTests extends BaseApiGwTests { val actionName = testName + "_action" try { // Create the action for the API. It must be a "web-action" action. - val file = TestCLIUtils.getTestActionFilename(s"echo.js") + val file = TestUtils.getTestActionFilename(s"echo.js") wsk.action.create(name = actionName, artifact = Some(file), expectedExitCode = createCode, web = Some("true")) var rr = apiCreate( @@ -783,7 +783,7 @@ abstract class ApiGwTests extends BaseApiGwTests { val actionName = testName + "_action" try { // Create the action for the API. It must be a "web-action" action. - val file = TestCLIUtils.getTestActionFilename(s"echo.js") + val file = TestUtils.getTestActionFilename(s"echo.js") wsk.action.create(name = actionName, artifact = Some(file), expectedExitCode = createCode, web = Some("true")) var rr = apiCreate( @@ -823,7 +823,7 @@ abstract class ApiGwTests extends BaseApiGwTests { val testurlop2 = "post" val testapiname = testName + " API Name" val actionName = "test1a" - val swaggerPath = TestCLIUtils.getTestApiGwFilename(s"testswaggerdoc2") + val swaggerPath = TestUtils.getTestApiGwFilename(s"testswaggerdoc2") try { var rr = apiCreate(swagger = Some(swaggerPath)) println("api create stdout: " + rr.stdout) @@ -849,7 +849,7 @@ abstract class ApiGwTests extends BaseApiGwTests { val actionName = testName + "_action" try { // Create the action for the API. It must be a "web-action" action. - val file = TestCLIUtils.getTestActionFilename(s"echo.js") + val file = TestUtils.getTestActionFilename(s"echo.js") wsk.action.create(name = actionName, artifact = Some(file), expectedExitCode = createCode, web = Some("true")) var rr = apiCreate( @@ -894,7 +894,7 @@ abstract class ApiGwTests extends BaseApiGwTests { val responseType = "http" try { // Create the action for the API. It must be a "web-action" action. - val file = TestCLIUtils.getTestActionFilename(s"echo.js") + val file = TestUtils.getTestActionFilename(s"echo.js") wsk.action.create(name = actionName, artifact = Some(file), expectedExitCode = createCode, web = Some("true")) var rr = apiCreate( @@ -927,7 +927,7 @@ abstract class ApiGwTests extends BaseApiGwTests { val testbasepath = "/NoActions" val testrelpath = "/" val testops: Seq[String] = Seq("put", "delete", "get", "head", "options", "patch", "post") - val swaggerPath = TestCLIUtils.getTestApiGwFilename(s"endpoints.without.action.swagger.json") + val swaggerPath = TestUtils.getTestApiGwFilename(s"endpoints.without.action.swagger.json") try { var rr = apiCreate(swagger = Some(swaggerPath)) @@ -964,7 +964,7 @@ abstract class ApiGwTests extends BaseApiGwTests { try { // Create the action for the API. - val file = TestCLIUtils.getTestActionFilename(s"echo.js") + val file = TestUtils.getTestActionFilename(s"echo.js") wsk.action.create(name = actionName, artifact = Some(file), expectedExitCode = createCode, web = Some("true")) // Set an invalid auth key diff --git a/tests/src/test/scala/whisk/core/cli/test/ApiGwCliTests.scala b/tests/src/test/scala/whisk/core/cli/test/ApiGwCliTests.scala index 3465815c..4dfe20fb 100644 --- a/tests/src/test/scala/whisk/core/cli/test/ApiGwCliTests.scala +++ b/tests/src/test/scala/whisk/core/cli/test/ApiGwCliTests.scala @@ -32,7 +32,7 @@ import scala.util.parsing.json.JSON * Tests for basic CLI usage. Some of these tests require a deployed backend. */ @RunWith(classOf[JUnitRunner]) -class ApiGwCliTests extends ApiGwTests { +class ApiGwCliTests extends ApiGwCliBasicTests { override lazy val wsk: common.Wsk = new Wsk override lazy val createCode = SUCCESS_EXIT behavior of "Cli Wsk api creation with path parameters no swagger" diff --git a/tests/src/test/scala/whisk/core/cli/test/WskApiGwTests.scala b/tests/src/test/scala/whisk/core/cli/test/WskApiGwTests.scala index 25dab826..364fde0e 100644 --- a/tests/src/test/scala/whisk/core/cli/test/WskApiGwTests.scala +++ b/tests/src/test/scala/whisk/core/cli/test/WskApiGwTests.scala @@ -22,7 +22,7 @@ import org.scalatest.junit.JUnitRunner import common.JsHelpers import common.StreamLogging -import common.TestCLIUtils +import common.TestUtils import common.TestUtils.ANY_ERROR_EXIT import common.TestUtils.DONTCARE_EXIT import common.TestUtils.SUCCESS_EXIT @@ -271,7 +271,7 @@ class WskApiGwTests extends BaseApiGwTests with WskActorSystem with JsHelpers wi val actionName = testName + "_action" try { // Create the action for the API. It must NOT be a "web-action" action for this test - val file = TestCLIUtils.getTestActionFilename(s"echo.js") + val file = TestUtils.getTestActionFilename(s"echo.js") wsk.action.create(name = actionName, artifact = Some(file), expectedExitCode = SUCCESS_EXIT) val rr = apiCreate( @@ -299,7 +299,7 @@ class WskApiGwTests extends BaseApiGwTests with WskActorSystem with JsHelpers wi it should "list api alphabetically by Base/Rel/Verb" in { val baseName = "/BaseTestPathApiList" val actionName = "actionName" - val file = TestCLIUtils.getTestActionFilename(s"echo-web-http.js") + val file = TestUtils.getTestActionFilename(s"echo-web-http.js") try { // Create Action for apis var action = @@ -346,7 +346,7 @@ class WskApiGwTests extends BaseApiGwTests with WskActorSystem with JsHelpers wi val responseType = "http" try { // Create the action for the API. It must be a "web-action" action. - val file = TestCLIUtils.getTestActionFilename(s"echo.js") + val file = TestUtils.getTestActionFilename(s"echo.js") wsk.action.create(name = actionName, artifact = Some(file), expectedExitCode = SUCCESS_EXIT, web = Some("true")) var rr = apiCreate( @@ -377,7 +377,7 @@ class WskApiGwTests extends BaseApiGwTests with WskActorSystem with JsHelpers wi val responseType = "http" try { // Create the action for the API. It must be a "web-action" action. - val file = TestCLIUtils.getTestActionFilename(s"echo.js") + val file = TestUtils.getTestActionFilename(s"echo.js") wsk.action.create(name = actionName, artifact = Some(file), expectedExitCode = SUCCESS_EXIT, web = Some("true")) var rr = apiCreate( @@ -407,7 +407,7 @@ class WskApiGwTests extends BaseApiGwTests with WskActorSystem with JsHelpers wi val testurlop = "get" val testapiname = testbasepath val actionName = "webhttpecho" - val swaggerPath = TestCLIUtils.getTestApiGwFilename(s"local.api.yaml") + val swaggerPath = TestUtils.getTestApiGwFilename(s"local.api.yaml") try { var rr = apiCreate(swagger = Some(swaggerPath)) println("api create stdout: " + rr.stdout) @@ -425,7 +425,7 @@ class WskApiGwTests extends BaseApiGwTests with WskActorSystem with JsHelpers wi it should "reject creation of an API from invalid YAML formatted API configuration file" in { val testName = "CLI_APIGWTEST22" val testbasepath = "/" + testName + "_bp" - val swaggerPath = TestCLIUtils.getTestApiGwFilename(s"local.api.bad.yaml") + val swaggerPath = TestUtils.getTestApiGwFilename(s"local.api.bad.yaml") try { val rr = apiCreate(swagger = Some(swaggerPath), expectedExitCode = ANY_ERROR_EXIT) println("api create stdout: " + rr.stdout) diff --git a/tests/src/test/scala/whisk/core/cli/test/WskBasicUsageTests.scala b/tests/src/test/scala/whisk/core/cli/test/WskCliBasicUsageTests.scala similarity index 94% rename from tests/src/test/scala/whisk/core/cli/test/WskBasicUsageTests.scala rename to tests/src/test/scala/whisk/core/cli/test/WskCliBasicUsageTests.scala index cbacabae..0e8ab1c4 100644 --- a/tests/src/test/scala/whisk/core/cli/test/WskBasicUsageTests.scala +++ b/tests/src/test/scala/whisk/core/cli/test/WskCliBasicUsageTests.scala @@ -27,11 +27,10 @@ import scala.language.postfixOps import scala.concurrent.duration.Duration import scala.concurrent.duration.DurationInt import scala.util.Random -import system.basic.WskCliTestHelpers import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner import common.TestHelpers -import common.TestCLIUtils +import common.TestUtils import common.TestUtils._ import common.WhiskProperties import common.Wsk @@ -52,11 +51,11 @@ import whisk.http.Messages * Tests for basic CLI usage. Some of these tests require a deployed backend. */ @RunWith(classOf[JUnitRunner]) -class WskBasicUsageTests extends TestHelpers with WskTestHelpers { +class WskCliBasicUsageTests extends TestHelpers with WskTestHelpers { implicit val wskprops = WskProps() val wsk = new Wsk - val defaultAction = Some(TestCLIUtils.getTestActionFilename("hello.js")) + val defaultAction = Some(TestUtils.getTestActionFilename("hello.js")) val usrAgentHeaderRegEx = """\bUser-Agent\b": \[\s+"OpenWhisk\-CLI/1.\d+.*""" behavior of "Wsk CLI usage" @@ -93,10 +92,10 @@ class WskBasicUsageTests extends TestHelpers with WskTestHelpers { it should "allow a 3 part Fully Qualified Name (FQN) without a leading '/'" in withAssetCleaner( wskprops) { (wp, assetHelper) => val guestNamespace = wsk.namespace.whois() - val packageName = WskCliTestHelpers.withTimestamp("packageName3ptFQN") - val actionName = WskCliTestHelpers.withTimestamp("actionName3ptFQN") - val triggerName = WskCliTestHelpers.withTimestamp("triggerName3ptFQN") - val ruleName = WskCliTestHelpers.withTimestamp("ruleName3ptFQN") + val packageName = withTimestamp("packageName3ptFQN") + val actionName = withTimestamp("actionName3ptFQN") + val triggerName = withTimestamp("triggerName3ptFQN") + val ruleName = withTimestamp("ruleName3ptFQN") val fullQualifiedName = s"${guestNamespace}/${packageName}/${actionName}" // Used for action and rule creation below assetHelper.withCleaner(wsk.pkg, packageName) { (pkg, _) => @@ -160,7 +159,7 @@ class WskBasicUsageTests extends TestHelpers with WskTestHelpers { wskprops) { (wp, assetHelper) => // Create dummy action to update val name = "updateMissingFile" - val file = Some(TestCLIUtils.getTestActionFilename("hello.js")) + val file = Some(TestUtils.getTestActionFilename("hello.js")) assetHelper.withCleaner(wsk.action, name) { (action, name) => action.create(name, file) } @@ -174,7 +173,7 @@ class WskBasicUsageTests extends TestHelpers with WskTestHelpers { it should "reject action update for sequence with no components" in withAssetCleaner( wskprops) { (wp, assetHelper) => val name = "updateMissingComponents" - val file = Some(TestCLIUtils.getTestActionFilename("hello.js")) + val file = Some(TestUtils.getTestActionFilename("hello.js")) assetHelper.withCleaner(wsk.action, name) { (action, name) => action.create(name, file) } @@ -188,7 +187,7 @@ class WskBasicUsageTests extends TestHelpers with WskTestHelpers { it should "create, and get an action to verify parameter and annotation parsing" in withAssetCleaner( wskprops) { (wp, assetHelper) => val name = "actionAnnotations" - val file = Some(TestCLIUtils.getTestActionFilename("hello.js")) + val file = Some(TestUtils.getTestActionFilename("hello.js")) assetHelper.withCleaner(wsk.action, name) { (action, _) => action.create(name, @@ -221,8 +220,8 @@ class WskBasicUsageTests extends TestHelpers with WskTestHelpers { it should "create, and get an action to verify file parameter and annotation parsing" in withAssetCleaner( wskprops) { (wp, assetHelper) => val name = "actionAnnotAndParamParsing" - val file = Some(TestCLIUtils.getTestActionFilename("hello.js")) - val argInput = Some(TestCLIUtils.getTestActionFilename("validInput1.json")) + val file = Some(TestUtils.getTestActionFilename("hello.js")) + val argInput = Some(TestUtils.getTestActionFilename("validInput1.json")) assetHelper.withCleaner(wsk.action, name) { (action, _) => action.create(name, @@ -255,7 +254,7 @@ class WskBasicUsageTests extends TestHelpers with WskTestHelpers { it should "create an action with the proper parameter and annotation escapes" in withAssetCleaner( wskprops) { (wp, assetHelper) => val name = "actionEscapes" - val file = Some(TestCLIUtils.getTestActionFilename("hello.js")) + val file = Some(TestUtils.getTestActionFilename("hello.js")) assetHelper.withCleaner(wsk.action, name) { (action, _) => action.create(name, @@ -290,7 +289,7 @@ class WskBasicUsageTests extends TestHelpers with WskTestHelpers { val name = "abort init" assetHelper.withCleaner(wsk.action, name) { (action, _) => action.create(name, - Some(TestCLIUtils.getTestActionFilename("initexit.js"))) + Some(TestUtils.getTestActionFilename("initexit.js"))) } withActivation(wsk.activation, wsk.action.invoke(name)) { activation => @@ -307,7 +306,7 @@ class WskBasicUsageTests extends TestHelpers with WskTestHelpers { val name = "hang init" assetHelper.withCleaner(wsk.action, name) { (action, _) => action.create(name, - Some(TestCLIUtils.getTestActionFilename("initforever.js")), + Some(TestUtils.getTestActionFilename("initforever.js")), timeout = Some(3 seconds)) } @@ -326,7 +325,7 @@ class WskBasicUsageTests extends TestHelpers with WskTestHelpers { val name = "abort run" assetHelper.withCleaner(wsk.action, name) { (action, _) => action.create(name, - Some(TestCLIUtils.getTestActionFilename("runexit.js"))) + Some(TestUtils.getTestActionFilename("runexit.js"))) } withActivation(wsk.activation, wsk.action.invoke(name)) { activation => @@ -386,7 +385,7 @@ class WskBasicUsageTests extends TestHelpers with WskTestHelpers { (wp, assetHelper) => assetHelper.withCleaner(wsk.action, name) { (action, _) => - action.create(name, Some(TestCLIUtils.getTestActionFilename("log.js"))) + action.create(name, Some(TestUtils.getTestActionFilename("log.js"))) } withActivation(wsk.activation, wsk.action.invoke(name)) { activation => @@ -407,7 +406,7 @@ class WskBasicUsageTests extends TestHelpers with WskTestHelpers { (wp, assetHelper) => assetHelper.withCleaner(wsk.action, name) { (action, _) => action.create(name, - Some(TestCLIUtils.getTestActionFilename("argCheck.js"))) + Some(TestUtils.getTestActionFilename("argCheck.js"))) } val run = wsk.action.invoke(name) @@ -432,7 +431,7 @@ class WskBasicUsageTests extends TestHelpers with WskTestHelpers { assetHelper.withCleaner(wsk.action, name) { (action, _) => action.create(name, - Some(TestCLIUtils.getTestActionFilename("helloAsync.js")), + Some(TestUtils.getTestActionFilename("helloAsync.js")), memory = Some(memoryLimit), timeout = Some(timeLimit), logsize = Some(logLimit)) @@ -466,7 +465,7 @@ class WskBasicUsageTests extends TestHelpers with WskTestHelpers { "invalid kind", confirmDelete = false) { (action, name) => action.create(name, - Some(TestCLIUtils.getTestActionFilename("echo.js")), + Some(TestUtils.getTestActionFilename("echo.js")), kind = Some("foobar"), expectedExitCode = BAD_REQUEST) } @@ -477,7 +476,7 @@ class WskBasicUsageTests extends TestHelpers with WskTestHelpers { wskprops) { (wp, assetHelper) => val name = "zipWithNoKind" val zippedPythonAction = - Some(TestCLIUtils.getTestActionFilename("python.zip")) + Some(TestUtils.getTestActionFilename("python.zip")) val createResult = assetHelper.withCleaner(wsk.action, name, confirmDelete = false) { (action, _) => @@ -526,7 +525,7 @@ class WskBasicUsageTests extends TestHelpers with WskTestHelpers { action.create( name, Some( - TestCLIUtils.getTestActionFilename("helloOpenwhiskPackage.js"))) + TestUtils.getTestActionFilename("helloOpenwhiskPackage.js"))) } val run = wsk.action @@ -548,7 +547,7 @@ class WskBasicUsageTests extends TestHelpers with WskTestHelpers { val name = "context" assetHelper.withCleaner(wsk.action, name) { (action, _) => action.create(name, - Some(TestCLIUtils.getTestActionFilename("helloContext.js"))) + Some(TestUtils.getTestActionFilename("helloContext.js"))) } val start = Instant.now(Clock.systemUTC()).toEpochMilli @@ -569,7 +568,7 @@ class WskBasicUsageTests extends TestHelpers with WskTestHelpers { wskprops) { (wp, assetHelper) => val name = "invokeResult" assetHelper.withCleaner(wsk.action, name) { (action, _) => - action.create(name, Some(TestCLIUtils.getTestActionFilename("echo.js"))) + action.create(name, Some(TestUtils.getTestActionFilename("echo.js"))) } val args = Map("hello" -> "Robert".toJson) val run = wsk.action.invoke(name, args, blocking = true, result = true) @@ -582,7 +581,7 @@ class WskBasicUsageTests extends TestHelpers with WskTestHelpers { assetHelper.withCleaner(wsk.action, name) { (action, _) => action.create( name, - Some(TestCLIUtils.getTestActionFilename("helloDeadline.js")), + Some(TestUtils.getTestActionFilename("helloDeadline.js")), timeout = Some(3 seconds)) } @@ -605,7 +604,7 @@ class WskBasicUsageTests extends TestHelpers with WskTestHelpers { assetHelper.withCleaner(wsk.action, name) { (action, _) => action.create( name, - Some(TestCLIUtils.getTestActionFilename("helloDeadline.js")), + Some(TestUtils.getTestActionFilename("helloDeadline.js")), timeout = Some(3 seconds)) } @@ -634,7 +633,7 @@ class WskBasicUsageTests extends TestHelpers with WskTestHelpers { it should "ensure --web flags set the proper annotations" in withAssetCleaner( wskprops) { (wp, assetHelper) => val name = "webaction" - val file = Some(TestCLIUtils.getTestActionFilename("echo.js")) + val file = Some(TestUtils.getTestActionFilename("echo.js")) assetHelper.withCleaner(wsk.action, name) { (action, _) => action.create(name, file) @@ -667,7 +666,7 @@ class WskBasicUsageTests extends TestHelpers with WskTestHelpers { it should "ensure action update with --web flag only copies existing annotations when new annotations are not provided" in withAssetCleaner( wskprops) { (wp, assetHelper) => val name = "webaction" - val file = Some(TestCLIUtils.getTestActionFilename("echo.js")) + val file = Some(TestUtils.getTestActionFilename("echo.js")) val createKey = "createKey" val createValue = JsString("createValue") val updateKey = "updateKey" @@ -723,7 +722,7 @@ class WskBasicUsageTests extends TestHelpers with WskTestHelpers { it should "ensure action update creates an action with --web flag" in withAssetCleaner( wskprops) { (wp, assetHelper) => val name = "webaction" - val file = Some(TestCLIUtils.getTestActionFilename("echo.js")) + val file = Some(TestUtils.getTestActionFilename("echo.js")) assetHelper.withCleaner(wsk.action, name) { (action, _) => action.create(name, file, web = Some("true"), update = true) @@ -744,7 +743,7 @@ class WskBasicUsageTests extends TestHelpers with WskTestHelpers { it should "reject action create and update with invalid --web flag input" in withAssetCleaner( wskprops) { (wp, assetHelper) => val name = "webaction" - val file = Some(TestCLIUtils.getTestActionFilename("echo.js")) + val file = Some(TestUtils.getTestActionFilename("echo.js")) val invalidInput = "bogus" val errorMsg = s"Invalid argument '$invalidInput' for --web flag. Valid input consist of 'yes', 'true', 'raw', 'false', or 'no'." @@ -765,8 +764,8 @@ class WskBasicUsageTests extends TestHelpers with WskTestHelpers { it should "reject action create and update when --web-secure used on a non-web action" in withAssetCleaner( wskprops) { (wp, assetHelper) => - val name = WskCliTestHelpers.withTimestamp("nonwebaction") - val file = Some(TestCLIUtils.getTestActionFilename("echo.js")) + val name = withTimestamp("nonwebaction") + val file = Some(TestUtils.getTestActionFilename("echo.js")) val errorMsg = s"The --web-secure option is only valid when the --web option is enabled." @@ -804,8 +803,8 @@ class WskBasicUsageTests extends TestHelpers with WskTestHelpers { it should "generate a require-whisk-annotation --web-secure used on a web action" in withAssetCleaner( wskprops) { (wp, assetHelper) => - val name = WskCliTestHelpers.withTimestamp("webaction") - val file = Some(TestCLIUtils.getTestActionFilename("echo.js")) + val name = withTimestamp("webaction") + val file = Some(TestUtils.getTestActionFilename("echo.js")) val secretStr = "my-secret" // -web true --web-secure true -> annotation "require-whisk-auth" value is an int @@ -882,8 +881,8 @@ class WskBasicUsageTests extends TestHelpers with WskTestHelpers { it should "remove existing require-whisk-annotation when --web-secure is false" in withAssetCleaner( wskprops) { (wp, assetHelper) => - val name = WskCliTestHelpers.withTimestamp("webaction") - val file = Some(TestCLIUtils.getTestActionFilename("echo.js")) + val name = withTimestamp("webaction") + val file = Some(TestUtils.getTestActionFilename("echo.js")) val secretStr = "my-secret" // @@ -917,7 +916,7 @@ class WskBasicUsageTests extends TestHelpers with WskTestHelpers { it should "ensure action update with --web-secure flag only copies existing annotations when new annotations are not provided" in withAssetCleaner( wskprops) { (wp, assetHelper) => val name = "webaction" - val file = Some(TestCLIUtils.getTestActionFilename("echo.js")) + val file = Some(TestUtils.getTestActionFilename("echo.js")) val createKey = "createKey" val createValue = JsString("createValue") val updateKey = "updateKey" @@ -993,7 +992,7 @@ class WskBasicUsageTests extends TestHelpers with WskTestHelpers { it should "invoke action while not encoding &, <, > characters" in withAssetCleaner( wskprops) { (wp, assetHelper) => val name = "nonescape" - val file = Some(TestCLIUtils.getTestActionFilename("hello.js")) + val file = Some(TestUtils.getTestActionFilename("hello.js")) val nonescape = "&<>" val input = Map("payload" -> nonescape.toJson) val output = JsObject("payload" -> JsString(s"hello, $nonescape!")) @@ -1014,11 +1013,11 @@ class WskBasicUsageTests extends TestHelpers with WskTestHelpers { it should "get an action URL" in withAssetCleaner(wskprops) { (wp, assetHelper) => - val actionName = WskCliTestHelpers.withTimestamp("action name@_-.") - val packageName = WskCliTestHelpers.withTimestamp("package name@_-.") + val actionName = withTimestamp("action name@_-.") + val packageName = withTimestamp("package name@_-.") val defaultPackageName = "default" - val webActionName = WskCliTestHelpers.withTimestamp("web action name@_-.") - val nonExistentActionName = WskCliTestHelpers.withTimestamp("non-existence action") + val webActionName = withTimestamp("web action name@_-.") + val nonExistentActionName = withTimestamp("non-existence action") val packagedAction = s"$packageName/$actionName" val packagedWebAction = s"$packageName/$webActionName" val namespace = wsk.namespace.whois() @@ -1139,7 +1138,7 @@ class WskBasicUsageTests extends TestHelpers with WskTestHelpers { val params = Seq("-p", "bigValue", "a" * 1000) assetHelper.withCleaner(wsk.action, name) { (action, _) => - action.create(name, Some(TestCLIUtils.getTestActionFilename("echo.js"))) + action.create(name, Some(TestUtils.getTestActionFilename("echo.js"))) } val truncated = @@ -1382,8 +1381,8 @@ class WskBasicUsageTests extends TestHelpers with WskTestHelpers { it should "create, and get a package to verify file parameter and annotation parsing" in withAssetCleaner( wskprops) { (wp, assetHelper) => val name = "packageAnnotAndParamFileParsing" - val file = Some(TestCLIUtils.getTestActionFilename("hello.js")) - val argInput = Some(TestCLIUtils.getTestActionFilename("validInput1.json")) + val file = Some(TestUtils.getTestActionFilename("hello.js")) + val argInput = Some(TestUtils.getTestActionFilename("validInput1.json")) assetHelper.withCleaner(wsk.pkg, name) { (pkg, _) => pkg.create(name, annotationFile = argInput, parameterFile = argInput) @@ -1444,7 +1443,7 @@ class WskBasicUsageTests extends TestHelpers with WskTestHelpers { it should "report conformance error accessing action as package" in withAssetCleaner( wskprops) { (wp, assetHelper) => val name = "aAsP" - val file = Some(TestCLIUtils.getTestActionFilename("hello.js")) + val file = Some(TestUtils.getTestActionFilename("hello.js")) assetHelper.withCleaner(wsk.action, name) { (action, _) => action.create(name, file) } @@ -1567,8 +1566,8 @@ class WskBasicUsageTests extends TestHelpers with WskTestHelpers { it should "create, and get a trigger to verify file parameter and annotation parsing" in withAssetCleaner( wskprops) { (wp, assetHelper) => val name = "triggerAnnotAndParamFileParsing" - val file = Some(TestCLIUtils.getTestActionFilename("hello.js")) - val argInput = Some(TestCLIUtils.getTestActionFilename("validInput1.json")) + val file = Some(TestUtils.getTestActionFilename("hello.js")) + val argInput = Some(TestUtils.getTestActionFilename("validInput1.json")) assetHelper.withCleaner(wsk.trigger, name) { (trigger, _) => trigger.create(name, annotationFile = argInput, parameterFile = argInput) @@ -1662,12 +1661,12 @@ class WskBasicUsageTests extends TestHelpers with WskTestHelpers { it should "invoke a feed action with the correct lifecyle event when creating, retrieving and deleting a feed trigger" in withAssetCleaner( wskprops) { (wp, assetHelper) => - val actionName = WskCliTestHelpers.withTimestamp("echo") + val actionName = withTimestamp("echo") val triggerName = "feedTest" assetHelper.withCleaner(wsk.action, actionName) { (action, _) => action.create(actionName, - Some(TestCLIUtils.getTestActionFilename("echo.js"))) + Some(TestUtils.getTestActionFilename("echo.js"))) } try { @@ -1771,7 +1770,7 @@ class WskBasicUsageTests extends TestHelpers with WskTestHelpers { it should "create, and list an action with a long name" in withAssetCleaner( wskprops) { (wp, assetHelper) => val name = "x" * 70 - val file = Some(TestCLIUtils.getTestActionFilename("hello.js")) + val file = Some(TestUtils.getTestActionFilename("hello.js")) assetHelper.withCleaner(wsk.action, name) { (action, _) => action.create(name, file) } @@ -1794,8 +1793,8 @@ class WskBasicUsageTests extends TestHelpers with WskTestHelpers { it should "create, and list a rule with a long name" in withAssetCleaner( wskprops) { (wp, assetHelper) => val ruleName = "x" * 70 - val triggerName = WskCliTestHelpers.withTimestamp("listRulesTrigger") - val actionName = WskCliTestHelpers.withTimestamp("listRulesAction"); + val triggerName = withTimestamp("listRulesTrigger") + val actionName = withTimestamp("listRulesAction"); assetHelper.withCleaner(wsk.trigger, triggerName) { (trigger, name) => trigger.create(name) } @@ -1813,7 +1812,7 @@ class WskBasicUsageTests extends TestHelpers with WskTestHelpers { it should "return a list of alphabetized actions" in withAssetCleaner( wskprops) { (wp, assetHelper) => // Declare 4 actions, create them out of alphabetical order - val actionName = WskCliTestHelpers.withTimestamp("actionAlphaTest") + val actionName = withTimestamp("actionAlphaTest") for (i <- 1 to 3) { val name = s"$actionName$i" assetHelper.withCleaner(wsk.action, name) { (action, name) => @@ -1840,8 +1839,8 @@ class WskBasicUsageTests extends TestHelpers with WskTestHelpers { it should "return an alphabetized list with default package actions on top" in withAssetCleaner( wskprops) { (wp, assetHelper) => // Declare 4 actions, create them out of alphabetical order - val actionName = WskCliTestHelpers.withTimestamp("actionPackageAlphaTest") - val packageName = WskCliTestHelpers.withTimestamp("packageAlphaTest") + val actionName = withTimestamp("actionPackageAlphaTest") + val packageName = withTimestamp("packageAlphaTest") assetHelper.withCleaner(wsk.action, actionName) { (action, actionName) => action.create(actionName, defaultAction) } @@ -1933,8 +1932,8 @@ class WskBasicUsageTests extends TestHelpers with WskTestHelpers { it should "return a list of alphabetized rules" in withAssetCleaner(wskprops) { (wp, assetHelper) => // Declare a trigger and an action for the purposes of creating rules - val triggerName = WskCliTestHelpers.withTimestamp("listRulesTrigger") - val actionName = WskCliTestHelpers.withTimestamp("listRulesAction") + val triggerName = withTimestamp("listRulesTrigger") + val actionName = withTimestamp("listRulesAction") assetHelper.withCleaner(wsk.trigger, triggerName) { (trigger, name) => trigger.create(name) @@ -1968,21 +1967,21 @@ class WskBasicUsageTests extends TestHelpers with WskTestHelpers { it should "reject commands that are executed with invalid JSON for annotations and parameters" in { val invalidJSONInputs = getInvalidJSONInput val invalidJSONFiles = Seq( - TestCLIUtils.getTestActionFilename("malformed.js"), - TestCLIUtils.getTestActionFilename("invalidInput1.json"), - TestCLIUtils.getTestActionFilename("invalidInput2.json"), - TestCLIUtils.getTestActionFilename("invalidInput3.json"), - TestCLIUtils.getTestActionFilename("invalidInput4.json") + TestUtils.getTestActionFilename("malformed.js"), + TestUtils.getTestActionFilename("invalidInput1.json"), + TestUtils.getTestActionFilename("invalidInput2.json"), + TestUtils.getTestActionFilename("invalidInput3.json"), + TestUtils.getTestActionFilename("invalidInput4.json") ) val paramCmds = Seq( Seq("action", "create", "actionName", - TestCLIUtils.getTestActionFilename("hello.js")), + TestUtils.getTestActionFilename("hello.js")), Seq("action", "update", "actionName", - TestCLIUtils.getTestActionFilename("hello.js")), + TestUtils.getTestActionFilename("hello.js")), Seq("action", "invoke", "actionName"), Seq("package", "create", "packageName"), Seq("package", "update", "packageName"), @@ -1995,11 +1994,11 @@ class WskBasicUsageTests extends TestHelpers with WskTestHelpers { Seq("action", "create", "actionName", - TestCLIUtils.getTestActionFilename("hello.js")), + TestUtils.getTestActionFilename("hello.js")), Seq("action", "update", "actionName", - TestCLIUtils.getTestActionFilename("hello.js")), + TestUtils.getTestActionFilename("hello.js")), Seq("package", "create", "packageName"), Seq("package", "update", "packageName"), Seq("package", "bind", "packageName", "boundPackageName"), @@ -2042,7 +2041,7 @@ class WskBasicUsageTests extends TestHelpers with WskTestHelpers { } it should "reject commands that are executed with a missing or invalid parameter or annotation file" in { - val emptyFile = TestCLIUtils.getTestActionFilename("emtpy.js") + val emptyFile = TestUtils.getTestActionFilename("emtpy.js") val missingFile = "notafile" val emptyFileMsg = s"File '$emptyFile' is not a valid file or it does not exist" @@ -2052,14 +2051,14 @@ class WskBasicUsageTests extends TestHelpers with WskTestHelpers { (Seq("action", "create", "actionName", - TestCLIUtils.getTestActionFilename("hello.js"), + TestUtils.getTestActionFilename("hello.js"), "-P", emptyFile), emptyFileMsg), (Seq("action", "update", "actionName", - TestCLIUtils.getTestActionFilename("hello.js"), + TestUtils.getTestActionFilename("hello.js"), "-P", emptyFile), emptyFileMsg), @@ -2094,14 +2093,14 @@ class WskBasicUsageTests extends TestHelpers with WskTestHelpers { (Seq("action", "create", "actionName", - TestCLIUtils.getTestActionFilename("hello.js"), + TestUtils.getTestActionFilename("hello.js"), "-A", missingFile), missingFileMsg), (Seq("action", "update", "actionName", - TestCLIUtils.getTestActionFilename("hello.js"), + TestUtils.getTestActionFilename("hello.js"), "-A", missingFile), missingFileMsg), @@ -2419,7 +2418,7 @@ class WskBasicUsageTests extends TestHelpers with WskTestHelpers { it should "create an action with different permutations of limits" in withAssetCleaner( wskprops) { (wp, assetHelper) => - val file = Some(TestCLIUtils.getTestActionFilename("hello.js")) + val file = Some(TestUtils.getTestActionFilename("hello.js")) def testLimit(timeout: Option[Duration] = None, memory: Option[ByteSize] = None, ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
