diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DataFlowInspectionBase.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DataFlowInspectionBase.java index cdf5517de5f3..6b8560f9ceaa 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DataFlowInspectionBase.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DataFlowInspectionBase.java @@ -13,6 +13,7 @@ import com.intellij.codeInspection.dataFlow.fix.*; import com.intellij.codeInspection.dataFlow.instructions.*; import com.intellij.codeInspection.dataFlow.value.DfaConstValue; import com.intellij.codeInspection.nullable.NullableStuffInspectionBase; +import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Pair; @@ -195,7 +196,8 @@ public class DataFlowInspectionBase extends AbstractBaseJavaLocalInspectionTool final DataFlowInstructionVisitor visitor = new DataFlowInstructionVisitor(); final RunnerResult rc = dfaRunner.analyzeMethod(scope, visitor, IGNORE_ASSERT_STATEMENTS, initialStates); if (rc == RunnerResult.OK) { - if (dfaRunner.wasForciblyMerged() && Registry.is("ide.dfa.report.imprecise")) { + if (dfaRunner.wasForciblyMerged() && + (ApplicationManager.getApplication().isUnitTestMode() || Registry.is("ide.dfa.report.imprecise"))) { reportAnalysisQualityProblem(holder, scope, "dataflow.not.precise"); } createDescription(dfaRunner, holder, visitor, scope); diff --git a/java/java-tests/testData/inspection/dataFlow/fixture/ComplexInitializer.java b/java/java-tests/testData/inspection/dataFlow/fixture/ComplexInitializer.java index c1857d1f5da1..4ad7c38c282e 100644 --- a/java/java-tests/testData/inspection/dataFlow/fixture/ComplexInitializer.java +++ b/java/java-tests/testData/inspection/dataFlow/fixture/ComplexInitializer.java @@ -63,7 +63,7 @@ class Constants { static native Object get(); } -class NotTooComplexInitializer { +class NotTooComplexInitializer { static { int i = 1; for(Object obj = Constants.get(); obj != Constants.C5; obj = Constants.get()) { @@ -84,7 +84,7 @@ class NotTooComplexInitializer { } } } -class NotTooComplexMergingInitializer { +class NotTooComplexMergingInitializer { static { foo(Constants.C1 == null, Constants.C2 == null, Constants.C3 == null, Constants.C4 == null, Constants.C5 == null, Constants.C6 == null, diff --git a/java/java-tests/testData/inspection/dataFlow/fixture/EqualsInLoopNotTooComplex.java b/java/java-tests/testData/inspection/dataFlow/fixture/EqualsInLoopNotTooComplex.java index 6ed439c2022b..7f3c1421df40 100644 --- a/java/java-tests/testData/inspection/dataFlow/fixture/EqualsInLoopNotTooComplex.java +++ b/java/java-tests/testData/inspection/dataFlow/fixture/EqualsInLoopNotTooComplex.java @@ -4,7 +4,7 @@ class Test { enum A {X, Y, Z}; List list1, list2; - void test(List tokens) { + void test(List tokens) { String t = "int"; A s = A.X; A l = A.X; diff --git a/java/java-tests/testData/inspection/dataFlow/fixture/ManyObjectEquals.java b/java/java-tests/testData/inspection/dataFlow/fixture/ManyObjectEquals.java index f55d980c445e..e43e3d23c7f7 100644 --- a/java/java-tests/testData/inspection/dataFlow/fixture/ManyObjectEquals.java +++ b/java/java-tests/testData/inspection/dataFlow/fixture/ManyObjectEquals.java @@ -191,7 +191,7 @@ public class ManyObjectEquals { private String test183; @Override - public boolean equals(Object o) { + public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; ManyObjectEquals test = (ManyObjectEquals) o; diff --git a/java/java-tests/testData/inspection/dataFlow/fixture/NestedScopeComplexity.java b/java/java-tests/testData/inspection/dataFlow/fixture/NestedScopeComplexity.java index 4bef90d1228d..f56cf68892a9 100644 --- a/java/java-tests/testData/inspection/dataFlow/fixture/NestedScopeComplexity.java +++ b/java/java-tests/testData/inspection/dataFlow/fixture/NestedScopeComplexity.java @@ -30,7 +30,7 @@ class NestedScopeComplexity { static Object get() {return new Object();} - void test() { + void test() { int i = 1; for(Object obj = get(); obj != C100; obj = get()) { if (obj == C1) i = 2;