dubeejw commented on a change in pull request #2589: Add the fundamental framework of REST invocation for test cases URL: https://github.com/apache/incubator-openwhisk/pull/2589#discussion_r143729033
########## File path: tests/src/test/scala/common/rest/WskRest.scala ########## @@ -0,0 +1,1482 @@ +/* + * 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.rest + +import java.io.File +import java.time.Clock +import java.time.Instant +import java.util.Base64 + +import org.apache.commons.io.FileUtils +import org.scalatest.Matchers +import org.scalatest.FlatSpec +import org.scalatest.concurrent.ScalaFutures +import org.scalatest.time.Span.convertDurationToSpan + +import scala.Left +import scala.Right +import scala.collection.JavaConversions.mapAsJavaMap +import scala.collection.mutable.Buffer +import scala.collection.immutable.Seq +import scala.concurrent.duration.Duration +import scala.concurrent.duration.DurationInt +import scala.concurrent.Future +import scala.language.postfixOps +import scala.util.Failure +import scala.util.Success +import scala.util.Try +import scala.util.{Failure, Success} + +import akka.http.scaladsl.model.StatusCode +import akka.http.scaladsl.model.StatusCodes.Accepted +import akka.http.scaladsl.model.StatusCodes.NotFound +import akka.http.scaladsl.model.StatusCodes.BadRequest +import akka.http.scaladsl.model.StatusCodes.OK +import akka.http.scaladsl.model.HttpRequest +import akka.http.scaladsl.model.HttpMethod +import akka.http.scaladsl.model.HttpResponse +import akka.http.scaladsl.model.headers.Authorization +import akka.http.scaladsl.model.HttpEntity +import akka.http.scaladsl.model.ContentTypes +import akka.http.scaladsl.Http + +import akka.http.scaladsl.model.headers.BasicHttpCredentials +import akka.http.scaladsl.model.Uri +import akka.http.scaladsl.model.Uri.Path + +import akka.http.scaladsl.model.HttpMethods.DELETE +import akka.http.scaladsl.model.HttpMethods.GET +import akka.http.scaladsl.model.HttpMethods.POST +import akka.http.scaladsl.model.HttpMethods.PUT + +import akka.stream.ActorMaterializer + +import spray.json._ +import spray.json.DefaultJsonProtocol._ +import spray.json.JsObject +import spray.json.JsValue +import spray.json.pimpString + +import common._ +import common.BaseDeleteFromCollection +import common.BaseListOrGetFromCollection +import common.HasActivation +import common.RunWskCmd +import common.TestUtils +import common.TestUtils.SUCCESS_EXIT +import common.TestUtils.DONTCARE_EXIT +import common.TestUtils.ANY_ERROR_EXIT +import common.TestUtils.DONTCARE_EXIT +import common.TestUtils.RunResult +import common.WaitFor +import common.WhiskProperties +import common.WskActorSystem +import common.WskProps + +import whisk.core.entity.ByteSize +import whisk.utils.retry + +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 +} + +trait ListOrGetFromCollectionRest extends BaseListOrGetFromCollection { + self: RunWskRestCmd => + + /** + * List entities in collection. + * + * @param namespace (optional) if specified must be fully qualified namespace + * @param expectedExitCode (optional) the expected exit code for the command + * if the code is anything but DONTCARE_EXIT, assert the code is as expected + */ + override def list(namespace: Option[String] = None, + limit: Option[Int] = None, + nameSort: Option[Boolean] = None, + expectedExitCode: Int = OK.intValue)(implicit wp: WskProps): RestResult = { + val NS = namespace map { ns => + ns + } getOrElse "" + val (ns, name) = getNamespaceActionName(NS) + + val pathToList = s"$basePath/namespaces/$ns/$noun" + val entPath = + if (name != "") Path(s"$pathToList/$name/") + else Path(s"$pathToList") + val paramMap = Map[String, String]() ++ { Map("skip" -> "0".toString, "docs" -> true.toString) } ++ { + limit map { l => + Map("limit" -> l.toString) + } getOrElse Map[String, String]("limit" -> "30".toString) + } + val resp = getWhiskEntity(entPath, paramMap).futureValue + val r = new RestResult(resp.status, getRespData(resp)) + if (expectedExitCode != DONTCARE_EXIT) + if (r.statusCode.intValue != expectedExitCode) + r.statusCode.intValue shouldBe expectedExitCode + r + } + + /** + * Gets entity from collection. + * + * @param name either a fully qualified name or a simple entity name + * @param expectedExitCode (optional) the expected exit code for the command + * if the code is anything but DONTCARE_EXIT, assert the code is as expected + */ + override def get(name: String, + expectedExitCode: Int = OK.intValue, + summary: Boolean = false, + fieldFilter: Option[String] = None, + url: Option[Boolean] = None)(implicit wp: WskProps): RestResult = { + val (ns, entity) = getNamespaceActionName(name) + val entPath = Path(s"$basePath/namespaces/$ns/$noun/$entity") + val resp = getWhiskEntity(entPath)(wp).futureValue + val r = new RestResult(resp.status, getRespData(resp)) + if (expectedExitCode != DONTCARE_EXIT) Review comment: Looks like the check for expectedExitCode is repeated many times. Should construct a function that does the check instead. ---------------------------------------------------------------- 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
