Fix test data for PyDunderSlotsInspection

python/testData/inspections/PyDunderSlotsInspection/classVarInBaseAndSlotsInDerived.py

@@ -0,0 +1,5 @@
+class Base(object):
+    foo = 1
+
+class Derived(Base):
+    __slots__ = 'foo'

python/testData/inspections/PyDunderSlotsInspection/slotAndClassVar.py

@@ -0,0 +1,3 @@
+class Foo(object):
+    __slots__ = <warning descr="'foo' in __slots__ conflicts with class variable">'foo'</warning>
+    foo = 1

python/testData/inspections/PyDunderSlotsInspection/slotInListAndClassVar.py

@@ -0,0 +1,3 @@
+class Foo(object):
+    __slots__ = [<warning descr="'foo' in __slots__ conflicts with class variable">'foo'</warning>]
+    foo = 1

python/testData/inspections/PyDunderSlotsInspection/slotInTupleAndClassVar.py

@@ -0,0 +1,3 @@
+class Foo(object):
+    __slots__ = (<warning descr="'foo' in __slots__ conflicts with class variable">'foo'</warning>)
+    foo = 1

python/testData/inspections/PyDunderSlotsInspection/slotsInBaseAndClassVarInDerived.py

@@ -0,0 +1,5 @@
+class Base(object):
+    __slots__ = 'foo'
+
+class Derived(Base):
+    foo = 1

python/testData/inspections/PyDunderSlotsInspection/slotsInBaseAndDerivedClassVarInBase.py

@@ -0,0 +1,6 @@
+class Base(object):
+    __slots__ = 'bar'
+    foo = 1
+
+class Derived(Base):
+    __slots__ = 'foo'

python/testData/inspections/PyDunderSlotsInspection/slotsInBaseAndDerivedClassVarInDerived.py

@@ -0,0 +1,6 @@
+class Base(object):
+    __slots__ = 'foo'
+
+class Derived(Base):
+    __slots__ = 'bar'
+    foo = 1

python/testData/inspections/PyDunderSlotsInspection/test.py

@@ -1,62 +0,0 @@
-# PY-20280: one slot in list
-class Foo(object):
-    __slots__ = [<warning descr="'foo' in __slots__ conflicts with class variable">'foo'</warning>]
-    foo = 1
-
-
-# PY-20280: one slot in tuple
-class Foo(object):
-    __slots__ = (<warning descr="'foo' in __slots__ conflicts with class variable">'foo'</warning>)
-    foo = 1
-
-
-# PY-20280: one slot
-class Foo(object):
-    __slots__ = <warning descr="'foo' in __slots__ conflicts with class variable">'foo'</warning>
-    foo = 1
-
-
-# PY-20280: two slots in list
-class Foo(object):
-    __slots__ = [<warning descr="'foo' in __slots__ conflicts with class variable">'foo'</warning>, 'bar']
-    foo = 1
-
-
-# PY-20280: two slots in tuple
-class Foo(object):
-    __slots__ = (<warning descr="'foo' in __slots__ conflicts with class variable">'foo'</warning>, 'bar')
-    foo = 1
-
-
-# PY-20280: slots in base and class variable in derived
-class Base(object):
-    __slots__ = 'foo'
-
-class Derived(Base):
-    foo = 1
-
-
-# PY-20280: class variable in base and slots in derived
-class Base(object):
-    foo = 1
-
-class Derived(Base):
-    __slots__ = 'foo'
-
-
-# PY-20280: slots in base and derived, class variable in derived
-class Base(object):
-    __slots__ = 'foo'
-
-class Derived(Base):
-    __slots__ = 'bar'
-    foo = 1
-
-
-# PY-20280: slots in base and derived, class variable in base
-class Base(object):
-    __slots__ = 'bar'
-    foo = 1
-
-class Derived(Base):
-    __slots__ = 'foo'

python/testData/inspections/PyDunderSlotsInspection/twoSlotsInListAndClassVar.py

@@ -0,0 +1,3 @@
+class Foo(object):
+    __slots__ = [<warning descr="'foo' in __slots__ conflicts with class variable">'foo'</warning>, 'bar']
+    foo = 1

python/testData/inspections/PyDunderSlotsInspection/twoSlotsInTupleAndClassVar.py

@@ -0,0 +1,3 @@
+class Foo(object):
+    __slots__ = (<warning descr="'foo' in __slots__ conflicts with class variable">'foo'</warning>, 'bar')
+    foo = 1

python/testSrc/com/jetbrains/python/PythonInspectionsTest.java

@@ -333,10 +333,6 @@ public class PythonInspectionsTest extends PyTestCase {
     doHighlightingTest(PyShadowingNamesInspection.class);
   }
 
-  public void testPyDunderSlotsInspection() {
-    runWithLanguageLevel(LanguageLevel.PYTHON30, () -> doHighlightingTest(PyDunderSlotsInspection.class));
-  }
-
   // PY-21645
   public void testInspectionsDisabledInFunctionTypeComments() {
     myFixture.enableInspections(PyIncorrectDocstringInspection.class); 

python/testSrc/com/jetbrains/python/inspections/PyDunderSlotsInspectionTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 JetBrains s.r.o.
+ * Copyright 2000-2017 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.
@@ -189,6 +189,51 @@ public class PyDunderSlotsInspectionTest extends PyTestCase {
     doTestPy3();
   }
 
+  // PY-20280
+  public void testSlotInListAndClassVar() {
+    doTestPy3();
+  }
+
+  // PY-20280
+  public void testSlotInTupleAndClassVar() {
+    doTestPy3();
+  }
+
+  // PY-20280
+  public void testSlotAndClassVar() {
+    doTestPy3();
+  }
+
+  // PY-20280
+  public void testTwoSlotsInListAndClassVar() {
+    doTestPy3();
+  }
+
+  // PY-20280
+  public void testTwoSlotsInTupleAndClassVar() {
+    doTestPy3();
+  }
+
+  // PY-20280
+  public void testSlotsInBaseAndClassVarInDerived() {
+    doTestPy3();
+  }
+
+  // PY-20280
+  public void testClassVarInBaseAndSlotsInDerived() {
+    doTestPy3();
+  }
+
+  // PY-20280
+  public void testSlotsInBaseAndDerivedClassVarInDerived() {
+    doTestPy3();
+  }
+
+  // PY-20280
+  public void testSlotsInBaseAndDerivedClassVarInBase() {
+    doTestPy3();
+  }
+
   private void doTestPy2() {
     runWithLanguageLevel(LanguageLevel.PYTHON26, this::doTestPy);
   }
@@ -198,7 +243,7 @@ public class PyDunderSlotsInspectionTest extends PyTestCase {
   }
 
   private void doTestPy() {
-    final String path = "inspections/PyDunderSlotsInspectionTest/" + getTestName(true) + ".py";
+    final String path = "inspections/PyDunderSlotsInspection/" + getTestName(true) + ".py";
 
     final VirtualFile file = myFixture.getTempDirFixture().getFile(path);
     if (file != null) {