assertContains

apache · Sep 21, 2023 · 622b5c9 · 622b5c9
1 parent 2969f97
commit 622b5c9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/kyuubi-server/src/main/scala/org/apache/kyuubi/engine/ProcBuilder.scala b/kyuubi-server/src/main/scala/org/apache/kyuubi/engine/ProcBuilder.scala
@@ -26,7 +26,6 @@ import scala.collection.JavaConverters._
 
 import com.google.common.annotations.VisibleForTesting
 import com.google.common.collect.EvictingQueue
-import org.apache.commons.lang3.StringUtils
 import org.apache.commons.lang3.StringUtils.containsIgnoreCase
 
 import org.apache.kyuubi._

diff --git a/kyuubi-util-scala/src/test/scala/org/apache/kyuubi/util/AssertionUtils.scala b/kyuubi-util-scala/src/test/scala/org/apache/kyuubi/util/AssertionUtils.scala
@@ -108,14 +108,12 @@ object AssertionUtils {
   /**
    * Assert the iterable contains all the expected elements
    */
-  def assertContains(iter: TraversableOnce[AnyRef], elems: AnyRef*)(implicit
+  def assertContains(actual: TraversableOnce[AnyRef], expected: AnyRef*)(implicit
       prettifier: Prettifier,
       pos: Position): Unit = {
-    val iterableSeq = iter.toSeq
-    elems.foreach { elem =>
-      assert(iterableSeq.contains(elem), s", expected containing [${elems.mkString(", ")}]")(
-        prettifier,
-        pos)
+    val actualSeq = actual.toSeq
+    withClue(s", expected containing [${expected.mkString(", ")}]") {
+      expected.foreach { elem => assert(actualSeq.contains(elem))(prettifier, pos) }
     }
   }