diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/controlflow/conditional_expression_with_identical_branches/ConditionalExpressionWithIdenticalBranches.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/controlflow/conditional_expression_with_identical_branches/ConditionalExpressionWithIdenticalBranches.java
index 6c076bfebbe7..2b13f8d5ca13 100644
--- a/plugins/InspectionGadgets/test/com/siyeh/igtest/controlflow/conditional_expression_with_identical_branches/ConditionalExpressionWithIdenticalBranches.java
+++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/controlflow/conditional_expression_with_identical_branches/ConditionalExpressionWithIdenticalBranches.java
@@ -5,7 +5,7 @@ import java.util.Random;
class ConditionalExpressionWithIdenticalBranches {
int one(boolean b) {
- return b ? 1 + 2 + 3 : 1 + 2 + 3;
+ return b ? 1 + 2 + 3 : 1 + 2 + 3;
}
int two(boolean b) {
@@ -13,35 +13,35 @@ class ConditionalExpressionWithIdenticalBranches {
}
Class three(boolean b) {
- return b ? java.lang.String.class : String.class;
+ return b ? java.lang.String.class : String.class;
}
int incomplete(boolean b) {
- return b?
+ return b?
}
void fuzzy() {
- String someString = new Random().nextBoolean() ? "2" + "q" + "1" : "2" + "qwe" + "1";
+ String someString = new Random().nextBoolean() ? "2" + "q" + "1" : "2" + "qwe" + "1";
}
void fuzzy2() {
- Object someString = new Random().nextBoolean() ? (Object) "1" : (Object) "2";
+ Object someString = new Random().nextBoolean() ? (Object) "1" : (Object) "2";
}
void fuzzy3() {
- Object someString = new Random().nextBoolean() ? "21" + (Object) "1" : "21" + (Object) "2";
+ Object someString = new Random().nextBoolean() ? "21" + (Object) "1" : "21" + (Object) "2";
}
void fuzzy4(int[] ints) {
- int i = new Random().nextBoolean() ? ints[3] : ints[4];
+ int i = new Random().nextBoolean() ? ints[3] : ints[4];
}
void fuzzy5(String[] strings) {
- String s = new Random().nextBoolean()? "asd" + strings[2] : "qwe" + strings[2];
+ String s = new Random().nextBoolean()? "asd" + strings[2] : "qwe" + strings[2];
}
void fuzzy6() {
- int j = new Random().nextBoolean() ? 6 + someMethod("123", "") : 6 + someMethod("321", "");
+ int j = new Random().nextBoolean() ? 6 + someMethod("123", "") : 6 + someMethod("321", "");
}
int someMethod(String s, String s2) {
@@ -59,7 +59,7 @@ class ConditionalExpressionWithIdenticalBranches {
int i = 1;
Item item = (i == 1 ? new Item("1") : new Item(i)); // warning here
- Item item1 = (i == 1 ? new Item("1") : new Item("2")); // warning here
+ Item item1 = (i == 1 ? new Item("1") : new Item("2")); // warning here
}
}
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/controlflow/conditional_expression_with_identical_branches/expected.xml b/plugins/InspectionGadgets/test/com/siyeh/igtest/controlflow/conditional_expression_with_identical_branches/expected.xml
deleted file mode 100644
index 6b270c082c80..000000000000
--- a/plugins/InspectionGadgets/test/com/siyeh/igtest/controlflow/conditional_expression_with_identical_branches/expected.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-
- ConditionalExpressionWithIdenticalBranches.java
- 8
- Conditional expression with identical or similar branches
- Conditional expression <code>b ? 1 + 2 + 3 : 1 + 2 + 3</code> with identical or similar branches #loc
-
-
-
- ConditionalExpressionWithIdenticalBranches.java
- 16
- Conditional expression with identical or similar branches
- Conditional expression <code>b ? java.lang.String.class : String.class</code> with identical or similar branches #loc
-
-
-
- ConditionalExpressionWithIdenticalBranches.java
- 28
- Conditional expression with identical or similar branches
- Conditional expression <code>new Random().nextBoolean() ? (Object) "1" : (Object) "2"</code> with identical or similar branches #loc
-
-
-
- ConditionalExpressionWithIdenticalBranches.java
- 32
- Conditional expression with identical or similar branches
- Conditional expression <code>new Random().nextBoolean() ? "21" + (Object) "1" : "21" + (Object) "2"</code> with identical or similar branches #loc
-
-
-
- ConditionalExpressionWithIdenticalBranches.java
- 36
- Conditional expression with identical or similar branches
- Conditional expression <code>new Random().nextBoolean() ? ints[3] : ints[4]</code> with identical or similar branches #loc
-
-
-
- ConditionalExpressionWithIdenticalBranches.java
- 40
- Conditional expression with identical or similar branches
- Conditional expression <code>new Random().nextBoolean()? "asd" + strings[2] : "qwe" + strings[2]</code> with identical or similar branches #loc
-
-
-
- ConditionalExpressionWithIdenticalBranches.java
- 44
- Conditional expression with identical or similar branches
- Conditional expression <code>new Random().nextBoolean() ? 6 + someMethod("123", "") : 6 + someMethod("321", "")</code> with identical or similar branches #loc
-
-
-
- ConditionalExpressionWithIdenticalBranches.java
- 24
- Conditional expression with identical or similar branches
- Conditional expression <code>new Random().nextBoolean() ? "2" + "q" + "1" : "2" + "qwe" + "1"</code> with identical or similar branches #loc
-
-
-
- ConditionalExpressionWithIdenticalBranches.java
- 62
- Conditional expression with identical or similar branches
- Conditional expression <code>i == 1 ? new Item("1") : new Item("2")</code> with identical or similar branches #loc
-
-
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/controlflow/ConditionalExpressionWithIdenticalBranchesInspectionTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/controlflow/ConditionalExpressionWithIdenticalBranchesInspectionTest.java
index 738289c40d7a..a5de9aaabbe7 100644
--- a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/controlflow/ConditionalExpressionWithIdenticalBranchesInspectionTest.java
+++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/controlflow/ConditionalExpressionWithIdenticalBranchesInspectionTest.java
@@ -1,11 +1,33 @@
+/*
+ * Copyright 2000-2016 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
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 ConditionalExpressionWithIdenticalBranchesInspectionTest extends IGInspectionTestCase {
+public class ConditionalExpressionWithIdenticalBranchesInspectionTest extends LightInspectionTestCase {
- public void test() throws Exception {
- doTest("com/siyeh/igtest/controlflow/conditional_expression_with_identical_branches",
- new ConditionalExpressionWithIdenticalBranchesInspection());
+ public void testConditionalExpressionWithIdenticalBranches() {
+ doTest();
+ }
+
+ @Nullable
+ @Override
+ protected InspectionProfileEntry getInspection() {
+ return new ConditionalExpressionWithIdenticalBranchesInspection();
}
}