MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[gui-test] Process that ExtendedJTreePathFinder.value can return null

Browse Source
This commit is contained in:
Viktoria.Shirunova
2018-07-10 23:32:35 +03:00
parent e62ce77381
commit e6eb7e4e1b
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/testGuiFramework/src/com/intellij/testGuiFramework/driver/ExtendedJTreePathFinder.kt
+6 -4
View File
@@ -27,7 +27,8 @@ class ExtendedJTreePathFinder(val jTree: JTree) {
fun findMatchingPathByPredicate(vararg pathStrings: String, predicate: FinderPredicate): TreePath {
val model = jTree.model
if (jTree.isRootVisible) {
if (!predicate(pathStrings[0], jTree.value(model.root))) pathNotFound(*pathStrings)
val childValue = jTree.value(model.root) ?: ""
if (!predicate(pathStrings[0], childValue)) pathNotFound(*pathStrings)
if (pathStrings.size == 1) return TreePath(arrayOf<Any>(model.root))
val result: TreePath = jTree.traverseChildren(
@@ -104,7 +105,8 @@ class ExtendedJTreePathFinder(val jTree: JTree) {
val child = model.getChild(node, childIndex)
if (child is LoadingNode)
throw ExtendedJTreeDriver.LoadingNodeException(node = child, treePath = this.getPathToNode(node))
if (predicate(original, value(child))) {
val childValue = value(child) ?: continue
if (predicate(original, childValue)) {
if (currentOrder == order) {
if (pathStrings.size == 1) {
return TreePath(arrayOf<Any>(child))
@@ -211,8 +213,8 @@ class ExtendedJTreePathFinder(val jTree: JTree) {
return TreePath(path)
}
private fun JTree.value(modelValue: Any): String {
return cellReader.valueAt(this, modelValue)!!.eraseZeroSpaceSymbols()
private fun JTree.value(modelValue: Any): String? {
return cellReader.valueAt(this, modelValue)?.eraseZeroSpaceSymbols()
}
private fun String.eraseZeroSpaceSymbols(): String = replace("\u200B", "")