Removing obsolete view, throwing out rotten test
The "uuids" view is no longer in use hence all code providing "lookup by uuid" functionality is removed.
ConformanceTests doesn't do anything meaningful by now.
diff --git a/tests/src/whisk/core/controller/test/AuthenticateTests.scala b/tests/src/whisk/core/controller/test/AuthenticateTests.scala
index 1e74d80..06718bc 100644
--- a/tests/src/whisk/core/controller/test/AuthenticateTests.scala
+++ b/tests/src/whisk/core/controller/test/AuthenticateTests.scala
@@ -171,7 +171,7 @@
// force another key for the same uuid to cause an internal violation
val secondCreds = WhiskAuth(Subject(), AuthKey(creds.uuid, Secret()))
put(authStore, secondCreds)
- waitOnView(authStore, creds.uuid, 2)
+ waitOnView(authStore, creds.authkey, 2)
val invalidCredentials = BasicHttpCredentials(creds.uuid.asString, creds.key.asString)
Get("/secured") ~> addCredentials(invalidCredentials) ~> route ~> check {
diff --git a/tests/src/whisk/core/controller/test/ControllerTestCommon.scala b/tests/src/whisk/core/controller/test/ControllerTestCommon.scala
index c9b544e..9ec42bb 100644
--- a/tests/src/whisk/core/controller/test/ControllerTestCommon.scala
+++ b/tests/src/whisk/core/controller/test/ControllerTestCommon.scala
@@ -84,7 +84,7 @@
def createTempCredentials(implicit transid: TransactionId) = {
val auth = WhiskAuth(Subject(), AuthKey())
put(authStore, auth)
- waitOnView(authStore, auth.uuid, 1)
+ waitOnView(authStore, auth.authkey, 1)
(auth, BasicHttpCredentials(auth.uuid.asString, auth.key.asString))
}
diff --git a/tests/src/whisk/core/database/test/DbUtils.scala b/tests/src/whisk/core/database/test/DbUtils.scala
index d19adfc..6fc9970 100644
--- a/tests/src/whisk/core/database/test/DbUtils.scala
+++ b/tests/src/whisk/core/database/test/DbUtils.scala
@@ -40,12 +40,12 @@
import whisk.core.entity.DocId
import whisk.core.entity.DocInfo
import whisk.core.entity.EntityPath
-import whisk.core.entity.UUID
-import whisk.core.entity.WhiskAuth
+import whisk.core.entity.Identity
import whisk.core.entity.WhiskDocument
import whisk.core.entity.WhiskEntityQueries
import whisk.core.entity.types.AuthStore
import whisk.core.entity.types.EntityStore
+import whisk.core.entity.AuthKey
/**
* WARNING: the put/get/del operations in this trait operate directly on the datastore,
@@ -125,10 +125,10 @@
* Wait on view for the authentication table. This is like the other waitOnViews but
* specific to the WhiskAuth records.
*/
- def waitOnView(db: AuthStore, uuid: UUID, count: Int)(
+ def waitOnView(db: AuthStore, authkey: AuthKey, count: Int)(
implicit context: ExecutionContext, transid: TransactionId, timeout: Duration) = {
val success = retry(() => {
- WhiskAuth.list(db, uuid) map { l =>
+ Identity.list(db, authkey) map { l =>
if (l.length != count) {
throw RetryOp()
} else true
diff --git a/tests/src/whisk/core/entity/test/ConformanceTests.scala b/tests/src/whisk/core/entity/test/ConformanceTests.scala
deleted file mode 100644
index 20addb6..0000000
--- a/tests/src/whisk/core/entity/test/ConformanceTests.scala
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright 2015-2016 IBM Corporation
- *
- * Licensed 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 whisk.core.entity.test
-
-import scala.util.Try
-
-import akka.event.Logging.InfoLevel
-import org.junit.runner.RunWith
-import org.scalatest.FlatSpec
-import org.scalatest.Matchers
-import org.scalatest.concurrent.ScalaFutures
-import org.scalatest.junit.JUnitRunner
-import org.scalatest.time.{ Minutes, Seconds, Span }
-import whisk.common.TransactionCounter
-import whisk.core.WhiskConfig
-import whisk.core.WhiskConfig._
-import whisk.core.database.ArtifactStore
-import whisk.core.entity._
-import spray.json.JsObject
-import spray.json.DefaultJsonProtocol
-
-import common.WskActorSystem
-
-/**
- * Tests to ensure our database records conform to the intended schema
- */
-@RunWith(classOf[JUnitRunner])
-class ConformanceTests extends FlatSpec
- with Matchers
- with ScalaFutures
- with DefaultJsonProtocol
- with TransactionCounter
- with WskActorSystem {
-
- implicit val defaultPatience =
- PatienceConfig(timeout = Span(1, Minutes), interval = Span(1, Seconds))
-
- // Properties for WhiskAuthStore and WhiskEntityStore.
- val config = new WhiskConfig(Map(
- dbProvider -> null,
- dbProtocol -> null,
- dbUsername -> null,
- dbPassword -> null,
- dbHost -> null,
- dbPort -> null,
- dbAuths -> null,
- dbWhisk -> null))
- assert(config.isValid)
-
- val datastore: ArtifactStore[WhiskEntity] = WhiskEntityStore.datastore(config)
- datastore.setVerbosity(InfoLevel)
-
- val authstore: ArtifactStore[WhiskAuth] = WhiskAuthStore.datastore(config)
- authstore.setVerbosity(InfoLevel)
-
- /**
- * Helper functions: if d represents a document from the database,
- * is it a design doc, whisk record or whisk activation?
- */
- def isDesignDoc(d: JsObject) = Try(d.fields("_id").convertTo[String].startsWith("_design")).getOrElse(false)
- def isAction(m: JsObject) = m.fields.isDefinedAt("exec")
- def isRule(m: JsObject) = m.fields.isDefinedAt("trigger")
- def isTrigger(m: JsObject) = !isAction(m) && m.fields.isDefinedAt("parameters") && !m.fields.isDefinedAt("binding")
- def isPackage(m: JsObject) = m.fields.isDefinedAt("binding")
- def isActivation(m: JsObject) = m.fields.isDefinedAt("activationId")
-
- /**
- * Check that all records in the database each have the required fields
- */
- def checkDatabaseFields[U, K](store: ArtifactStore[U], viewName: String, filter: JsObject => Boolean, requiredFields: Set[String]) = {
- implicit val tid = transid()
-
- val futureDocs = store.query(viewName, Nil, Nil, 0, 0, true, false, false)
-
- whenReady(futureDocs) { docs =>
- for (doc <- docs if !isDesignDoc(doc) && filter(doc)) {
- for (field <- requiredFields) {
- assert(doc.fields.isDefinedAt(field), s"did not find field '$field' in database record $doc")
- }
- }
- }
- }
-
- "Auth Database" should "conform to expected schema" in {
- checkDatabaseFields(authstore, "subjects/uuids", _ => true, Set("subject", "uuid", "key", "_id", "_rev"))
- }
-
- "Whisk Database" should "conform to expected schema" in {
- checkDatabaseFields(datastore, "whisks/all", isAction, Set("exec", "limits", "parameters"))
-
- checkDatabaseFields(datastore, "whisks/all", isTrigger, Set("limits", "parameters"))
-
- checkDatabaseFields(datastore, "whisks/all", isRule, Set("trigger", "action"))
-
- // Added an exception for 'cause', as it doesn't seem to be present for all records.
- checkDatabaseFields(datastore, "whisks/all", isActivation, Set("subject", "activationId", "cause", "start", "end", "response", "logs") - "cause")
-
- checkDatabaseFields(datastore, "whisks/all", isPackage, Set("binding", "parameters"))
- }
-}
diff --git a/tests/src/whisk/core/entity/test/DatastoreTests.scala b/tests/src/whisk/core/entity/test/DatastoreTests.scala
index 38b789c..5f40794 100644
--- a/tests/src/whisk/core/entity/test/DatastoreTests.scala
+++ b/tests/src/whisk/core/entity/test/DatastoreTests.scala
@@ -77,16 +77,6 @@
putGetCheck(authstore, auth, WhiskAuth)
}
- it should "lookup key by uuid" in {
- implicit val tid = transid()
- val auth = WhiskAuth(Subject(), AuthKey())
- put(authstore, auth)
- val confirm = waitOnView(authstore, auth.uuid, 1)
- val result = retry(() => WhiskAuth.get(authstore, auth.uuid), dbOpTimeout).get
- assert(result != null)
- assert(result == auth)
- }
-
it should "CRD action blackbox" in {
implicit val tid = transid()
implicit val basename = EntityName("create action blackbox")
