From dff5f05835e9545af1443d85f1cdebf0615b2d8d Mon Sep 17 00:00:00 2001
From: Ekaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Date: Wed, 19 Sep 2012 16:02:31 +0400
Subject: [PATCH] refactored tests for PyAugmentedAssignment Inspection

---
 .../PyAugmentAssignmentInspection/add.py      |  1 +
 .../differentOperations.py                    |  8 +++
 .../PyAugmentAssignmentInspection/list.py     |  2 +
 .../PyAugmentAssignmentInspection/mult.py     |  1 +
 .../PyAugmentAssignmentInspection/negative.py |  2 +
 .../negativeAssignment.py                     |  5 ++
 .../negativeMinus.py                          |  3 +
 .../negativeString.py                         |  8 +++
 .../PyAugmentAssignmentInspection/numeric.py  |  8 +++
 .../PyAugmentAssignmentInspection/string.py   |  7 +++
 .../PyAugmentAssignmentInspection/test.py     | 39 -------------
 .../python/PythonInspectionsTest.java         |  4 --
 .../PyAugmentAssignmentInspectionTest.java    | 55 +++++++++++++++++++
 13 files changed, 100 insertions(+), 43 deletions(-)
 create mode 100644 python/testData/inspections/PyAugmentAssignmentInspection/add.py
 create mode 100644 python/testData/inspections/PyAugmentAssignmentInspection/differentOperations.py
 create mode 100644 python/testData/inspections/PyAugmentAssignmentInspection/list.py
 create mode 100644 python/testData/inspections/PyAugmentAssignmentInspection/mult.py
 create mode 100644 python/testData/inspections/PyAugmentAssignmentInspection/negative.py
 create mode 100644 python/testData/inspections/PyAugmentAssignmentInspection/negativeAssignment.py
 create mode 100644 python/testData/inspections/PyAugmentAssignmentInspection/negativeMinus.py
 create mode 100644 python/testData/inspections/PyAugmentAssignmentInspection/negativeString.py
 create mode 100644 python/testData/inspections/PyAugmentAssignmentInspection/numeric.py
 create mode 100644 python/testData/inspections/PyAugmentAssignmentInspection/string.py
 delete mode 100644 python/testData/inspections/PyAugmentAssignmentInspection/test.py
 create mode 100644 python/testSrc/com/jetbrains/python/inspections/PyAugmentAssignmentInspectionTest.java

