From 3c0f5f174f6aaab6c7cb1c4afec52ae0957bdf7e Mon Sep 17 00:00:00 2001
From: "Viktoria.Shirunova" <viktoria.shirunova@jetbrains.com>
Date: Tue, 10 Jul 2018 20:26:16 +0300
Subject: [PATCH] [gui-test] ExtendedJTreePathFixture: corrected secondary
 constructor and its usage

---
 .../fixtures/extended/ExtendedJTreePathFixture.kt         | 8 +++++++-
 .../intellij/testGuiFramework/generators/Generators.kt    | 6 +++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/platform/testGuiFramework/src/com/intellij/testGuiFramework/fixtures/extended/ExtendedJTreePathFixture.kt b/platform/testGuiFramework/src/com/intellij/testGuiFramework/fixtures/extended/ExtendedJTreePathFixture.kt
index add236f98f9e..d4149ee99852 100644
--- a/platform/testGuiFramework/src/com/intellij/testGuiFramework/fixtures/extended/ExtendedJTreePathFixture.kt
+++ b/platform/testGuiFramework/src/com/intellij/testGuiFramework/fixtures/extended/ExtendedJTreePathFixture.kt
@@ -23,7 +23,13 @@ open class ExtendedJTreePathFixture(
   private val myDriver: ExtendedJTreeDriver = ExtendedJTreeDriver(robot)
 ) : JTreeFixture(robot, tree) {
 
-  constructor(tree: JTree, path: TreePath, predicate: FinderPredicate, robot: Robot, driver: ExtendedJTreeDriver) :
+  constructor(
+    tree: JTree,
+    path: TreePath,
+    predicate: FinderPredicate = ExtendedJTreePathFinder.predicateEquality,
+    robot: Robot = GuiRobotHolder.robot,
+    driver: ExtendedJTreeDriver = ExtendedJTreeDriver(robot)
+  ) :
     this(tree, path.path.map { it.toString() }.toList(), predicate, robot, driver)
 
   init {
diff --git a/platform/testGuiFramework/src/com/intellij/testGuiFramework/generators/Generators.kt b/platform/testGuiFramework/src/com/intellij/testGuiFramework/generators/Generators.kt
index 695ae4c7060f..f48141b13f66 100644
--- a/platform/testGuiFramework/src/com/intellij/testGuiFramework/generators/Generators.kt
+++ b/platform/testGuiFramework/src/com/intellij/testGuiFramework/generators/Generators.kt
@@ -767,11 +767,11 @@ object Utils {
   fun getJTreePathItemsString(cmp: JTree, path: TreePath): String {
     return getJTreePathArray(cmp, path)
       .map { StringUtil.wrapWithDoubleQuote(it) }
-      .reduceRight({ s, s1 -> "$s, $s1" })
+      .reduceRight { s, s1 -> "$s, $s1" }
   }
 
-  internal fun getJTreePathArray(tree: JTree, path: TreePath): List<String> = withRobot { robot ->
-    ExtendedJTreePathFixture(tree, path, robot).getPathStrings()
+  private fun getJTreePathArray(tree: JTree, path: TreePath): List<String> = withRobot { robot ->
+    ExtendedJTreePathFixture(tree, path, robot = robot).getPathStrings()
   }
 
   fun <ReturnType> withRobot(robotFunction: (Robot) -> ReturnType): ReturnType {