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-package-kafka.git
The following commit(s) were added to refs/heads/master by this push:
new 8ee710f Fix test compile failures (#344)
8ee710f is described below
commit 8ee710fe38d4037db24427434ae58a77ed978893
Author: James Dubee <jwdu...@us.ibm.com>
AuthorDate: Thu Jun 6 18:01:24 2019 -0400
Fix test compile failures (#344)
---
tests/src/test/scala/system/health/BasicHealthTest.scala | 4 ++--
tests/src/test/scala/system/packages/KafkaFeedWebTests.scala | 4 ++--
.../src/test/scala/system/packages/MessageHubFeedTests.scala | 12 ++++++------
.../test/scala/system/packages/MessageHubFeedWebTests.scala | 4 ++--
.../test/scala/system/packages/MessageHubProduceTests.scala | 6 +++---
.../test/scala/system/packages/MessagingServiceTests.scala | 2 +-
tests/src/test/scala/system/utils/KafkaUtils.scala | 4 ++--
7 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/tests/src/test/scala/system/health/BasicHealthTest.scala
b/tests/src/test/scala/system/health/BasicHealthTest.scala
index 3083f6b..d365b17 100644
--- a/tests/src/test/scala/system/health/BasicHealthTest.scala
+++ b/tests/src/test/scala/system/health/BasicHealthTest.scala
@@ -26,7 +26,7 @@ import spray.json.DefaultJsonProtocol._
import spray.json._
import system.utils.KafkaUtils
import org.apache.openwhisk.utils.retry
-import org.apache.openwhisk.core.entity.WhiskAction
+import org.apache.openwhisk.core.entity.Annotations
import scala.concurrent.duration.DurationInt
import scala.language.postfixOps
@@ -79,7 +79,7 @@ class BasicHealthTest
val defaultActionName = s"helloKafka-$currentTime"
assetHelper.withCleaner(wsk.action, defaultActionName) { (action, name)
=>
- action.create(name, defaultAction, annotations =
Map(WhiskAction.provideApiKeyAnnotationName -> JsBoolean(true)))
+ action.create(name, defaultAction, annotations =
Map(Annotations.ProvideApiKeyAnnotationName -> JsBoolean(true)))
}
assetHelper.withCleaner(wsk.rule,
s"dummyMessageHub-helloKafka-$currentTime") { (rule, name) =>
diff --git a/tests/src/test/scala/system/packages/KafkaFeedWebTests.scala
b/tests/src/test/scala/system/packages/KafkaFeedWebTests.scala
index 421906b..66c8114 100644
--- a/tests/src/test/scala/system/packages/KafkaFeedWebTests.scala
+++ b/tests/src/test/scala/system/packages/KafkaFeedWebTests.scala
@@ -23,8 +23,8 @@ import org.scalatest.FlatSpec
import org.scalatest.Matchers
import org.scalatest.junit.JUnitRunner
-import com.jayway.restassured.RestAssured
-import com.jayway.restassured.config.SSLConfig
+import io.restassured.RestAssured
+import io.restassured.config.SSLConfig
import common.Wsk
import common.WskProps
diff --git a/tests/src/test/scala/system/packages/MessageHubFeedTests.scala
b/tests/src/test/scala/system/packages/MessageHubFeedTests.scala
index f875ec4..a40c75c 100644
--- a/tests/src/test/scala/system/packages/MessageHubFeedTests.scala
+++ b/tests/src/test/scala/system/packages/MessageHubFeedTests.scala
@@ -38,7 +38,7 @@ import common.WskTestHelpers
import ActionHelper._
import common.TestUtils.NOT_FOUND
import org.apache.openwhisk.utils.retry
-import org.apache.openwhisk.core.entity.WhiskAction
+import org.apache.openwhisk.core.entity.Annotations
import java.util.concurrent.ExecutionException
@RunWith(classOf[JUnitRunner])
@@ -137,7 +137,7 @@ class MessageHubFeedTests
val defaultActionName = s"helloKafka-${currentTime}"
assetHelper.withCleaner(wsk.action, defaultActionName) { (action, name)
=>
- action.create(name, defaultAction, annotations =
Map(WhiskAction.provideApiKeyAnnotationName -> JsBoolean(true)))
+ action.create(name, defaultAction, annotations =
Map(Annotations.ProvideApiKeyAnnotationName -> JsBoolean(true)))
}
assetHelper.withCleaner(wsk.rule, "rule") { (rule, name) =>
rule.create(name, trigger = triggerName, action = defaultActionName)
@@ -190,7 +190,7 @@ class MessageHubFeedTests
val defaultActionName = s"helloKafka-${currentTime}"
assetHelper.withCleaner(wsk.action, defaultActionName) { (action, name)
=>
- action.create(name, defaultAction, annotations =
Map(WhiskAction.provideApiKeyAnnotationName -> JsBoolean(true)))
+ action.create(name, defaultAction, annotations =
Map(Annotations.ProvideApiKeyAnnotationName -> JsBoolean(true)))
}
assetHelper.withCleaner(wsk.rule, "rule") { (rule, name) =>
rule.create(name, trigger = triggerName, action = defaultActionName)
@@ -366,7 +366,7 @@ class MessageHubFeedTests
val defaultActionName = s"helloKafka-${currentTime}"
assetHelper.withCleaner(wsk.action, defaultActionName) { (action, name)
=>
- action.create(name, defaultAction1, annotations =
Map(WhiskAction.provideApiKeyAnnotationName -> JsBoolean(true)))
+ action.create(name, defaultAction1, annotations =
Map(Annotations.ProvideApiKeyAnnotationName -> JsBoolean(true)))
}
assetHelper.withCleaner(wsk.rule, "rule") { (rule, name) =>
rule.create(name, trigger = triggerName, action = defaultActionName)
@@ -401,7 +401,7 @@ class MessageHubFeedTests
}
val defaultAction2 =
Some("dat/createTriggerActionsFromEncodedMessage.js")
- wsk.action.create(defaultActionName, defaultAction2, update = true,
annotations = Map(WhiskAction.provideApiKeyAnnotationName -> JsBoolean(true)))
+ wsk.action.create(defaultActionName, defaultAction2, update = true,
annotations = Map(Annotations.ProvideApiKeyAnnotationName -> JsBoolean(true)))
println("Giving the consumer a moment to get ready")
Thread.sleep(consumerInitTime)
@@ -431,7 +431,7 @@ class MessageHubFeedTests
val defaultActionName = s"helloKafka-${currentTime}"
assetHelper.withCleaner(wsk.action, defaultActionName) { (action, name)
=>
- action.create(name, defaultAction1, annotations =
Map(WhiskAction.provideApiKeyAnnotationName -> JsBoolean(true)))
+ action.create(name, defaultAction1, annotations =
Map(Annotations.ProvideApiKeyAnnotationName -> JsBoolean(true)))
}
assetHelper.withCleaner(wsk.rule, "rule") { (rule, name) =>
rule.create(name, trigger = triggerName, action = defaultActionName)
diff --git a/tests/src/test/scala/system/packages/MessageHubFeedWebTests.scala
b/tests/src/test/scala/system/packages/MessageHubFeedWebTests.scala
index 4a3354a..48f753d 100644
--- a/tests/src/test/scala/system/packages/MessageHubFeedWebTests.scala
+++ b/tests/src/test/scala/system/packages/MessageHubFeedWebTests.scala
@@ -23,8 +23,8 @@ import org.scalatest.FlatSpec
import org.scalatest.Matchers
import org.scalatest.junit.JUnitRunner
-import com.jayway.restassured.RestAssured
-import com.jayway.restassured.config.SSLConfig
+import io.restassured.RestAssured
+import io.restassured.config.SSLConfig
import common.Wsk
import common.WskProps
diff --git a/tests/src/test/scala/system/packages/MessageHubProduceTests.scala
b/tests/src/test/scala/system/packages/MessageHubProduceTests.scala
index b47ff21..e8121f5 100644
--- a/tests/src/test/scala/system/packages/MessageHubProduceTests.scala
+++ b/tests/src/test/scala/system/packages/MessageHubProduceTests.scala
@@ -43,7 +43,7 @@ import java.util.Base64
import java.nio.charset.StandardCharsets
import org.apache.openwhisk.utils.retry
-import org.apache.openwhisk.core.entity.WhiskAction
+import org.apache.openwhisk.core.entity.Annotations
@RunWith(classOf[JUnitRunner])
class MessageHubProduceTests
@@ -146,7 +146,7 @@ class MessageHubProduceTests
val defaultActionName = s"helloKafka-${currentTime}"
assetHelper.withCleaner(wsk.action, defaultActionName) { (action,
name) =>
- action.create(name, defaultAction, annotations =
Map(WhiskAction.provideApiKeyAnnotationName -> JsBoolean(true)))
+ action.create(name, defaultAction, annotations =
Map(Annotations.ProvideApiKeyAnnotationName -> JsBoolean(true)))
}
assetHelper.withCleaner(wsk.rule,
s"dummyMessageHub-helloKafka-$currentTime") { (rule, name) =>
@@ -190,7 +190,7 @@ class MessageHubProduceTests
val defaultActionName = s"helloKafka-${currentTime}"
assetHelper.withCleaner(wsk.action, defaultActionName) { (action,
name) =>
- action.create(name, defaultAction, annotations =
Map(WhiskAction.provideApiKeyAnnotationName -> JsBoolean(true)))
+ action.create(name, defaultAction, annotations =
Map(Annotations.ProvideApiKeyAnnotationName -> JsBoolean(true)))
}
assetHelper.withCleaner(wsk.rule,
s"dummyMessageHub-helloKafka-$currentTime") { (rule, name) =>
diff --git a/tests/src/test/scala/system/packages/MessagingServiceTests.scala
b/tests/src/test/scala/system/packages/MessagingServiceTests.scala
index ccd3173..7bbbc7b 100644
--- a/tests/src/test/scala/system/packages/MessagingServiceTests.scala
+++ b/tests/src/test/scala/system/packages/MessagingServiceTests.scala
@@ -21,7 +21,7 @@ import org.scalatest.BeforeAndAfter
import org.scalatest.FlatSpec
import org.scalatest.Matchers
import org.scalatest.junit.JUnitRunner
-import com.jayway.restassured.RestAssured
+import io.restassured.RestAssured
@RunWith(classOf[JUnitRunner])
class MessagingServiceTests
diff --git a/tests/src/test/scala/system/utils/KafkaUtils.scala
b/tests/src/test/scala/system/utils/KafkaUtils.scala
index 19345b3..2674746 100644
--- a/tests/src/test/scala/system/utils/KafkaUtils.scala
+++ b/tests/src/test/scala/system/utils/KafkaUtils.scala
@@ -21,8 +21,8 @@ import java.util.HashMap
import java.util.Properties
import java.util.concurrent.{TimeUnit, TimeoutException}
-import com.jayway.restassured.RestAssured
-import com.jayway.restassured.config.{RestAssuredConfig, SSLConfig}
+import io.restassured.RestAssured
+import io.restassured.config.{RestAssuredConfig, SSLConfig}
import javax.security.auth.login.Configuration
import javax.security.auth.login.AppConfigurationEntry
import org.apache.kafka.clients.producer.KafkaProducer