diff --git a/python/testData/inspections/PyAugmentAssignmentInspection/add.py b/python/testData/inspections/PyAugmentAssignmentInspection/add.py
new file mode 100644
index 000000000000..b3b61d9c4f91
--- /dev/null
+++ b/python/testData/inspections/PyAugmentAssignmentInspection/add.py
@@ -0,0 +1 @@
+<weak_warning descr="Assignment can be replaced with augmented assignment">var_1 = var_1 + 1</weak_warning>
diff --git a/python/testData/inspections/PyAugmentAssignmentInspection/differentOperations.py b/python/testData/inspections/PyAugmentAssignmentInspection/differentOperations.py
new file mode 100644
index 000000000000..ab2a26b03a2f
--- /dev/null
+++ b/python/testData/inspections/PyAugmentAssignmentInspection/differentOperations.py
@@ -0,0 +1,8 @@
+# PY-2488
+<weak_warning descr="Assignment can be replaced with augmented assignment">a = a ** 1</weak_warning>
+
+<weak_warning descr="Assignment can be replaced with augmented assignment">x = x % 3</weak_warning>
+<weak_warning descr="Assignment can be replaced with augmented assignment">x = x | 3</weak_warning>
+<weak_warning descr="Assignment can be replaced with augmented assignment">x = x & 3</weak_warning>
+<weak_warning descr="Assignment can be replaced with augmented assignment">x = x ^ 3</weak_warning>
+
diff --git a/python/testData/inspections/PyAugmentAssignmentInspection/list.py b/python/testData/inspections/PyAugmentAssignmentInspection/list.py
new file mode 100644
index 000000000000..bec79b1f9616
--- /dev/null
+++ b/python/testData/inspections/PyAugmentAssignmentInspection/list.py
@@ -0,0 +1,2 @@
+# PY-2483
+<weak_warning descr="Assignment can be replaced with augmented assignment">list[0] = list[0] + 1</weak_warning>
diff --git a/python/testData/inspections/PyAugmentAssignmentInspection/mult.py b/python/testData/inspections/PyAugmentAssignmentInspection/mult.py
new file mode 100644
index 000000000000..87d44d6dae24
--- /dev/null
+++ b/python/testData/inspections/PyAugmentAssignmentInspection/mult.py
@@ -0,0 +1 @@
+<weak_warning descr="Assignment can be replaced with augmented assignment">var = var * 2</weak_warning>
diff --git a/python/testData/inspections/PyAugmentAssignmentInspection/negative.py b/python/testData/inspections/PyAugmentAssignmentInspection/negative.py
new file mode 100644
index 000000000000..dcd2ea209984
--- /dev/null
+++ b/python/testData/inspections/PyAugmentAssignmentInspection/negative.py
@@ -0,0 +1,2 @@
+var_7 += 2
+
diff --git a/python/testData/inspections/PyAugmentAssignmentInspection/negativeAssignment.py b/python/testData/inspections/PyAugmentAssignmentInspection/negativeAssignment.py
new file mode 100644
index 000000000000..bdf3d768d756
--- /dev/null
+++ b/python/testData/inspections/PyAugmentAssignmentInspection/negativeAssignment.py
@@ -0,0 +1,5 @@
+str = "string"
+
+var_3 = var_3
+
+var_4 = 1
diff --git a/python/testData/inspections/PyAugmentAssignmentInspection/negativeMinus.py b/python/testData/inspections/PyAugmentAssignmentInspection/negativeMinus.py
new file mode 100644
index 000000000000..10ebeee1f4e3
--- /dev/null
+++ b/python/testData/inspections/PyAugmentAssignmentInspection/negativeMinus.py
@@ -0,0 +1,3 @@
+
+#PY-2514
+dy = 1 - dy
diff --git a/python/testData/inspections/PyAugmentAssignmentInspection/negativeString.py b/python/testData/inspections/PyAugmentAssignmentInspection/negativeString.py
new file mode 100644
index 000000000000..d9d0df18b5e1
--- /dev/null
+++ b/python/testData/inspections/PyAugmentAssignmentInspection/negativeString.py
@@ -0,0 +1,8 @@
+#PY-6331
+var = "string"
+var = "some " + var
+
+#PY-6490
+foo = "a"
+bar = "b"
+foo = bar + foo
\ No newline at end of file
diff --git a/python/testData/inspections/PyAugmentAssignmentInspection/numeric.py b/python/testData/inspections/PyAugmentAssignmentInspection/numeric.py
new file mode 100644
index 000000000000..320ad7841bc4
--- /dev/null
+++ b/python/testData/inspections/PyAugmentAssignmentInspection/numeric.py
@@ -0,0 +1,8 @@
+
+var_3 = var_3
+var_4 = 1
+<weak_warning descr="Assignment can be replaced with augmented assignment">var_6 = var_6 + var_4</weak_warning>
+
+#PY-2482
+<weak_warning descr="Assignment can be replaced with augmented assignment">var = 2 + var</weak_warning>
+
diff --git a/python/testData/inspections/PyAugmentAssignmentInspection/string.py b/python/testData/inspections/PyAugmentAssignmentInspection/string.py
new file mode 100644
index 000000000000..17a99ffd3b9c
--- /dev/null
+++ b/python/testData/inspections/PyAugmentAssignmentInspection/string.py
@@ -0,0 +1,7 @@
+str = "string"
+
+<weak_warning descr="Assignment can be replaced with augmented assignment">var_2 = var_2 + str</weak_warning>
+
+var_3 = var_3
+var_4 = 1
+<weak_warning descr="Assignment can be replaced with augmented assignment">var_5 = var_5 + "string"</weak_warning>
diff --git a/python/testData/inspections/PyAugmentAssignmentInspection/test.py b/python/testData/inspections/PyAugmentAssignmentInspection/test.py
deleted file mode 100644
index e5348ee73018..000000000000
--- a/python/testData/inspections/PyAugmentAssignmentInspection/test.py
+++ /dev/null
@@ -1,39 +0,0 @@
-<weak_warning descr="Assignment can be replaced with augmented assignment">var = var * 2</weak_warning>
-<weak_warning descr="Assignment can be replaced with augmented assignment">var_1 = var_1 + 1</weak_warning>
-
-str = "string"
-
-<weak_warning descr="Assignment can be replaced with augmented assignment">var_2 = var_2 + str</weak_warning>
-
-var_3 = var_3
-var_4 = 1
-<weak_warning descr="Assignment can be replaced with augmented assignment">var_5 = var_5 + "string"</weak_warning>
-<weak_warning descr="Assignment can be replaced with augmented assignment">var_6 = var_6 + var_4</weak_warning>
-
-var_7 += 2
-
-#PY-2482
-<weak_warning descr="Assignment can be replaced with augmented assignment">var = 2 + var</weak_warning>
-
-# PY-2483
-<weak_warning descr="Assignment can be replaced with augmented assignment">list[0] = list[0] + 1</weak_warning>
-
-# PY-2488
-<weak_warning descr="Assignment can be replaced with augmented assignment">a = a ** 1</weak_warning>
-
-<weak_warning descr="Assignment can be replaced with augmented assignment">x = x % 3</weak_warning>
-<weak_warning descr="Assignment can be replaced with augmented assignment">x = x | 3</weak_warning>
-<weak_warning descr="Assignment can be replaced with augmented assignment">x = x & 3</weak_warning>
-<weak_warning descr="Assignment can be replaced with augmented assignment">x = x ^ 3</weak_warning>
-
-#PY-2514
-dy = 1 - dy
-
-#PY-6331
-var = "string"
-var = "some " + var
-
-#PY-6490
-foo = "a"
-bar = "b"
-foo = bar + foo
\ No newline at end of file
diff --git a/python/testSrc/com/jetbrains/python/PythonInspectionsTest.java b/python/testSrc/com/jetbrains/python/PythonInspectionsTest.java
index 1c475fbe8e1a..e67beab8c461 100644
--- a/python/testSrc/com/jetbrains/python/PythonInspectionsTest.java
+++ b/python/testSrc/com/jetbrains/python/PythonInspectionsTest.java
@@ -259,10 +259,6 @@ public class PythonInspectionsTest extends PyTestCase {
     doHighlightingTest(PyBroadExceptionInspection.class);
   }
 
