rabbah commented on a change in pull request #3945: Treat action code as attachments URL: https://github.com/apache/incubator-openwhisk/pull/3945#discussion_r209897231
########## File path: tests/src/test/scala/whisk/core/entity/test/ExecTests.scala ########## @@ -0,0 +1,175 @@ +/* + * 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 whisk.core.entity.test + +import common.StreamLogging +import spray.json._ +import org.junit.runner.RunWith +import org.scalatest.junit.JUnitRunner +import org.scalatest.{BeforeAndAfterAll, FlatSpec, Matchers} +import whisk.core.WhiskConfig +import whisk.core.entity.Attachments.{Attached, Inline} +import whisk.core.entity.{CodeExecAsAttachment, CodeExecAsString, Exec, ExecManifest, WhiskAction} + +import scala.collection.mutable + +@RunWith(classOf[JUnitRunner]) +class ExecTests extends FlatSpec with Matchers with StreamLogging with BeforeAndAfterAll { + behavior of "exec deserialization" + + val config = new WhiskConfig(ExecManifest.requiredProperties) + ExecManifest.initialize(config) + + override protected def afterAll(): Unit = { + ExecManifest.initialize(config) + super.afterAll() + } + + it should "read existing code string as attachment" in { + val json = """{ + | "name": "action_tests_name2", + | "_id": "anon-Yzycx8QnIYDp3Tby0Fnj23KcMtH/action_tests_name2", + | "publish": false, + | "annotations": [], + | "version": "0.0.1", + | "updated": 1533623651650, + | "entityType": "action", + | "exec": { + | "kind": "nodejs:6", + | "code": "foo", + | "binary": false + | }, + | "parameters": [ + | { + | "key": "x", + | "value": "b" + | } + | ], + | "limits": { + | "timeout": 60000, + | "memory": 256, + | "logs": 10 + | }, + | "namespace": "anon-Yzycx8QnIYDp3Tby0Fnj23KcMtH" + |}""".stripMargin.parseJson.asJsObject + val action = WhiskAction.serdes.read(json) + action.exec should matchPattern { case CodeExecAsAttachment(_, Inline("foo"), None, false) => } + } + + it should "properly determine binary property" in { + val j1 = """{ + | "kind": "nodejs:6", + | "code": "SGVsbG8gT3BlbldoaXNr", + | "binary": false + |}""".stripMargin.parseJson.asJsObject + Exec.serdes.read(j1) should matchPattern { + case CodeExecAsAttachment(_, Inline("SGVsbG8gT3BlbldoaXNr"), None, true) => + } + + val j2 = """{ + | "kind": "nodejs:6", + | "code": "while (true)", + | "binary": false + |}""".stripMargin.parseJson.asJsObject + Exec.serdes.read(j2) should matchPattern { + case CodeExecAsAttachment(_, Inline("while (true)"), None, false) => + } + + //Defaults to binary + val j3 = """{ + | "kind": "nodejs:6", + | "code": "while (true)" + |}""".stripMargin.parseJson.asJsObject + Exec.serdes.read(j3) should matchPattern { + case CodeExecAsAttachment(_, Inline("while (true)"), None, false) => + } + } + + it should "read code stored as attachment" in { + val json = """{ + | "kind": "java", + | "code": { + | "attachmentName": "foo:bar", + | "attachmentType": "application/java-archive", + | "length": 32768, Review comment: Thanks for adding this test. ---------------------------------------------------------------- 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
