From f18d76f9e7609def7f363a537eb2fd8dd845ab97 Mon Sep 17 00:00:00 2001
From: "Anna.Kozlova" <anna.kozlova@jetbrains.com>
Date: Mon, 12 Nov 2018 15:06:53 +0100
Subject: [PATCH] NPE

---
 .../testDiscovery/actions/DiscoveredTestsTreeModel.java      | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/java/execution/impl/src/com/intellij/execution/testDiscovery/actions/DiscoveredTestsTreeModel.java b/java/execution/impl/src/com/intellij/execution/testDiscovery/actions/DiscoveredTestsTreeModel.java
index d707845cb75c..0e0571596b3f 100644
--- a/java/execution/impl/src/com/intellij/execution/testDiscovery/actions/DiscoveredTestsTreeModel.java
+++ b/java/execution/impl/src/com/intellij/execution/testDiscovery/actions/DiscoveredTestsTreeModel.java
@@ -73,9 +73,8 @@ class DiscoveredTestsTreeModel extends BaseTreeModel<Object> {
     }
 
     List<Node.Method> testMethods = myTests.get(myTestClasses.get(idx));
-    int methodIdx = ReadAction.compute(() -> Collections.binarySearch(testMethods,
-                                                                      methodNode,
-                                                                      (o1, o2) -> Comparing.compare(o1.getName(), o2.getName())));
+    int methodIdx = methodNode != null ? ReadAction.compute(() -> Collections.binarySearch(testMethods, methodNode, (o1, o2) -> Comparing.compare(o1.getName(), o2.getName()))) 
+                                       : -1;
 
     Node.Method actualMethodNode;
     if (methodIdx < 0) {