Repository: kafka Updated Branches: refs/heads/trunk 9e2c683f5 -> 47b7a686e
KAFKA-2084; trivial follow-up (remove JUnit3Suite dependency) Project: http://git-wip-us.apache.org/repos/asf/kafka/repo Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/47b7a686 Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/47b7a686 Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/47b7a686 Branch: refs/heads/trunk Commit: 47b7a686e9636a68226efeca221073f76d887f36 Parents: 9e2c683 Author: Joel Koshy <jjko...@gmail.com> Authored: Wed Aug 19 14:32:25 2015 -0700 Committer: Joel Koshy <jjko...@gmail.com> Committed: Wed Aug 19 14:32:25 2015 -0700 ---------------------------------------------------------------------- .../controller/ControllerFailoverTest.scala | 19 ++++--------------- .../kafka/server/ClientQuotaManagerTest.scala | 8 +++----- .../server/ThrottledResponseExpirationTest.scala | 7 +++---- 3 files changed, 10 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kafka/blob/47b7a686/core/src/test/scala/unit/kafka/controller/ControllerFailoverTest.scala ---------------------------------------------------------------------- diff --git a/core/src/test/scala/unit/kafka/controller/ControllerFailoverTest.scala b/core/src/test/scala/unit/kafka/controller/ControllerFailoverTest.scala index 0e38a18..d7112d4 100644 --- a/core/src/test/scala/unit/kafka/controller/ControllerFailoverTest.scala +++ b/core/src/test/scala/unit/kafka/controller/ControllerFailoverTest.scala @@ -17,28 +17,17 @@ package kafka.controller -import java.util.concurrent.LinkedBlockingQueue import java.util.Properties - -import junit.framework.Assert._ -import org.scalatest.junit.JUnit3Suite - -import org.junit.{Test, After, Before} -import org.I0Itec.zkclient.{IZkDataListener, IZkStateListener, ZkClient} -import org.I0Itec.zkclient.serialize.ZkSerializer -import org.apache.log4j.{Logger, Level} +import java.util.concurrent.LinkedBlockingQueue import kafka.api.RequestOrResponse import kafka.common.TopicAndPartition import kafka.integration.KafkaServerTestHarness -import kafka.server.BrokerState -import kafka.server.KafkaConfig -import kafka.server.KafkaServer -import kafka.server.RunningAsController +import kafka.server.{KafkaConfig, KafkaServer} import kafka.utils._ -import kafka.utils.TestUtils._ +import org.apache.log4j.{Level, Logger} +import org.junit.{After, Before, Test} -import scala.collection.Map import scala.collection.mutable http://git-wip-us.apache.org/repos/asf/kafka/blob/47b7a686/core/src/test/scala/unit/kafka/server/ClientQuotaManagerTest.scala ---------------------------------------------------------------------- diff --git a/core/src/test/scala/unit/kafka/server/ClientQuotaManagerTest.scala b/core/src/test/scala/unit/kafka/server/ClientQuotaManagerTest.scala index 97dcca8..caf98e8 100644 --- a/core/src/test/scala/unit/kafka/server/ClientQuotaManagerTest.scala +++ b/core/src/test/scala/unit/kafka/server/ClientQuotaManagerTest.scala @@ -18,14 +18,12 @@ package kafka.server import java.util.Collections -import kafka.api.RequestKeys import org.apache.kafka.common.MetricName -import org.apache.kafka.common.metrics.{Metrics, Quota, MetricConfig} +import org.apache.kafka.common.metrics.{MetricConfig, Metrics, Quota} import org.apache.kafka.common.utils.MockTime -import org.scalatest.junit.JUnit3Suite -import org.junit.{Before, Test, Assert} +import org.junit.{Assert, Before, Test} -class ClientQuotaManagerTest extends JUnit3Suite { +class ClientQuotaManagerTest { private val time = new MockTime private val config = ClientQuotaManagerConfig(quotaBytesPerSecondDefault = 500, http://git-wip-us.apache.org/repos/asf/kafka/blob/47b7a686/core/src/test/scala/unit/kafka/server/ThrottledResponseExpirationTest.scala ---------------------------------------------------------------------- diff --git a/core/src/test/scala/unit/kafka/server/ThrottledResponseExpirationTest.scala b/core/src/test/scala/unit/kafka/server/ThrottledResponseExpirationTest.scala index 14a7f45..c4b5803 100644 --- a/core/src/test/scala/unit/kafka/server/ThrottledResponseExpirationTest.scala +++ b/core/src/test/scala/unit/kafka/server/ThrottledResponseExpirationTest.scala @@ -19,14 +19,13 @@ package kafka.server import java.util.Collections -import java.util.concurrent.{TimeUnit, DelayQueue} +import java.util.concurrent.{DelayQueue, TimeUnit} import org.apache.kafka.common.metrics.MetricConfig import org.apache.kafka.common.utils.MockTime -import org.junit.{AfterClass, Before, Assert, Test} -import org.scalatest.junit.JUnit3Suite +import org.junit.{Assert, Before, Test} -class ThrottledResponseExpirationTest extends JUnit3Suite { +class ThrottledResponseExpirationTest { private val time = new MockTime private var numCallbacks: Int = 0 private val metrics = new org.apache.kafka.common.metrics.Metrics(new MetricConfig(),
