16 files changed, 82 insertions, 9 deletions
diff --git a/plugins/IntentionPowerPak/test/com/siyeh/ipp/junit/flip_assert_literal/ExistingStaticImport.java b/plugins/IntentionPowerPak/test/com/siyeh/ipp/junit/flip_assert_literal/ExistingStaticImport.java
new file mode 100644
index 000000000000..96be19ed47a7
--- /dev/null
+++ b/plugins/IntentionPowerPak/test/com/siyeh/ipp/junit/flip_assert_literal/ExistingStaticImport.java
@@ -0,0 +1,11 @@
+import org.junit.Test;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+
+class X {
+  @Test
+  void t() {
+    <caret>assertTrue(true);
+  }
+}
+\ No newline at end of file
diff --git a/plugins/IntentionPowerPak/test/com/siyeh/ipp/junit/flip_assert_literal/ExistingStaticImport_after.java b/plugins/IntentionPowerPak/test/com/siyeh/ipp/junit/flip_assert_literal/ExistingStaticImport_after.java
new file mode 100644
index 000000000000..8eccf08eb0ad
--- /dev/null
+++ b/plugins/IntentionPowerPak/test/com/siyeh/ipp/junit/flip_assert_literal/ExistingStaticImport_after.java
@@ -0,0 +1,11 @@
+import org.junit.Test;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+
+class X {
+  @Test
+  void t() {
+      assertFalse(!true);
+  }
+}
+\ No newline at end of file
diff --git a/plugins/IntentionPowerPak/test/com/siyeh/ipp/junit/flip_assert_literal/StaticImportWithoutTestMethod.java b/plugins/IntentionPowerPak/test/com/siyeh/ipp/junit/flip_assert_literal/StaticImportWithoutTestMethod.java
new file mode 100644
index 000000000000..369c92ea185f
--- /dev/null
+++ b/plugins/IntentionPowerPak/test/com/siyeh/ipp/junit/flip_assert_literal/StaticImportWithoutTestMethod.java
@@ -0,0 +1,8 @@
+import static org.junit.Assert.assertTrue;
+
+class StaticImportWithoutTestMethod {
+
+  void t() {
+    <caret>assertTrue(false);
+  }
+}
+\ No newline at end of file
diff --git a/plugins/IntentionPowerPak/test/com/siyeh/ipp/junit/flip_assert_literal/StaticImportWithoutTestMethod_after.java b/plugins/IntentionPowerPak/test/com/siyeh/ipp/junit/flip_assert_literal/StaticImportWithoutTestMethod_after.java
new file mode 100644
index 000000000000..5bf7c4d7c1fb
--- /dev/null
+++ b/plugins/IntentionPowerPak/test/com/siyeh/ipp/junit/flip_assert_literal/StaticImportWithoutTestMethod_after.java
@@ -0,0 +1,9 @@
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+class StaticImportWithoutTestMethod {
+
+  void t() {
+      assertFalse(!false);
+  }
+}
+\ No newline at end of file
diff --git a/plugins/IntentionPowerPak/test/com/siyeh/ipp/junit/replace_assert_equals_with_assert_literal/OutsideTestMethod.java b/plugins/IntentionPowerPak/test/com/siyeh/ipp/junit/replace_assert_equals_with_assert_literal/OutsideTestMethod.java
new file mode 100644
index 000000000000..5af128b5478b
--- /dev/null
+++ b/plugins/IntentionPowerPak/test/com/siyeh/ipp/junit/replace_assert_equals_with_assert_literal/OutsideTestMethod.java
@@ -0,0 +1,8 @@
+import static org.junit.Assert.assertEquals;
+
+class OutsideTestMethod {
+
+  void m() {
+    <caret>assertEquals("asdf", null);
+  }
+}
+\ No newline at end of file
diff --git a/plugins/IntentionPowerPak/test/com/siyeh/ipp/junit/replace_assert_equals_with_assert_literal/OutsideTestMethod_after.java b/plugins/IntentionPowerPak/test/com/siyeh/ipp/junit/replace_assert_equals_with_assert_literal/OutsideTestMethod_after.java
new file mode 100644
index 000000000000..e3291d9d271f
--- /dev/null
+++ b/plugins/IntentionPowerPak/test/com/siyeh/ipp/junit/replace_assert_equals_with_assert_literal/OutsideTestMethod_after.java
@@ -0,0 +1,9 @@
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+class OutsideTestMethod {
+
+  void m() {
+      assertNull("asdf");
+  }
+}
+\ No newline at end of file
diff --git a/plugins/IntentionPowerPak/test/com/siyeh/ipp/junit/replace_assert_literal_with_assert_equals/OutsideTestMethod.java b/plugins/IntentionPowerPak/test/com/siyeh/ipp/junit/replace_assert_literal_with_assert_equals/OutsideTestMethod.java
new file mode 100644
index 000000000000..34c98500412e
--- /dev/null
+++ b/plugins/IntentionPowerPak/test/com/siyeh/ipp/junit/replace_assert_literal_with_assert_equals/OutsideTestMethod.java
@@ -0,0 +1,8 @@
+import static org.junit.Assert.assertNull;
+
+class OutsideTestMethod {
+
+  void m() {
+    <caret>assertNull("asdf");
+  }
+}
+\ No newline at end of file
diff --git a/plugins/IntentionPowerPak/test/com/siyeh/ipp/junit/replace_assert_literal_with_assert_equals/OutsideTestMethod_after.java b/plugins/IntentionPowerPak/test/com/siyeh/ipp/junit/replace_assert_literal_with_assert_equals/OutsideTestMethod_after.java
new file mode 100644
index 000000000000..0d6315f93c7b
--- /dev/null
+++ b/plugins/IntentionPowerPak/test/com/siyeh/ipp/junit/replace_assert_literal_with_assert_equals/OutsideTestMethod_after.java
@@ -0,0 +1,9 @@
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+class OutsideTestMethod {
+
+  void m() {
+      assertEquals(null, "asdf");
+  }
+}
+\ No newline at end of file
diff --git a/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/methodRefs2lambda/Ambiguity_after.java b/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/methodRefs2lambda/Ambiguity_after.java
index b0e14f13dad8..2d27aef15301 100644
--- a/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/methodRefs2lambda/Ambiguity_after.java
+++ b/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/methodRefs2lambda/Ambiguity_after.java
@@ -14,6 +14,6 @@ public class MyTest {
     static void call(int i, I2 s) {}
 
     public static void main(String[] args) {
-        call(1, (x) -> MyTest.m(x));
+        call(1, (i) -> MyTest.m(i));
     }
 }
