From eade4935b0008b8c78ddd87ca0fec43eb6ddf399 Mon Sep 17 00:00:00 2001 From: David Grove Date: Mon, 29 Jan 2024 11:15:03 -0500 Subject: [PATCH] Rename Php7 to Php8 in all test files (#139) --- .../Php81ActionContainerTests.scala | 2 +- .../Php82ActionContainerTests.scala | 2 +- .../Php83ActionContainerTests.scala | 2 +- ...s.scala => Php8ActionContainerTests.scala} | 30 +++++++++---------- 4 files changed, 18 insertions(+), 18 deletions(-) rename tests/src/test/scala/runtime/actionContainers/{Php7ActionContainerTests.scala => Php8ActionContainerTests.scala} (95%) diff --git a/tests/src/test/scala/runtime/actionContainers/Php81ActionContainerTests.scala b/tests/src/test/scala/runtime/actionContainers/Php81ActionContainerTests.scala index bfaf808..bc200c0 100644 --- a/tests/src/test/scala/runtime/actionContainers/Php81ActionContainerTests.scala +++ b/tests/src/test/scala/runtime/actionContainers/Php81ActionContainerTests.scala @@ -21,7 +21,7 @@ import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) -class Php81ActionContainerTests extends Php7ActionContainerTests { +class Php81ActionContainerTests extends Php8ActionContainerTests { override lazy val phpContainerImageName = "action-php-v8.1" } diff --git a/tests/src/test/scala/runtime/actionContainers/Php82ActionContainerTests.scala b/tests/src/test/scala/runtime/actionContainers/Php82ActionContainerTests.scala index b8ff1c0..5b7a5bb 100644 --- a/tests/src/test/scala/runtime/actionContainers/Php82ActionContainerTests.scala +++ b/tests/src/test/scala/runtime/actionContainers/Php82ActionContainerTests.scala @@ -21,7 +21,7 @@ import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) -class Php82ActionContainerTests extends Php7ActionContainerTests { +class Php82ActionContainerTests extends Php8ActionContainerTests { override lazy val phpContainerImageName = "action-php-v8.2" } diff --git a/tests/src/test/scala/runtime/actionContainers/Php83ActionContainerTests.scala b/tests/src/test/scala/runtime/actionContainers/Php83ActionContainerTests.scala index c3620df..11a3266 100644 --- a/tests/src/test/scala/runtime/actionContainers/Php83ActionContainerTests.scala +++ b/tests/src/test/scala/runtime/actionContainers/Php83ActionContainerTests.scala @@ -21,7 +21,7 @@ import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) -class Php83ActionContainerTests extends Php7ActionContainerTests { +class Php83ActionContainerTests extends Php8ActionContainerTests { override lazy val phpContainerImageName = "action-php-v8.3" } diff --git a/tests/src/test/scala/runtime/actionContainers/Php7ActionContainerTests.scala b/tests/src/test/scala/runtime/actionContainers/Php8ActionContainerTests.scala similarity index 95% rename from tests/src/test/scala/runtime/actionContainers/Php7ActionContainerTests.scala rename to tests/src/test/scala/runtime/actionContainers/Php8ActionContainerTests.scala index 827cb09..749b0c7 100644 --- a/tests/src/test/scala/runtime/actionContainers/Php7ActionContainerTests.scala +++ b/tests/src/test/scala/runtime/actionContainers/Php8ActionContainerTests.scala @@ -27,7 +27,7 @@ import spray.json._ import spray.json.DefaultJsonProtocol._ @RunWith(classOf[JUnitRunner]) -abstract class Php7ActionContainerTests extends BasicActionRunnerTests with WskActorSystem { +abstract class Php8ActionContainerTests extends BasicActionRunnerTests with WskActorSystem { // note: "out" will not be empty as the PHP web server outputs a message when it starts up val enforceEmptyOutputStream = false @@ -37,7 +37,7 @@ abstract class Php7ActionContainerTests extends BasicActionRunnerTests with WskA withContainer(phpContainerImageName, env)(code) } - def withPhp7Container(code: ActionContainer => Unit) = withActionContainer()(code) + def withPhp8Container(code: ActionContainer => Unit) = withActionContainer()(code) behavior of phpContainerImageName @@ -132,7 +132,7 @@ abstract class Php7ActionContainerTests extends BasicActionRunnerTests with WskA } it should "return some error on action error" in { - val (out, err) = withPhp7Container { c => + val (out, err) = withPhp8Container { c => val code = """ | + withPhp8Container { c => val code = """ | + val (out, err) = withPhp8Container { c => val code = """ | + val (out, err) = withPhp8Container { c => val code = """ | + val (out, err) = withPhp8Container { c => val code = """ | + val (out, err) = withPhp8Container { c => val code = """ | + val (out, err) = withPhp8Container { c => val code = """ | = 500000 - val (out, err) = withPhp7Container { c => + val (out, err) = withPhp8Container { c => c.init(initPayload(code))._1 should be(200) val (runCode, runRes) = c.run(runPayload(JsObject())) @@ -431,7 +431,7 @@ abstract class Php7ActionContainerTests extends BasicActionRunnerTests with WskA val code = ZipBuilder.mkBase64Zip(srcs) - val (out, err) = withPhp7Container { c => + val (out, err) = withPhp8Container { c => c.init(initPayload(code))._1 should be(200) val (runCode, runRes) = c.run(runPayload(JsObject())) @@ -456,7 +456,7 @@ abstract class Php7ActionContainerTests extends BasicActionRunnerTests with WskA val code = ZipBuilder.mkBase64Zip(srcs) - val (out, err) = withPhp7Container { c => + val (out, err) = withPhp8Container { c => c.init(initPayload(code))._1 should be(200) val (runCode, runRes) = c.run(runPayload(JsObject())) @@ -479,7 +479,7 @@ abstract class Php7ActionContainerTests extends BasicActionRunnerTests with WskA val code = ZipBuilder.mkBase64Zip(srcs) - withPhp7Container { c => + withPhp8Container { c => c.init(initPayload(code, main = "niam"))._1 should be(200) val (runCode, runRes) = c.run(runPayload(JsObject())) @@ -501,7 +501,7 @@ abstract class Php7ActionContainerTests extends BasicActionRunnerTests with WskA val code = ZipBuilder.mkBase64Zip(srcs) - withPhp7Container { c => + withPhp8Container { c => c.init(initPayload(code))._1 should be(200) val (runCode, runRes) = c.run(runPayload(JsObject())) @@ -523,7 +523,7 @@ abstract class Php7ActionContainerTests extends BasicActionRunnerTests with WskA val code = ZipBuilder.mkBase64Zip(srcs) - withPhp7Container { c => + withPhp8Container { c => c.init(initPayload(code))._1 should be(200) val (runCode, runRes) = c.run(runPayload(JsArray(JsString("a"), JsString("b"))))