Fix namespace passed to action to be subject namespace not action namespace.
diff --git a/tests/src/whisk/core/dispatcher/test/DispatcherTests.scala b/tests/src/whisk/core/dispatcher/test/DispatcherTests.scala
index ff226d4..baf621a 100644
--- a/tests/src/whisk/core/dispatcher/test/DispatcherTests.scala
+++ b/tests/src/whisk/core/dispatcher/test/DispatcherTests.scala
@@ -39,14 +39,7 @@
import whisk.core.dispatcher.ActivationFeed
import whisk.core.dispatcher.Dispatcher
import whisk.core.dispatcher.MessageHandler
-import whisk.core.entity.ActivationId
-import whisk.core.entity.AuthKey
-import whisk.core.entity.DocRevision
-import whisk.core.entity.EntityName
-import whisk.core.entity.EntityPath
-import whisk.core.entity.FullyQualifiedEntityName
-import whisk.core.entity.SemVer
-import whisk.core.entity.Subject
+import whisk.core.entity._
import whisk.utils.retry
@RunWith(classOf[JUnitRunner])
@@ -66,10 +59,9 @@
def sendMessage(connector: TestConnector, count: Int) = {
val content = JsObject("payload" -> JsNumber(count))
- val subject = Subject()
- val authkey = AuthKey()
+ val user = WhiskAuth(Subject(), AuthKey()).toIdentity
val path = FullyQualifiedEntityName(EntityPath("test"), EntityName(s"count-$count"), Some(SemVer()))
- val msg = Message(TransactionId.testing, path, DocRevision(), subject, authkey, ActivationId(), EntityPath(subject()), Some(content))
+ val msg = Message(TransactionId.testing, path, DocRevision(), user, ActivationId(), EntityPath(user.subject()), Some(content))
connector.send(msg)
}
diff --git a/tests/src/whisk/core/entity/test/SchemaTests.scala b/tests/src/whisk/core/entity/test/SchemaTests.scala
index a90d208..b287d78 100644
--- a/tests/src/whisk/core/entity/test/SchemaTests.scala
+++ b/tests/src/whisk/core/entity/test/SchemaTests.scala
@@ -31,8 +31,8 @@
import org.scalatest.Matchers
import org.scalatest.junit.JUnitRunner
-import spray.json.DefaultJsonProtocol._
import spray.json._
+import spray.json.DefaultJsonProtocol._
import whisk.core.entity._
import whisk.core.entity.size.SizeInt
@@ -57,6 +57,19 @@
}
}
+ behavior of "Identity"
+
+ it should "serdes an identity" in {
+ val i = WhiskAuth(Subject(), AuthKey()).toIdentity
+ val expected = JsObject(
+ "subject" -> i.subject().toJson,
+ "namespace" -> i.namespace.toJson,
+ "authkey" -> i.authkey.compact.toJson,
+ "rights" -> Array("READ", "PUT", "DELETE", "ACTIVATE").toJson)
+ Identity.serdes.write(i) shouldBe expected
+ Identity.serdes.read(expected) shouldBe i
+ }
+
behavior of "DocInfo"
it should "accept well formed doc info" in {
