Fix scalastyle issue and remove unnecessary null.

Eric Vandenberg · Eric Vandenberg · commit f2399e967965 · 2017-06-26T16:13:36.000-07:00
diff --git a/core/src/test/scala/org/apache/spark/scheduler/TaskSetManagerSuite.scala b/core/src/test/scala/org/apache/spark/scheduler/TaskSetManagerSuite.scala
@@ -23,7 +23,7 @@ import scala.collection.mutable
 import scala.collection.mutable.ArrayBuffer
 
 import org.mockito.Matchers.{any, anyInt, anyString}
-import org.mockito.Mockito.{mock, never, spy, verify, when, times}
+import org.mockito.Mockito.{mock, never, spy, times, verify, when}
 import org.mockito.invocation.InvocationOnMock
 import org.mockito.stubbing.Answer
 
@@ -1204,7 +1204,6 @@ class TaskSetManagerSuite extends SparkFunSuite with LocalSparkContext with Logg
           val task = invocationOnMock.getArgumentAt(0, classOf[Int])
           assert(taskSetManager.taskSetBlacklistHelperOpt.get.
             isExecutorBlacklistedForTask(exec, task))
-          null
         }
       }
     )

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ import scala.collection.mutable`
`23`	`23`	`import scala.collection.mutable.ArrayBuffer`
`24`	`24`
`25`	`25`	`import org.mockito.Matchers.{any, anyInt, anyString}`
`26`		`-import org.mockito.Mockito.{mock, never, spy, verify, when, times}`
	`26`	`+import org.mockito.Mockito.{mock, never, spy, times, verify, when}`
`27`	`27`	`import org.mockito.invocation.InvocationOnMock`
`28`	`28`	`import org.mockito.stubbing.Answer`
`29`	`29`
`@@ -1204,7 +1204,6 @@ class TaskSetManagerSuite extends SparkFunSuite with LocalSparkContext with Logg`
`1204`	`1204`	`val task = invocationOnMock.getArgumentAt(0, classOf[Int])`
`1205`	`1205`	`assert(taskSetManager.taskSetBlacklistHelperOpt.get.`
`1206`	`1206`	`isExecutorBlacklistedForTask(exec, task))`
`1207`		`- null`
`1208`	`1207`	`}`
`1209`	`1208`	`}`
`1210`	`1209`	`)`