From 9c6480b7ec3b4cf847400bdbe23a014112d0a6c5 Mon Sep 17 00:00:00 2001 From: Andrey Vlasovskikh Date: Mon, 18 Jun 2018 15:13:25 +0300 Subject: [PATCH] Moved former skeletons test for namedtuple() to regular tests --- .../namedTupleFunction.py} | 0 .../env/python/PythonSkeletonsTest.java | 22 ------------------- .../PyUnresolvedReferencesInspectionTest.java | 4 ++++ 3 files changed, 4 insertions(+), 22 deletions(-) rename python/testData/{skeletons/FakeNamedTuple.py => inspections/PyUnresolvedReferencesInspection/namedTupleFunction.py} (100%) diff --git a/python/testData/skeletons/FakeNamedTuple.py b/python/testData/inspections/PyUnresolvedReferencesInspection/namedTupleFunction.py similarity index 100% rename from python/testData/skeletons/FakeNamedTuple.py rename to python/testData/inspections/PyUnresolvedReferencesInspection/namedTupleFunction.py diff --git a/python/testSrc/com/jetbrains/env/python/PythonSkeletonsTest.java b/python/testSrc/com/jetbrains/env/python/PythonSkeletonsTest.java index 638f3751c99e..57d1961ac55b 100644 --- a/python/testSrc/com/jetbrains/env/python/PythonSkeletonsTest.java +++ b/python/testSrc/com/jetbrains/env/python/PythonSkeletonsTest.java @@ -21,14 +21,12 @@ import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleUtilCore; import com.intellij.openapi.project.Project; import com.intellij.openapi.projectRoots.Sdk; -import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiFile; import com.intellij.testFramework.EdtTestUtil; import com.jetbrains.env.PyEnvTestCase; import com.jetbrains.env.PyExecutionFixtureTestTask; import com.jetbrains.env.PyTestTask; -import com.jetbrains.env.Staging; import com.jetbrains.python.PythonFileType; import com.jetbrains.python.inspections.unresolvedReference.PyUnresolvedReferencesInspection; import com.jetbrains.python.psi.*; @@ -112,26 +110,6 @@ public class PythonSkeletonsTest extends PyEnvTestCase { }); } - // PY-4349 - @Test - @Staging - public void testFakeNamedTuple() { - runTest(new SkeletonsTask() { - @Override - protected void runTestOn(@NotNull Sdk sdk) { - final LanguageLevel languageLevel = PythonSdkType.getLanguageLevelForSdk(sdk); - // XXX: A workaround for invalidating VFS cache with the test file copied to our temp directory - LocalFileSystem.getInstance().refresh(false); - - // Run inspections on code that uses named tuples - EdtTestUtil.runInEdtAndWait(() -> myFixture.configureByFile(getTestName(false) + ".py")); - myFixture.enableInspections(PyUnresolvedReferencesInspection.class); - - EdtTestUtil.runInEdtAndWait(() -> myFixture.checkHighlighting(true, false, false)); - } - }); - } - @Test public void testKnownPropertiesTypes() { runTest(new SkeletonsTask() { diff --git a/python/testSrc/com/jetbrains/python/inspections/PyUnresolvedReferencesInspectionTest.java b/python/testSrc/com/jetbrains/python/inspections/PyUnresolvedReferencesInspectionTest.java index 501f12773355..30629df75db4 100644 --- a/python/testSrc/com/jetbrains/python/inspections/PyUnresolvedReferencesInspectionTest.java +++ b/python/testSrc/com/jetbrains/python/inspections/PyUnresolvedReferencesInspectionTest.java @@ -749,6 +749,10 @@ public class PyUnresolvedReferencesInspectionTest extends PyInspectionTestCase { " self.one.abc"); } + public void testNamedTupleFunction() { + doTest(); + } + @NotNull @Override protected Class getInspectionClass() {