diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/style/unclear_binary_expression/UnclearBinaryExpression.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/style/unclear_binary_expression/UnclearBinaryExpression.java index 9defc07cb34c..745f5d8d415b 100644 --- a/plugins/InspectionGadgets/test/com/siyeh/igtest/style/unclear_binary_expression/UnclearBinaryExpression.java +++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/style/unclear_binary_expression/UnclearBinaryExpression.java @@ -21,17 +21,17 @@ import java.util.List; public class UnclearBinaryExpression { void foo() { - boolean b2 = "asdf" + "asdf" instanceof String; - int i = true ? 1 + 2 * 7 : 2; + boolean b2 = "asdf" + "asdf" instanceof String; + int i = true ? 1 + 2 * 7 : 2; boolean j = true ? false : true; - System.out.println(3 + 1 + 2 * 9 * 8 + 1); + System.out.println(3 + 1 + 2 * 9 * 8 + 1); } boolean bar(String name, Condition condition, Operation operation) { List values = new ArrayList(); - return name.equals(condition.name) + return name.equals(condition.name) && values.contains(condition.value) == (operation == Operation.equals) - && name instanceof String; + && name instanceof String; } class Condition { @@ -43,12 +43,12 @@ public class UnclearBinaryExpression { } void more(Object o) { - String s = true? false ? "one" : "two" : "three"; - boolean b = true ? o instanceof String : false; + String s = true? false ? "one" : "two" : "three"; + boolean b = true ? o instanceof String : false; } void more(int i) { - i = i += i = 1; + i = i += i = 1; } void noMore() { @@ -57,6 +57,6 @@ public class UnclearBinaryExpression { } int incomplete(String s) { - return s == null ? + return s == null ? } } diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/style/unclear_binary_expression/expected.xml b/plugins/InspectionGadgets/test/com/siyeh/igtest/style/unclear_binary_expression/expected.xml deleted file mode 100644 index 15c69d34a11b..000000000000 --- a/plugins/InspectionGadgets/test/com/siyeh/igtest/style/unclear_binary_expression/expected.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - UnclearBinaryExpression.java - 24 - Unclear binary expression - Expression could use clarifying parentheses #loc - - - - UnclearBinaryExpression.java - 25 - Unclear binary expression - Expression could use clarifying parentheses #loc - - - - UnclearBinaryExpression.java - 27 - Unclear binary expression - Expression could use clarifying parentheses #loc - - - - UnclearBinaryExpression.java - 32 - Unclear binary expression - Expression could use clarifying parentheses #loc - - - - UnclearBinaryExpression.java - 46 - Unclear expression - Expression could use clarifying parentheses #loc - - - - UnclearBinaryExpression.java - 47 - Unclear expression - Expression could use clarifying parentheses #loc - - - - UnclearBinaryExpression.java - 51 - Unclear expression - Expression could use clarifying parentheses #loc - - \ No newline at end of file diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/style/UnclearBinaryExpressionInspectionTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/style/UnclearBinaryExpressionInspectionTest.java index fe0f4c7e1c53..1e7b8c81b393 100644 --- a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/style/UnclearBinaryExpressionInspectionTest.java +++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/style/UnclearBinaryExpressionInspectionTest.java @@ -1,11 +1,16 @@ package com.siyeh.ig.style; -import com.siyeh.ig.IGInspectionTestCase; +import com.intellij.codeInspection.InspectionProfileEntry; +import com.siyeh.ig.LightInspectionTestCase; +import org.jetbrains.annotations.Nullable; -public class UnclearBinaryExpressionInspectionTest extends IGInspectionTestCase { +public class UnclearBinaryExpressionInspectionTest extends LightInspectionTestCase { - public void test() throws Exception { - doTest("com/siyeh/igtest/style/unclear_binary_expression", - new UnclearBinaryExpressionInspection()); + public void testUnclearBinaryExpression() { doTest(); } + + @Nullable + @Override + protected InspectionProfileEntry getInspection() { + return new UnclearBinaryExpressionInspection(); } } \ No newline at end of file