You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by du...@apache.org on 2017/11/06 20:44:20 UTC
[incubator-openwhisk] branch master updated: Replace basic runtimes
with REST implementation (#2920)
This is an automated email from the ASF dual-hosted git repository.
dubeejw pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git
The following commit(s) were added to refs/heads/master by this push:
new 7cf2f6c Replace basic runtimes with REST implementation (#2920)
7cf2f6c is described below
commit 7cf2f6ccee314609754ec60b37e5bbfcdcf22543
Author: Vincent <sh...@us.ibm.com>
AuthorDate: Mon Nov 6 15:44:18 2017 -0500
Replace basic runtimes with REST implementation (#2920)
Swift3, Swift311, Python, Node and Java are not cli related tests.
We do not have to maintain them as cli test suites, so a straight
replacement of wsk with wskrest will be sufficient for them.
---
tests/src/test/scala/system/basic/WskBasicJavaTests.scala | 6 +++---
tests/src/test/scala/system/basic/WskBasicNodeTests.scala | 6 +++---
tests/src/test/scala/system/basic/WskBasicPythonTests.scala | 6 +++---
tests/src/test/scala/system/basic/WskBasicSwift3Tests.scala | 10 +++++-----
...{WskBasicSwift311Tests.scala => WskCliBasicJavaTests.scala} | 7 ++++---
...{WskBasicSwift311Tests.scala => WskCliBasicNodeTests.scala} | 7 ++++---
...skBasicSwift311Tests.scala => WskCliBasicPythonTests.scala} | 7 ++++---
...BasicSwift311Tests.scala => WskCliBasicSwift311Tests.scala} | 8 +++++---
...skBasicSwift311Tests.scala => WskCliBasicSwift3Tests.scala} | 7 ++++---
...{WskUnicodeJavaTests.scala => WskCliUnicodeJavaTests.scala} | 4 +++-
...{WskUnicodeNodeTests.scala => WskCliUnicodeNodeTests.scala} | 4 +++-
...icodePython2Tests.scala => WskCliUnicodePython2Tests.scala} | 8 +++++---
...icodePython2Tests.scala => WskCliUnicodePython3Tests.scala} | 8 +++++---
...odeSwift311Tests.scala => WskCliUnicodeSwift311Tests.scala} | 4 +++-
...UnicodeSwift3Tests.scala => WskCliUnicodeSwift3Tests.scala} | 4 +++-
tests/src/test/scala/system/basic/WskConsoleTests.scala | 2 +-
...WskBasicSwift311Tests.scala => WskRestBasicJavaTests.scala} | 7 ++++---
...WskBasicSwift311Tests.scala => WskRestBasicNodeTests.scala} | 7 ++++---
...kBasicSwift311Tests.scala => WskRestBasicPythonTests.scala} | 7 ++++---
...asicSwift311Tests.scala => WskRestBasicSwift311Tests.scala} | 6 ++++--
...kBasicSwift311Tests.scala => WskRestBasicSwift3Tests.scala} | 7 ++++---
...WskUnicodeJavaTests.scala => WskRestUnicodeJavaTests.scala} | 4 +++-
...WskUnicodeNodeTests.scala => WskRestUnicodeNodeTests.scala} | 4 +++-
...codePython2Tests.scala => WskRestUnicodePython2Tests.scala} | 4 +++-
...codePython3Tests.scala => WskRestUnicodePython3Tests.scala} | 4 +++-
...deSwift311Tests.scala => WskRestUnicodeSwift311Tests.scala} | 4 +++-
...nicodeSwift3Tests.scala => WskRestUnicodeSwift3Tests.scala} | 4 +++-
tests/src/test/scala/system/basic/WskUnicodeTests.scala | 6 +++---
28 files changed, 99 insertions(+), 63 deletions(-)
diff --git a/tests/src/test/scala/system/basic/WskBasicJavaTests.scala b/tests/src/test/scala/system/basic/WskBasicJavaTests.scala
index 39059da..fafbde2 100644
--- a/tests/src/test/scala/system/basic/WskBasicJavaTests.scala
+++ b/tests/src/test/scala/system/basic/WskBasicJavaTests.scala
@@ -24,7 +24,7 @@ import common.TestUtils
import common.TestUtils.ANY_ERROR_EXIT
import common.WskTestHelpers
import common.WskProps
-import common.Wsk
+import common.BaseWsk
import org.junit.runner.RunWith
import org.scalatest.Matchers
@@ -33,10 +33,10 @@ import org.scalatest.junit.JUnitRunner
import spray.json.JsString
@RunWith(classOf[JUnitRunner])
-class WskBasicJavaTests extends TestHelpers with WskTestHelpers with Matchers {
+abstract class WskBasicJavaTests extends TestHelpers with WskTestHelpers with Matchers {
implicit val wskprops = WskProps()
- val wsk = new Wsk
+ val wsk: BaseWsk
val expectedDuration = 120.seconds
val activationPollDuration = 60.seconds
diff --git a/tests/src/test/scala/system/basic/WskBasicNodeTests.scala b/tests/src/test/scala/system/basic/WskBasicNodeTests.scala
index 95db46d..5904b93 100644
--- a/tests/src/test/scala/system/basic/WskBasicNodeTests.scala
+++ b/tests/src/test/scala/system/basic/WskBasicNodeTests.scala
@@ -25,17 +25,17 @@ import common.TestHelpers
import common.TestUtils
import common.TestUtils.ANY_ERROR_EXIT
import common.TestUtils.RunResult
-import common.Wsk
+import common.BaseWsk
import common.WskProps
import common.WskTestHelpers
import spray.json._
import spray.json.DefaultJsonProtocol._
@RunWith(classOf[JUnitRunner])
-class WskBasicNodeTests extends TestHelpers with WskTestHelpers with JsHelpers {
+abstract class WskBasicNodeTests extends TestHelpers with WskTestHelpers with JsHelpers {
implicit val wskprops = WskProps()
- val wsk = new Wsk
+ val wsk: BaseWsk
val defaultAction = Some(TestUtils.getTestActionFilename("hello.js"))
val currentNodeJsDefaultKind = "nodejs:6"
diff --git a/tests/src/test/scala/system/basic/WskBasicPythonTests.scala b/tests/src/test/scala/system/basic/WskBasicPythonTests.scala
index 9461c32..ada635a 100644
--- a/tests/src/test/scala/system/basic/WskBasicPythonTests.scala
+++ b/tests/src/test/scala/system/basic/WskBasicPythonTests.scala
@@ -26,16 +26,16 @@ import spray.json.DefaultJsonProtocol.StringJsonFormat
import common.JsHelpers
import common.TestHelpers
import common.TestUtils
-import common.Wsk
+import common.BaseWsk
import common.WskProps
import common.WskTestHelpers
import common.WhiskProperties
@RunWith(classOf[JUnitRunner])
-class WskBasicPythonTests extends TestHelpers with WskTestHelpers with Matchers with JsHelpers {
+abstract class WskBasicPythonTests extends TestHelpers with WskTestHelpers with Matchers with JsHelpers {
implicit val wskprops = WskProps()
- val wsk = new Wsk
+ val wsk: BaseWsk
behavior of "Native Python Action"
diff --git a/tests/src/test/scala/system/basic/WskBasicSwift3Tests.scala b/tests/src/test/scala/system/basic/WskBasicSwift3Tests.scala
index a1c5098..db2317f 100644
--- a/tests/src/test/scala/system/basic/WskBasicSwift3Tests.scala
+++ b/tests/src/test/scala/system/basic/WskBasicSwift3Tests.scala
@@ -23,7 +23,7 @@ import org.scalatest.junit.JUnitRunner
import common.JsHelpers
import common.TestHelpers
import common.TestUtils
-import common.Wsk
+import common.BaseWsk
import common.WskProps
import common.WskTestHelpers
import spray.json.pimpString
@@ -32,11 +32,11 @@ import common.TestUtils.RunResult
import spray.json.JsObject
@RunWith(classOf[JUnitRunner])
-class WskBasicSwift3Tests extends TestHelpers with WskTestHelpers with JsHelpers {
+abstract class WskBasicSwift3Tests extends TestHelpers with WskTestHelpers with JsHelpers {
- implicit val wskprops = WskProps()
- val wsk = new Wsk
- val defaultAction = Some(TestUtils.getTestActionFilename("hello.swift"))
+ implicit val wskprops: common.WskProps = WskProps()
+ val wsk: BaseWsk
+ val defaultAction: Some[String] = Some(TestUtils.getTestActionFilename("hello.swift"))
lazy val currentSwiftDefaultKind = "swift:3"
behavior of "Swift runtime"
diff --git a/tests/src/test/scala/system/basic/WskBasicSwift311Tests.scala b/tests/src/test/scala/system/basic/WskCliBasicJavaTests.scala
similarity index 88%
copy from tests/src/test/scala/system/basic/WskBasicSwift311Tests.scala
copy to tests/src/test/scala/system/basic/WskCliBasicJavaTests.scala
index 71a816f..3d26690 100644
--- a/tests/src/test/scala/system/basic/WskBasicSwift311Tests.scala
+++ b/tests/src/test/scala/system/basic/WskCliBasicJavaTests.scala
@@ -17,11 +17,12 @@
package system.basic
+import common.Wsk
+
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
@RunWith(classOf[JUnitRunner])
-class WskBasicSwift311Tests extends WskBasicSwift3Tests {
-
- override lazy val currentSwiftDefaultKind = "swift:3.1.1"
+class WskCliBasicJavaTests extends WskBasicJavaTests {
+ override val wsk: Wsk = new Wsk
}
diff --git a/tests/src/test/scala/system/basic/WskBasicSwift311Tests.scala b/tests/src/test/scala/system/basic/WskCliBasicNodeTests.scala
similarity index 88%
copy from tests/src/test/scala/system/basic/WskBasicSwift311Tests.scala
copy to tests/src/test/scala/system/basic/WskCliBasicNodeTests.scala
index 71a816f..5c923b9 100644
--- a/tests/src/test/scala/system/basic/WskBasicSwift311Tests.scala
+++ b/tests/src/test/scala/system/basic/WskCliBasicNodeTests.scala
@@ -17,11 +17,12 @@
package system.basic
+import common.Wsk
+
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
@RunWith(classOf[JUnitRunner])
-class WskBasicSwift311Tests extends WskBasicSwift3Tests {
-
- override lazy val currentSwiftDefaultKind = "swift:3.1.1"
+class WskCliBasicNodeTests extends WskBasicNodeTests {
+ override val wsk: Wsk = new Wsk
}
diff --git a/tests/src/test/scala/system/basic/WskBasicSwift311Tests.scala b/tests/src/test/scala/system/basic/WskCliBasicPythonTests.scala
similarity index 88%
copy from tests/src/test/scala/system/basic/WskBasicSwift311Tests.scala
copy to tests/src/test/scala/system/basic/WskCliBasicPythonTests.scala
index 71a816f..a0957c2 100644
--- a/tests/src/test/scala/system/basic/WskBasicSwift311Tests.scala
+++ b/tests/src/test/scala/system/basic/WskCliBasicPythonTests.scala
@@ -17,11 +17,12 @@
package system.basic
+import common.Wsk
+
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
@RunWith(classOf[JUnitRunner])
-class WskBasicSwift311Tests extends WskBasicSwift3Tests {
-
- override lazy val currentSwiftDefaultKind = "swift:3.1.1"
+class WskCliBasicPythonTests extends WskBasicPythonTests {
+ override val wsk: common.Wsk = new Wsk
}
diff --git a/tests/src/test/scala/system/basic/WskBasicSwift311Tests.scala b/tests/src/test/scala/system/basic/WskCliBasicSwift311Tests.scala
similarity index 84%
copy from tests/src/test/scala/system/basic/WskBasicSwift311Tests.scala
copy to tests/src/test/scala/system/basic/WskCliBasicSwift311Tests.scala
index 71a816f..017dbd1 100644
--- a/tests/src/test/scala/system/basic/WskBasicSwift311Tests.scala
+++ b/tests/src/test/scala/system/basic/WskCliBasicSwift311Tests.scala
@@ -17,11 +17,13 @@
package system.basic
+import common.Wsk
+
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
@RunWith(classOf[JUnitRunner])
-class WskBasicSwift311Tests extends WskBasicSwift3Tests {
-
- override lazy val currentSwiftDefaultKind = "swift:3.1.1"
+class WskCliBasicSwift311Tests extends WskBasicSwift3Tests {
+ override val wsk = new Wsk
+ override lazy val currentSwiftDefaultKind: String = "swift:3.1.1"
}
diff --git a/tests/src/test/scala/system/basic/WskBasicSwift311Tests.scala b/tests/src/test/scala/system/basic/WskCliBasicSwift3Tests.scala
similarity index 88%
copy from tests/src/test/scala/system/basic/WskBasicSwift311Tests.scala
copy to tests/src/test/scala/system/basic/WskCliBasicSwift3Tests.scala
index 71a816f..bbe3cd7 100644
--- a/tests/src/test/scala/system/basic/WskBasicSwift311Tests.scala
+++ b/tests/src/test/scala/system/basic/WskCliBasicSwift3Tests.scala
@@ -17,11 +17,12 @@
package system.basic
+import common.Wsk
+
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
@RunWith(classOf[JUnitRunner])
-class WskBasicSwift311Tests extends WskBasicSwift3Tests {
-
- override lazy val currentSwiftDefaultKind = "swift:3.1.1"
+class WskCliBasicSwift3Tests extends WskBasicSwift3Tests {
+ override val wsk: common.Wsk = new Wsk
}
diff --git a/tests/src/test/scala/system/basic/WskUnicodeJavaTests.scala b/tests/src/test/scala/system/basic/WskCliUnicodeJavaTests.scala
similarity index 88%
copy from tests/src/test/scala/system/basic/WskUnicodeJavaTests.scala
copy to tests/src/test/scala/system/basic/WskCliUnicodeJavaTests.scala
index decef28..b4d2557 100644
--- a/tests/src/test/scala/system/basic/WskUnicodeJavaTests.scala
+++ b/tests/src/test/scala/system/basic/WskCliUnicodeJavaTests.scala
@@ -22,10 +22,12 @@ import org.scalatest.junit.JUnitRunner
import common.JsHelpers
import common.WskTestHelpers
+import common.Wsk
@RunWith(classOf[JUnitRunner])
-class WskUnicodeJavaTests extends WskUnicodeTests with WskTestHelpers with JsHelpers {
+class WskCliUnicodeJavaTests extends WskUnicodeTests with WskTestHelpers with JsHelpers {
+ override val wsk: Wsk = new Wsk
override lazy val actionKind = "java"
override lazy val actionSource = "unicode.jar"
diff --git a/tests/src/test/scala/system/basic/WskUnicodeNodeTests.scala b/tests/src/test/scala/system/basic/WskCliUnicodeNodeTests.scala
similarity index 87%
copy from tests/src/test/scala/system/basic/WskUnicodeNodeTests.scala
copy to tests/src/test/scala/system/basic/WskCliUnicodeNodeTests.scala
index 65160b3..37a7219 100644
--- a/tests/src/test/scala/system/basic/WskUnicodeNodeTests.scala
+++ b/tests/src/test/scala/system/basic/WskCliUnicodeNodeTests.scala
@@ -22,10 +22,12 @@ import org.scalatest.junit.JUnitRunner
import common.JsHelpers
import common.WskTestHelpers
+import common.Wsk
@RunWith(classOf[JUnitRunner])
-class WskUnicodeNodeTests extends WskUnicodeTests with WskTestHelpers with JsHelpers {
+class WskCliUnicodeNodeTests extends WskUnicodeTests with WskTestHelpers with JsHelpers {
+ override val wsk: common.Wsk = new Wsk
override lazy val actionKind = "nodejs:6"
override lazy val actionSource = "unicode.js"
diff --git a/tests/src/test/scala/system/basic/WskUnicodePython2Tests.scala b/tests/src/test/scala/system/basic/WskCliUnicodePython2Tests.scala
similarity index 79%
copy from tests/src/test/scala/system/basic/WskUnicodePython2Tests.scala
copy to tests/src/test/scala/system/basic/WskCliUnicodePython2Tests.scala
index 6c5a50d..c1ea429 100644
--- a/tests/src/test/scala/system/basic/WskUnicodePython2Tests.scala
+++ b/tests/src/test/scala/system/basic/WskCliUnicodePython2Tests.scala
@@ -22,11 +22,13 @@ import org.scalatest.junit.JUnitRunner
import common.JsHelpers
import common.WskTestHelpers
+import common.Wsk
@RunWith(classOf[JUnitRunner])
-class WskUnicodePython2Tests extends WskUnicodeTests with WskTestHelpers with JsHelpers {
+class WskCliUnicodePython2Tests extends WskUnicodeTests with WskTestHelpers with JsHelpers {
- override lazy val actionKind = "python:2"
- override lazy val actionSource = "unicode2.py"
+ override val wsk: common.Wsk = new Wsk
+ override lazy val actionKind: String = "python:2"
+ override lazy val actionSource: String = "unicode2.py"
}
diff --git a/tests/src/test/scala/system/basic/WskUnicodePython2Tests.scala b/tests/src/test/scala/system/basic/WskCliUnicodePython3Tests.scala
similarity index 79%
copy from tests/src/test/scala/system/basic/WskUnicodePython2Tests.scala
copy to tests/src/test/scala/system/basic/WskCliUnicodePython3Tests.scala
index 6c5a50d..b24a155 100644
--- a/tests/src/test/scala/system/basic/WskUnicodePython2Tests.scala
+++ b/tests/src/test/scala/system/basic/WskCliUnicodePython3Tests.scala
@@ -22,11 +22,13 @@ import org.scalatest.junit.JUnitRunner
import common.JsHelpers
import common.WskTestHelpers
+import common.Wsk
@RunWith(classOf[JUnitRunner])
-class WskUnicodePython2Tests extends WskUnicodeTests with WskTestHelpers with JsHelpers {
+class WskCliUnicodePython3Tests extends WskUnicodeTests with WskTestHelpers with JsHelpers {
- override lazy val actionKind = "python:2"
- override lazy val actionSource = "unicode2.py"
+ override val wsk: common.Wsk = new Wsk
+ override lazy val actionKind: String = "python:3"
+ override lazy val actionSource: String = "unicode3.py"
}
diff --git a/tests/src/test/scala/system/basic/WskUnicodeSwift311Tests.scala b/tests/src/test/scala/system/basic/WskCliUnicodeSwift311Tests.scala
similarity index 87%
copy from tests/src/test/scala/system/basic/WskUnicodeSwift311Tests.scala
copy to tests/src/test/scala/system/basic/WskCliUnicodeSwift311Tests.scala
index c14827d..460b340 100644
--- a/tests/src/test/scala/system/basic/WskUnicodeSwift311Tests.scala
+++ b/tests/src/test/scala/system/basic/WskCliUnicodeSwift311Tests.scala
@@ -22,10 +22,12 @@ import org.scalatest.junit.JUnitRunner
import common.JsHelpers
import common.WskTestHelpers
+import common.Wsk
@RunWith(classOf[JUnitRunner])
-class WskUnicodeSwift311Tests extends WskUnicodeTests with WskTestHelpers with JsHelpers {
+class WskCliUnicodeSwift311Tests extends WskUnicodeTests with WskTestHelpers with JsHelpers {
+ override val wsk: common.Wsk = new Wsk
override lazy val actionKind = "swift:3.1.1"
override lazy val actionSource = "unicode.swift"
diff --git a/tests/src/test/scala/system/basic/WskUnicodeSwift3Tests.scala b/tests/src/test/scala/system/basic/WskCliUnicodeSwift3Tests.scala
similarity index 87%
copy from tests/src/test/scala/system/basic/WskUnicodeSwift3Tests.scala
copy to tests/src/test/scala/system/basic/WskCliUnicodeSwift3Tests.scala
index 6288261..69fe8f9 100644
--- a/tests/src/test/scala/system/basic/WskUnicodeSwift3Tests.scala
+++ b/tests/src/test/scala/system/basic/WskCliUnicodeSwift3Tests.scala
@@ -22,10 +22,12 @@ import org.scalatest.junit.JUnitRunner
import common.JsHelpers
import common.WskTestHelpers
+import common.Wsk
@RunWith(classOf[JUnitRunner])
-class WskUnicodeSwift3Tests extends WskUnicodeTests with WskTestHelpers with JsHelpers {
+class WskCliUnicodeSwift3Tests extends WskUnicodeTests with WskTestHelpers with JsHelpers {
+ override val wsk: common.Wsk = new Wsk
override lazy val actionKind = "swift:3"
override lazy val actionSource = "unicode.swift"
diff --git a/tests/src/test/scala/system/basic/WskConsoleTests.scala b/tests/src/test/scala/system/basic/WskConsoleTests.scala
index ba0548b..064de72 100644
--- a/tests/src/test/scala/system/basic/WskConsoleTests.scala
+++ b/tests/src/test/scala/system/basic/WskConsoleTests.scala
@@ -42,7 +42,7 @@ import spray.json.pimpAny
@RunWith(classOf[JUnitRunner])
abstract class WskConsoleTests extends TestHelpers with WskTestHelpers {
- implicit val wskprops: common.WskProps = WskProps()
+ implicit val wskprops = WskProps()
val wsk: BaseWsk
val guestNamespace = wskprops.namespace
diff --git a/tests/src/test/scala/system/basic/WskBasicSwift311Tests.scala b/tests/src/test/scala/system/basic/WskRestBasicJavaTests.scala
similarity index 87%
copy from tests/src/test/scala/system/basic/WskBasicSwift311Tests.scala
copy to tests/src/test/scala/system/basic/WskRestBasicJavaTests.scala
index 71a816f..0ccbd56 100644
--- a/tests/src/test/scala/system/basic/WskBasicSwift311Tests.scala
+++ b/tests/src/test/scala/system/basic/WskRestBasicJavaTests.scala
@@ -17,11 +17,12 @@
package system.basic
+import common.rest.WskRest
+
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
@RunWith(classOf[JUnitRunner])
-class WskBasicSwift311Tests extends WskBasicSwift3Tests {
-
- override lazy val currentSwiftDefaultKind = "swift:3.1.1"
+class WskRestBasicJavaTests extends WskBasicJavaTests {
+ override val wsk: common.rest.WskRest = new WskRest
}
diff --git a/tests/src/test/scala/system/basic/WskBasicSwift311Tests.scala b/tests/src/test/scala/system/basic/WskRestBasicNodeTests.scala
similarity index 87%
copy from tests/src/test/scala/system/basic/WskBasicSwift311Tests.scala
copy to tests/src/test/scala/system/basic/WskRestBasicNodeTests.scala
index 71a816f..7e08469 100644
--- a/tests/src/test/scala/system/basic/WskBasicSwift311Tests.scala
+++ b/tests/src/test/scala/system/basic/WskRestBasicNodeTests.scala
@@ -17,11 +17,12 @@
package system.basic
+import common.rest.WskRest
+
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
@RunWith(classOf[JUnitRunner])
-class WskBasicSwift311Tests extends WskBasicSwift3Tests {
-
- override lazy val currentSwiftDefaultKind = "swift:3.1.1"
+class WskRestBasicNodeTests extends WskBasicNodeTests {
+ override val wsk: common.rest.WskRest = new WskRest
}
diff --git a/tests/src/test/scala/system/basic/WskBasicSwift311Tests.scala b/tests/src/test/scala/system/basic/WskRestBasicPythonTests.scala
similarity index 86%
copy from tests/src/test/scala/system/basic/WskBasicSwift311Tests.scala
copy to tests/src/test/scala/system/basic/WskRestBasicPythonTests.scala
index 71a816f..3273c99 100644
--- a/tests/src/test/scala/system/basic/WskBasicSwift311Tests.scala
+++ b/tests/src/test/scala/system/basic/WskRestBasicPythonTests.scala
@@ -17,11 +17,12 @@
package system.basic
+import common.rest.WskRest
+
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
@RunWith(classOf[JUnitRunner])
-class WskBasicSwift311Tests extends WskBasicSwift3Tests {
-
- override lazy val currentSwiftDefaultKind = "swift:3.1.1"
+class WskRestBasicPythonTests extends WskBasicPythonTests {
+ override val wsk: common.rest.WskRest = new WskRest
}
diff --git a/tests/src/test/scala/system/basic/WskBasicSwift311Tests.scala b/tests/src/test/scala/system/basic/WskRestBasicSwift311Tests.scala
similarity index 87%
copy from tests/src/test/scala/system/basic/WskBasicSwift311Tests.scala
copy to tests/src/test/scala/system/basic/WskRestBasicSwift311Tests.scala
index 71a816f..1d954f2 100644
--- a/tests/src/test/scala/system/basic/WskBasicSwift311Tests.scala
+++ b/tests/src/test/scala/system/basic/WskRestBasicSwift311Tests.scala
@@ -17,11 +17,13 @@
package system.basic
+import common.rest.WskRest
+
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
@RunWith(classOf[JUnitRunner])
-class WskBasicSwift311Tests extends WskBasicSwift3Tests {
-
+class WskRestBasicSwift311Tests extends WskBasicSwift3Tests {
+ override val wsk: common.rest.WskRest = new WskRest
override lazy val currentSwiftDefaultKind = "swift:3.1.1"
}
diff --git a/tests/src/test/scala/system/basic/WskBasicSwift311Tests.scala b/tests/src/test/scala/system/basic/WskRestBasicSwift3Tests.scala
similarity index 86%
rename from tests/src/test/scala/system/basic/WskBasicSwift311Tests.scala
rename to tests/src/test/scala/system/basic/WskRestBasicSwift3Tests.scala
index 71a816f..37359ed 100644
--- a/tests/src/test/scala/system/basic/WskBasicSwift311Tests.scala
+++ b/tests/src/test/scala/system/basic/WskRestBasicSwift3Tests.scala
@@ -17,11 +17,12 @@
package system.basic
+import common.rest.WskRest
+
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
@RunWith(classOf[JUnitRunner])
-class WskBasicSwift311Tests extends WskBasicSwift3Tests {
-
- override lazy val currentSwiftDefaultKind = "swift:3.1.1"
+class WskRestBasicSwift3Tests extends WskBasicSwift3Tests {
+ override val wsk: common.rest.WskRest = new WskRest
}
diff --git a/tests/src/test/scala/system/basic/WskUnicodeJavaTests.scala b/tests/src/test/scala/system/basic/WskRestUnicodeJavaTests.scala
similarity index 86%
rename from tests/src/test/scala/system/basic/WskUnicodeJavaTests.scala
rename to tests/src/test/scala/system/basic/WskRestUnicodeJavaTests.scala
index decef28..025261c 100644
--- a/tests/src/test/scala/system/basic/WskUnicodeJavaTests.scala
+++ b/tests/src/test/scala/system/basic/WskRestUnicodeJavaTests.scala
@@ -22,10 +22,12 @@ import org.scalatest.junit.JUnitRunner
import common.JsHelpers
import common.WskTestHelpers
+import common.rest.WskRest
@RunWith(classOf[JUnitRunner])
-class WskUnicodeJavaTests extends WskUnicodeTests with WskTestHelpers with JsHelpers {
+class WskRestUnicodeJavaTests extends WskUnicodeTests with WskTestHelpers with JsHelpers {
+ override val wsk: common.rest.WskRest = new WskRest
override lazy val actionKind = "java"
override lazy val actionSource = "unicode.jar"
diff --git a/tests/src/test/scala/system/basic/WskUnicodeNodeTests.scala b/tests/src/test/scala/system/basic/WskRestUnicodeNodeTests.scala
similarity index 86%
rename from tests/src/test/scala/system/basic/WskUnicodeNodeTests.scala
rename to tests/src/test/scala/system/basic/WskRestUnicodeNodeTests.scala
index 65160b3..875135f 100644
--- a/tests/src/test/scala/system/basic/WskUnicodeNodeTests.scala
+++ b/tests/src/test/scala/system/basic/WskRestUnicodeNodeTests.scala
@@ -22,10 +22,12 @@ import org.scalatest.junit.JUnitRunner
import common.JsHelpers
import common.WskTestHelpers
+import common.rest.WskRest
@RunWith(classOf[JUnitRunner])
-class WskUnicodeNodeTests extends WskUnicodeTests with WskTestHelpers with JsHelpers {
+class WskRestUnicodeNodeTests extends WskUnicodeTests with WskTestHelpers with JsHelpers {
+ override val wsk: common.rest.WskRest = new WskRest
override lazy val actionKind = "nodejs:6"
override lazy val actionSource = "unicode.js"
diff --git a/tests/src/test/scala/system/basic/WskUnicodePython2Tests.scala b/tests/src/test/scala/system/basic/WskRestUnicodePython2Tests.scala
similarity index 86%
rename from tests/src/test/scala/system/basic/WskUnicodePython2Tests.scala
rename to tests/src/test/scala/system/basic/WskRestUnicodePython2Tests.scala
index 6c5a50d..e0612f6 100644
--- a/tests/src/test/scala/system/basic/WskUnicodePython2Tests.scala
+++ b/tests/src/test/scala/system/basic/WskRestUnicodePython2Tests.scala
@@ -22,10 +22,12 @@ import org.scalatest.junit.JUnitRunner
import common.JsHelpers
import common.WskTestHelpers
+import common.rest.WskRest
@RunWith(classOf[JUnitRunner])
-class WskUnicodePython2Tests extends WskUnicodeTests with WskTestHelpers with JsHelpers {
+class WskRestUnicodePython2Tests extends WskUnicodeTests with WskTestHelpers with JsHelpers {
+ override val wsk: common.rest.WskRest = new WskRest
override lazy val actionKind = "python:2"
override lazy val actionSource = "unicode2.py"
diff --git a/tests/src/test/scala/system/basic/WskUnicodePython3Tests.scala b/tests/src/test/scala/system/basic/WskRestUnicodePython3Tests.scala
similarity index 86%
rename from tests/src/test/scala/system/basic/WskUnicodePython3Tests.scala
rename to tests/src/test/scala/system/basic/WskRestUnicodePython3Tests.scala
index ba39144..1202aba 100644
--- a/tests/src/test/scala/system/basic/WskUnicodePython3Tests.scala
+++ b/tests/src/test/scala/system/basic/WskRestUnicodePython3Tests.scala
@@ -22,10 +22,12 @@ import org.scalatest.junit.JUnitRunner
import common.JsHelpers
import common.WskTestHelpers
+import common.rest.WskRest
@RunWith(classOf[JUnitRunner])
-class WskUnicodePython3Tests extends WskUnicodeTests with WskTestHelpers with JsHelpers {
+class WskRestUnicodePython3Tests extends WskUnicodeTests with WskTestHelpers with JsHelpers {
+ override val wsk: common.rest.WskRest = new WskRest
override lazy val actionKind = "python:3"
override lazy val actionSource = "unicode3.py"
diff --git a/tests/src/test/scala/system/basic/WskUnicodeSwift311Tests.scala b/tests/src/test/scala/system/basic/WskRestUnicodeSwift311Tests.scala
similarity index 86%
rename from tests/src/test/scala/system/basic/WskUnicodeSwift311Tests.scala
rename to tests/src/test/scala/system/basic/WskRestUnicodeSwift311Tests.scala
index c14827d..fdb1924 100644
--- a/tests/src/test/scala/system/basic/WskUnicodeSwift311Tests.scala
+++ b/tests/src/test/scala/system/basic/WskRestUnicodeSwift311Tests.scala
@@ -22,10 +22,12 @@ import org.scalatest.junit.JUnitRunner
import common.JsHelpers
import common.WskTestHelpers
+import common.rest.WskRest
@RunWith(classOf[JUnitRunner])
-class WskUnicodeSwift311Tests extends WskUnicodeTests with WskTestHelpers with JsHelpers {
+class WskRestUnicodeSwift311Tests extends WskUnicodeTests with WskTestHelpers with JsHelpers {
+ override val wsk: common.rest.WskRest = new WskRest
override lazy val actionKind = "swift:3.1.1"
override lazy val actionSource = "unicode.swift"
diff --git a/tests/src/test/scala/system/basic/WskUnicodeSwift3Tests.scala b/tests/src/test/scala/system/basic/WskRestUnicodeSwift3Tests.scala
similarity index 86%
rename from tests/src/test/scala/system/basic/WskUnicodeSwift3Tests.scala
rename to tests/src/test/scala/system/basic/WskRestUnicodeSwift3Tests.scala
index 6288261..4d1d924 100644
--- a/tests/src/test/scala/system/basic/WskUnicodeSwift3Tests.scala
+++ b/tests/src/test/scala/system/basic/WskRestUnicodeSwift3Tests.scala
@@ -22,10 +22,12 @@ import org.scalatest.junit.JUnitRunner
import common.JsHelpers
import common.WskTestHelpers
+import common.rest.WskRest
@RunWith(classOf[JUnitRunner])
-class WskUnicodeSwift3Tests extends WskUnicodeTests with WskTestHelpers with JsHelpers {
+class WskRestUnicodeSwift3Tests extends WskUnicodeTests with WskTestHelpers with JsHelpers {
+ override val wsk: common.rest.WskRest = new WskRest
override lazy val actionKind = "swift:3"
override lazy val actionSource = "unicode.swift"
diff --git a/tests/src/test/scala/system/basic/WskUnicodeTests.scala b/tests/src/test/scala/system/basic/WskUnicodeTests.scala
index b9e1ad6..8d9c42d 100644
--- a/tests/src/test/scala/system/basic/WskUnicodeTests.scala
+++ b/tests/src/test/scala/system/basic/WskUnicodeTests.scala
@@ -23,7 +23,7 @@ import org.scalatest.junit.JUnitRunner
import common.JsHelpers
import common.TestHelpers
import common.TestUtils
-import common.Wsk
+import common.BaseWsk
import common.WskProps
import common.WskTestHelpers
import spray.json._
@@ -34,8 +34,8 @@ abstract class WskUnicodeTests extends TestHelpers with WskTestHelpers with JsHe
val actionKind: String
val actionSource: String
- implicit val wskprops = WskProps()
- val wsk = new Wsk
+ implicit val wskprops: common.WskProps = WskProps()
+ val wsk: BaseWsk
s"$actionKind action" should "Ensure that UTF-8 in supported in source files, input params, logs, and output results" in withAssetCleaner(
wskprops) { (wp, assetHelper) =>
--
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <co...@openwhisk.apache.org>'].