More cleanup (renaming variables, updating comments etc)

Author: andrewor14

core/src/test/scala/org/apache/spark/scheduler/EventLoggingListenerSuite.scala

@@ -240,7 +240,7 @@ class EventLoggingListenerSuite extends FunSuite with BeforeAndAfter {
     // Verify file contains exactly the two events logged
     val eventLoggingInfo = EventLoggingListener.parseLoggingInfo(eventLogger.logDir, fileSystem)
     assert(eventLoggingInfo.logPaths.size > 0)
-    val lines = getLines(eventLoggingInfo.logPaths.head, eventLoggingInfo.compressionCodec)
+    val lines = readFileLines(eventLoggingInfo.logPaths.head, eventLoggingInfo.compressionCodec)
     assert(lines.size === 2)
     assert(lines(0).contains("SparkListenerApplicationStart"))
     assert(lines(1).contains("SparkListenerApplicationEnd"))
@@ -281,7 +281,7 @@ class EventLoggingListenerSuite extends FunSuite with BeforeAndAfter {
   private def assertEventsExist(eventLogger: EventLoggingListener, events: Seq[String]) {
     val eventLoggingInfo = EventLoggingListener.parseLoggingInfo(eventLogger.logDir, fileSystem)
     assert(eventLoggingInfo.logPaths.size > 0)
-    val lines = getLines(eventLoggingInfo.logPaths.head, eventLoggingInfo.compressionCodec)
+    val lines = readFileLines(eventLoggingInfo.logPaths.head, eventLoggingInfo.compressionCodec)
     val eventSet = mutable.Set(events: _*)
     lines.foreach { line =>
       eventSet.foreach { event =>
@@ -301,7 +301,9 @@ class EventLoggingListenerSuite extends FunSuite with BeforeAndAfter {
    * Read all lines from the file specified by the given path.
    * If a compression codec is specified, use it to read the file.
    */
-  private def getLines(filePath: Path, compressionCodec: Option[CompressionCodec]): Seq[String] = {
+  private def readFileLines(
+      filePath: Path,
+      compressionCodec: Option[CompressionCodec]): Seq[String] = {
     val fstream = fileSystem.open(filePath)
     val cstream =
       compressionCodec.map { codec =>

core/src/test/scala/org/apache/spark/scheduler/ReplayListenerSuite.scala

@@ -119,16 +119,16 @@ class ReplayListenerSuite extends FunSuite with BeforeAndAfter {
     val codec = codecName.map(getCompressionCodec)
     val applications = fileSystem.listStatus(new Path(logDir))
     assert(applications != null && applications.size > 0)
-    val eventLogDir =
-      applications.filter(_.getPath.getName.startsWith("test-replay")).sortBy(_.getAccessTime).last
+    val eventLogDir = applications.sortBy(_.getAccessTime).last
     assert(eventLogDir.isDir)
     val logFiles = fileSystem.listStatus(eventLogDir.getPath)
     assert(logFiles != null && logFiles.size > 0)
     val logFile = logFiles.find(_.getPath.getName.startsWith("EVENT_LOG_"))
     assert(logFile.isDefined)
+    val logFilePath = logFile.get.getPath
 
     // Replay events
-    val replayer = new ReplayListenerBus(Seq(logFile.get.getPath), fileSystem, codec)
+    val replayer = new ReplayListenerBus(Seq(logFilePath), fileSystem, codec)
     val eventMonster = new EventMonster(conf)
     replayer.addListener(eventMonster)
     replayer.replay()

core/src/test/scala/org/apache/spark/util/FileLoggerSuite.scala

@@ -123,9 +123,6 @@ class FileLoggerSuite extends FunSuite with BeforeAndAfter {
       } else {
         new FileLogger(logDir, conf)
       }
-    assert(fileSystem.exists(logDirPath))
-    assert(fileSystem.getFileStatus(logDirPath).isDir)
-    assert(fileSystem.listStatus(logDirPath).size === 0)
 
     logger.newFile("Jean_Valjean")
     logger.logLine("Who am I?")