This is an automated email from the ASF dual-hosted git repository. mdeuser pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git
commit 38c3679b9a3495ba30177e1cb97042b33d3667c2 Author: Rodric Rabbah <rod...@gmail.com> AuthorDate: Fri Jun 8 21:32:08 2018 -0400 Renaming, no intended semantic change. --- .../apigw/healthtests/ApiGwEndToEndTests.scala | 4 +- .../apigw/healthtests/ApiGwRestEndToEndTests.scala | 4 +- .../common/{CliCommand.scala => CommandLine.scala} | 4 +- .../common/{BaseWsk.scala => WskOperations.scala} | 34 +++++----- tests/src/test/scala/common/WskTestHelpers.scala | 12 ++-- .../{WskRest.scala => WskRestOperations.scala} | 75 ++++++++++++---------- tests/src/test/scala/ha/ShootComponentsTests.scala | 4 +- tests/src/test/scala/limits/ThrottleTests.scala | 6 +- tests/src/test/scala/services/HeadersTests.scala | 4 +- .../test/scala/system/basic/WskActionTests.scala | 4 +- .../scala/system/basic/WskActivationTests.scala | 4 +- .../scala/system/basic/WskBasicJavaTests.scala | 4 +- .../scala/system/basic/WskBasicNode6Tests.scala | 4 +- .../system/basic/WskBasicNodeDefaultTests.scala | 4 +- .../scala/system/basic/WskBasicPythonTests.scala | 4 +- .../scala/system/basic/WskBasicSwift3Tests.scala | 4 +- .../scala/system/basic/WskConductorTests.scala | 4 +- .../test/scala/system/basic/WskConsoleTests.scala | 4 +- .../test/scala/system/basic/WskPackageTests.scala | 4 +- .../scala/system/basic/WskRestActionTests.scala | 4 +- .../system/basic/WskRestActivationTests.scala | 4 +- .../scala/system/basic/WskRestBasicJavaTests.scala | 4 +- .../system/basic/WskRestBasicNode6Tests.scala | 4 +- .../system/basic/WskRestBasicNode8Tests.scala | 4 +- .../basic/WskRestBasicNodeDefaultTests.scala | 4 +- .../system/basic/WskRestBasicPythonTests.scala | 4 +- .../system/basic/WskRestBasicSwift311Tests.scala | 4 +- .../system/basic/WskRestBasicSwift41Tests.scala | 4 +- .../scala/system/basic/WskRestBasicTests.scala | 4 +- .../scala/system/basic/WskRestConductorTests.scala | 4 +- .../scala/system/basic/WskRestPackageTests.scala | 4 +- .../test/scala/system/basic/WskRestRuleTests.scala | 4 +- .../scala/system/basic/WskRestSequenceTests.scala | 4 +- .../system/basic/WskRestUnicodeJavaTests.scala | 4 +- .../system/basic/WskRestUnicodeNode6Tests.scala | 4 +- .../system/basic/WskRestUnicodeNode8Tests.scala | 4 +- .../system/basic/WskRestUnicodePython2Tests.scala | 4 +- .../system/basic/WskRestUnicodePython3Tests.scala | 4 +- .../system/basic/WskRestUnicodeSwift311Tests.scala | 4 +- .../system/basic/WskRestUnicodeSwift41Tests.scala | 4 +- .../src/test/scala/system/basic/WskRuleTests.scala | 4 +- .../test/scala/system/basic/WskSequenceTests.scala | 4 +- .../test/scala/system/basic/WskUnicodeTests.scala | 4 +- .../test/scala/system/rest/ActionSchemaTests.scala | 4 +- .../test/scala/whisk/common/UserEventTests.scala | 4 +- .../scala/whisk/core/admin/WskAdminTests.scala | 4 +- .../test/ApiGwRestRoutemgmtActionTests.scala | 4 +- .../actions/test/ApiGwRoutemgmtActionTests.scala | 4 +- .../scala/whisk/core/cli/test/ApiGwRestTests.scala | 4 +- .../scala/whisk/core/cli/test/BaseApiGwTests.scala | 4 +- .../core/cli/test/WskActionSequenceTests.scala | 4 +- .../whisk/core/cli/test/WskEntitlementTests.scala | 4 +- .../core/cli/test/WskRestActionSequenceTests.scala | 4 +- .../core/cli/test/WskRestBasicUsageTests.scala | 4 +- .../core/cli/test/WskRestEntitlementTests.scala | 4 +- .../core/cli/test/WskRestWebActionsTests.scala | 4 +- .../whisk/core/cli/test/WskWebActionsTests.scala | 4 +- .../core/database/test/CacheConcurrencyTests.scala | 4 +- .../whisk/core/limits/ActionLimitsTests.scala | 4 +- .../whisk/core/limits/MaxActionDurationTests.scala | 4 +- 60 files changed, 179 insertions(+), 172 deletions(-) diff --git a/tests/src/test/scala/apigw/healthtests/ApiGwEndToEndTests.scala b/tests/src/test/scala/apigw/healthtests/ApiGwEndToEndTests.scala index 1b0f5e0..59821e7 100644 --- a/tests/src/test/scala/apigw/healthtests/ApiGwEndToEndTests.scala +++ b/tests/src/test/scala/apigw/healthtests/ApiGwEndToEndTests.scala @@ -34,7 +34,7 @@ import com.jayway.restassured.RestAssured import common.TestHelpers import common.TestUtils import common.TestUtils._ -import common.BaseWsk +import common.WskOperations import common.WskProps import common.WskTestHelpers import spray.json._ @@ -54,7 +54,7 @@ abstract class ApiGwEndToEndTests with BeforeAndAfterAll { implicit val wskprops: common.WskProps = WskProps() - val wsk: BaseWsk + val wsk: WskOperations val namespace: String = wsk.namespace.whois() val createCode: Int diff --git a/tests/src/test/scala/apigw/healthtests/ApiGwRestEndToEndTests.scala b/tests/src/test/scala/apigw/healthtests/ApiGwRestEndToEndTests.scala index 2f92185..abb82e0 100644 --- a/tests/src/test/scala/apigw/healthtests/ApiGwRestEndToEndTests.scala +++ b/tests/src/test/scala/apigw/healthtests/ApiGwRestEndToEndTests.scala @@ -27,13 +27,13 @@ import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner import common.TestUtils._ -import common.rest.WskRest +import common.rest.WskRestOperations import common.rest.RestResult @RunWith(classOf[JUnitRunner]) class ApiGwRestEndToEndTests extends ApiGwEndToEndTests { - override lazy val wsk: common.rest.WskRest = new WskRest + override lazy val wsk: common.rest.WskRestOperations = new WskRestOperations override val createCode: Int = OK.intValue override def verifyAPICreated(rr: RunResult): Unit = { diff --git a/tests/src/test/scala/common/CliCommand.scala b/tests/src/test/scala/common/CommandLine.scala similarity index 98% rename from tests/src/test/scala/common/CliCommand.scala rename to tests/src/test/scala/common/CommandLine.scala index 44c9dcf..55e451d 100644 --- a/tests/src/test/scala/common/CliCommand.scala +++ b/tests/src/test/scala/common/CommandLine.scala @@ -26,7 +26,7 @@ import TestUtils._ import scala.collection.mutable -trait CliCommand extends Matchers { +trait CommandLine extends Matchers { /** * The base command to run. This returns a new mutable buffer, intended for building the rest of the command line. @@ -102,7 +102,7 @@ trait CliCommand extends Matchers { } object WskAdmin { - val wskadmin = new CliCommand { + val wskadmin = new CommandLine { override def baseCommand: mutable.Buffer[String] = WskAdmin.baseCommand } diff --git a/tests/src/test/scala/common/BaseWsk.scala b/tests/src/test/scala/common/WskOperations.scala similarity index 94% rename from tests/src/test/scala/common/BaseWsk.scala rename to tests/src/test/scala/common/WskOperations.scala index 90e9ffa..9aa1564 100644 --- a/tests/src/test/scala/common/BaseWsk.scala +++ b/tests/src/test/scala/common/WskOperations.scala @@ -143,14 +143,14 @@ trait HasActivation { } } -trait BaseWsk { - val action: BaseAction - val trigger: BaseTrigger - val rule: BaseRule - val activation: BaseActivation - val pkg: BasePackage - val namespace: BaseNamespace - val api: BaseApi +trait WskOperations { + val action: ActionOperations + val trigger: TriggerOperations + val rule: RuleOperations + val activation: ActivationOperations + val pkg: PackageOperations + val namespace: NamespaceOperations + val api: GatewayOperations /* * Utility function to return a JSON object from the CLI output that returns @@ -161,7 +161,7 @@ trait BaseWsk { } } -trait BaseListOrGetFromCollection { +trait ListOrGetFromCollectionOperations { protected val noun: String @@ -193,7 +193,7 @@ trait BaseListOrGetFromCollection { saveAs: Option[String] = None)(implicit wp: WskProps): RunResult } -trait BaseDeleteFromCollection { +trait DeleteFromCollectionOperations { protected val noun: String @@ -215,7 +215,7 @@ trait BaseDeleteFromCollection { def sanitize(name: String)(implicit wp: WskProps): RunResult } -trait BaseAction extends BaseDeleteFromCollection with BaseListOrGetFromCollection { +trait ActionOperations extends DeleteFromCollectionOperations with ListOrGetFromCollectionOperations { def create(name: String, artifact: Option[String], @@ -243,7 +243,7 @@ trait BaseAction extends BaseDeleteFromCollection with BaseListOrGetFromCollecti expectedExitCode: Int = SUCCESS_EXIT)(implicit wp: WskProps): RunResult } -trait BasePackage extends BaseDeleteFromCollection with BaseListOrGetFromCollection { +trait PackageOperations extends DeleteFromCollectionOperations with ListOrGetFromCollectionOperations { def create(name: String, parameters: Map[String, JsValue] = Map(), @@ -261,7 +261,7 @@ trait BasePackage extends BaseDeleteFromCollection with BaseListOrGetFromCollect expectedExitCode: Int = SUCCESS_EXIT)(implicit wp: WskProps): RunResult } -trait BaseTrigger extends BaseDeleteFromCollection with BaseListOrGetFromCollection { +trait TriggerOperations extends DeleteFromCollectionOperations with ListOrGetFromCollectionOperations { def create(name: String, parameters: Map[String, JsValue] = Map(), @@ -279,7 +279,7 @@ trait BaseTrigger extends BaseDeleteFromCollection with BaseListOrGetFromCollect expectedExitCode: Int = SUCCESS_EXIT)(implicit wp: WskProps): RunResult } -trait BaseRule extends BaseDeleteFromCollection with BaseListOrGetFromCollection { +trait RuleOperations extends DeleteFromCollectionOperations with ListOrGetFromCollectionOperations { def create(name: String, trigger: String, @@ -296,7 +296,7 @@ trait BaseRule extends BaseDeleteFromCollection with BaseListOrGetFromCollection def state(name: String, expectedExitCode: Int = SUCCESS_EXIT)(implicit wp: WskProps): RunResult } -trait BaseActivation { +trait ActivationOperations { def extractActivationId(result: RunResult): Option[String] @@ -328,14 +328,14 @@ trait BaseActivation { implicit wp: WskProps): RunResult } -trait BaseNamespace { +trait NamespaceOperations { def list(expectedExitCode: Int = SUCCESS_EXIT, nameSort: Option[Boolean] = None)(implicit wp: WskProps): RunResult def whois()(implicit wskprops: WskProps): String } -trait BaseApi { +trait GatewayOperations { def create(basepath: Option[String] = None, relpath: Option[String] = None, diff --git a/tests/src/test/scala/common/WskTestHelpers.scala b/tests/src/test/scala/common/WskTestHelpers.scala index 0008784..65d2f16 100644 --- a/tests/src/test/scala/common/WskTestHelpers.scala +++ b/tests/src/test/scala/common/WskTestHelpers.scala @@ -166,7 +166,7 @@ object RuleActivationResult extends DefaultJsonProtocol { * completed, will delete them all. */ trait WskTestHelpers extends Matchers { - type Assets = ListBuffer[(BaseDeleteFromCollection, String, Boolean)] + type Assets = ListBuffer[(DeleteFromCollectionOperations, String, Boolean)] /** * Helper to register an entity to delete once a test completes. @@ -175,7 +175,7 @@ trait WskTestHelpers extends Matchers { * */ class AssetCleaner(assetsToDeleteAfterTest: Assets, wskprops: WskProps) { - def withCleaner[T <: BaseDeleteFromCollection](cli: T, name: String, confirmDelete: Boolean = true)( + def withCleaner[T <: DeleteFromCollectionOperations](cli: T, name: String, confirmDelete: Boolean = true)( cmd: (T, String) => RunResult): RunResult = { // sanitize (delete) if asset exists cli.sanitize(name)(wskprops) @@ -208,7 +208,7 @@ trait WskTestHelpers extends Matchers { case (cli, n, delete) => n -> Try { cli match { - case _: BasePackage if delete => + case _: PackageOperations if delete => // sanitize ignores the exit code, so we can inspect the actual result and retry accordingly val rr = cli.sanitize(n)(wskprops) rr.exitCode match { @@ -239,7 +239,7 @@ trait WskTestHelpers extends Matchers { * the activation to the post processor which then check for expected values. */ def withActivation( - wsk: BaseActivation, + wsk: ActivationOperations, run: RunResult, initialWait: Duration = 1.second, pollPeriod: Duration = 1.second, @@ -257,7 +257,7 @@ trait WskTestHelpers extends Matchers { * Polls activations until one matching id is found. If found, pass * the activation to the post processor which then check for expected values. */ - def withActivation(wsk: BaseActivation, + def withActivation(wsk: ActivationOperations, activationId: String, initialWait: Duration, pollPeriod: Duration, @@ -273,7 +273,7 @@ trait WskTestHelpers extends Matchers { } } } - def withActivation(wsk: BaseActivation, activationId: String)(check: ActivationResult => Unit)( + def withActivation(wsk: ActivationOperations, activationId: String)(check: ActivationResult => Unit)( implicit wskprops: WskProps): Unit = { withActivation(wsk, activationId, 1.second, 1.second, 60.seconds)(check) } diff --git a/tests/src/test/scala/common/rest/WskRest.scala b/tests/src/test/scala/common/rest/WskRestOperations.scala similarity index 96% rename from tests/src/test/scala/common/rest/WskRest.scala rename to tests/src/test/scala/common/rest/WskRestOperations.scala index a209735..b3d42c1 100644 --- a/tests/src/test/scala/common/rest/WskRest.scala +++ b/tests/src/test/scala/common/rest/WskRestOperations.scala @@ -58,8 +58,8 @@ import akka.stream.ActorMaterializer import spray.json._ import spray.json.DefaultJsonProtocol._ import common._ -import common.BaseDeleteFromCollection -import common.BaseListOrGetFromCollection +import common.DeleteFromCollectionOperations +import common.ListOrGetFromCollectionOperations import common.HasActivation import common.TestUtils.SUCCESS_EXIT import common.TestUtils.ANY_ERROR_EXIT @@ -145,17 +145,17 @@ object HttpConnection { } } -class WskRest() extends RunWskRestCmd with BaseWsk { - override implicit val action = new WskRestAction - override implicit val trigger = new WskRestTrigger - override implicit val rule = new WskRestRule - override implicit val activation = new WskRestActivation - override implicit val pkg = new WskRestPackage - override implicit val namespace = new WskRestNamespace - override implicit val api = new WskRestApi +class WskRestOperations() extends RunWskRestCmd with WskOperations { + override implicit val action = new RestActionOperations + override implicit val trigger = new RestTriggerOperations + override implicit val rule = new RestRuleOperations + override implicit val activation = new RestActivationOperations + override implicit val pkg = new RestPackageOperations + override implicit val namespace = new RestNamespaceOperations + override implicit val api = new RestGatewayOperations } -trait ListOrGetFromCollectionRest extends RunWskRestCmd with BaseListOrGetFromCollection { +trait RestListOrGetFromCollectionOperations extends RunWskRestCmd with ListOrGetFromCollectionOperations { import FullyQualifiedNames.resolve /** @@ -208,7 +208,7 @@ trait ListOrGetFromCollectionRest extends RunWskRestCmd with BaseListOrGetFromCo } } -trait DeleteFromCollectionRest extends RunWskRestCmd with BaseDeleteFromCollection { +trait RestDeleteFromCollectionOperations extends RunWskRestCmd with DeleteFromCollectionOperations { /** * Deletes entity from collection. @@ -237,7 +237,7 @@ trait DeleteFromCollectionRest extends RunWskRestCmd with BaseDeleteFromCollecti } } -trait HasActivationRest extends HasActivation { +trait RestActivation extends HasActivation { /** * Extracts activation id from invoke (action or trigger) or activation get @@ -257,12 +257,12 @@ trait HasActivationRest extends HasActivation { } } -class WskRestAction +class RestActionOperations extends RunWskRestCmd - with ListOrGetFromCollectionRest - with DeleteFromCollectionRest - with HasActivationRest - with BaseAction { + with RestListOrGetFromCollectionOperations + with RestDeleteFromCollectionOperations + with RestActivation + with ActionOperations { override protected val noun = "actions" @@ -458,12 +458,12 @@ class WskRestAction } } -class WskRestTrigger +class RestTriggerOperations extends RunWskRestCmd - with ListOrGetFromCollectionRest - with DeleteFromCollectionRest - with HasActivationRest - with BaseTrigger { + with RestListOrGetFromCollectionOperations + with RestDeleteFromCollectionOperations + with RestActivation + with TriggerOperations { override protected val noun = "triggers" @@ -568,12 +568,12 @@ class WskRestTrigger } } -class WskRestRule +class RestRuleOperations extends RunWskRestCmd - with ListOrGetFromCollectionRest - with DeleteFromCollectionRest + with RestListOrGetFromCollectionOperations + with RestDeleteFromCollectionOperations with WaitFor - with BaseRule { + with RuleOperations { override protected val noun = "rules" @@ -652,7 +652,7 @@ class WskRestRule } } -class WskRestActivation extends RunWskRestCmd with HasActivationRest with WaitFor with BaseActivation { +class RestActivationOperations extends RunWskRestCmd with RestActivation with WaitFor with ActivationOperations { protected val noun = "activations" @@ -864,7 +864,7 @@ class WskRestActivation extends RunWskRestCmd with HasActivationRest with WaitFo private case class PartialResult(ids: Seq[String]) extends Throwable } -class WskRestNamespace extends RunWskRestCmd with BaseNamespace { +class RestNamespaceOperations extends RunWskRestCmd with NamespaceOperations { protected val noun = "namespaces" @@ -895,11 +895,11 @@ class WskRestNamespace extends RunWskRestCmd with BaseNamespace { } } -class WskRestPackage +class RestPackageOperations extends RunWskRestCmd - with ListOrGetFromCollectionRest - with DeleteFromCollectionRest - with BasePackage { + with RestListOrGetFromCollectionOperations + with RestDeleteFromCollectionOperations + with PackageOperations { override protected val noun = "packages" @@ -979,7 +979,7 @@ class WskRestPackage } -class WskRestApi extends RunWskRestCmd with BaseApi { +class RestGatewayOperations extends RunWskRestCmd with GatewayOperations { protected val noun = "apis" /** @@ -1386,15 +1386,21 @@ class RunWskRestCmd() extends FlatSpec with Matchers with ScalaFutures with WskA web: Boolean = false, expectedExitCode: Int = Accepted.intValue)(implicit wp: WskProps): RestResult = { val (ns, actName) = this.getNamespaceEntityName(name) + val path = if (web) Path(s"$basePath/web/$systemNamespace/$actName.http") else Path(s"$basePath/namespaces/$ns/actions/$actName") + val paramMap = Map("blocking" -> blocking.toString, "result" -> result.toString) + val input = parameterFile map { pf => Some(FileUtils.readFileToString(new File(pf), StandardCharsets.UTF_8)) } getOrElse Some(parameters.toJson.toString) + val resp = requestEntity(POST, path, paramMap, input) + val rr = new RestResult(resp.status.intValue, getRespData(resp), blocking) + // If the statusCode does not not equal to expectedExitCode, it is acceptable that the statusCode // equals to 200 for the case that either blocking or result is set to true. if (!isStatusCodeExpected(expectedExitCode, rr.statusCode.intValue)) { @@ -1404,6 +1410,7 @@ class RunWskRestCmd() extends FlatSpec with Matchers with ScalaFutures with WskA rr.statusCode.intValue shouldBe expectedExitCode } } + rr } } diff --git a/tests/src/test/scala/ha/ShootComponentsTests.scala b/tests/src/test/scala/ha/ShootComponentsTests.scala index e3480bc..4807061 100644 --- a/tests/src/test/scala/ha/ShootComponentsTests.scala +++ b/tests/src/test/scala/ha/ShootComponentsTests.scala @@ -33,7 +33,7 @@ import akka.http.scaladsl.model.StatusCodes import akka.http.scaladsl.unmarshalling.Unmarshal import akka.stream.ActorMaterializer import common._ -import common.rest.{HttpConnection, WskRest} +import common.rest.{HttpConnection, WskRestOperations} import pureconfig._ import spray.json._ import spray.json.DefaultJsonProtocol._ @@ -54,7 +54,7 @@ class ShootComponentsTests with ShootComponentUtils { implicit val wskprops = WskProps() - val wsk = new WskRest + val wsk = new WskRestOperations val defaultAction = Some(TestUtils.getTestActionFilename("hello.js")) implicit val materializer = ActorMaterializer() diff --git a/tests/src/test/scala/limits/ThrottleTests.scala b/tests/src/test/scala/limits/ThrottleTests.scala index bc5da1e..ae01309 100644 --- a/tests/src/test/scala/limits/ThrottleTests.scala +++ b/tests/src/test/scala/limits/ThrottleTests.scala @@ -33,7 +33,7 @@ import org.scalatest.concurrent.ScalaFutures import org.scalatest.junit.JUnitRunner import common._ import common.TestUtils._ -import common.rest.WskRest +import common.rest.WskRestOperations import WskAdmin.wskadmin import spray.json._ import spray.json.DefaultJsonProtocol._ @@ -62,7 +62,7 @@ class ThrottleTests implicit val testConfig = PatienceConfig(5.minutes) implicit val wskprops = WskProps() - val wsk = new WskRest + val wsk = new WskRestOperations val defaultAction = Some(TestUtils.getTestActionFilename("hello.js")) val throttleWindow = 1.minute @@ -301,7 +301,7 @@ class NamespaceSpecificThrottleTests val defaultAction = Some(TestUtils.getTestActionFilename("hello.js")) - val wsk = new WskRest + val wsk = new WskRestOperations def sanitizeNamespaces(namespaces: Seq[String], expectedExitCode: Int = SUCCESS_EXIT): Unit = { val deletions = namespaces.map { ns => diff --git a/tests/src/test/scala/services/HeadersTests.scala b/tests/src/test/scala/services/HeadersTests.scala index af67970..42c51c3 100644 --- a/tests/src/test/scala/services/HeadersTests.scala +++ b/tests/src/test/scala/services/HeadersTests.scala @@ -29,7 +29,7 @@ import org.scalatest.junit.JUnitRunner import org.scalatest.time.Span.convertDurationToSpan import common.TestUtils import common.WhiskProperties -import common.rest.{HttpConnection, WskRest} +import common.rest.{HttpConnection, WskRestOperations} import common.WskProps import common.WskTestHelpers import akka.http.scaladsl.model.Uri @@ -81,7 +81,7 @@ class HeadersTests extends FlatSpec with Matchers with ScalaFutures with WskActo val basePath = Path("/api/v1") implicit val wskprops = WskProps() - val wsk = new WskRest + val wsk = new WskRestOperations /** * Checks, if the required headers are in the list of all headers. diff --git a/tests/src/test/scala/system/basic/WskActionTests.scala b/tests/src/test/scala/system/basic/WskActionTests.scala index bee8170..4eddb13 100644 --- a/tests/src/test/scala/system/basic/WskActionTests.scala +++ b/tests/src/test/scala/system/basic/WskActionTests.scala @@ -23,7 +23,7 @@ import common.ActivationResult import common.JsHelpers import common.TestHelpers import common.TestUtils -import common.BaseWsk +import common.WskOperations import common.WskProps import common.WskTestHelpers import spray.json._ @@ -33,7 +33,7 @@ import spray.json.DefaultJsonProtocol._ abstract class WskActionTests extends TestHelpers with WskTestHelpers with JsHelpers { implicit val wskprops = WskProps() - val wsk: BaseWsk + val wsk: WskOperations val testString = "this is a test" val testResult = JsObject("count" -> testString.split(" ").length.toJson) diff --git a/tests/src/test/scala/system/basic/WskActivationTests.scala b/tests/src/test/scala/system/basic/WskActivationTests.scala index a96be29..4d5c216 100644 --- a/tests/src/test/scala/system/basic/WskActivationTests.scala +++ b/tests/src/test/scala/system/basic/WskActivationTests.scala @@ -20,7 +20,7 @@ package system.basic import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner -import common.{BaseWsk, TestHelpers, TestUtils, WskProps, WskTestHelpers} +import common.{TestHelpers, TestUtils, WskOperations, WskProps, WskTestHelpers} import whisk.utils.retry @@ -33,7 +33,7 @@ import spray.json.DefaultJsonProtocol._ abstract class WskActivationTests extends TestHelpers with WskTestHelpers { implicit val wskprops = WskProps() - val wsk: BaseWsk + val wsk: WskOperations behavior of "Whisk activations" diff --git a/tests/src/test/scala/system/basic/WskBasicJavaTests.scala b/tests/src/test/scala/system/basic/WskBasicJavaTests.scala index fafbde2..ba64d53 100644 --- a/tests/src/test/scala/system/basic/WskBasicJavaTests.scala +++ b/tests/src/test/scala/system/basic/WskBasicJavaTests.scala @@ -24,7 +24,7 @@ import common.TestUtils import common.TestUtils.ANY_ERROR_EXIT import common.WskTestHelpers import common.WskProps -import common.BaseWsk +import common.WskOperations import org.junit.runner.RunWith import org.scalatest.Matchers @@ -36,7 +36,7 @@ import spray.json.JsString abstract class WskBasicJavaTests extends TestHelpers with WskTestHelpers with Matchers { implicit val wskprops = WskProps() - val wsk: BaseWsk + val wsk: WskOperations val expectedDuration = 120.seconds val activationPollDuration = 60.seconds diff --git a/tests/src/test/scala/system/basic/WskBasicNode6Tests.scala b/tests/src/test/scala/system/basic/WskBasicNode6Tests.scala index f4a04e3..c829b6f 100644 --- a/tests/src/test/scala/system/basic/WskBasicNode6Tests.scala +++ b/tests/src/test/scala/system/basic/WskBasicNode6Tests.scala @@ -24,7 +24,7 @@ import common.JsHelpers import common.TestHelpers import common.TestUtils import common.TestUtils.RunResult -import common.BaseWsk +import common.WskOperations import common.WskProps import common.WskTestHelpers import spray.json._ @@ -33,7 +33,7 @@ import spray.json._ abstract class WskBasicNode6Tests extends TestHelpers with WskTestHelpers with JsHelpers { implicit val wskprops = WskProps() - val wsk: BaseWsk + val wsk: WskOperations val defaultAction = Some(TestUtils.getTestActionFilename("hello.js")) lazy val currentNodeJsKind = "nodejs:6" diff --git a/tests/src/test/scala/system/basic/WskBasicNodeDefaultTests.scala b/tests/src/test/scala/system/basic/WskBasicNodeDefaultTests.scala index 2f5d8d3..0e7ed87 100644 --- a/tests/src/test/scala/system/basic/WskBasicNodeDefaultTests.scala +++ b/tests/src/test/scala/system/basic/WskBasicNodeDefaultTests.scala @@ -25,7 +25,7 @@ import common.TestHelpers import common.TestUtils import common.TestUtils.ANY_ERROR_EXIT import common.TestUtils.RunResult -import common.BaseWsk +import common.WskOperations import common.WskProps import common.WskTestHelpers import spray.json._ @@ -35,7 +35,7 @@ import spray.json.DefaultJsonProtocol._ abstract class WskBasicNodeDefaultTests extends TestHelpers with WskTestHelpers with JsHelpers { implicit val wskprops = WskProps() - val wsk: BaseWsk + val wsk: WskOperations val defaultAction = Some(TestUtils.getTestActionFilename("hello.js")) val currentNodeJsDefaultKind = "nodejs:6" diff --git a/tests/src/test/scala/system/basic/WskBasicPythonTests.scala b/tests/src/test/scala/system/basic/WskBasicPythonTests.scala index ada635a..61941d0 100644 --- a/tests/src/test/scala/system/basic/WskBasicPythonTests.scala +++ b/tests/src/test/scala/system/basic/WskBasicPythonTests.scala @@ -26,7 +26,7 @@ import spray.json.DefaultJsonProtocol.StringJsonFormat import common.JsHelpers import common.TestHelpers import common.TestUtils -import common.BaseWsk +import common.WskOperations import common.WskProps import common.WskTestHelpers import common.WhiskProperties @@ -35,7 +35,7 @@ import common.WhiskProperties abstract class WskBasicPythonTests extends TestHelpers with WskTestHelpers with Matchers with JsHelpers { implicit val wskprops = WskProps() - val wsk: BaseWsk + val wsk: WskOperations behavior of "Native Python Action" diff --git a/tests/src/test/scala/system/basic/WskBasicSwift3Tests.scala b/tests/src/test/scala/system/basic/WskBasicSwift3Tests.scala index 857beb0..174bd29 100644 --- a/tests/src/test/scala/system/basic/WskBasicSwift3Tests.scala +++ b/tests/src/test/scala/system/basic/WskBasicSwift3Tests.scala @@ -23,7 +23,7 @@ import scala.concurrent.duration.DurationInt import common.JsHelpers import common.TestHelpers import common.TestUtils -import common.BaseWsk +import common.WskOperations import common.WskProps import common.WskTestHelpers import spray.json._ @@ -33,7 +33,7 @@ import common.TestUtils.RunResult abstract class WskBasicSwift3Tests extends TestHelpers with WskTestHelpers with JsHelpers { implicit val wskprops: common.WskProps = WskProps() - val wsk: BaseWsk + val wsk: WskOperations val defaultAction: Some[String] = Some(TestUtils.getTestActionFilename("hello.swift")) lazy val actionKind = "swift:3.1.1" val activationMaxDuration = 2.minutes diff --git a/tests/src/test/scala/system/basic/WskConductorTests.scala b/tests/src/test/scala/system/basic/WskConductorTests.scala index aa4c5b6..22ba657 100644 --- a/tests/src/test/scala/system/basic/WskConductorTests.scala +++ b/tests/src/test/scala/system/basic/WskConductorTests.scala @@ -28,7 +28,7 @@ import common.StreamLogging import common.JsHelpers import common.TestHelpers import common.TestUtils -import common.BaseWsk +import common.WskOperations import common.WskProps import common.WskTestHelpers @@ -43,7 +43,7 @@ import whisk.http.Messages._ abstract class WskConductorTests extends TestHelpers with WskTestHelpers with JsHelpers with StreamLogging { implicit val wskprops = WskProps() - val wsk: BaseWsk + val wsk: WskOperations val allowedActionDuration = 120 seconds val testString = "this is a test" diff --git a/tests/src/test/scala/system/basic/WskConsoleTests.scala b/tests/src/test/scala/system/basic/WskConsoleTests.scala index 2d6f0fc..3baa03c 100644 --- a/tests/src/test/scala/system/basic/WskConsoleTests.scala +++ b/tests/src/test/scala/system/basic/WskConsoleTests.scala @@ -29,7 +29,7 @@ import org.scalatest.junit.JUnitRunner import common.TestHelpers import common.TestUtils -import common.BaseWsk +import common.WskOperations import common.WskProps import common.WskTestHelpers import spray.json.DefaultJsonProtocol._ @@ -42,7 +42,7 @@ import spray.json._ abstract class WskConsoleTests extends TestHelpers with WskTestHelpers { implicit val wskprops = WskProps() - val wsk: BaseWsk + val wsk: WskOperations val guestNamespace = wskprops.namespace behavior of "Wsk Activation Console" diff --git a/tests/src/test/scala/system/basic/WskPackageTests.scala b/tests/src/test/scala/system/basic/WskPackageTests.scala index fe0daba..3b3c76b 100644 --- a/tests/src/test/scala/system/basic/WskPackageTests.scala +++ b/tests/src/test/scala/system/basic/WskPackageTests.scala @@ -24,7 +24,7 @@ import scala.concurrent.duration.DurationInt import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner import common.TestUtils -import common.BaseWsk +import common.WskOperations import common.WskProps import spray.json._ import spray.json.DefaultJsonProtocol.StringJsonFormat @@ -37,7 +37,7 @@ import common.WskProps abstract class WskPackageTests extends TestHelpers with WskTestHelpers { implicit val wskprops = WskProps() - val wsk: BaseWsk + val wsk: WskOperations val LOG_DELAY = 80 seconds behavior of "Wsk Package" diff --git a/tests/src/test/scala/system/basic/WskRestActionTests.scala b/tests/src/test/scala/system/basic/WskRestActionTests.scala index de2bd2d..1f46628 100644 --- a/tests/src/test/scala/system/basic/WskRestActionTests.scala +++ b/tests/src/test/scala/system/basic/WskRestActionTests.scala @@ -20,14 +20,14 @@ package system.basic import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner -import common.rest.WskRest +import common.rest.WskRestOperations import common.TestUtils import spray.json._ @RunWith(classOf[JUnitRunner]) class WskRestActionTests extends WskActionTests { - override val wsk: WskRest = new WskRest + override val wsk: WskRestOperations = new WskRestOperations it should "create an action with an empty file" in withAssetCleaner(wskprops) { (wp, assetHelper) => val name = "empty" diff --git a/tests/src/test/scala/system/basic/WskRestActivationTests.scala b/tests/src/test/scala/system/basic/WskRestActivationTests.scala index 5044938..c7f7897 100644 --- a/tests/src/test/scala/system/basic/WskRestActivationTests.scala +++ b/tests/src/test/scala/system/basic/WskRestActivationTests.scala @@ -20,9 +20,9 @@ package system.basic import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner -import common.rest.WskRest +import common.rest.WskRestOperations @RunWith(classOf[JUnitRunner]) class WskRestActivationTests extends WskActivationTests { - override val wsk: WskRest = new WskRest + override val wsk: WskRestOperations = new WskRestOperations } diff --git a/tests/src/test/scala/system/basic/WskRestBasicJavaTests.scala b/tests/src/test/scala/system/basic/WskRestBasicJavaTests.scala index 0ccbd56..5cc5126 100644 --- a/tests/src/test/scala/system/basic/WskRestBasicJavaTests.scala +++ b/tests/src/test/scala/system/basic/WskRestBasicJavaTests.scala @@ -17,12 +17,12 @@ package system.basic -import common.rest.WskRest +import common.rest.WskRestOperations import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) class WskRestBasicJavaTests extends WskBasicJavaTests { - override val wsk: common.rest.WskRest = new WskRest + override val wsk: common.rest.WskRestOperations = new WskRestOperations } diff --git a/tests/src/test/scala/system/basic/WskRestBasicNode6Tests.scala b/tests/src/test/scala/system/basic/WskRestBasicNode6Tests.scala index ba23bd6..792b13d 100644 --- a/tests/src/test/scala/system/basic/WskRestBasicNode6Tests.scala +++ b/tests/src/test/scala/system/basic/WskRestBasicNode6Tests.scala @@ -17,12 +17,12 @@ package system.basic -import common.rest.WskRest +import common.rest.WskRestOperations import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) class WskRestBasicNode6Tests extends WskBasicNode6Tests { - override val wsk: common.rest.WskRest = new WskRest + override val wsk: common.rest.WskRestOperations = new WskRestOperations } diff --git a/tests/src/test/scala/system/basic/WskRestBasicNode8Tests.scala b/tests/src/test/scala/system/basic/WskRestBasicNode8Tests.scala index 65a4428..3b69b74 100644 --- a/tests/src/test/scala/system/basic/WskRestBasicNode8Tests.scala +++ b/tests/src/test/scala/system/basic/WskRestBasicNode8Tests.scala @@ -17,12 +17,12 @@ package system.basic -import common.rest.WskRest +import common.rest.WskRestOperations import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) class WskRestBasicNode8Tests extends WskBasicNode8Tests { - override val wsk: common.rest.WskRest = new WskRest + override val wsk: common.rest.WskRestOperations = new WskRestOperations } diff --git a/tests/src/test/scala/system/basic/WskRestBasicNodeDefaultTests.scala b/tests/src/test/scala/system/basic/WskRestBasicNodeDefaultTests.scala index 43b2839..367aa9c 100644 --- a/tests/src/test/scala/system/basic/WskRestBasicNodeDefaultTests.scala +++ b/tests/src/test/scala/system/basic/WskRestBasicNodeDefaultTests.scala @@ -17,12 +17,12 @@ package system.basic -import common.rest.WskRest +import common.rest.WskRestOperations import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) class WskRestBasicNodeDefaultTests extends WskBasicNodeDefaultTests { - override val wsk: common.rest.WskRest = new WskRest + override val wsk: common.rest.WskRestOperations = new WskRestOperations } diff --git a/tests/src/test/scala/system/basic/WskRestBasicPythonTests.scala b/tests/src/test/scala/system/basic/WskRestBasicPythonTests.scala index 3273c99..d6242f1 100644 --- a/tests/src/test/scala/system/basic/WskRestBasicPythonTests.scala +++ b/tests/src/test/scala/system/basic/WskRestBasicPythonTests.scala @@ -17,12 +17,12 @@ package system.basic -import common.rest.WskRest +import common.rest.WskRestOperations import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) class WskRestBasicPythonTests extends WskBasicPythonTests { - override val wsk: common.rest.WskRest = new WskRest + override val wsk: common.rest.WskRestOperations = new WskRestOperations } diff --git a/tests/src/test/scala/system/basic/WskRestBasicSwift311Tests.scala b/tests/src/test/scala/system/basic/WskRestBasicSwift311Tests.scala index 06e4323..46e3935 100644 --- a/tests/src/test/scala/system/basic/WskRestBasicSwift311Tests.scala +++ b/tests/src/test/scala/system/basic/WskRestBasicSwift311Tests.scala @@ -17,13 +17,13 @@ package system.basic -import common.rest.WskRest +import common.rest.WskRestOperations import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) class WskRestBasicSwift311Tests extends WskBasicSwift3Tests { - override val wsk: common.rest.WskRest = new WskRest + override val wsk: common.rest.WskRestOperations = new WskRestOperations override lazy val actionKind = "swift:3.1.1" } diff --git a/tests/src/test/scala/system/basic/WskRestBasicSwift41Tests.scala b/tests/src/test/scala/system/basic/WskRestBasicSwift41Tests.scala index 2a44ccb..0222020 100644 --- a/tests/src/test/scala/system/basic/WskRestBasicSwift41Tests.scala +++ b/tests/src/test/scala/system/basic/WskRestBasicSwift41Tests.scala @@ -17,14 +17,14 @@ package system.basic -import common.rest.WskRest +import common.rest.WskRestOperations import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) class WskRestBasicSwift41Tests extends WskBasicSwift3Tests { - override val wsk: common.rest.WskRest = new WskRest + override val wsk: common.rest.WskRestOperations = new WskRestOperations override lazy val actionKind = "swift:4.1" } diff --git a/tests/src/test/scala/system/basic/WskRestBasicTests.scala b/tests/src/test/scala/system/basic/WskRestBasicTests.scala index 7412f9b..3042205 100644 --- a/tests/src/test/scala/system/basic/WskRestBasicTests.scala +++ b/tests/src/test/scala/system/basic/WskRestBasicTests.scala @@ -32,7 +32,7 @@ import org.scalatest.junit.JUnitRunner import common.TestHelpers import common.TestUtils -import common.rest.WskRest +import common.rest.WskRestOperations import common.rest.RestResult import common.WskProps import common.WskTestHelpers @@ -44,7 +44,7 @@ import whisk.http.Messages class WskRestBasicTests extends TestHelpers with WskTestHelpers { implicit val wskprops: common.WskProps = WskProps() - val wsk: common.rest.WskRest = new WskRest + val wsk: common.rest.WskRestOperations = new WskRestOperations val defaultAction: Some[String] = Some(TestUtils.getTestActionFilename("hello.js")) /** diff --git a/tests/src/test/scala/system/basic/WskRestConductorTests.scala b/tests/src/test/scala/system/basic/WskRestConductorTests.scala index c43bcdb..7a0757b 100644 --- a/tests/src/test/scala/system/basic/WskRestConductorTests.scala +++ b/tests/src/test/scala/system/basic/WskRestConductorTests.scala @@ -20,9 +20,9 @@ package system.basic import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner -import common.rest.WskRest +import common.rest.WskRestOperations @RunWith(classOf[JUnitRunner]) class WskRestConductorTests extends WskConductorTests { - override val wsk: WskRest = new WskRest + override val wsk: WskRestOperations = new WskRestOperations } diff --git a/tests/src/test/scala/system/basic/WskRestPackageTests.scala b/tests/src/test/scala/system/basic/WskRestPackageTests.scala index df5f662..1751f06 100644 --- a/tests/src/test/scala/system/basic/WskRestPackageTests.scala +++ b/tests/src/test/scala/system/basic/WskRestPackageTests.scala @@ -19,9 +19,9 @@ package system.basic import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner -import common.rest.WskRest +import common.rest.WskRestOperations @RunWith(classOf[JUnitRunner]) class WskRestPackageTests extends WskPackageTests { - override val wsk: WskRest = new WskRest + override val wsk: WskRestOperations = new WskRestOperations } diff --git a/tests/src/test/scala/system/basic/WskRestRuleTests.scala b/tests/src/test/scala/system/basic/WskRestRuleTests.scala index d281a6b..7ba4ed7 100644 --- a/tests/src/test/scala/system/basic/WskRestRuleTests.scala +++ b/tests/src/test/scala/system/basic/WskRestRuleTests.scala @@ -21,7 +21,7 @@ import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner import common.TestUtils.RunResult -import common.rest.WskRest +import common.rest.WskRestOperations import common.rest.RestResult import whisk.utils.retry @@ -33,7 +33,7 @@ import spray.json.DefaultJsonProtocol._ @RunWith(classOf[JUnitRunner]) class WskRestRuleTests extends WskRuleTests { - override val wsk: common.rest.WskRest = new WskRest + override val wsk: common.rest.WskRestOperations = new WskRestOperations override def verifyRuleList(ruleListResult: RunResult, ruleNameEnable: String, diff --git a/tests/src/test/scala/system/basic/WskRestSequenceTests.scala b/tests/src/test/scala/system/basic/WskRestSequenceTests.scala index 916b575..5d5c8b5 100644 --- a/tests/src/test/scala/system/basic/WskRestSequenceTests.scala +++ b/tests/src/test/scala/system/basic/WskRestSequenceTests.scala @@ -20,7 +20,7 @@ package system.basic import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner -import common.rest.WskRest +import common.rest.WskRestOperations import whisk.core.WhiskConfig /** @@ -29,7 +29,7 @@ import whisk.core.WhiskConfig @RunWith(classOf[JUnitRunner]) class WskRestSequenceTests extends WskSequenceTests { - override val wsk: common.rest.WskRest = new WskRest + override val wsk: common.rest.WskRestOperations = new WskRestOperations override val whiskConfig = new WhiskConfig(Map(WhiskConfig.actionSequenceMaxLimit -> null)) assert(whiskConfig.isValid) } diff --git a/tests/src/test/scala/system/basic/WskRestUnicodeJavaTests.scala b/tests/src/test/scala/system/basic/WskRestUnicodeJavaTests.scala index 025261c..6b27621 100644 --- a/tests/src/test/scala/system/basic/WskRestUnicodeJavaTests.scala +++ b/tests/src/test/scala/system/basic/WskRestUnicodeJavaTests.scala @@ -22,12 +22,12 @@ import org.scalatest.junit.JUnitRunner import common.JsHelpers import common.WskTestHelpers -import common.rest.WskRest +import common.rest.WskRestOperations @RunWith(classOf[JUnitRunner]) class WskRestUnicodeJavaTests extends WskUnicodeTests with WskTestHelpers with JsHelpers { - override val wsk: common.rest.WskRest = new WskRest + override val wsk: common.rest.WskRestOperations = new WskRestOperations override lazy val actionKind = "java" override lazy val actionSource = "unicode.jar" diff --git a/tests/src/test/scala/system/basic/WskRestUnicodeNode6Tests.scala b/tests/src/test/scala/system/basic/WskRestUnicodeNode6Tests.scala index 5ebef6d..182dcec 100644 --- a/tests/src/test/scala/system/basic/WskRestUnicodeNode6Tests.scala +++ b/tests/src/test/scala/system/basic/WskRestUnicodeNode6Tests.scala @@ -22,12 +22,12 @@ import org.scalatest.junit.JUnitRunner import common.JsHelpers import common.WskTestHelpers -import common.rest.WskRest +import common.rest.WskRestOperations @RunWith(classOf[JUnitRunner]) class WskRestUnicodeNode6Tests extends WskUnicodeTests with WskTestHelpers with JsHelpers { - override val wsk: common.rest.WskRest = new WskRest + override val wsk: common.rest.WskRestOperations = new WskRestOperations override lazy val actionKind = "nodejs:6" override lazy val actionSource = "unicode.js" diff --git a/tests/src/test/scala/system/basic/WskRestUnicodeNode8Tests.scala b/tests/src/test/scala/system/basic/WskRestUnicodeNode8Tests.scala index 48a2e4d..35a7f29 100644 --- a/tests/src/test/scala/system/basic/WskRestUnicodeNode8Tests.scala +++ b/tests/src/test/scala/system/basic/WskRestUnicodeNode8Tests.scala @@ -22,12 +22,12 @@ import org.scalatest.junit.JUnitRunner import common.JsHelpers import common.WskTestHelpers -import common.rest.WskRest +import common.rest.WskRestOperations @RunWith(classOf[JUnitRunner]) class WskRestUnicodeNode8Tests extends WskUnicodeTests with WskTestHelpers with JsHelpers { - override val wsk: common.rest.WskRest = new WskRest + override val wsk: common.rest.WskRestOperations = new WskRestOperations override lazy val actionKind = "nodejs:8" override lazy val actionSource = "unicode.js" diff --git a/tests/src/test/scala/system/basic/WskRestUnicodePython2Tests.scala b/tests/src/test/scala/system/basic/WskRestUnicodePython2Tests.scala index e0612f6..a67e151 100644 --- a/tests/src/test/scala/system/basic/WskRestUnicodePython2Tests.scala +++ b/tests/src/test/scala/system/basic/WskRestUnicodePython2Tests.scala @@ -22,12 +22,12 @@ import org.scalatest.junit.JUnitRunner import common.JsHelpers import common.WskTestHelpers -import common.rest.WskRest +import common.rest.WskRestOperations @RunWith(classOf[JUnitRunner]) class WskRestUnicodePython2Tests extends WskUnicodeTests with WskTestHelpers with JsHelpers { - override val wsk: common.rest.WskRest = new WskRest + override val wsk: common.rest.WskRestOperations = new WskRestOperations override lazy val actionKind = "python:2" override lazy val actionSource = "unicode2.py" diff --git a/tests/src/test/scala/system/basic/WskRestUnicodePython3Tests.scala b/tests/src/test/scala/system/basic/WskRestUnicodePython3Tests.scala index 1202aba..6d74598 100644 --- a/tests/src/test/scala/system/basic/WskRestUnicodePython3Tests.scala +++ b/tests/src/test/scala/system/basic/WskRestUnicodePython3Tests.scala @@ -22,12 +22,12 @@ import org.scalatest.junit.JUnitRunner import common.JsHelpers import common.WskTestHelpers -import common.rest.WskRest +import common.rest.WskRestOperations @RunWith(classOf[JUnitRunner]) class WskRestUnicodePython3Tests extends WskUnicodeTests with WskTestHelpers with JsHelpers { - override val wsk: common.rest.WskRest = new WskRest + override val wsk: common.rest.WskRestOperations = new WskRestOperations override lazy val actionKind = "python:3" override lazy val actionSource = "unicode3.py" diff --git a/tests/src/test/scala/system/basic/WskRestUnicodeSwift311Tests.scala b/tests/src/test/scala/system/basic/WskRestUnicodeSwift311Tests.scala index fdb1924..3b1e5d9 100644 --- a/tests/src/test/scala/system/basic/WskRestUnicodeSwift311Tests.scala +++ b/tests/src/test/scala/system/basic/WskRestUnicodeSwift311Tests.scala @@ -22,12 +22,12 @@ import org.scalatest.junit.JUnitRunner import common.JsHelpers import common.WskTestHelpers -import common.rest.WskRest +import common.rest.WskRestOperations @RunWith(classOf[JUnitRunner]) class WskRestUnicodeSwift311Tests extends WskUnicodeTests with WskTestHelpers with JsHelpers { - override val wsk: common.rest.WskRest = new WskRest + override val wsk: common.rest.WskRestOperations = new WskRestOperations override lazy val actionKind = "swift:3.1.1" override lazy val actionSource = "unicode.swift" diff --git a/tests/src/test/scala/system/basic/WskRestUnicodeSwift41Tests.scala b/tests/src/test/scala/system/basic/WskRestUnicodeSwift41Tests.scala index 3ea4553..cd62237 100644 --- a/tests/src/test/scala/system/basic/WskRestUnicodeSwift41Tests.scala +++ b/tests/src/test/scala/system/basic/WskRestUnicodeSwift41Tests.scala @@ -18,14 +18,14 @@ package system.basic import common.{JsHelpers, WskTestHelpers} -import common.rest.WskRest +import common.rest.WskRestOperations import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) class WskRestUnicodeSwift41Tests extends WskUnicodeTests with WskTestHelpers with JsHelpers { - override val wsk: common.rest.WskRest = new WskRest + override val wsk: common.rest.WskRestOperations = new WskRestOperations override lazy val actionKind = "swift:4.1" override lazy val actionSource = "unicode.swift" diff --git a/tests/src/test/scala/system/basic/WskRuleTests.scala b/tests/src/test/scala/system/basic/WskRuleTests.scala index 29c99ea..e332aaa 100644 --- a/tests/src/test/scala/system/basic/WskRuleTests.scala +++ b/tests/src/test/scala/system/basic/WskRuleTests.scala @@ -22,7 +22,7 @@ import org.scalatest.junit.JUnitRunner import common.TestHelpers import common.TestUtils import common.TestUtils.RunResult -import common.BaseWsk +import common.WskOperations import common.WskProps import common.WskTestHelpers import common.RuleActivationResult @@ -34,7 +34,7 @@ import java.time.Instant abstract class WskRuleTests extends TestHelpers with WskTestHelpers { implicit val wskprops = WskProps() - val wsk: BaseWsk + val wsk: WskOperations val defaultAction = TestUtils.getTestActionFilename("wc.js") val secondAction = TestUtils.getTestActionFilename("hello.js") val testString = "this is a test" diff --git a/tests/src/test/scala/system/basic/WskSequenceTests.scala b/tests/src/test/scala/system/basic/WskSequenceTests.scala index beb0ff3..5b9c509 100644 --- a/tests/src/test/scala/system/basic/WskSequenceTests.scala +++ b/tests/src/test/scala/system/basic/WskSequenceTests.scala @@ -32,7 +32,7 @@ import common.StreamLogging import common.TestHelpers import common.TestUtils import common.TestUtils._ -import common.BaseWsk +import common.WskOperations import common.WskProps import common.RuleActivationResult import common.WskTestHelpers @@ -52,7 +52,7 @@ import whisk.http.Messages.sequenceIsTooLong abstract class WskSequenceTests extends TestHelpers with ScalatestRouteTest with WskTestHelpers with StreamLogging { implicit val wskprops = WskProps() - val wsk: BaseWsk + val wsk: WskOperations val allowedActionDuration = 120 seconds val shortDuration = 10 seconds diff --git a/tests/src/test/scala/system/basic/WskUnicodeTests.scala b/tests/src/test/scala/system/basic/WskUnicodeTests.scala index 8fe46cc..13f9376 100644 --- a/tests/src/test/scala/system/basic/WskUnicodeTests.scala +++ b/tests/src/test/scala/system/basic/WskUnicodeTests.scala @@ -23,7 +23,7 @@ import scala.concurrent.duration.DurationInt import common.JsHelpers import common.TestHelpers import common.TestUtils -import common.BaseWsk +import common.WskOperations import common.WskProps import common.WskTestHelpers import spray.json._ @@ -35,7 +35,7 @@ abstract class WskUnicodeTests extends TestHelpers with WskTestHelpers with JsHe val actionSource: String implicit val wskprops: common.WskProps = WskProps() - val wsk: BaseWsk + val wsk: WskOperations val activationMaxDuration = 2.minutes val activationPollDuration = 3.minutes diff --git a/tests/src/test/scala/system/rest/ActionSchemaTests.scala b/tests/src/test/scala/system/rest/ActionSchemaTests.scala index 8db3259..7c6356e 100644 --- a/tests/src/test/scala/system/rest/ActionSchemaTests.scala +++ b/tests/src/test/scala/system/rest/ActionSchemaTests.scala @@ -29,7 +29,7 @@ import com.jayway.restassured.RestAssured import common.TestUtils import common.WhiskProperties -import common.rest.WskRest +import common.rest.WskRestOperations import common.WskProps import common.WskTestHelpers import spray.json._ @@ -41,7 +41,7 @@ import spray.json._ class ActionSchemaTests extends FlatSpec with Matchers with RestUtil with JsonSchema with WskTestHelpers { implicit val wskprops = WskProps() - val wsk = new WskRest + val wsk = new WskRestOperations val guestNamespace = wskprops.namespace it should "respond to GET /actions as documented in swagger" in withAssetCleaner(wskprops) { (wp, assetHelper) => diff --git a/tests/src/test/scala/whisk/common/UserEventTests.scala b/tests/src/test/scala/whisk/common/UserEventTests.scala index 661b07e..cfa02dc 100644 --- a/tests/src/test/scala/whisk/common/UserEventTests.scala +++ b/tests/src/test/scala/whisk/common/UserEventTests.scala @@ -21,7 +21,7 @@ import java.nio.charset.StandardCharsets import akka.actor.ActorSystem import common._ -import common.rest.WskRest +import common.rest.WskRestOperations import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner import org.scalatest.{BeforeAndAfterAll, FlatSpec, Matchers} @@ -38,7 +38,7 @@ class UserEventTests extends FlatSpec with Matchers with WskTestHelpers with Str implicit val system = ActorSystem("UserEventTestSystem") val config = new WhiskConfig(WhiskConfig.kafkaHosts) - val wsk = new WskRest + val wsk = new WskRestOperations val groupid = "kafkatest" val topic = "events" diff --git a/tests/src/test/scala/whisk/core/admin/WskAdminTests.scala b/tests/src/test/scala/whisk/core/admin/WskAdminTests.scala index e5bcff3..7251e1a 100644 --- a/tests/src/test/scala/whisk/core/admin/WskAdminTests.scala +++ b/tests/src/test/scala/whisk/core/admin/WskAdminTests.scala @@ -19,7 +19,7 @@ package whisk.core.admin import common.WskAdmin.wskadmin import common.{TestHelpers, TestUtils, WskAdmin, WskProps} -import common.rest.WskRest +import common.rest.WskRestOperations import org.junit.runner.RunWith import org.scalatest.{BeforeAndAfterAll, Matchers} import org.scalatest.junit.JUnitRunner @@ -115,7 +115,7 @@ class WskAdminTests extends TestHelpers with Matchers with BeforeAndAfterAll { it should "verify guest account installed correctly" in { implicit val wskprops = WskProps() - val wsk = new WskRest + val wsk = new WskRestOperations val ns = wsk.namespace.whois() wskadmin.cli(Seq("user", "get", ns)).stdout.trim should be(wskprops.authKey) } diff --git a/tests/src/test/scala/whisk/core/apigw/actions/test/ApiGwRestRoutemgmtActionTests.scala b/tests/src/test/scala/whisk/core/apigw/actions/test/ApiGwRestRoutemgmtActionTests.scala index aff8072..32584fc 100644 --- a/tests/src/test/scala/whisk/core/apigw/actions/test/ApiGwRestRoutemgmtActionTests.scala +++ b/tests/src/test/scala/whisk/core/apigw/actions/test/ApiGwRestRoutemgmtActionTests.scala @@ -20,12 +20,12 @@ package whisk.core.apigw.actions.test import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner -import common.rest.WskRest +import common.rest.WskRestOperations /** * Tests for basic CLI usage. Some of these tests require a deployed backend. */ @RunWith(classOf[JUnitRunner]) class ApiGwRestRoutemgmtActionTests extends ApiGwRoutemgmtActionTests { - override lazy val wsk = new WskRest + override lazy val wsk = new WskRestOperations } diff --git a/tests/src/test/scala/whisk/core/apigw/actions/test/ApiGwRoutemgmtActionTests.scala b/tests/src/test/scala/whisk/core/apigw/actions/test/ApiGwRoutemgmtActionTests.scala index b283af5..a2f09fe 100644 --- a/tests/src/test/scala/whisk/core/apigw/actions/test/ApiGwRoutemgmtActionTests.scala +++ b/tests/src/test/scala/whisk/core/apigw/actions/test/ApiGwRoutemgmtActionTests.scala @@ -27,7 +27,7 @@ import common.TestHelpers import common.TestUtils.DONTCARE_EXIT import common.TestUtils.RunResult import common.TestUtils.SUCCESS_EXIT -import common.BaseWsk +import common.WskOperations import common.WskActorSystem import common.WskAdmin import common.WskProps @@ -50,7 +50,7 @@ abstract class ApiGwRoutemgmtActionTests val systemId = "whisk.system" implicit val wskprops = WskProps(authKey = WskAdmin.listKeys(systemId)(0)._1, namespace = systemId) - val wsk: BaseWsk + val wsk: WskOperations def getApis(bpOrName: Option[String], relpath: Option[String] = None, diff --git a/tests/src/test/scala/whisk/core/cli/test/ApiGwRestTests.scala b/tests/src/test/scala/whisk/core/cli/test/ApiGwRestTests.scala index b118e81..dcb9104 100644 --- a/tests/src/test/scala/whisk/core/cli/test/ApiGwRestTests.scala +++ b/tests/src/test/scala/whisk/core/cli/test/ApiGwRestTests.scala @@ -22,7 +22,7 @@ import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner import spray.json.JsObject import spray.json._ -import common.rest.WskRest +import common.rest.WskRestOperations import common.rest.RestResult import common.TestUtils.{RunResult, _} import common.TestUtils @@ -34,7 +34,7 @@ import java.io.File */ @RunWith(classOf[JUnitRunner]) class ApiGwRestTests extends ApiGwRestBasicTests with RestUtil { - override lazy val wsk = new WskRest + override lazy val wsk = new WskRestOperations override lazy val createCode = OK.intValue override def verifyBadCommands(rr: RunResult, badpath: String): Unit = { diff --git a/tests/src/test/scala/whisk/core/cli/test/BaseApiGwTests.scala b/tests/src/test/scala/whisk/core/cli/test/BaseApiGwTests.scala index 8aa24fc..5ebb00c 100644 --- a/tests/src/test/scala/whisk/core/cli/test/BaseApiGwTests.scala +++ b/tests/src/test/scala/whisk/core/cli/test/BaseApiGwTests.scala @@ -33,7 +33,7 @@ import org.scalatest.junit.JUnitRunner import common.TestHelpers import common.TestUtils._ import common.WhiskProperties -import common.BaseWsk +import common.WskOperations import common.WskProps import common.WskTestHelpers @@ -44,7 +44,7 @@ import common.WskTestHelpers abstract class BaseApiGwTests extends TestHelpers with WskTestHelpers with BeforeAndAfterEach with BeforeAndAfterAll { implicit val wskprops = WskProps() - val wsk: BaseWsk + val wsk: WskOperations // This test suite makes enough CLI invocations in 60 seconds to trigger the OpenWhisk // throttling restriction. To avoid CLI failures due to being throttled, track the diff --git a/tests/src/test/scala/whisk/core/cli/test/WskActionSequenceTests.scala b/tests/src/test/scala/whisk/core/cli/test/WskActionSequenceTests.scala index 39b9efd..05aff02 100644 --- a/tests/src/test/scala/whisk/core/cli/test/WskActionSequenceTests.scala +++ b/tests/src/test/scala/whisk/core/cli/test/WskActionSequenceTests.scala @@ -22,7 +22,7 @@ import org.scalatest.junit.JUnitRunner import common.TestHelpers import common.TestUtils -import common.BaseWsk +import common.WskOperations import common.WskProps import common.WskTestHelpers import TestUtils.RunResult @@ -36,7 +36,7 @@ import whisk.core.entity.EntityPath abstract class WskActionSequenceTests extends TestHelpers with WskTestHelpers { implicit val wskprops = WskProps() - val wsk: BaseWsk + val wsk: WskOperations val defaultNamespace = EntityPath.DEFAULT.asString val namespace = wsk.namespace.whois() diff --git a/tests/src/test/scala/whisk/core/cli/test/WskEntitlementTests.scala b/tests/src/test/scala/whisk/core/cli/test/WskEntitlementTests.scala index e2d32a7..0e689c8 100644 --- a/tests/src/test/scala/whisk/core/cli/test/WskEntitlementTests.scala +++ b/tests/src/test/scala/whisk/core/cli/test/WskEntitlementTests.scala @@ -24,7 +24,7 @@ import org.scalatest.junit.JUnitRunner import common.TestHelpers import common.TestUtils import common.TestUtils.RunResult -import common.BaseWsk +import common.WskOperations import common.WskProps import common.WskTestHelpers import spray.json._ @@ -36,7 +36,7 @@ import scala.concurrent.duration._ @RunWith(classOf[JUnitRunner]) abstract class WskEntitlementTests extends TestHelpers with WskTestHelpers with BeforeAndAfterAll { - val wsk: BaseWsk + val wsk: WskOperations lazy val defaultWskProps = WskProps() lazy val guestWskProps = getAdditionalTestSubject(Subject().asString) val forbiddenCode: Int diff --git a/tests/src/test/scala/whisk/core/cli/test/WskRestActionSequenceTests.scala b/tests/src/test/scala/whisk/core/cli/test/WskRestActionSequenceTests.scala index a96eb9e..955f9a3 100644 --- a/tests/src/test/scala/whisk/core/cli/test/WskRestActionSequenceTests.scala +++ b/tests/src/test/scala/whisk/core/cli/test/WskRestActionSequenceTests.scala @@ -21,13 +21,13 @@ import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner import spray.json._ -import common.rest.WskRest +import common.rest.WskRestOperations import common.rest.RestResult import common.TestUtils.RunResult @RunWith(classOf[JUnitRunner]) class WskRestActionSequenceTests extends WskActionSequenceTests { - override lazy val wsk = new WskRest + override lazy val wsk = new WskRestOperations override def verifyActionSequence(action: RunResult, name: String, compValue: JsArray, kindValue: JsString): Unit = { val actionResultRest = action.asInstanceOf[RestResult] diff --git a/tests/src/test/scala/whisk/core/cli/test/WskRestBasicUsageTests.scala b/tests/src/test/scala/whisk/core/cli/test/WskRestBasicUsageTests.scala index 823abbf..c248ae1 100644 --- a/tests/src/test/scala/whisk/core/cli/test/WskRestBasicUsageTests.scala +++ b/tests/src/test/scala/whisk/core/cli/test/WskRestBasicUsageTests.scala @@ -36,7 +36,7 @@ import common.TestUtils._ import common.WhiskProperties import common.WskProps import common.WskTestHelpers -import common.rest.WskRest +import common.rest.WskRestOperations import spray.json.DefaultJsonProtocol._ import spray.json._ import whisk.core.entity._ @@ -51,7 +51,7 @@ import whisk.http.Messages class WskRestBasicUsageTests extends TestHelpers with WskTestHelpers { implicit val wskprops = WskProps() - val wsk = new WskRest + val wsk = new WskRestOperations val defaultAction: Some[String] = Some(TestUtils.getTestActionFilename("hello.js")) val usrAgentHeaderRegEx: String = """\bUser-Agent\b": \[\s+"OpenWhisk\-CLI/1.\d+.*""" diff --git a/tests/src/test/scala/whisk/core/cli/test/WskRestEntitlementTests.scala b/tests/src/test/scala/whisk/core/cli/test/WskRestEntitlementTests.scala index 7395922..c017e5f 100644 --- a/tests/src/test/scala/whisk/core/cli/test/WskRestEntitlementTests.scala +++ b/tests/src/test/scala/whisk/core/cli/test/WskRestEntitlementTests.scala @@ -24,13 +24,13 @@ import akka.http.scaladsl.model.StatusCodes.NotFound import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner -import common.rest.WskRest +import common.rest.WskRestOperations import common.rest.RestResult import common.TestUtils.RunResult @RunWith(classOf[JUnitRunner]) class WskRestEntitlementTests extends WskEntitlementTests { - override lazy val wsk = new WskRest + override lazy val wsk = new WskRestOperations override lazy val forbiddenCode = Forbidden.intValue override lazy val timeoutCode = BadGateway.intValue override lazy val notFoundCode = NotFound.intValue diff --git a/tests/src/test/scala/whisk/core/cli/test/WskRestWebActionsTests.scala b/tests/src/test/scala/whisk/core/cli/test/WskRestWebActionsTests.scala index 832d365..517258e 100644 --- a/tests/src/test/scala/whisk/core/cli/test/WskRestWebActionsTests.scala +++ b/tests/src/test/scala/whisk/core/cli/test/WskRestWebActionsTests.scala @@ -20,9 +20,9 @@ package whisk.core.cli.test import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner -import common.rest.WskRest +import common.rest.WskRestOperations @RunWith(classOf[JUnitRunner]) class WskRestWebActionsTests extends WskWebActionsTests { - override lazy val wsk: common.rest.WskRest = new WskRest + override lazy val wsk: common.rest.WskRestOperations = new WskRestOperations } diff --git a/tests/src/test/scala/whisk/core/cli/test/WskWebActionsTests.scala b/tests/src/test/scala/whisk/core/cli/test/WskWebActionsTests.scala index b003e8d..a3b4f08 100644 --- a/tests/src/test/scala/whisk/core/cli/test/WskWebActionsTests.scala +++ b/tests/src/test/scala/whisk/core/cli/test/WskWebActionsTests.scala @@ -30,7 +30,7 @@ import com.jayway.restassured.response.Header import common.TestHelpers import common.TestUtils import common.WhiskProperties -import common.BaseWsk +import common.WskOperations import common.WskProps import common.WskTestHelpers import common.SimpleExec @@ -48,7 +48,7 @@ import whisk.core.entity.Subject abstract class WskWebActionsTests extends TestHelpers with WskTestHelpers with RestUtil with BeforeAndAfterAll { val MAX_URL_LENGTH = 8192 // 8K matching nginx default - val wsk: BaseWsk + val wsk: WskOperations private implicit val wskprops = WskProps() val namespace = wsk.namespace.whois() diff --git a/tests/src/test/scala/whisk/core/database/test/CacheConcurrencyTests.scala b/tests/src/test/scala/whisk/core/database/test/CacheConcurrencyTests.scala index d2d61bb..eadac08 100644 --- a/tests/src/test/scala/whisk/core/database/test/CacheConcurrencyTests.scala +++ b/tests/src/test/scala/whisk/core/database/test/CacheConcurrencyTests.scala @@ -32,7 +32,7 @@ import common.TestUtils import common.WhiskProperties import common.WskProps import common.WskTestHelpers -import common.rest.WskRest +import common.rest.WskRestOperations import spray.json.JsString import whisk.common.TransactionId import whisk.utils.retry @@ -44,7 +44,7 @@ class CacheConcurrencyTests extends FlatSpec with WskTestHelpers with BeforeAndA implicit private val transId = TransactionId.testing implicit private val wp = WskProps() - private val wsk = new WskRest + private val wsk = new WskRestOperations val nExternalIters = 1 val nInternalIters = 5 diff --git a/tests/src/test/scala/whisk/core/limits/ActionLimitsTests.scala b/tests/src/test/scala/whisk/core/limits/ActionLimitsTests.scala index 77999fb..5962fdc 100644 --- a/tests/src/test/scala/whisk/core/limits/ActionLimitsTests.scala +++ b/tests/src/test/scala/whisk/core/limits/ActionLimitsTests.scala @@ -32,7 +32,7 @@ import common.TestHelpers import common.TestUtils import common.TestUtils.{BAD_REQUEST, DONTCARE_EXIT, SUCCESS_EXIT} import common.WhiskProperties -import common.rest.WskRest +import common.rest.WskRestOperations import common.WskProps import common.WskTestHelpers import spray.json._ @@ -45,7 +45,7 @@ import whisk.http.Messages class ActionLimitsTests extends TestHelpers with WskTestHelpers { implicit val wskprops = WskProps() - val wsk = new WskRest + val wsk = new WskRestOperations val defaultSleepAction = TestUtils.getTestActionFilename("sleep.js") val allowedActionDuration = 10 seconds diff --git a/tests/src/test/scala/whisk/core/limits/MaxActionDurationTests.scala b/tests/src/test/scala/whisk/core/limits/MaxActionDurationTests.scala index b35ffa8..95a0cbd 100644 --- a/tests/src/test/scala/whisk/core/limits/MaxActionDurationTests.scala +++ b/tests/src/test/scala/whisk/core/limits/MaxActionDurationTests.scala @@ -24,7 +24,7 @@ import org.scalatest.junit.JUnitRunner import common.TestHelpers import common.TestUtils -import common.rest.WskRest +import common.rest.WskRestOperations import common.WskProps import common.WskTestHelpers import whisk.core.entity._ @@ -41,7 +41,7 @@ import org.scalatest.tagobjects.Slow class MaxActionDurationTests extends TestHelpers with WskTestHelpers { implicit val wskprops = WskProps() - val wsk = new WskRest + val wsk = new WskRestOperations /** * Purpose of the following integration test is to verify that the action proxy