From 3445d6ad80329e1503572d95af505d3b098cdc03 Mon Sep 17 00:00:00 2001
From: Bas Leijdekkers <basleijdekkers@gmail.com>
Date: Thu, 22 Oct 2015 11:45:15 +0200
Subject: [PATCH] IG: add test for negated conditional

---
 .../trivialIf/NegatedConditional.after.java   | 20 +++++++++++++++
 .../trivialIf/NegatedConditional.java         | 21 ++++++++++++++++
 .../fixes/controlflow/TrivialIfFixTest.java   | 25 +++++--------------
 3 files changed, 47 insertions(+), 19 deletions(-)
 create mode 100644 plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/trivialIf/NegatedConditional.after.java
 create mode 100644 plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/trivialIf/NegatedConditional.java

diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/trivialIf/NegatedConditional.after.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/trivialIf/NegatedConditional.after.java
new file mode 100644
index 000000000000..d40c4f38b654
--- /dev/null
+++ b/plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/trivialIf/NegatedConditional.after.java
@@ -0,0 +1,20 @@
+class NegatedConditional {
+  String text;
+
+  public boolean equals(Object object) {
+    if (this == object) return true;
+    if (!(object instanceof NegatedConditional)) return false;
+    if (!super.equals(object)) return false;
+
+    final NegatedConditional that = (NegatedConditional)object;
+
+      return text != null ? text.equals(that.text) : that.text == null;
+
+  }
+
+  public int hashCode() {
+    int result = super.hashCode();
+    result = 31 * result + (text != null ? text.hashCode() : 0);
+    return result;
+  }
+}
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/trivialIf/NegatedConditional.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/trivialIf/NegatedConditional.java
new file mode 100644
index 000000000000..13294d834efa
--- /dev/null
+++ b/plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/trivialIf/NegatedConditional.java
@@ -0,0 +1,21 @@
+class NegatedConditional {
+  String text;
+
+  public boolean equals(Object object) {
+    if (this == object) return true;
+    if (!(object instanceof NegatedConditional)) return false;
+    if (!super.equals(object)) return false;
+
+    final NegatedConditional that = (NegatedConditional)object;
+
+    <caret>if (text != null ? !text.equals(that.text) : that.text != null) return false;
+
+    return true;
+  }
+
+  public int hashCode() {
+    int result = super.hashCode();
+    result = 31 * result + (text != null ? text.hashCode() : 0);
+    return result;
+  }
+}
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/controlflow/TrivialIfFixTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/controlflow/TrivialIfFixTest.java
index ee6dc837245e..d3a196936b74 100644
--- a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/controlflow/TrivialIfFixTest.java
+++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/controlflow/TrivialIfFixTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2000-2015 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.
@@ -15,13 +15,10 @@
  */
 package com.siyeh.ig.fixes.controlflow;
 
-import com.intellij.codeInsight.intention.IntentionAction;
 import com.siyeh.InspectionGadgetsBundle;
 import com.siyeh.ig.IGQuickFixesTestCase;
 import com.siyeh.ig.controlflow.TrivialIfInspection;
 
-import java.util.List;
-
 public class TrivialIfFixTest extends IGQuickFixesTestCase {
 
   @Override
@@ -29,28 +26,18 @@ public class TrivialIfFixTest extends IGQuickFixesTestCase {
     super.setUp();
     myFixture.enableInspections(new TrivialIfInspection());
     myRelativePath = "controlflow/trivialIf";
+    myDefaultHint = InspectionGadgetsBundle.message("constant.conditional.expression.simplify.quickfix");
   }
 
   public void testComments() {
-    doTestByName(getTestName(false));
+    doTest();
   }
 
   public void testCommentsInAssignment() {
-    doTestByName(getTestName(false));
+    doTest();
   }
 
-  public void doTestByName(String testName) {
-    myFixture.configureByFile(getRelativePath() + "/" + testName + ".java");
-    final String message = InspectionGadgetsBundle.message("constant.conditional.expression.simplify.quickfix");
-    final List<IntentionAction> actions =
-      myFixture.filterAvailableIntentions(message);
-    assertFalse("No actions available", actions.isEmpty());
-    for (IntentionAction action : actions) {
-      if (action.getText().equals(message)) {
-        myFixture.launchAction(action);
-        myFixture.checkResultByFile(getRelativePath() + "/" + testName + ".after.java");
-        break;
-      }
-    }
+  public void testNegatedConditional() {
+    doTest();
   }
 }
\ No newline at end of file