MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-19 13:02:30 +07:00
Code Issues Packages Projects Releases Wiki Activity

[python] Fix Python Console tests

Browse Source 
Delete IPythonConsoleTest#testParsing: duplicates PythonConsoleParsingTest#testQuestionEnd. Fails because a virtual file is not marked as IPython.
PythonConsoleTest#testCompletionDoNotEvaluateProperty: rewrite to static.
DebugConsoleTest: delete deprecated python function.


Merge-request: IJ-MR-145576
Merged-by: Egor Eliseev <Egor.Eliseev@jetbrains.com>

GitOrigin-RevId: 3708defece0a957708073b524995c21e7d095224
This commit is contained in:
Egor Eliseev
2024-09-26 13:05:09 +00:00
committed by intellij-monorepo-bot
parent 78c4d75a36
commit ed136fcdd4
3 changed files with 61 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
python/testData/debug/test1.py
View File

@@ -1,4 +1,4 @@
from __future__ import print_statement
from __future__ import with_statement
from time import sleep

32
python/testSrc/com/jetbrains/env/debug/IPythonConsoleTest.java vendored
View File

@@ -1,21 +1,15 @@
// Copyright 2000-2020 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 com.jetbrains.env.debug;
import com.google.common.collect.Collections2;
import com.google.common.collect.ImmutableSet;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.psi.PsiDocumentManager;
import com.intellij.psi.PsiErrorElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.util.PsiTreeUtil;
import com.jetbrains.env.PyEnvTestCase;
import org.hamcrest.Matchers;
import org.jetbrains.annotations.NotNull;
import org.junit.Assert;
import org.junit.Test;
import java.util.Collection;
import java.util.Collections;
import java.util.Set;
import static org.junit.Assert.assertTrue;
@@ -33,32 +27,6 @@ public class IPythonConsoleTest extends PyEnvTestCase {
});
}
@Test
public void testParsing() {
runPythonTest(new IPythonTask() {
@Override
public void testing() throws Exception {
waitForReady();
addTextToEditor("sys?");
ApplicationManager.getApplication().runReadAction(() -> {
PsiFile psi =
PsiDocumentManager.getInstance(getProject())
.getPsiFile(getConsoleView().getConsoleEditor().getDocument());
Assert.assertThat("No errors expected", getErrors(psi), Matchers.empty());
});
}
});
}
@NotNull
private static Collection<String> getErrors(PsiFile psi) { //TODO: NotNull?
if (!PsiTreeUtil.hasErrorElements(psi)) {
return Collections.emptyList();
}
return Collections2.transform(PsiTreeUtil.findChildrenOfType(psi, PsiErrorElement.class), input -> input.getErrorDescription());
}
@Test
public void testParsingNoIPython() {
runPythonTest(new IPythonTask() {

83
python/testSrc/com/jetbrains/env/debug/PythonConsoleTest.java vendored
View File

@@ -6,17 +6,24 @@ import com.google.common.collect.Sets;
import com.intellij.execution.console.ConsoleHistoryController;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ReadAction;
import com.intellij.openapi.command.WriteCommandAction;
import com.intellij.openapi.editor.Caret;
import com.intellij.openapi.editor.ex.EditorEx;
import com.intellij.testFramework.EditorTestUtil;
import com.intellij.testFramework.EdtTestUtil;
import com.intellij.testFramework.TestActionEvent;
import com.intellij.testFramework.fixtures.CodeInsightTestFixture;
import com.intellij.util.concurrency.annotations.RequiresEdt;
import com.intellij.xdebugger.impl.ui.tree.nodes.XDebuggerTreeNode;
import com.jetbrains.env.PyEnvTestCase;
import com.jetbrains.python.console.PyConsoleOptions;
import com.jetbrains.python.console.PyConsoleOptionsConfigurable;
import com.jetbrains.python.console.PythonConsoleView;
import com.jetbrains.python.console.pydev.PydevCompletionVariant;
import com.jetbrains.python.debugger.PyDebugValue;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.junit.Assert;
import org.junit.Test;
@@ -24,6 +31,7 @@ import javax.swing.tree.TreeNode;
import java.util.Collections;
import java.util.List;
import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Predicate;
import static com.intellij.testFramework.UsefulTestCase.assertContainsElements;
@@ -33,6 +41,36 @@ import static com.jetbrains.python.PyParameterInfoTest.checkParameters;
import static org.junit.Assert.*;
public class PythonConsoleTest extends PyEnvTestCase {
private static @Nullable List<String> getStaticCompletion(CodeInsightTestFixture fixture, PythonConsoleView consoleView) {
fixture.configureFromExistingVirtualFile(consoleView.getVirtualFile());
ApplicationManager.getApplication().invokeAndWait(() -> {
addCaretsToConsoleEditor(consoleView.getCurrentEditor());
});
fixture.completeBasic();
return fixture.getLookupElementStrings();
}
@RequiresEdt
private static void addCaretsToConsoleEditor(EditorEx consoleEditor) {
var state = EditorTestUtil.extractCaretAndSelectionMarkers(consoleEditor.getDocument());
AtomicBoolean primary = new AtomicBoolean(true);
ReadAction.run(() -> {
var model = consoleEditor.getCaretModel();
List<Caret> oldCarets = List.copyOf(model.getAllCarets());
for (EditorTestUtil.CaretInfo caret : state.carets()) {
if (caret.position != null) {
model.addCaret(caret.position, primary.get());
primary.set(false);
}
}
oldCarets.forEach(model::removeCaret);
});
}
@Test
public void testConsolePrint() {
runPythonTest(new PyConsoleTask() {
@@ -171,8 +209,8 @@ public class PythonConsoleTest extends PyEnvTestCase {
public void testing() throws Exception {
exec("foo = 'bar'");
waitForConditionIsTrue("`foo` is not in the console variable tree", (root) -> {
for(TreeNode child : root.getChildren()) {
XDebuggerTreeNode node = (XDebuggerTreeNode) child;
for (TreeNode child : root.getChildren()) {
XDebuggerTreeNode node = (XDebuggerTreeNode)child;
if (node.toString().equals("foo")) {
return true;
}
@@ -182,8 +220,8 @@ public class PythonConsoleTest extends PyEnvTestCase {
exec("foo = 'baz'");
waitForConditionIsTrue("`foo` value hasn't changed to 'baz'", (root) -> {
for(TreeNode child : root.getChildren()) {
XDebuggerTreeNode node = (XDebuggerTreeNode) child;
for (TreeNode child : root.getChildren()) {
XDebuggerTreeNode node = (XDebuggerTreeNode)child;
if (node.toString().equals("foo") && node.getText().toString().contains("'baz'")) {
return true;
}
@@ -275,13 +313,18 @@ public class PythonConsoleTest extends PyEnvTestCase {
@Test
public void testCompletionDoNotEvaluateProperty() {
runPythonTest(new PyConsoleTask("/debug") {
@Override
public void before() {
PyConsoleOptions.getInstance(getProject()).setCodeCompletionOption(PyConsoleOptionsConfigurable.CodeCompletionOption.STATIC);
}
@Override
public void testing() throws Exception {
exec("""
class Bar:
@property
def prop(self):
x = 238
x = 2389952
print(x + 1)
return "bar"
\s
@@ -290,19 +333,16 @@ public class PythonConsoleTest extends PyEnvTestCase {
exec("print(\"Hey\")");
waitForOutput("Hey");
List<PydevCompletionVariant> completions = getCompletions("bar.");
assertFalse("Completion variants list is empty", completions.isEmpty());
addTextToEditor("bar.<caret>");
getStaticCompletion(myFixture, getConsoleView());
assertTrue(getConsoleView().getCurrentEditor().getDocument().getText().endsWith("prop"));
// Just to make sure that output is updated
exec("print('Hello')");
waitForOutput("Hello");
PydevCompletionVariant compVariant = findCompletionVariantByName(completions, "prop");
assertNotNull("Completion variant `prop` is missing", compVariant);
assertEquals(3, compVariant.getType());
String currentOutput = output();
assertFalse("Property was called for completion", currentOutput.contains("239"));
assertFalse("Property was called for completion", currentOutput.contains("2389953"));
}
@Override
@@ -315,6 +355,11 @@ public class PythonConsoleTest extends PyEnvTestCase {
@Test
public void testParameterInfo() {
runPythonTest(new PyConsoleTask("/debug") {
@Override
public void before() {
PyConsoleOptions.getInstance(getProject()).setCodeCompletionOption(PyConsoleOptionsConfigurable.CodeCompletionOption.RUNTIME);
}
@Override
public void testing() throws Exception {
exec("from os import getenv");
@@ -360,16 +405,7 @@ public class PythonConsoleTest extends PyEnvTestCase {
exec("x = 42");
exec("s = 'str'");
getStaticCompletion("x", "foo", "s");
}
private void getStaticCompletion(String... completionVariants) {
myFixture.configureFromExistingVirtualFile(getConsoleView().getVirtualFile());
myFixture.completeBasic();
List<String> completions = myFixture.getLookupElementStrings();
for (String variant : completionVariants) {
assertTrue(completions.contains(variant));
}
assertContainsElements(getStaticCompletion(myFixture, getConsoleView()), "x", "foo", "s");
}
});
}
@@ -424,7 +460,8 @@ public class PythonConsoleTest extends PyEnvTestCase {
else {
assertEquals(linesCount - 1, caretLine);
}
} else {
}
else {
assertEquals(0, caretLine);
}
});