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

IDEA-70123 Test Assistant: Make it possible to work with test data for existing test classes that are not properly annotated

Browse Source 
1. Check that already found test data is more relevant than the new candidate;
2. Ignore test data candidate files that remain under source root;
This commit is contained in:
Denis Zhdanov
2011-05-26 16:01:54 +04:00
parent ac83721558
commit 49281d78ec
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/IdeaTestAssistant/src/com/intellij/testAssistant/TestDataGuessByExistingFilesUtil.java
+17 -6
View File
@@ -3,6 +3,8 @@ package com.intellij.testAssistant;
import com.intellij.codeInsight.AnnotationUtil;
import com.intellij.ide.util.gotoByName.GotoFileModel;
import com.intellij.openapi.extensions.Extensions;
import com.intellij.openapi.roots.ProjectFileIndex;
import com.intellij.openapi.roots.ProjectRootManager;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.Trinity;
import com.intellij.openapi.vfs.VirtualFile;
@@ -163,7 +165,8 @@ public class TestDataGuessByExistingFilesUtil {
}
testNames.add(name);
}
final Pair<String, Collection<VirtualFile>> matchedFiles = getMatchedFiles(gotoModel, testNames, psiClass);
ProjectFileIndex fileIndex = ProjectRootManager.getInstance(psiClass.getProject()).getFileIndex();
final Pair<String, Collection<VirtualFile>> matchedFiles = getMatchedFiles(gotoModel, fileIndex, testNames, psiClass);
if (matchedFiles == null) {
CACHE.put(psiClass.getQualifiedName(), new Pair<TestDataDescriptor, Long>(descriptor, System.currentTimeMillis()));
return descriptor;
@@ -207,6 +210,7 @@ public class TestDataGuessByExistingFilesUtil {
@Nullable
private static Pair<String, Collection<VirtualFile>> getMatchedFiles(@NotNull GotoFileModel gotoModel,
@NotNull ProjectFileIndex fileIndex,
@NotNull Collection<String> testNames,
@NotNull PsiClass psiClass)
{
@@ -236,10 +240,11 @@ public class TestDataGuessByExistingFilesUtil {
continue;
}
final VirtualFile file = ((PsiFile)element).getVirtualFile();
if (file == null) {
if (file == null || fileIndex.isInSource(file)) {
continue;
}
final String filePath = PathUtil.getFileName(file.getPath()).toLowerCase();
int i = filePath.indexOf(trinity.second.toLowerCase());
// Skip files that doesn't contain target test name and files that contain digit after target test name fragment.
@@ -288,13 +293,17 @@ public class TestDataGuessByExistingFilesUtil {
final String candidatePath = candidate.getPath();
final String candidateDir = PathUtil.getParentPath(candidatePath);
final String currentDir = PathUtil.getParentPath(current.get(0).getPath());
boolean candidateMatched;
boolean currentMatched;
// By package.
int i = className.lastIndexOf(".");
if (i >= 0) {
String packageAsPath = className.substring(0, i).replace('.', '/').toLowerCase();
if (candidateDir.toLowerCase().contains(packageAsPath) && !currentDir.toLowerCase().contains(packageAsPath)) {
return true;
candidateMatched = candidateDir.toLowerCase().contains(packageAsPath);
currentMatched = currentDir.toLowerCase().contains(packageAsPath);
if (candidateMatched ^ currentMatched) {
return candidateMatched;
}
}
@@ -307,8 +316,10 @@ public class TestDataGuessByExistingFilesUtil {
if (i >= 0) {
pattern = pattern.substring(i + 1);
}
if (candidateDir.toLowerCase().contains(pattern) && !currentDir.toLowerCase().contains(pattern)) {
return true;
candidateMatched = candidateDir.toLowerCase().contains(pattern);
currentMatched = currentDir.toLowerCase().contains(pattern);
if (candidateMatched ^ currentMatched) {
return candidateMatched;
}
// By test name.