Cleanup (test)

- Groovy tests moved to corresponding module
- assertions cleaned
- parasitic exceptions suppressed
This commit is contained in:
Roman Shevchenko
2013-11-07 13:10:47 +01:00
parent a5960af372
commit 202e2ae646
4 changed files with 204 additions and 158 deletions
@@ -139,36 +139,41 @@ public abstract class CodeInsightTestCase extends PsiTestCase {
return configureByFile(vFile, projectFile);
}
protected PsiFile configureByText(@NotNull FileType fileType, @NonNls final String text) throws Exception {
protected PsiFile configureByText(@NotNull FileType fileType, @NonNls final String text) {
return configureByText(fileType, text, null);
}
protected PsiFile configureByText(@NotNull final FileType fileType, @NonNls final String text, @Nullable String _extension) throws Exception {
final String extension = _extension == null ? fileType.getDefaultExtension():_extension;
protected PsiFile configureByText(@NotNull final FileType fileType, @NonNls final String text, @Nullable String _extension) {
try {
final String extension = _extension == null ? fileType.getDefaultExtension():_extension;
File dir = createTempDirectory();
final File tempFile = FileUtil.createTempFile(dir, "aaa", "." + extension, true);
final FileTypeManager fileTypeManager = FileTypeManager.getInstance();
if (fileTypeManager.getFileTypeByExtension(extension) != fileType) {
new WriteCommandAction(getProject()) {
@Override
protected void run(Result result) throws Exception {
fileTypeManager.associateExtension(fileType, extension);
}
}.execute();
File dir = createTempDirectory();
final File tempFile = FileUtil.createTempFile(dir, "aaa", "." + extension, true);
final FileTypeManager fileTypeManager = FileTypeManager.getInstance();
if (fileTypeManager.getFileTypeByExtension(extension) != fileType) {
new WriteCommandAction(getProject()) {
@Override
protected void run(Result result) throws Exception {
fileTypeManager.associateExtension(fileType, extension);
}
}.execute();
}
final VirtualFile vFile = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(tempFile);
assert vFile != null;
VfsUtil.saveText(vFile, text);
final VirtualFile vdir = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(dir);
PsiTestUtil.addSourceRoot(myModule, vdir);
configureByExistingFile(vFile);
assertEquals(fileType, myFile.getVirtualFile().getFileType());
return myFile;
}
catch (IOException e) {
throw new RuntimeException(e);
}
final VirtualFile vFile = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(tempFile);
assert vFile != null;
VfsUtil.saveText(vFile, text);
final VirtualFile vdir = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(dir);
PsiTestUtil.addSourceRoot(myModule, vdir);
configureByExistingFile(vFile);
assertEquals(fileType, myFile.getVirtualFile().getFileType());
return myFile;
}
@@ -0,0 +1,85 @@
/*
* Copyright 2000-2013 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.
*/
package com.intellij.find;
import com.intellij.testFramework.LightVirtualFile;
import junit.framework.Assert;
public class FindManagerTestUtils {
static void runFindInCommentsAndLiterals(FindManager findManager, FindModel findModel, String text) {
runFindInCommentsAndLiterals(findManager, findModel, text, "java");
}
public static void runFindInCommentsAndLiterals(FindManager findManager, FindModel findModel, String text, String ext) {
findModel.setInStringLiteralsOnly(true);
findModel.setInCommentsOnly(false);
runFindForwardAndBackward(findManager, findModel, text, ext);
findModel.setInStringLiteralsOnly(false);
findModel.setInCommentsOnly(true);
runFindForwardAndBackward(findManager, findModel, text, ext);
}
public static void runFindForwardAndBackward(FindManager findManager, FindModel findModel, String text) {
runFindForwardAndBackward(findManager, findModel, text, "java");
}
public static void runFindForwardAndBackward(FindManager findManager, FindModel findModel, String text, String ext) {
findModel.setForward(true);
LightVirtualFile file = new LightVirtualFile("A."+ext, text);
int previousOffset;
FindResult findResult = findManager.findString(text, 0, findModel, file);
Assert.assertTrue(findResult.isStringFound());
previousOffset = findResult.getStartOffset();
findResult = findManager.findString(text, findResult.getEndOffset(), findModel, file);
Assert.assertTrue(findResult.isStringFound());
Assert.assertTrue(findResult.getStartOffset() > previousOffset);
previousOffset = findResult.getStartOffset();
findResult = findManager.findString(text, findResult.getEndOffset(), findModel, file);
Assert.assertTrue(findResult.isStringFound());
Assert.assertTrue(findResult.getStartOffset() > previousOffset);
findModel.setForward(false);
findResult = findManager.findString(text, text.length(), findModel, file);
Assert.assertTrue(findResult.isStringFound());
previousOffset = findResult.getStartOffset();
findResult = findManager.findString(text, previousOffset, findModel, file);
Assert.assertTrue(findResult.isStringFound());
Assert.assertTrue(previousOffset > findResult.getStartOffset());
previousOffset = findResult.getStartOffset();
findResult = findManager.findString(text, previousOffset, findModel, file);
Assert.assertTrue(findResult.isStringFound());
Assert.assertTrue(previousOffset > findResult.getStartOffset());
}
public static FindModel configureFindModel(String stringToFind) {
FindModel findModel = new FindModel();
findModel.setStringToFind(stringToFind);
findModel.setWholeWordsOnly(false);
findModel.setFromCursor(false);
findModel.setGlobal(true);
findModel.setMultipleFiles(false);
findModel.setProjectScope(true);
return findModel;
}
}