Address the issues

Author: jerryshao

dev/run-tests

@@ -173,7 +173,7 @@ CURRENT_BLOCK=$BLOCK_BUILD
     build/mvn $HIVE_BUILD_ARGS clean package -DskipTests
   else
     echo -e "q\n" \
-      | build/sbt $HIVE_BUILD_ARGS package assembly/assembly  streaming-kafka-assembly/assembly \
+      | build/sbt $HIVE_BUILD_ARGS package assembly/assembly streaming-kafka-assembly/assembly \
       | grep -v -e "info.*Resolving" -e "warn.*Merging" -e "info.*Including"
   fi
 }

external/kafka/src/main/scala/org/apache/spark/streaming/kafka/KafkaTestUtils.scala

@@ -126,14 +126,14 @@ private class KafkaTestUtils extends Logging {
     brokerReady = true
   }
 
-  /** setup thw whole embedded servers, including Zookeeper and Kafka brokers */
-  def setupEmbeddedServers(): Unit = {
+  /** setup the whole embedded servers, including Zookeeper and Kafka brokers */
+  def setup(): Unit = {
     setupEmbeddedZookeeper()
     setupEmbeddedKafkaServer()
   }
 
-  /** Tear down the whole servers, including Kafka broker and Zookeeper */
-  def teardownEmbeddedServers(): Unit = {
+  /** Teardown the whole servers, including Kafka broker and Zookeeper */
+  def teardown(): Unit = {
     brokerReady = false
     zkReady = false
 

external/kafka/src/test/java/org/apache/spark/streaming/kafka/JavaDirectKafkaStreamSuite.java

@@ -46,7 +46,7 @@ public class JavaDirectKafkaStreamSuite implements Serializable {
   @Before
   public void setUp() {
     kafkaTestUtils = new KafkaTestUtils();
-    kafkaTestUtils.setupEmbeddedServers();
+    kafkaTestUtils.setup();
     System.clearProperty("spark.driver.port");
     SparkConf sparkConf = new SparkConf()
       .setMaster("local[4]").setAppName(this.getClass().getSimpleName());
@@ -63,7 +63,7 @@ public void tearDown() {
     System.clearProperty("spark.driver.port");
 
     if (kafkaTestUtils != null) {
-      kafkaTestUtils.teardownEmbeddedServers();
+      kafkaTestUtils.teardown();
       kafkaTestUtils = null;
     }
   }

external/kafka/src/test/java/org/apache/spark/streaming/kafka/JavaKafkaRDDSuite.java

@@ -42,7 +42,7 @@ public class JavaKafkaRDDSuite implements Serializable {
   @Before
   public void setUp() {
     kafkaTestUtils = new KafkaTestUtils();
-    kafkaTestUtils.setupEmbeddedServers();
+    kafkaTestUtils.setup();
     System.clearProperty("spark.driver.port");
     SparkConf sparkConf = new SparkConf()
       .setMaster("local[4]").setAppName(this.getClass().getSimpleName());
@@ -58,7 +58,7 @@ public void tearDown() {
     System.clearProperty("spark.driver.port");
 
     if (kafkaTestUtils != null) {
-      kafkaTestUtils.teardownEmbeddedServers();
+      kafkaTestUtils.teardown();
       kafkaTestUtils = null;
     }
   }

external/kafka/src/test/java/org/apache/spark/streaming/kafka/JavaKafkaStreamSuite.java

@@ -47,7 +47,7 @@ public class JavaKafkaStreamSuite implements Serializable {
   @Before
   public void setUp() {
     kafkaTestUtils = new KafkaTestUtils();
-    kafkaTestUtils.setupEmbeddedServers();
+    kafkaTestUtils.setup();
     System.clearProperty("spark.driver.port");
     SparkConf sparkConf = new SparkConf()
       .setMaster("local[4]").setAppName(this.getClass().getSimpleName());
@@ -64,7 +64,7 @@ public void tearDown() {
     System.clearProperty("spark.driver.port");
 
     if (kafkaTestUtils != null) {
-      kafkaTestUtils.teardownEmbeddedServers();
+      kafkaTestUtils.teardown();
       kafkaTestUtils = null;
     }
   }

external/kafka/src/test/scala/org/apache/spark/streaming/kafka/DirectKafkaStreamSuite.scala

@@ -54,12 +54,12 @@ class DirectKafkaStreamSuite
 
   override def beforeAll {
     kafkaTestUtils = new KafkaTestUtils
-    kafkaTestUtils.setupEmbeddedServers()
+    kafkaTestUtils.setup()
   }
 
   override def afterAll {
     if (kafkaTestUtils != null) {
-      kafkaTestUtils.teardownEmbeddedServers()
+      kafkaTestUtils.teardown()
       kafkaTestUtils = null
     }
   }

external/kafka/src/test/scala/org/apache/spark/streaming/kafka/KafkaClusterSuite.scala

@@ -31,7 +31,7 @@ class KafkaClusterSuite extends FunSuite with BeforeAndAfterAll {
 
   override def beforeAll() {
     kafkaTestUtils = new KafkaTestUtils
-    kafkaTestUtils.setupEmbeddedServers()
+    kafkaTestUtils.setup()
 
     kafkaTestUtils.createTopic(topic)
     kafkaTestUtils.sendMessages(topic, Map("a" -> 1))
@@ -40,7 +40,7 @@ class KafkaClusterSuite extends FunSuite with BeforeAndAfterAll {
 
   override def afterAll() {
     if (kafkaTestUtils != null) {
-      kafkaTestUtils.teardownEmbeddedServers()
+      kafkaTestUtils.teardown()
       kafkaTestUtils = null
     }
   }

external/kafka/src/test/scala/org/apache/spark/streaming/kafka/KafkaRDDSuite.scala

@@ -37,7 +37,7 @@ class KafkaRDDSuite extends FunSuite with BeforeAndAfterAll {
   override def beforeAll {
     sc = new SparkContext(sparkConf)
     kafkaTestUtils = new KafkaTestUtils
-    kafkaTestUtils.setupEmbeddedServers()
+    kafkaTestUtils.setup()
   }
 
   override def afterAll {
@@ -47,7 +47,7 @@ class KafkaRDDSuite extends FunSuite with BeforeAndAfterAll {
     }
 
     if (kafkaTestUtils != null) {
-      kafkaTestUtils.teardownEmbeddedServers()
+      kafkaTestUtils.teardown()
       kafkaTestUtils = null
     }
   }

external/kafka/src/test/scala/org/apache/spark/streaming/kafka/KafkaStreamSuite.scala

@@ -36,7 +36,7 @@ class KafkaStreamSuite extends FunSuite with Eventually with BeforeAndAfterAll {
 
   override def beforeAll(): Unit = {
     kafkaTestUtils = new KafkaTestUtils
-    kafkaTestUtils.setupEmbeddedServers()
+    kafkaTestUtils.setup()
   }
 
   override def afterAll(): Unit = {
@@ -46,7 +46,7 @@ class KafkaStreamSuite extends FunSuite with Eventually with BeforeAndAfterAll {
     }
 
     if (kafkaTestUtils != null) {
-      kafkaTestUtils.teardownEmbeddedServers()
+      kafkaTestUtils.teardown()
       kafkaTestUtils = null
     }
   }
@@ -84,4 +84,3 @@ class KafkaStreamSuite extends FunSuite with Eventually with BeforeAndAfterAll {
     }
   }
 }
-

external/kafka/src/test/scala/org/apache/spark/streaming/kafka/ReliableKafkaStreamSuite.scala

@@ -53,7 +53,7 @@ class ReliableKafkaStreamSuite extends FunSuite
 
   override def beforeAll() : Unit = {
     kafkaTestUtils = new KafkaTestUtils
-    kafkaTestUtils.setupEmbeddedServers()
+    kafkaTestUtils.setup()
 
     groupId = s"test-consumer-${Random.nextInt(10000)}"
     kafkaParams = Map(
@@ -72,7 +72,7 @@ class ReliableKafkaStreamSuite extends FunSuite
     }
 
     if (kafkaTestUtils != null) {
-      kafkaTestUtils.teardownEmbeddedServers()
+      kafkaTestUtils.teardown()
       kafkaTestUtils = null
     }
   }