From 3620f2a817640a502ce7db0d1962b986c3d26c9a Mon Sep 17 00:00:00 2001 From: Bas Leijdekkers Date: Tue, 19 May 2015 22:38:37 +0200 Subject: [PATCH] make IG test light --- .../siyeh/igtest/bugs/DuplicateCondition.java | 27 -------------- .../DuplicateCondition.java | 30 +++++++++++++-- .../duplicate_condition/expected.xml | 37 ------------------- .../DuplicateConditionInspectionTest.java | 16 ++++++-- 4 files changed, 39 insertions(+), 71 deletions(-) delete mode 100644 plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/DuplicateCondition.java delete mode 100644 plugins/InspectionGadgets/test/com/siyeh/igtest/controlflow/duplicate_condition/expected.xml diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/DuplicateCondition.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/DuplicateCondition.java deleted file mode 100644 index aad58b54108e..000000000000 --- a/plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/DuplicateCondition.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.siyeh.igtest.bugs; - -public class DuplicateCondition { - public void foo() - { - if(bar()||bar()) - { - System.out.println("1"); - }else if(bar()|| true) - { - System.out.println("2"); - } - } - - public boolean bar() - { - return true; - } - - void incompleteCode(String s) { - if (s.contains(A)) { - - } else if (s.contains(B)) { - - } - } -} diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/controlflow/duplicate_condition/DuplicateCondition.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/controlflow/duplicate_condition/DuplicateCondition.java index ef047398e14f..148dc19c35fc 100644 --- a/plugins/InspectionGadgets/test/com/siyeh/igtest/controlflow/duplicate_condition/DuplicateCondition.java +++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/controlflow/duplicate_condition/DuplicateCondition.java @@ -3,10 +3,34 @@ package com.siyeh.igtest.controlflow.duplicate_condition; public class DuplicateCondition { void x(boolean b) { - if (b || b || b ) { + if (b || b || b ) { - } else if (b) { + } else if (b) { - } else if (b) {} + } else if (b) {} + } + + public void foo() + { + if(bar()||bar()) + { + System.out.println("1"); + }else if(bar()|| true) + { + System.out.println("2"); + } + } + + public boolean bar() + { + return true; + } + + void incompleteCode(String s) { + if (s.contains(A)) { + + } else if (s.contains(B)) { + + } } } \ No newline at end of file diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/controlflow/duplicate_condition/expected.xml b/plugins/InspectionGadgets/test/com/siyeh/igtest/controlflow/duplicate_condition/expected.xml deleted file mode 100644 index 47f1e352b5e6..000000000000 --- a/plugins/InspectionGadgets/test/com/siyeh/igtest/controlflow/duplicate_condition/expected.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - DuplicateCondition.java - 6 - Duplicate condition in 'if' statement - Duplicate condition <code>b</code> #loc - - - - DuplicateCondition.java - 6 - Duplicate condition in 'if' statement - Duplicate condition <code>b</code> #loc - - - - DuplicateCondition.java - 8 - Duplicate condition in 'if' statement - Duplicate condition <code>b</code> #loc - - - - DuplicateCondition.java - 6 - Duplicate condition in 'if' statement - Duplicate condition <code>b</code> #loc - - - - DuplicateCondition.java - 10 - Duplicate condition in 'if' statement - Duplicate condition <code>b</code> #loc - - \ No newline at end of file diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/controlflow/DuplicateConditionInspectionTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/controlflow/DuplicateConditionInspectionTest.java index aaa379cf6ad1..60cd9abe92ce 100644 --- a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/controlflow/DuplicateConditionInspectionTest.java +++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/controlflow/DuplicateConditionInspectionTest.java @@ -1,10 +1,18 @@ package com.siyeh.ig.controlflow; -import com.siyeh.ig.IGInspectionTestCase; +import com.intellij.codeInspection.InspectionProfileEntry; +import com.siyeh.ig.LightInspectionTestCase; +import org.jetbrains.annotations.Nullable; -public class DuplicateConditionInspectionTest extends IGInspectionTestCase { +public class DuplicateConditionInspectionTest extends LightInspectionTestCase { - public void test() throws Exception { - doTest("com/siyeh/igtest/controlflow/duplicate_condition", new DuplicateConditionInspection()); + public void testDuplicateCondition() { + doTest(); + } + + @Nullable + @Override + protected InspectionProfileEntry getInspection() { + return new DuplicateConditionInspection(); } } \ No newline at end of file