-  public void testPyAugmentAssignmentInspection() {
-    doHighlightingTest(PyAugmentAssignmentInspection.class);
-  }
-
   public void testPyDictDuplicateKeysInspection() {
     doHighlightingTest(PyDictDuplicateKeysInspection.class);
   }
diff --git a/python/testSrc/com/jetbrains/python/inspections/PyAugmentAssignmentInspectionTest.java b/python/testSrc/com/jetbrains/python/inspections/PyAugmentAssignmentInspectionTest.java
new file mode 100644
index 000000000000..3ad5432d4543
--- /dev/null
+++ b/python/testSrc/com/jetbrains/python/inspections/PyAugmentAssignmentInspectionTest.java
@@ -0,0 +1,55 @@
+package com.jetbrains.python.inspections;
+
+import com.jetbrains.python.fixtures.PyTestCase;
+
+/**
+ * User: ktisha
+ */
+public class PyAugmentAssignmentInspectionTest extends PyTestCase {
+
+  public void testMult() {
+    doTest();
+  }
+
+  public void testAdd() {
+    doTest();
+  }
+
+  public void testNegativeAssignment() {
+    doTest();
+  }
+
+  public void testNegative() {
+    doTest();
+  }
+
+  public void testNegativeMinus() {
+    doTest();
+  }
+
+  public void testNegativeString() {
+    doTest();
+  }
+
+  public void testString() {
+    doTest();
+  }
+
+  public void testNumeric() {
+    doTest();
+  }
+
+  public void testList() {
+    doTest();
+  }
+
+  public void testDifferentOperations() {
+    doTest();
+  }
+
+  private void doTest() {
+    myFixture.configureByFile("inspections/PyAugmentAssignmentInspection/" + getTestName(true) + ".py");
+    myFixture.enableInspections(PyAugmentAssignmentInspection.class);
+    myFixture.checkHighlighting(true, false, true);
+  }
+}