From 896b6d7b2a2b187d43516f1da0d0f4441f1f2e79 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Thu, 26 Oct 2017 12:55:21 +0200 Subject: [PATCH] [devkit] do not check for type annotations (IDEA-181206) --- .../TestDataGuessByExistingFilesUtil.java | 23 ++++--------------- 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/plugins/devkit/src/testAssistant/TestDataGuessByExistingFilesUtil.java b/plugins/devkit/src/testAssistant/TestDataGuessByExistingFilesUtil.java index 588c6a176d18..69131dde9bef 100644 --- a/plugins/devkit/src/testAssistant/TestDataGuessByExistingFilesUtil.java +++ b/plugins/devkit/src/testAssistant/TestDataGuessByExistingFilesUtil.java @@ -1,18 +1,4 @@ -/* - * Copyright 2000-2016 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package org.jetbrains.idea.devkit.testAssistant; import com.intellij.codeInsight.AnnotationUtil; @@ -151,9 +137,10 @@ public class TestDataGuessByExistingFilesUtil { } // JUnit4 - else if (framework.getClass().getName().contains("JUnit4")) { - return !AnnotationUtil.isAnnotated(method, "org.junit.Test", false); + if (framework.getClass().getName().contains("JUnit4")) { + return !AnnotationUtil.isAnnotated(method, "org.junit.Test", 0); } + return false; } @@ -298,7 +285,7 @@ public class TestDataGuessByExistingFilesUtil { } return result; } - + private static boolean moreRelevantPath(@NotNull TestLocationDescriptor candidate, @NotNull TestLocationDescriptor current, @NotNull PsiClass psiClass)