diff --git a/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/methodRefs2lambda/ArrayMethodRef_after.java b/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/methodRefs2lambda/ArrayMethodRef_after.java
index 65a55a55e8aa..94c8d2f42151 100644
--- a/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/methodRefs2lambda/ArrayMethodRef_after.java
+++ b/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/methodRefs2lambda/ArrayMethodRef_after.java
@@ -1,6 +1,6 @@
 public class Foo {
     static void foo() {
-        Cln j = (p) -> p.clone();
+        Cln j = (ints) -> ints.clone();
     }
 
     interface Cln {
diff --git a/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/methodRefs2lambda/NewRefsInference1_after.java b/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/methodRefs2lambda/NewRefsInference1_after.java
index b61947e47488..bd874395a9f5 100644
--- a/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/methodRefs2lambda/NewRefsInference1_after.java
+++ b/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/methodRefs2lambda/NewRefsInference1_after.java
@@ -10,8 +10,8 @@ public class MyTest {
     static void m(I s) {}
 
     static {
-        m((s) -> {
-            new Foo<Integer>(s);
+        m((x) -> {
+            new Foo<Integer>(x);
         });
     }
 }
diff --git a/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/methodRefs2lambda/NewRefsInference_after.java b/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/methodRefs2lambda/NewRefsInference_after.java
index 22e5bef35348..cd937894625e 100644
--- a/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/methodRefs2lambda/NewRefsInference_after.java
+++ b/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/methodRefs2lambda/NewRefsInference_after.java
@@ -11,6 +11,6 @@ public class MyTest<X> {
     }
 
     static {
-        I<String> s = (z) -> new MyTest<String>(z);
+        I<String> s = (x) -> new MyTest<String>(x);
     }
 }
 \ No newline at end of file
diff --git a/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/methodRefs2lambda/NewRefsInnerClass_after.java b/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/methodRefs2lambda/NewRefsInnerClass_after.java
index 600af263857a..0d1106d8e4b6 100644
--- a/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/methodRefs2lambda/NewRefsInnerClass_after.java
+++ b/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/methodRefs2lambda/NewRefsInnerClass_after.java
@@ -8,6 +8,6 @@ class MyTest {
     }
 
     static {
-        I i1 = (receiver) -> new Inner(receiver);
+        I i1 = (mt) -> new Inner(mt);
     }
 }
diff --git a/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/methodRefs2lambda/NewRefsStaticInnerClass_after.java b/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/methodRefs2lambda/NewRefsStaticInnerClass_after.java
index fdce48211ed4..c26cd8a6d244 100644
--- a/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/methodRefs2lambda/NewRefsStaticInnerClass_after.java
+++ b/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/methodRefs2lambda/NewRefsStaticInnerClass_after.java
@@ -10,6 +10,6 @@ class MyTest {
     
 
   static {
-      I i1 = (receiver) -> new Inner(receiver);
+      I i1 = (outer) -> new Inner(outer);
   }
 }
diff --git a/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/methodRefs2lambda/Receiver_after.java b/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/methodRefs2lambda/Receiver_after.java
index 9f5bcafa929d..5b3eaf82c2b9 100644
--- a/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/methodRefs2lambda/Receiver_after.java
+++ b/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/methodRefs2lambda/Receiver_after.java
@@ -11,6 +11,6 @@ public class MyTest {
     }
 
     static {
-        I i = (I) (receiver) -> receiver.m();
+        I i = (I) (myTest) -> myTest.m();
     }
 }
diff --git a/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/methodRefs2lambda/Subst_after.java b/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/methodRefs2lambda/Subst_after.java
index c719ccefa15b..2ff6feee03b9 100644
--- a/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/methodRefs2lambda/Subst_after.java
+++ b/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/methodRefs2lambda/Subst_after.java
@@ -5,5 +5,5 @@ class Bar {
 }
 
 class Test {
-    Comparator<Bar> comparator = (o1, o2) -> o1.xxx(o2);
+    Comparator<Bar> comparator = (bar, p) -> bar.xxx(p);
 }
 \ No newline at end of file