SAMZA-596; upgrade scala test to 2.2.4
Project: http://git-wip-us.apache.org/repos/asf/samza/repo Commit: http://git-wip-us.apache.org/repos/asf/samza/commit/2904bc9b Tree: http://git-wip-us.apache.org/repos/asf/samza/tree/2904bc9b Diff: http://git-wip-us.apache.org/repos/asf/samza/diff/2904bc9b Branch: refs/heads/samza-sql Commit: 2904bc9be9d3525617d97f1ca32d49722aedc4c6 Parents: 13ee706 Author: Bennett Andrews <[email protected]> Authored: Thu Mar 12 18:44:58 2015 -0700 Committer: Chris Riccomini <[email protected]> Committed: Thu Mar 12 18:44:58 2015 -0700 ---------------------------------------------------------------------- gradle/dependency-versions.gradle | 2 +- .../src/test/scala/org/apache/samza/container/TestRunLoop.scala | 4 ++-- .../scala/org/apache/samza/system/TestStreamMetadataCache.scala | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/samza/blob/2904bc9b/gradle/dependency-versions.gradle ---------------------------------------------------------------------- diff --git a/gradle/dependency-versions.gradle b/gradle/dependency-versions.gradle index 84be50b..cb6ef21 100644 --- a/gradle/dependency-versions.gradle +++ b/gradle/dependency-versions.gradle @@ -22,7 +22,7 @@ jacksonVersion = "1.8.5" junitVersion = "4.8.1" mockitoVersion = "1.8.4" - scalaTestVersion = "1.9.2" + scalaTestVersion = "2.2.4" zkClientVersion = "0.3" zookeeperVersion = "3.3.4" metricsVersion = "2.2.0" http://git-wip-us.apache.org/repos/asf/samza/blob/2904bc9b/samza-core/src/test/scala/org/apache/samza/container/TestRunLoop.scala ---------------------------------------------------------------------- diff --git a/samza-core/src/test/scala/org/apache/samza/container/TestRunLoop.scala b/samza-core/src/test/scala/org/apache/samza/container/TestRunLoop.scala index fb1ebdd..2a0897f 100644 --- a/samza-core/src/test/scala/org/apache/samza/container/TestRunLoop.scala +++ b/samza-core/src/test/scala/org/apache/samza/container/TestRunLoop.scala @@ -25,14 +25,14 @@ import org.mockito.Mockito._ import org.mockito.invocation.InvocationOnMock import org.mockito.stubbing.Answer import org.scalatest.junit.AssertionsForJUnit -import org.scalatest.matchers.ShouldMatchers +import org.scalatest.{Matchers => ScalaTestMatchers} import org.scalatest.mock.MockitoSugar import org.apache.samza.Partition import org.apache.samza.system.{ IncomingMessageEnvelope, SystemConsumers, SystemStreamPartition } import org.apache.samza.task.ReadableCoordinator import org.apache.samza.task.TaskCoordinator.RequestScope -class TestRunLoop extends AssertionsForJUnit with MockitoSugar with ShouldMatchers { +class TestRunLoop extends AssertionsForJUnit with MockitoSugar with ScalaTestMatchers { class StopRunLoop extends RuntimeException val p0 = new Partition(0) http://git-wip-us.apache.org/repos/asf/samza/blob/2904bc9b/samza-core/src/test/scala/org/apache/samza/system/TestStreamMetadataCache.scala ---------------------------------------------------------------------- diff --git a/samza-core/src/test/scala/org/apache/samza/system/TestStreamMetadataCache.scala b/samza-core/src/test/scala/org/apache/samza/system/TestStreamMetadataCache.scala index 89ea078..4716d97 100644 --- a/samza-core/src/test/scala/org/apache/samza/system/TestStreamMetadataCache.scala +++ b/samza-core/src/test/scala/org/apache/samza/system/TestStreamMetadataCache.scala @@ -24,12 +24,12 @@ import org.apache.samza.system.SystemStreamMetadata.SystemStreamPartitionMetadat import org.apache.samza.util.Clock import org.junit.{Before, Test} import org.mockito.Mockito._ -import org.scalatest.matchers.ShouldMatchers +import org.scalatest.{Matchers => ScalaTestMatchers} import org.scalatest.junit.AssertionsForJUnit import org.scalatest.mock.MockitoSugar import scala.collection.JavaConversions._ -class TestStreamMetadataCache extends AssertionsForJUnit with MockitoSugar with ShouldMatchers { +class TestStreamMetadataCache extends AssertionsForJUnit with MockitoSugar with ScalaTestMatchers { def makeMetadata(streamNames: Set[String] = Set("stream"), numPartitions: Int = 4) = { val partitions = (0 until numPartitions).map(partition => { new Partition(partition) -> new SystemStreamPartitionMetadata("oldest", "newest", "upcoming")
