From 95a9a5efec065b54342606f408b1b9c8d2b3dbca Mon Sep 17 00:00:00 2001 From: Proneet Verma Date: Tue, 16 Jun 2015 15:52:44 +0530 Subject: [PATCH 1/2] fix package names in unit tests --- core/src/test/scala/unit/kafka/KafkaConfigTest.scala | 2 +- core/src/test/scala/unit/kafka/common/ConfigTest.scala | 2 +- core/src/test/scala/unit/kafka/common/TopicTest.scala | 2 +- core/src/test/scala/unit/kafka/consumer/PartitionAssignorTest.scala | 2 +- core/src/test/scala/unit/kafka/integration/MinIsrConfigTest.scala | 2 +- core/src/test/scala/unit/kafka/log/LogConfigTest.scala | 2 +- core/src/test/scala/unit/kafka/server/KafkaConfigConfigDefTest.scala | 2 +- core/src/test/scala/unit/kafka/utils/ByteBoundedBlockingQueueTest.scala | 2 +- core/src/test/scala/unit/kafka/utils/CommandLineUtilsTest.scala | 2 +- core/src/test/scala/unit/kafka/zk/ZKPathTest.scala | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/core/src/test/scala/unit/kafka/KafkaConfigTest.scala b/core/src/test/scala/unit/kafka/KafkaConfigTest.scala index 4cb92de..3fbc75f 100644 --- a/core/src/test/scala/unit/kafka/KafkaConfigTest.scala +++ b/core/src/test/scala/unit/kafka/KafkaConfigTest.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package unit.kafka +package kafka import java.io.{FileOutputStream, File} import java.security.Permission diff --git a/core/src/test/scala/unit/kafka/common/ConfigTest.scala b/core/src/test/scala/unit/kafka/common/ConfigTest.scala index 7bff96c..3ee6cae 100644 --- a/core/src/test/scala/unit/kafka/common/ConfigTest.scala +++ b/core/src/test/scala/unit/kafka/common/ConfigTest.scala @@ -15,7 +15,7 @@ * limitations under the License. */ -package unit.kafka.common +package kafka.common import junit.framework.Assert._ import collection.mutable.ArrayBuffer diff --git a/core/src/test/scala/unit/kafka/common/TopicTest.scala b/core/src/test/scala/unit/kafka/common/TopicTest.scala index 0fb2588..da2e126 100644 --- a/core/src/test/scala/unit/kafka/common/TopicTest.scala +++ b/core/src/test/scala/unit/kafka/common/TopicTest.scala @@ -15,7 +15,7 @@ * limitations under the License. */ -package unit.kafka.common +package kafka.common import junit.framework.Assert._ import collection.mutable.ArrayBuffer diff --git a/core/src/test/scala/unit/kafka/consumer/PartitionAssignorTest.scala b/core/src/test/scala/unit/kafka/consumer/PartitionAssignorTest.scala index 1910fcb..20b9850 100644 --- a/core/src/test/scala/unit/kafka/consumer/PartitionAssignorTest.scala +++ b/core/src/test/scala/unit/kafka/consumer/PartitionAssignorTest.scala @@ -15,7 +15,7 @@ * limitations under the License. */ -package unit.kafka.consumer +package kafka.consumer import org.scalatest.junit.JUnit3Suite import org.easymock.EasyMock diff --git a/core/src/test/scala/unit/kafka/integration/MinIsrConfigTest.scala b/core/src/test/scala/unit/kafka/integration/MinIsrConfigTest.scala index 70a5b3a..00824e1 100644 --- a/core/src/test/scala/unit/kafka/integration/MinIsrConfigTest.scala +++ b/core/src/test/scala/unit/kafka/integration/MinIsrConfigTest.scala @@ -15,7 +15,7 @@ * limitations under the License. */ -package unit.kafka.integration +package kafka.integration import java.util.Properties diff --git a/core/src/test/scala/unit/kafka/log/LogConfigTest.scala b/core/src/test/scala/unit/kafka/log/LogConfigTest.scala index f3546ad..992f2c4 100644 --- a/core/src/test/scala/unit/kafka/log/LogConfigTest.scala +++ b/core/src/test/scala/unit/kafka/log/LogConfigTest.scala @@ -15,7 +15,7 @@ * limitations under the License. */ -package unit.kafka.log +package kafka.log import java.util.Properties diff --git a/core/src/test/scala/unit/kafka/server/KafkaConfigConfigDefTest.scala b/core/src/test/scala/unit/kafka/server/KafkaConfigConfigDefTest.scala index ace6321..99dc3ec 100644 --- a/core/src/test/scala/unit/kafka/server/KafkaConfigConfigDefTest.scala +++ b/core/src/test/scala/unit/kafka/server/KafkaConfigConfigDefTest.scala @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package unit.kafka.server +package kafka.server import java.util.Properties diff --git a/core/src/test/scala/unit/kafka/utils/ByteBoundedBlockingQueueTest.scala b/core/src/test/scala/unit/kafka/utils/ByteBoundedBlockingQueueTest.scala index fe8d2ae..313fe2f 100644 --- a/core/src/test/scala/unit/kafka/utils/ByteBoundedBlockingQueueTest.scala +++ b/core/src/test/scala/unit/kafka/utils/ByteBoundedBlockingQueueTest.scala @@ -15,7 +15,7 @@ * limitations under the License. */ -package unit.kafka.utils +package kafka.utils import java.util.concurrent.TimeUnit diff --git a/core/src/test/scala/unit/kafka/utils/CommandLineUtilsTest.scala b/core/src/test/scala/unit/kafka/utils/CommandLineUtilsTest.scala index e832a01..c63f853 100644 --- a/core/src/test/scala/unit/kafka/utils/CommandLineUtilsTest.scala +++ b/core/src/test/scala/unit/kafka/utils/CommandLineUtilsTest.scala @@ -15,7 +15,7 @@ * limitations under the License. */ -package unit.kafka.utils +package kafka.utils import junit.framework.Assert._ import org.junit.{Test, After, Before} diff --git a/core/src/test/scala/unit/kafka/zk/ZKPathTest.scala b/core/src/test/scala/unit/kafka/zk/ZKPathTest.scala index 64c3ba2..bf7b9c7 100644 --- a/core/src/test/scala/unit/kafka/zk/ZKPathTest.scala +++ b/core/src/test/scala/unit/kafka/zk/ZKPathTest.scala @@ -15,7 +15,7 @@ * limitations under the License. */ -package unit.kafka.zk +package kafka.zk import junit.framework.Assert import kafka.consumer.ConsumerConfig -- 1.9.5.github.0 From a45e29282f00cee212f4676ceca93011a488bc59 Mon Sep 17 00:00:00 2001 From: Proneet Verma Date: Tue, 16 Jun 2015 21:43:34 +0530 Subject: [PATCH 2/2] Remove unused imports --- core/src/test/scala/unit/kafka/KafkaConfigTest.scala | 1 - core/src/test/scala/unit/kafka/common/ConfigTest.scala | 1 - core/src/test/scala/unit/kafka/common/TopicTest.scala | 1 - .../test/scala/unit/kafka/consumer/PartitionAssignorTest.scala | 8 +++----- core/src/test/scala/unit/kafka/integration/MinIsrConfigTest.scala | 1 - core/src/test/scala/unit/kafka/log/LogConfigTest.scala | 1 - .../test/scala/unit/kafka/server/KafkaConfigConfigDefTest.scala | 1 - .../scala/unit/kafka/utils/ByteBoundedBlockingQueueTest.scala | 1 - core/src/test/scala/unit/kafka/utils/CommandLineUtilsTest.scala | 3 +-- core/src/test/scala/unit/kafka/zk/ZKPathTest.scala | 2 -- 10 files changed, 4 insertions(+), 16 deletions(-) diff --git a/core/src/test/scala/unit/kafka/KafkaConfigTest.scala b/core/src/test/scala/unit/kafka/KafkaConfigTest.scala index 3fbc75f..4764c89 100644 --- a/core/src/test/scala/unit/kafka/KafkaConfigTest.scala +++ b/core/src/test/scala/unit/kafka/KafkaConfigTest.scala @@ -19,7 +19,6 @@ package kafka import java.io.{FileOutputStream, File} import java.security.Permission -import kafka.Kafka import kafka.server.KafkaConfig import org.junit.{After, Before, Test} import junit.framework.Assert._ diff --git a/core/src/test/scala/unit/kafka/common/ConfigTest.scala b/core/src/test/scala/unit/kafka/common/ConfigTest.scala index 3ee6cae..0aca938 100644 --- a/core/src/test/scala/unit/kafka/common/ConfigTest.scala +++ b/core/src/test/scala/unit/kafka/common/ConfigTest.scala @@ -20,7 +20,6 @@ package kafka.common import junit.framework.Assert._ import collection.mutable.ArrayBuffer import org.junit.Test -import kafka.common.InvalidConfigException import kafka.producer.ProducerConfig import kafka.consumer.ConsumerConfig diff --git a/core/src/test/scala/unit/kafka/common/TopicTest.scala b/core/src/test/scala/unit/kafka/common/TopicTest.scala index da2e126..79532c8 100644 --- a/core/src/test/scala/unit/kafka/common/TopicTest.scala +++ b/core/src/test/scala/unit/kafka/common/TopicTest.scala @@ -19,7 +19,6 @@ package kafka.common import junit.framework.Assert._ import collection.mutable.ArrayBuffer -import kafka.common.{Topic, InvalidTopicException} import org.junit.Test class TopicTest { diff --git a/core/src/test/scala/unit/kafka/consumer/PartitionAssignorTest.scala b/core/src/test/scala/unit/kafka/consumer/PartitionAssignorTest.scala index 20b9850..adf0801 100644 --- a/core/src/test/scala/unit/kafka/consumer/PartitionAssignorTest.scala +++ b/core/src/test/scala/unit/kafka/consumer/PartitionAssignorTest.scala @@ -21,14 +21,12 @@ import org.scalatest.junit.JUnit3Suite import org.easymock.EasyMock import org.I0Itec.zkclient.ZkClient import org.apache.zookeeper.data.Stat -import kafka.consumer._ import kafka.utils.{TestUtils, Logging, ZkUtils, Json} import junit.framework.Assert._ import kafka.common.TopicAndPartition -import unit.kafka.consumer.PartitionAssignorTest.StaticSubscriptionInfo -import kafka.consumer.ConsumerThreadId -import unit.kafka.consumer.PartitionAssignorTest.Scenario -import unit.kafka.consumer.PartitionAssignorTest.WildcardSubscriptionInfo +import kafka.consumer.PartitionAssignorTest.StaticSubscriptionInfo +import kafka.consumer.PartitionAssignorTest.Scenario +import kafka.consumer.PartitionAssignorTest.WildcardSubscriptionInfo class PartitionAssignorTest extends JUnit3Suite with Logging { diff --git a/core/src/test/scala/unit/kafka/integration/MinIsrConfigTest.scala b/core/src/test/scala/unit/kafka/integration/MinIsrConfigTest.scala index 00824e1..a2c9713 100644 --- a/core/src/test/scala/unit/kafka/integration/MinIsrConfigTest.scala +++ b/core/src/test/scala/unit/kafka/integration/MinIsrConfigTest.scala @@ -19,7 +19,6 @@ package kafka.integration import java.util.Properties -import kafka.integration.KafkaServerTestHarness import kafka.server.KafkaConfig import kafka.utils.TestUtils import org.scalatest.junit.JUnit3Suite diff --git a/core/src/test/scala/unit/kafka/log/LogConfigTest.scala b/core/src/test/scala/unit/kafka/log/LogConfigTest.scala index 992f2c4..3fd5a53 100644 --- a/core/src/test/scala/unit/kafka/log/LogConfigTest.scala +++ b/core/src/test/scala/unit/kafka/log/LogConfigTest.scala @@ -19,7 +19,6 @@ package kafka.log import java.util.Properties -import kafka.log.{Defaults, LogConfig} import org.apache.kafka.common.config.ConfigException import org.junit.{Assert, Test} import org.scalatest.junit.JUnit3Suite diff --git a/core/src/test/scala/unit/kafka/server/KafkaConfigConfigDefTest.scala b/core/src/test/scala/unit/kafka/server/KafkaConfigConfigDefTest.scala index 99dc3ec..c487f36 100644 --- a/core/src/test/scala/unit/kafka/server/KafkaConfigConfigDefTest.scala +++ b/core/src/test/scala/unit/kafka/server/KafkaConfigConfigDefTest.scala @@ -20,7 +20,6 @@ import java.util.Properties import kafka.api.ApiVersion import kafka.message._ -import kafka.server.{Defaults, KafkaConfig} import org.apache.kafka.common.protocol.SecurityProtocol import org.junit.{Assert, Test} import org.scalatest.junit.JUnit3Suite diff --git a/core/src/test/scala/unit/kafka/utils/ByteBoundedBlockingQueueTest.scala b/core/src/test/scala/unit/kafka/utils/ByteBoundedBlockingQueueTest.scala index 313fe2f..5f67534 100644 --- a/core/src/test/scala/unit/kafka/utils/ByteBoundedBlockingQueueTest.scala +++ b/core/src/test/scala/unit/kafka/utils/ByteBoundedBlockingQueueTest.scala @@ -21,7 +21,6 @@ import java.util.concurrent.TimeUnit import junit.framework.Assert._ import org.junit.{Test} -import kafka.utils.ByteBoundedBlockingQueue class ByteBoundedBlockingQueueTest { val sizeFunction = (a: String) => a.length diff --git a/core/src/test/scala/unit/kafka/utils/CommandLineUtilsTest.scala b/core/src/test/scala/unit/kafka/utils/CommandLineUtilsTest.scala index c63f853..32d710d 100644 --- a/core/src/test/scala/unit/kafka/utils/CommandLineUtilsTest.scala +++ b/core/src/test/scala/unit/kafka/utils/CommandLineUtilsTest.scala @@ -18,8 +18,7 @@ package kafka.utils import junit.framework.Assert._ -import org.junit.{Test, After, Before} -import kafka.utils.CommandLineUtils; +import org.junit.{Test} class CommandLineUtilsTest { diff --git a/core/src/test/scala/unit/kafka/zk/ZKPathTest.scala b/core/src/test/scala/unit/kafka/zk/ZKPathTest.scala index bf7b9c7..d3e44c6 100644 --- a/core/src/test/scala/unit/kafka/zk/ZKPathTest.scala +++ b/core/src/test/scala/unit/kafka/zk/ZKPathTest.scala @@ -20,8 +20,6 @@ package kafka.zk import junit.framework.Assert import kafka.consumer.ConsumerConfig import kafka.utils.{ZkPath, TestUtils, ZkUtils} -import kafka.zk.ZooKeeperTestHarness -import org.I0Itec.zkclient.ZkClient import org.apache.kafka.common.config.ConfigException import org.scalatest.junit.JUnit3Suite -- 1.9.5.github.0