azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make out-of-block test functional

Browse Source
This commit is contained in:
Nikolay Krasko
2014-10-20 16:46:28 +04:00
parent b58c5f7df4
commit 0844a11549
1 changed files with 30 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractOutOfBlockModificationTest.java
+30 -34
View File
@@ -16,8 +16,10 @@
package org.jetbrains.jet.plugin.codeInsight;
import com.intellij.psi.*;
import com.intellij.psi.impl.JavaCodeBlockModificationListener;
import com.intellij.psi.PsiDocumentManager;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiManager;
import com.intellij.psi.impl.PsiModificationTrackerImpl;
import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase;
import org.jetbrains.jet.plugin.PluginTestCaseBase;
@@ -35,6 +37,31 @@ public abstract class AbstractOutOfBlockModificationTest extends JetLightCodeIns
protected void doTest(String path) {
myFixture.configureByFile(path);
boolean expectedOutOfBlock = getExpectedOutOfBlockResult();
PsiModificationTrackerImpl tracker =
(PsiModificationTrackerImpl) PsiManager.getInstance(myFixture.getProject()).getModificationTracker();
PsiElement element = myFixture.getFile().findElementAt(myFixture.getCaretOffset());
assertNotNull("Should be valid element", element);
long oobBeforeType = tracker.getOutOfCodeBlockModificationCount();
long modificationCountBeforeType = tracker.getModificationCount();
myFixture.type('a');
PsiDocumentManager.getInstance(myFixture.getProject()).commitDocument(myFixture.getDocument(myFixture.getFile()));
long oobAfterCount = tracker.getOutOfCodeBlockModificationCount();
long modificationCountAfterType = tracker.getModificationCount();
assertTrue("Modification tracker should always be changed after type", modificationCountBeforeType != modificationCountAfterType);
assertEquals("Result for out of block test is differs from expected on element " + element,
expectedOutOfBlock, oobBeforeType != oobAfterCount);
}
private boolean getExpectedOutOfBlockResult() {
String text = myFixture.getDocument(myFixture.getFile()).getText();
boolean expectedOutOfBlock = false;
@@ -48,37 +75,6 @@ public abstract class AbstractOutOfBlockModificationTest extends JetLightCodeIns
fail("Expectation of code block result test should be configured with " +
"\"// TRUE\" or \"// FALSE\" directive in the beginning of the file");
}
PsiElement element = myFixture.getFile().findElementAt(myFixture.getCaretOffset());
assertNotNull("Should be valid element", element);
assertEquals("Result for out of block test is differs from expected on element " + element,
!expectedOutOfBlock, isInsideCodeBlock(element));
}
/**
* Copy of private {@link JavaCodeBlockModificationListener.isInsideCodeBlock()}
*/
@SuppressWarnings("JavadocReference")
private static boolean isInsideCodeBlock(PsiElement element) {
if (element instanceof PsiFileSystemItem) {
return false;
}
if (element == null || element.getParent() == null) return true;
PsiElement parent = element;
while (true) {
if (parent instanceof PsiFile || parent instanceof PsiDirectory || parent == null) {
return false;
}
if (parent instanceof PsiClass) return false; // anonymous or local class
if (parent instanceof PsiModifiableCodeBlock) {
if (!((PsiModifiableCodeBlock)parent).shouldChangeModificationCount(element)) {
return true;
}
}
parent = parent.getParent();
}
return expectedOutOfBlock;
}
}