From 359d047a766aa74a873b64065d6252824b46383f Mon Sep 17 00:00:00 2001 From: Mikhail Golubev Date: Tue, 2 Dec 2014 14:01:33 +0300 Subject: [PATCH] Remove "unittest" package from mock SDK, include it in test data instead --- python/testData/MockSdk3.2/Lib/unittest/__init__.py | 1 - python/testData/MockSdk3.2/Lib/unittest/case.py | 2 -- python/testData/MockSdk3.4/Lib/unittest/__init__.py | 1 - python/testData/MockSdk3.4/Lib/unittest/case.py | 2 -- .../PyPep8NamingInspection/{test.py => test/a.py} | 0 .../PyPep8NamingInspection/test}/unittest/__init__.py | 0 .../PyPep8NamingInspection/test}/unittest/case.py | 0 .../python/inspections/PyPep8NamingInspectionTest.java | 10 +++++++++- 8 files changed, 9 insertions(+), 7 deletions(-) delete mode 100644 python/testData/MockSdk3.2/Lib/unittest/__init__.py delete mode 100644 python/testData/MockSdk3.2/Lib/unittest/case.py delete mode 100644 python/testData/MockSdk3.4/Lib/unittest/__init__.py delete mode 100644 python/testData/MockSdk3.4/Lib/unittest/case.py rename python/testData/inspections/PyPep8NamingInspection/{test.py => test/a.py} (100%) rename python/testData/{MockSdk2.7/Lib => inspections/PyPep8NamingInspection/test}/unittest/__init__.py (100%) rename python/testData/{MockSdk2.7/Lib => inspections/PyPep8NamingInspection/test}/unittest/case.py (100%) diff --git a/python/testData/MockSdk3.2/Lib/unittest/__init__.py b/python/testData/MockSdk3.2/Lib/unittest/__init__.py deleted file mode 100644 index 2b93ab7cc67c..000000000000 --- a/python/testData/MockSdk3.2/Lib/unittest/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from .case import TestCase diff --git a/python/testData/MockSdk3.2/Lib/unittest/case.py b/python/testData/MockSdk3.2/Lib/unittest/case.py deleted file mode 100644 index fad1d5da6d97..000000000000 --- a/python/testData/MockSdk3.2/Lib/unittest/case.py +++ /dev/null @@ -1,2 +0,0 @@ -class TestCase(object): - pass \ No newline at end of file diff --git a/python/testData/MockSdk3.4/Lib/unittest/__init__.py b/python/testData/MockSdk3.4/Lib/unittest/__init__.py deleted file mode 100644 index 2b93ab7cc67c..000000000000 --- a/python/testData/MockSdk3.4/Lib/unittest/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from .case import TestCase diff --git a/python/testData/MockSdk3.4/Lib/unittest/case.py b/python/testData/MockSdk3.4/Lib/unittest/case.py deleted file mode 100644 index fad1d5da6d97..000000000000 --- a/python/testData/MockSdk3.4/Lib/unittest/case.py +++ /dev/null @@ -1,2 +0,0 @@ -class TestCase(object): - pass \ No newline at end of file diff --git a/python/testData/inspections/PyPep8NamingInspection/test.py b/python/testData/inspections/PyPep8NamingInspection/test/a.py similarity index 100% rename from python/testData/inspections/PyPep8NamingInspection/test.py rename to python/testData/inspections/PyPep8NamingInspection/test/a.py diff --git a/python/testData/MockSdk2.7/Lib/unittest/__init__.py b/python/testData/inspections/PyPep8NamingInspection/test/unittest/__init__.py similarity index 100% rename from python/testData/MockSdk2.7/Lib/unittest/__init__.py rename to python/testData/inspections/PyPep8NamingInspection/test/unittest/__init__.py diff --git a/python/testData/MockSdk2.7/Lib/unittest/case.py b/python/testData/inspections/PyPep8NamingInspection/test/unittest/case.py similarity index 100% rename from python/testData/MockSdk2.7/Lib/unittest/case.py rename to python/testData/inspections/PyPep8NamingInspection/test/unittest/case.py diff --git a/python/testSrc/com/jetbrains/python/inspections/PyPep8NamingInspectionTest.java b/python/testSrc/com/jetbrains/python/inspections/PyPep8NamingInspectionTest.java index 89b8b7a877fa..63d063172435 100644 --- a/python/testSrc/com/jetbrains/python/inspections/PyPep8NamingInspectionTest.java +++ b/python/testSrc/com/jetbrains/python/inspections/PyPep8NamingInspectionTest.java @@ -75,7 +75,7 @@ public class PyPep8NamingInspectionTest extends PyTestCase { } public void testTest() { - doTest(); + doMultiFileTest(); } public void testOverrideFromModule() { @@ -90,4 +90,12 @@ public class PyPep8NamingInspectionTest extends PyTestCase { myFixture.enableInspections(PyPep8NamingInspection.class); myFixture.checkHighlighting(false, false, true); } + + private void doMultiFileTest() { + myFixture.copyDirectoryToProject("inspections/PyPep8NamingInspection/" + getTestName(true), ""); + myFixture.configureByFile("a.py"); + myFixture.enableInspections(PyPep8NamingInspection.class); + myFixture.checkHighlighting(false, false, true); + } + }