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

Fix ignoring more than one guessed test data files

Browse Source
This commit is contained in:
Yaroslav Pankratyev
2017-07-24 20:51:24 +03:00
parent cd7129c7f4
commit 8e80559451
1 changed files with 38 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/devkit/src/testAssistant/TestDataGuessByExistingFilesUtil.java
+38 -43
View File
@@ -181,51 +181,46 @@ public class TestDataGuessByExistingFilesUtil {
final Collection<String> fileNames = getAllFileNames(possibleFileName, gotoModel);
for (String name : fileNames) {
ProgressManager.checkCanceled();
boolean currentNameProcessed = false;
final Object[] elements = gotoModel.getElementsByName(name, false, name);
for (Object element : elements) {
if (!(element instanceof PsiFile)) {
continue;
}
final VirtualFile file = ((PsiFile)element).getVirtualFile();
if (file == null || fileIndex.isInSource(file) && !fileIndex.isUnderSourceRootOfType(file, JavaModuleSourceRootTypes.RESOURCES)) {
continue;
}
final String filePath = file.getPath();
if (!StringUtil.containsIgnoreCase(filePath, possibleFilePath) && !StringUtil.containsIgnoreCase(filePath, test)) {
continue;
}
final String fileName = PathUtil.getFileName(filePath).toLowerCase();
int i = fileName.indexOf(possibleFileName.toLowerCase());
// Skip files that doesn't contain target test name and files that contain digit after target test name fragment.
// Example: there are tests with names 'testEnter()' and 'testEnter2()' and we don't want test data file 'testEnter2'
// to be matched to the test 'testEnter()'.
if (i < 0 || (i + possibleFileName.length() < fileName.length())
&& Character.isDigit(fileName.charAt(i + possibleFileName.length())))
{
continue;
}
TestLocationDescriptor current = new TestLocationDescriptor();
current.populate(possibleFileName, file);
if (!current.isComplete()) {
continue;
}
currentNameProcessed = true;
if (descriptors.isEmpty() || (descriptors.iterator().next().dir.equals(current.dir) && !descriptors.contains(current))) {
descriptors.add(current);
continue;
}
if (moreRelevantPath(current, descriptors, psiClass)) {
descriptors.clear();
descriptors.add(current);
}
final Object[] elements = gotoModel.getElementsByName(name, false, name);
for (Object element : elements) {
if (!(element instanceof PsiFile)) {
continue;
}
if (currentNameProcessed) {
break;
final VirtualFile file = ((PsiFile)element).getVirtualFile();
if (file == null || fileIndex.isInSource(file) && !fileIndex.isUnderSourceRootOfType(file, JavaModuleSourceRootTypes.RESOURCES)) {
continue;
}
final String filePath = file.getPath();
if (!StringUtil.containsIgnoreCase(filePath, possibleFilePath) && !StringUtil.containsIgnoreCase(filePath, test)) {
continue;
}
final String fileName = PathUtil.getFileName(filePath).toLowerCase();
int i = fileName.indexOf(possibleFileName.toLowerCase());
// Skip files that doesn't contain target test name and files that contain digit after target test name fragment.
// Example: there are tests with names 'testEnter()' and 'testEnter2()' and we don't want test data file 'testEnter2'
// to be matched to the test 'testEnter()'.
if (i < 0 || (i + possibleFileName.length() < fileName.length())
&& Character.isDigit(fileName.charAt(i + possibleFileName.length()))) {
continue;
}
TestLocationDescriptor current = new TestLocationDescriptor();
current.populate(possibleFileName, file);
if (!current.isComplete()) {
continue;
}
if (descriptors.isEmpty() || (descriptors.iterator().next().dir.equals(current.dir) && !descriptors.contains(current))) {
descriptors.add(current);
continue;
}
if (moreRelevantPath(current, descriptors, psiClass)) {
descriptors.clear();
descriptors.add(current);
}
break;
}
}
return new TestDataDescriptor(descriptors, possibleFileName);
}