diff --git a/testData/inspection/dataFlow/AlexBug/expected.xml b/java/java-tests/testData/inspection/dataFlow/AlexBug/expected.xml similarity index 100% rename from testData/inspection/dataFlow/AlexBug/expected.xml rename to java/java-tests/testData/inspection/dataFlow/AlexBug/expected.xml diff --git a/testData/inspection/dataFlow/AlexBug/src/Test.java b/java/java-tests/testData/inspection/dataFlow/AlexBug/src/Test.java similarity index 100% rename from testData/inspection/dataFlow/AlexBug/src/Test.java rename to java/java-tests/testData/inspection/dataFlow/AlexBug/src/Test.java diff --git a/testData/inspection/dataFlow/ArrayAccessDoesntCancelAnalysis/expected.xml b/java/java-tests/testData/inspection/dataFlow/ArrayAccessDoesntCancelAnalysis/expected.xml similarity index 100% rename from testData/inspection/dataFlow/ArrayAccessDoesntCancelAnalysis/expected.xml rename to java/java-tests/testData/inspection/dataFlow/ArrayAccessDoesntCancelAnalysis/expected.xml diff --git a/testData/inspection/dataFlow/ArrayAccessDoesntCancelAnalysis/src/Test.java b/java/java-tests/testData/inspection/dataFlow/ArrayAccessDoesntCancelAnalysis/src/Test.java similarity index 100% rename from testData/inspection/dataFlow/ArrayAccessDoesntCancelAnalysis/src/Test.java rename to java/java-tests/testData/inspection/dataFlow/ArrayAccessDoesntCancelAnalysis/src/Test.java diff --git a/testData/inspection/dataFlow/ArrayAccessNPE/expected.xml b/java/java-tests/testData/inspection/dataFlow/ArrayAccessNPE/expected.xml similarity index 100% rename from testData/inspection/dataFlow/ArrayAccessNPE/expected.xml rename to java/java-tests/testData/inspection/dataFlow/ArrayAccessNPE/expected.xml diff --git a/testData/inspection/dataFlow/ArrayAccessNPE/src/Test.java b/java/java-tests/testData/inspection/dataFlow/ArrayAccessNPE/src/Test.java similarity index 100% rename from testData/inspection/dataFlow/ArrayAccessNPE/src/Test.java rename to java/java-tests/testData/inspection/dataFlow/ArrayAccessNPE/src/Test.java diff --git a/testData/inspection/dataFlow/BoxingNaN/expected.xml b/java/java-tests/testData/inspection/dataFlow/BoxingNaN/expected.xml similarity index 100% rename from testData/inspection/dataFlow/BoxingNaN/expected.xml rename to java/java-tests/testData/inspection/dataFlow/BoxingNaN/expected.xml diff --git a/testData/inspection/dataFlow/BoxingNaN/src/Test.java b/java/java-tests/testData/inspection/dataFlow/BoxingNaN/src/Test.java similarity index 100% rename from testData/inspection/dataFlow/BoxingNaN/src/Test.java rename to java/java-tests/testData/inspection/dataFlow/BoxingNaN/src/Test.java diff --git a/testData/inspection/dataFlow/CatchParameterCantBeNull/expected.xml b/java/java-tests/testData/inspection/dataFlow/CatchParameterCantBeNull/expected.xml similarity index 100% rename from testData/inspection/dataFlow/CatchParameterCantBeNull/expected.xml rename to java/java-tests/testData/inspection/dataFlow/CatchParameterCantBeNull/expected.xml diff --git a/testData/inspection/dataFlow/CatchParameterCantBeNull/src/Test.java b/java/java-tests/testData/inspection/dataFlow/CatchParameterCantBeNull/src/Test.java similarity index 100% rename from testData/inspection/dataFlow/CatchParameterCantBeNull/src/Test.java rename to java/java-tests/testData/inspection/dataFlow/CatchParameterCantBeNull/src/Test.java diff --git a/testData/inspection/dataFlow/CheckedExceptionDominance/expected.xml b/java/java-tests/testData/inspection/dataFlow/CheckedExceptionDominance/expected.xml similarity index 100% rename from testData/inspection/dataFlow/CheckedExceptionDominance/expected.xml rename to java/java-tests/testData/inspection/dataFlow/CheckedExceptionDominance/expected.xml diff --git a/testData/inspection/dataFlow/CheckedExceptionDominance/src/Test.java b/java/java-tests/testData/inspection/dataFlow/CheckedExceptionDominance/src/Test.java similarity index 100% rename from testData/inspection/dataFlow/CheckedExceptionDominance/src/Test.java rename to java/java-tests/testData/inspection/dataFlow/CheckedExceptionDominance/src/Test.java diff --git a/testData/inspection/dataFlow/ConditionFalseAndNPE/expected.xml b/java/java-tests/testData/inspection/dataFlow/ConditionFalseAndNPE/expected.xml similarity index 100% rename from testData/inspection/dataFlow/ConditionFalseAndNPE/expected.xml rename to java/java-tests/testData/inspection/dataFlow/ConditionFalseAndNPE/expected.xml diff --git a/testData/inspection/dataFlow/ConditionFalseAndNPE/src/Test.java b/java/java-tests/testData/inspection/dataFlow/ConditionFalseAndNPE/src/Test.java similarity index 100% rename from testData/inspection/dataFlow/ConditionFalseAndNPE/src/Test.java rename to java/java-tests/testData/inspection/dataFlow/ConditionFalseAndNPE/src/Test.java diff --git a/testData/inspection/dataFlow/ConstantsDifferentTypes/expected.xml b/java/java-tests/testData/inspection/dataFlow/ConstantsDifferentTypes/expected.xml similarity index 100% rename from testData/inspection/dataFlow/ConstantsDifferentTypes/expected.xml rename to java/java-tests/testData/inspection/dataFlow/ConstantsDifferentTypes/expected.xml diff --git a/testData/inspection/dataFlow/ConstantsDifferentTypes/src/Test.java b/java/java-tests/testData/inspection/dataFlow/ConstantsDifferentTypes/src/Test.java similarity index 100% rename from testData/inspection/dataFlow/ConstantsDifferentTypes/src/Test.java rename to java/java-tests/testData/inspection/dataFlow/ConstantsDifferentTypes/src/Test.java diff --git a/testData/inspection/dataFlow/FieldsFlashing/expected.xml b/java/java-tests/testData/inspection/dataFlow/FieldsFlashing/expected.xml similarity index 100% rename from testData/inspection/dataFlow/FieldsFlashing/expected.xml rename to java/java-tests/testData/inspection/dataFlow/FieldsFlashing/expected.xml diff --git a/testData/inspection/dataFlow/FieldsFlashing/src/Test.java b/java/java-tests/testData/inspection/dataFlow/FieldsFlashing/src/Test.java similarity index 100% rename from testData/inspection/dataFlow/FieldsFlashing/src/Test.java rename to java/java-tests/testData/inspection/dataFlow/FieldsFlashing/src/Test.java diff --git a/testData/inspection/dataFlow/ForEachNPE/expected.xml b/java/java-tests/testData/inspection/dataFlow/ForEachNPE/expected.xml similarity index 100% rename from testData/inspection/dataFlow/ForEachNPE/expected.xml rename to java/java-tests/testData/inspection/dataFlow/ForEachNPE/expected.xml diff --git a/testData/inspection/dataFlow/ForEachNPE/src/Test.java b/java/java-tests/testData/inspection/dataFlow/ForEachNPE/src/Test.java similarity index 100% rename from testData/inspection/dataFlow/ForEachNPE/src/Test.java rename to java/java-tests/testData/inspection/dataFlow/ForEachNPE/src/Test.java diff --git a/testData/inspection/dataFlow/ForeachFlow/expected.xml b/java/java-tests/testData/inspection/dataFlow/ForeachFlow/expected.xml similarity index 100% rename from testData/inspection/dataFlow/ForeachFlow/expected.xml rename to java/java-tests/testData/inspection/dataFlow/ForeachFlow/expected.xml diff --git a/testData/inspection/dataFlow/ForeachFlow/src/Npe.java b/java/java-tests/testData/inspection/dataFlow/ForeachFlow/src/Npe.java similarity index 100% rename from testData/inspection/dataFlow/ForeachFlow/src/Npe.java rename to java/java-tests/testData/inspection/dataFlow/ForeachFlow/src/Npe.java diff --git a/testData/inspection/dataFlow/GenericInstanceof/expected.xml b/java/java-tests/testData/inspection/dataFlow/GenericInstanceof/expected.xml similarity index 100% rename from testData/inspection/dataFlow/GenericInstanceof/expected.xml rename to java/java-tests/testData/inspection/dataFlow/GenericInstanceof/expected.xml diff --git a/testData/inspection/dataFlow/GenericInstanceof/src/GenericInstanceof.java b/java/java-tests/testData/inspection/dataFlow/GenericInstanceof/src/GenericInstanceof.java similarity index 100% rename from testData/inspection/dataFlow/GenericInstanceof/src/GenericInstanceof.java rename to java/java-tests/testData/inspection/dataFlow/GenericInstanceof/src/GenericInstanceof.java diff --git a/testData/inspection/dataFlow/IDEA1840/expected.xml b/java/java-tests/testData/inspection/dataFlow/IDEA1840/expected.xml similarity index 100% rename from testData/inspection/dataFlow/IDEA1840/expected.xml rename to java/java-tests/testData/inspection/dataFlow/IDEA1840/expected.xml diff --git a/testData/inspection/dataFlow/IDEA1840/src/WrongParameter.java b/java/java-tests/testData/inspection/dataFlow/IDEA1840/src/WrongParameter.java similarity index 100% rename from testData/inspection/dataFlow/IDEA1840/src/WrongParameter.java rename to java/java-tests/testData/inspection/dataFlow/IDEA1840/src/WrongParameter.java diff --git a/testData/inspection/dataFlow/IDEADEV10489/expected.xml b/java/java-tests/testData/inspection/dataFlow/IDEADEV10489/expected.xml similarity index 100% rename from testData/inspection/dataFlow/IDEADEV10489/expected.xml rename to java/java-tests/testData/inspection/dataFlow/IDEADEV10489/expected.xml diff --git a/testData/inspection/dataFlow/IDEADEV10489/src/IDEADEV10489.java b/java/java-tests/testData/inspection/dataFlow/IDEADEV10489/src/IDEADEV10489.java similarity index 100% rename from testData/inspection/dataFlow/IDEADEV10489/src/IDEADEV10489.java rename to java/java-tests/testData/inspection/dataFlow/IDEADEV10489/src/IDEADEV10489.java diff --git a/testData/inspection/dataFlow/IDEADEV11033/expected.xml b/java/java-tests/testData/inspection/dataFlow/IDEADEV11033/expected.xml similarity index 100% rename from testData/inspection/dataFlow/IDEADEV11033/expected.xml rename to java/java-tests/testData/inspection/dataFlow/IDEADEV11033/expected.xml diff --git a/testData/inspection/dataFlow/IDEADEV11033/src/RightAssociativeAssignment.java b/java/java-tests/testData/inspection/dataFlow/IDEADEV11033/src/RightAssociativeAssignment.java similarity index 100% rename from testData/inspection/dataFlow/IDEADEV11033/src/RightAssociativeAssignment.java rename to java/java-tests/testData/inspection/dataFlow/IDEADEV11033/src/RightAssociativeAssignment.java diff --git a/testData/inspection/dataFlow/IDEADEV13153/expected.xml b/java/java-tests/testData/inspection/dataFlow/IDEADEV13153/expected.xml similarity index 100% rename from testData/inspection/dataFlow/IDEADEV13153/expected.xml rename to java/java-tests/testData/inspection/dataFlow/IDEADEV13153/expected.xml diff --git a/testData/inspection/dataFlow/IDEADEV13153/src/Npe.java b/java/java-tests/testData/inspection/dataFlow/IDEADEV13153/src/Npe.java similarity index 100% rename from testData/inspection/dataFlow/IDEADEV13153/src/Npe.java rename to java/java-tests/testData/inspection/dataFlow/IDEADEV13153/src/Npe.java diff --git a/testData/inspection/dataFlow/IDEADEV13156/expected.xml b/java/java-tests/testData/inspection/dataFlow/IDEADEV13156/expected.xml similarity index 100% rename from testData/inspection/dataFlow/IDEADEV13156/expected.xml rename to java/java-tests/testData/inspection/dataFlow/IDEADEV13156/expected.xml diff --git a/testData/inspection/dataFlow/IDEADEV13156/src/Npe.java b/java/java-tests/testData/inspection/dataFlow/IDEADEV13156/src/Npe.java similarity index 100% rename from testData/inspection/dataFlow/IDEADEV13156/src/Npe.java rename to java/java-tests/testData/inspection/dataFlow/IDEADEV13156/src/Npe.java diff --git a/testData/inspection/dataFlow/IDEADEV15583/expected.xml b/java/java-tests/testData/inspection/dataFlow/IDEADEV15583/expected.xml similarity index 100% rename from testData/inspection/dataFlow/IDEADEV15583/expected.xml rename to java/java-tests/testData/inspection/dataFlow/IDEADEV15583/expected.xml diff --git a/testData/inspection/dataFlow/IDEADEV15583/src/Npe.java b/java/java-tests/testData/inspection/dataFlow/IDEADEV15583/src/Npe.java similarity index 100% rename from testData/inspection/dataFlow/IDEADEV15583/src/Npe.java rename to java/java-tests/testData/inspection/dataFlow/IDEADEV15583/src/Npe.java diff --git a/testData/inspection/dataFlow/IDEADEV1575/expected.xml b/java/java-tests/testData/inspection/dataFlow/IDEADEV1575/expected.xml similarity index 100% rename from testData/inspection/dataFlow/IDEADEV1575/expected.xml rename to java/java-tests/testData/inspection/dataFlow/IDEADEV1575/expected.xml diff --git a/testData/inspection/dataFlow/IDEADEV1575/src/Test.java b/java/java-tests/testData/inspection/dataFlow/IDEADEV1575/src/Test.java similarity index 100% rename from testData/inspection/dataFlow/IDEADEV1575/src/Test.java rename to java/java-tests/testData/inspection/dataFlow/IDEADEV1575/src/Test.java diff --git a/testData/inspection/dataFlow/IDEADEV2605/expected.xml b/java/java-tests/testData/inspection/dataFlow/IDEADEV2605/expected.xml similarity index 100% rename from testData/inspection/dataFlow/IDEADEV2605/expected.xml rename to java/java-tests/testData/inspection/dataFlow/IDEADEV2605/expected.xml diff --git a/testData/inspection/dataFlow/IDEADEV2605/src/AndAssign.java b/java/java-tests/testData/inspection/dataFlow/IDEADEV2605/src/AndAssign.java similarity index 100% rename from testData/inspection/dataFlow/IDEADEV2605/src/AndAssign.java rename to java/java-tests/testData/inspection/dataFlow/IDEADEV2605/src/AndAssign.java diff --git a/testData/inspection/dataFlow/Instanceof/expected.xml b/java/java-tests/testData/inspection/dataFlow/Instanceof/expected.xml similarity index 100% rename from testData/inspection/dataFlow/Instanceof/expected.xml rename to java/java-tests/testData/inspection/dataFlow/Instanceof/expected.xml diff --git a/testData/inspection/dataFlow/Instanceof/src/Foo.java b/java/java-tests/testData/inspection/dataFlow/Instanceof/src/Foo.java similarity index 100% rename from testData/inspection/dataFlow/Instanceof/src/Foo.java rename to java/java-tests/testData/inspection/dataFlow/Instanceof/src/Foo.java diff --git a/testData/inspection/dataFlow/NotNullArray/expected.xml b/java/java-tests/testData/inspection/dataFlow/NotNullArray/expected.xml similarity index 100% rename from testData/inspection/dataFlow/NotNullArray/expected.xml rename to java/java-tests/testData/inspection/dataFlow/NotNullArray/expected.xml diff --git a/testData/inspection/dataFlow/NotNullArray/src/Test.java b/java/java-tests/testData/inspection/dataFlow/NotNullArray/src/Test.java similarity index 100% rename from testData/inspection/dataFlow/NotNullArray/src/Test.java rename to java/java-tests/testData/inspection/dataFlow/NotNullArray/src/Test.java diff --git a/testData/inspection/dataFlow/NotNullLocalVariable/expected.xml b/java/java-tests/testData/inspection/dataFlow/NotNullLocalVariable/expected.xml similarity index 100% rename from testData/inspection/dataFlow/NotNullLocalVariable/expected.xml rename to java/java-tests/testData/inspection/dataFlow/NotNullLocalVariable/expected.xml diff --git a/testData/inspection/dataFlow/NotNullLocalVariable/src/Npe.java b/java/java-tests/testData/inspection/dataFlow/NotNullLocalVariable/src/Npe.java similarity index 100% rename from testData/inspection/dataFlow/NotNullLocalVariable/src/Npe.java rename to java/java-tests/testData/inspection/dataFlow/NotNullLocalVariable/src/Npe.java diff --git a/testData/inspection/dataFlow/NotNullable/expected.xml b/java/java-tests/testData/inspection/dataFlow/NotNullable/expected.xml similarity index 100% rename from testData/inspection/dataFlow/NotNullable/expected.xml rename to java/java-tests/testData/inspection/dataFlow/NotNullable/expected.xml diff --git a/testData/inspection/dataFlow/NotNullable/src/Npe.java b/java/java-tests/testData/inspection/dataFlow/NotNullable/src/Npe.java similarity index 100% rename from testData/inspection/dataFlow/NotNullable/src/Npe.java rename to java/java-tests/testData/inspection/dataFlow/NotNullable/src/Npe.java diff --git a/testData/inspection/dataFlow/NotNullableParameter/expected.xml b/java/java-tests/testData/inspection/dataFlow/NotNullableParameter/expected.xml similarity index 100% rename from testData/inspection/dataFlow/NotNullableParameter/expected.xml rename to java/java-tests/testData/inspection/dataFlow/NotNullableParameter/expected.xml diff --git a/testData/inspection/dataFlow/NotNullableParameter/src/Npe.java b/java/java-tests/testData/inspection/dataFlow/NotNullableParameter/src/Npe.java similarity index 100% rename from testData/inspection/dataFlow/NotNullableParameter/src/Npe.java rename to java/java-tests/testData/inspection/dataFlow/NotNullableParameter/src/Npe.java diff --git a/testData/inspection/dataFlow/NotNullableParameter2/expected.xml b/java/java-tests/testData/inspection/dataFlow/NotNullableParameter2/expected.xml similarity index 100% rename from testData/inspection/dataFlow/NotNullableParameter2/expected.xml rename to java/java-tests/testData/inspection/dataFlow/NotNullableParameter2/expected.xml diff --git a/testData/inspection/dataFlow/NotNullableParameter2/src/Npe.java b/java/java-tests/testData/inspection/dataFlow/NotNullableParameter2/src/Npe.java similarity index 100% rename from testData/inspection/dataFlow/NotNullableParameter2/src/Npe.java rename to java/java-tests/testData/inspection/dataFlow/NotNullableParameter2/src/Npe.java diff --git a/testData/inspection/dataFlow/Nullable/expected.xml b/java/java-tests/testData/inspection/dataFlow/Nullable/expected.xml similarity index 100% rename from testData/inspection/dataFlow/Nullable/expected.xml rename to java/java-tests/testData/inspection/dataFlow/Nullable/expected.xml diff --git a/testData/inspection/dataFlow/Nullable/src/Npe.java b/java/java-tests/testData/inspection/dataFlow/Nullable/src/Npe.java similarity index 100% rename from testData/inspection/dataFlow/Nullable/src/Npe.java rename to java/java-tests/testData/inspection/dataFlow/Nullable/src/Npe.java diff --git a/testData/inspection/dataFlow/NullableAssignment/expected.xml b/java/java-tests/testData/inspection/dataFlow/NullableAssignment/expected.xml similarity index 100% rename from testData/inspection/dataFlow/NullableAssignment/expected.xml rename to java/java-tests/testData/inspection/dataFlow/NullableAssignment/expected.xml diff --git a/testData/inspection/dataFlow/NullableAssignment/src/Npe.java b/java/java-tests/testData/inspection/dataFlow/NullableAssignment/src/Npe.java similarity index 100% rename from testData/inspection/dataFlow/NullableAssignment/src/Npe.java rename to java/java-tests/testData/inspection/dataFlow/NullableAssignment/src/Npe.java diff --git a/testData/inspection/dataFlow/NullableLocalVariable/expected.xml b/java/java-tests/testData/inspection/dataFlow/NullableLocalVariable/expected.xml similarity index 100% rename from testData/inspection/dataFlow/NullableLocalVariable/expected.xml rename to java/java-tests/testData/inspection/dataFlow/NullableLocalVariable/expected.xml diff --git a/testData/inspection/dataFlow/NullableLocalVariable/src/Npe.java b/java/java-tests/testData/inspection/dataFlow/NullableLocalVariable/src/Npe.java similarity index 100% rename from testData/inspection/dataFlow/NullableLocalVariable/src/Npe.java rename to java/java-tests/testData/inspection/dataFlow/NullableLocalVariable/src/Npe.java diff --git a/testData/inspection/dataFlow/NullableReturn/expected.xml b/java/java-tests/testData/inspection/dataFlow/NullableReturn/expected.xml similarity index 100% rename from testData/inspection/dataFlow/NullableReturn/expected.xml rename to java/java-tests/testData/inspection/dataFlow/NullableReturn/expected.xml diff --git a/testData/inspection/dataFlow/NullableReturn/src/Npe.java b/java/java-tests/testData/inspection/dataFlow/NullableReturn/src/Npe.java similarity index 100% rename from testData/inspection/dataFlow/NullableReturn/src/Npe.java rename to java/java-tests/testData/inspection/dataFlow/NullableReturn/src/Npe.java diff --git a/testData/inspection/dataFlow/NullableReturn1/expected.xml b/java/java-tests/testData/inspection/dataFlow/NullableReturn1/expected.xml similarity index 100% rename from testData/inspection/dataFlow/NullableReturn1/expected.xml rename to java/java-tests/testData/inspection/dataFlow/NullableReturn1/expected.xml diff --git a/testData/inspection/dataFlow/NullableReturn1/src/Test.java b/java/java-tests/testData/inspection/dataFlow/NullableReturn1/src/Test.java similarity index 100% rename from testData/inspection/dataFlow/NullableReturn1/src/Test.java rename to java/java-tests/testData/inspection/dataFlow/NullableReturn1/src/Test.java diff --git a/testData/inspection/dataFlow/NullableThroughCast/expected.xml b/java/java-tests/testData/inspection/dataFlow/NullableThroughCast/expected.xml similarity index 100% rename from testData/inspection/dataFlow/NullableThroughCast/expected.xml rename to java/java-tests/testData/inspection/dataFlow/NullableThroughCast/expected.xml diff --git a/testData/inspection/dataFlow/NullableThroughCast/src/Npe.java b/java/java-tests/testData/inspection/dataFlow/NullableThroughCast/src/Npe.java similarity index 100% rename from testData/inspection/dataFlow/NullableThroughCast/src/Npe.java rename to java/java-tests/testData/inspection/dataFlow/NullableThroughCast/src/Npe.java diff --git a/testData/inspection/dataFlow/NullableThroughVariable/expected.xml b/java/java-tests/testData/inspection/dataFlow/NullableThroughVariable/expected.xml similarity index 100% rename from testData/inspection/dataFlow/NullableThroughVariable/expected.xml rename to java/java-tests/testData/inspection/dataFlow/NullableThroughVariable/expected.xml diff --git a/testData/inspection/dataFlow/NullableThroughVariable/src/Npe.java b/java/java-tests/testData/inspection/dataFlow/NullableThroughVariable/src/Npe.java similarity index 100% rename from testData/inspection/dataFlow/NullableThroughVariable/src/Npe.java rename to java/java-tests/testData/inspection/dataFlow/NullableThroughVariable/src/Npe.java diff --git a/testData/inspection/dataFlow/NullableThroughVariableShouldNotBeReported/expected.xml b/java/java-tests/testData/inspection/dataFlow/NullableThroughVariableShouldNotBeReported/expected.xml similarity index 100% rename from testData/inspection/dataFlow/NullableThroughVariableShouldNotBeReported/expected.xml rename to java/java-tests/testData/inspection/dataFlow/NullableThroughVariableShouldNotBeReported/expected.xml diff --git a/testData/inspection/dataFlow/NullableThroughVariableShouldNotBeReported/src/Npe.java b/java/java-tests/testData/inspection/dataFlow/NullableThroughVariableShouldNotBeReported/src/Npe.java similarity index 100% rename from testData/inspection/dataFlow/NullableThroughVariableShouldNotBeReported/src/Npe.java rename to java/java-tests/testData/inspection/dataFlow/NullableThroughVariableShouldNotBeReported/src/Npe.java diff --git a/testData/inspection/dataFlow/PlusOnStrings/expected.xml b/java/java-tests/testData/inspection/dataFlow/PlusOnStrings/expected.xml similarity index 100% rename from testData/inspection/dataFlow/PlusOnStrings/expected.xml rename to java/java-tests/testData/inspection/dataFlow/PlusOnStrings/expected.xml diff --git a/testData/inspection/dataFlow/PlusOnStrings/src/Test.java b/java/java-tests/testData/inspection/dataFlow/PlusOnStrings/src/Test.java similarity index 100% rename from testData/inspection/dataFlow/PlusOnStrings/src/Test.java rename to java/java-tests/testData/inspection/dataFlow/PlusOnStrings/src/Test.java diff --git a/testData/inspection/dataFlow/SCR13626/expected.xml b/java/java-tests/testData/inspection/dataFlow/SCR13626/expected.xml similarity index 100% rename from testData/inspection/dataFlow/SCR13626/expected.xml rename to java/java-tests/testData/inspection/dataFlow/SCR13626/expected.xml diff --git a/testData/inspection/dataFlow/SCR13626/src/Test.java b/java/java-tests/testData/inspection/dataFlow/SCR13626/src/Test.java similarity index 100% rename from testData/inspection/dataFlow/SCR13626/src/Test.java rename to java/java-tests/testData/inspection/dataFlow/SCR13626/src/Test.java diff --git a/testData/inspection/dataFlow/SCR13702/expected.xml b/java/java-tests/testData/inspection/dataFlow/SCR13702/expected.xml similarity index 100% rename from testData/inspection/dataFlow/SCR13702/expected.xml rename to java/java-tests/testData/inspection/dataFlow/SCR13702/expected.xml diff --git a/testData/inspection/dataFlow/SCR13702/src/Foo.java b/java/java-tests/testData/inspection/dataFlow/SCR13702/src/Foo.java similarity index 100% rename from testData/inspection/dataFlow/SCR13702/src/Foo.java rename to java/java-tests/testData/inspection/dataFlow/SCR13702/src/Foo.java diff --git a/testData/inspection/dataFlow/SCR13871/expected.xml b/java/java-tests/testData/inspection/dataFlow/SCR13871/expected.xml similarity index 100% rename from testData/inspection/dataFlow/SCR13871/expected.xml rename to java/java-tests/testData/inspection/dataFlow/SCR13871/expected.xml diff --git a/testData/inspection/dataFlow/SCR13871/src/Aaa.java b/java/java-tests/testData/inspection/dataFlow/SCR13871/src/Aaa.java similarity index 100% rename from testData/inspection/dataFlow/SCR13871/src/Aaa.java rename to java/java-tests/testData/inspection/dataFlow/SCR13871/src/Aaa.java diff --git a/testData/inspection/dataFlow/SCR14314/expected.xml b/java/java-tests/testData/inspection/dataFlow/SCR14314/expected.xml similarity index 100% rename from testData/inspection/dataFlow/SCR14314/expected.xml rename to java/java-tests/testData/inspection/dataFlow/SCR14314/expected.xml diff --git a/testData/inspection/dataFlow/SCR14314/src/Finally.java b/java/java-tests/testData/inspection/dataFlow/SCR14314/src/Finally.java similarity index 100% rename from testData/inspection/dataFlow/SCR14314/src/Finally.java rename to java/java-tests/testData/inspection/dataFlow/SCR14314/src/Finally.java diff --git a/testData/inspection/dataFlow/SCR14819/expected.xml b/java/java-tests/testData/inspection/dataFlow/SCR14819/expected.xml similarity index 100% rename from testData/inspection/dataFlow/SCR14819/expected.xml rename to java/java-tests/testData/inspection/dataFlow/SCR14819/expected.xml diff --git a/testData/inspection/dataFlow/SCR14819/src/Test.java b/java/java-tests/testData/inspection/dataFlow/SCR14819/src/Test.java similarity index 100% rename from testData/inspection/dataFlow/SCR14819/src/Test.java rename to java/java-tests/testData/inspection/dataFlow/SCR14819/src/Test.java diff --git a/testData/inspection/dataFlow/SCR15162/expected.xml b/java/java-tests/testData/inspection/dataFlow/SCR15162/expected.xml similarity index 100% rename from testData/inspection/dataFlow/SCR15162/expected.xml rename to java/java-tests/testData/inspection/dataFlow/SCR15162/expected.xml diff --git a/testData/inspection/dataFlow/SCR15162/src/NullTest.java b/java/java-tests/testData/inspection/dataFlow/SCR15162/src/NullTest.java similarity index 100% rename from testData/inspection/dataFlow/SCR15162/src/NullTest.java rename to java/java-tests/testData/inspection/dataFlow/SCR15162/src/NullTest.java diff --git a/testData/inspection/dataFlow/SCR15406/expected.xml b/java/java-tests/testData/inspection/dataFlow/SCR15406/expected.xml similarity index 100% rename from testData/inspection/dataFlow/SCR15406/expected.xml rename to java/java-tests/testData/inspection/dataFlow/SCR15406/expected.xml diff --git a/testData/inspection/dataFlow/SCR15406/src/CodeFlowTest.java b/java/java-tests/testData/inspection/dataFlow/SCR15406/src/CodeFlowTest.java similarity index 100% rename from testData/inspection/dataFlow/SCR15406/src/CodeFlowTest.java rename to java/java-tests/testData/inspection/dataFlow/SCR15406/src/CodeFlowTest.java diff --git a/testData/inspection/dataFlow/SCR18186/expected.xml b/java/java-tests/testData/inspection/dataFlow/SCR18186/expected.xml similarity index 100% rename from testData/inspection/dataFlow/SCR18186/expected.xml rename to java/java-tests/testData/inspection/dataFlow/SCR18186/expected.xml diff --git a/testData/inspection/dataFlow/SCR18186/src/Test.java b/java/java-tests/testData/inspection/dataFlow/SCR18186/src/Test.java similarity index 100% rename from testData/inspection/dataFlow/SCR18186/src/Test.java rename to java/java-tests/testData/inspection/dataFlow/SCR18186/src/Test.java diff --git a/testData/inspection/dataFlow/SCR39950/expected.xml b/java/java-tests/testData/inspection/dataFlow/SCR39950/expected.xml similarity index 100% rename from testData/inspection/dataFlow/SCR39950/expected.xml rename to java/java-tests/testData/inspection/dataFlow/SCR39950/expected.xml diff --git a/testData/inspection/dataFlow/SCR39950/src/Test.java b/java/java-tests/testData/inspection/dataFlow/SCR39950/src/Test.java similarity index 100% rename from testData/inspection/dataFlow/SCR39950/src/Test.java rename to java/java-tests/testData/inspection/dataFlow/SCR39950/src/Test.java diff --git a/testData/inspection/dataFlow/StrangeArrayIndexOutOfBounds/expected.xml b/java/java-tests/testData/inspection/dataFlow/StrangeArrayIndexOutOfBounds/expected.xml similarity index 100% rename from testData/inspection/dataFlow/StrangeArrayIndexOutOfBounds/expected.xml rename to java/java-tests/testData/inspection/dataFlow/StrangeArrayIndexOutOfBounds/expected.xml diff --git a/testData/inspection/dataFlow/StrangeArrayIndexOutOfBounds/src/Test.java b/java/java-tests/testData/inspection/dataFlow/StrangeArrayIndexOutOfBounds/src/Test.java similarity index 100% rename from testData/inspection/dataFlow/StrangeArrayIndexOutOfBounds/src/Test.java rename to java/java-tests/testData/inspection/dataFlow/StrangeArrayIndexOutOfBounds/src/Test.java diff --git a/testData/inspection/dataFlow/SwitchQualifierProducesNPE/expected.xml b/java/java-tests/testData/inspection/dataFlow/SwitchQualifierProducesNPE/expected.xml similarity index 100% rename from testData/inspection/dataFlow/SwitchQualifierProducesNPE/expected.xml rename to java/java-tests/testData/inspection/dataFlow/SwitchQualifierProducesNPE/expected.xml diff --git a/testData/inspection/dataFlow/SwitchQualifierProducesNPE/src/Test.java b/java/java-tests/testData/inspection/dataFlow/SwitchQualifierProducesNPE/src/Test.java similarity index 100% rename from testData/inspection/dataFlow/SwitchQualifierProducesNPE/src/Test.java rename to java/java-tests/testData/inspection/dataFlow/SwitchQualifierProducesNPE/src/Test.java diff --git a/testData/inspection/dataFlow/YoleBug/expected.xml b/java/java-tests/testData/inspection/dataFlow/YoleBug/expected.xml similarity index 100% rename from testData/inspection/dataFlow/YoleBug/expected.xml rename to java/java-tests/testData/inspection/dataFlow/YoleBug/expected.xml diff --git a/testData/inspection/dataFlow/YoleBug/src/Test.java b/java/java-tests/testData/inspection/dataFlow/YoleBug/src/Test.java similarity index 100% rename from testData/inspection/dataFlow/YoleBug/src/Test.java rename to java/java-tests/testData/inspection/dataFlow/YoleBug/src/Test.java diff --git a/testData/inspection/dataFlow/andEq/expected.xml b/java/java-tests/testData/inspection/dataFlow/andEq/expected.xml similarity index 100% rename from testData/inspection/dataFlow/andEq/expected.xml rename to java/java-tests/testData/inspection/dataFlow/andEq/expected.xml diff --git a/testData/inspection/dataFlow/andEq/src/Test.java b/java/java-tests/testData/inspection/dataFlow/andEq/src/Test.java similarity index 100% rename from testData/inspection/dataFlow/andEq/src/Test.java rename to java/java-tests/testData/inspection/dataFlow/andEq/src/Test.java diff --git a/testData/inspection/dataFlow/autoboxing/expected.xml b/java/java-tests/testData/inspection/dataFlow/autoboxing/expected.xml similarity index 100% rename from testData/inspection/dataFlow/autoboxing/expected.xml rename to java/java-tests/testData/inspection/dataFlow/autoboxing/expected.xml diff --git a/testData/inspection/dataFlow/autoboxing/src/Test.java b/java/java-tests/testData/inspection/dataFlow/autoboxing/src/Test.java similarity index 100% rename from testData/inspection/dataFlow/autoboxing/src/Test.java rename to java/java-tests/testData/inspection/dataFlow/autoboxing/src/Test.java diff --git a/testData/inspection/dataFlow/boxingBoolean/expected.xml b/java/java-tests/testData/inspection/dataFlow/boxingBoolean/expected.xml similarity index 100% rename from testData/inspection/dataFlow/boxingBoolean/expected.xml rename to java/java-tests/testData/inspection/dataFlow/boxingBoolean/expected.xml diff --git a/testData/inspection/dataFlow/boxingBoolean/src/Test.java b/java/java-tests/testData/inspection/dataFlow/boxingBoolean/src/Test.java similarity index 100% rename from testData/inspection/dataFlow/boxingBoolean/src/Test.java rename to java/java-tests/testData/inspection/dataFlow/boxingBoolean/src/Test.java diff --git a/testData/inspection/dataFlow/caseAndNpe/expected.xml b/java/java-tests/testData/inspection/dataFlow/caseAndNpe/expected.xml similarity index 100% rename from testData/inspection/dataFlow/caseAndNpe/expected.xml rename to java/java-tests/testData/inspection/dataFlow/caseAndNpe/expected.xml diff --git a/testData/inspection/dataFlow/caseAndNpe/src/CaseAndNpe.java b/java/java-tests/testData/inspection/dataFlow/caseAndNpe/src/CaseAndNpe.java similarity index 100% rename from testData/inspection/dataFlow/caseAndNpe/src/CaseAndNpe.java rename to java/java-tests/testData/inspection/dataFlow/caseAndNpe/src/CaseAndNpe.java diff --git a/testData/inspection/dataFlow/cce/expected.xml b/java/java-tests/testData/inspection/dataFlow/cce/expected.xml similarity index 100% rename from testData/inspection/dataFlow/cce/expected.xml rename to java/java-tests/testData/inspection/dataFlow/cce/expected.xml diff --git a/testData/inspection/dataFlow/cce/src/Cce.java b/java/java-tests/testData/inspection/dataFlow/cce/src/Cce.java similarity index 100% rename from testData/inspection/dataFlow/cce/src/Cce.java rename to java/java-tests/testData/inspection/dataFlow/cce/src/Cce.java diff --git a/testData/inspection/dataFlow/compileTimeConst/expected.xml b/java/java-tests/testData/inspection/dataFlow/compileTimeConst/expected.xml similarity index 100% rename from testData/inspection/dataFlow/compileTimeConst/expected.xml rename to java/java-tests/testData/inspection/dataFlow/compileTimeConst/expected.xml diff --git a/testData/inspection/dataFlow/compileTimeConst/src/Test.java b/java/java-tests/testData/inspection/dataFlow/compileTimeConst/src/Test.java similarity index 100% rename from testData/inspection/dataFlow/compileTimeConst/src/Test.java rename to java/java-tests/testData/inspection/dataFlow/compileTimeConst/src/Test.java diff --git a/testData/inspection/dataFlow/constantExpr/expected.xml b/java/java-tests/testData/inspection/dataFlow/constantExpr/expected.xml similarity index 100% rename from testData/inspection/dataFlow/constantExpr/expected.xml rename to java/java-tests/testData/inspection/dataFlow/constantExpr/expected.xml diff --git a/testData/inspection/dataFlow/constantExpr/src/Test.java b/java/java-tests/testData/inspection/dataFlow/constantExpr/src/Test.java similarity index 100% rename from testData/inspection/dataFlow/constantExpr/src/Test.java rename to java/java-tests/testData/inspection/dataFlow/constantExpr/src/Test.java diff --git a/testData/inspection/dataFlow/exceptionCFG/expected.xml b/java/java-tests/testData/inspection/dataFlow/exceptionCFG/expected.xml similarity index 100% rename from testData/inspection/dataFlow/exceptionCFG/expected.xml rename to java/java-tests/testData/inspection/dataFlow/exceptionCFG/expected.xml diff --git a/testData/inspection/dataFlow/exceptionCFG/src/ExceptionCFG.java b/java/java-tests/testData/inspection/dataFlow/exceptionCFG/src/ExceptionCFG.java similarity index 100% rename from testData/inspection/dataFlow/exceptionCFG/src/ExceptionCFG.java rename to java/java-tests/testData/inspection/dataFlow/exceptionCFG/src/ExceptionCFG.java diff --git a/testData/inspection/dataFlow/finalFields/expected.xml b/java/java-tests/testData/inspection/dataFlow/finalFields/expected.xml similarity index 100% rename from testData/inspection/dataFlow/finalFields/expected.xml rename to java/java-tests/testData/inspection/dataFlow/finalFields/expected.xml diff --git a/testData/inspection/dataFlow/finalFields/src/Test.java b/java/java-tests/testData/inspection/dataFlow/finalFields/src/Test.java similarity index 100% rename from testData/inspection/dataFlow/finalFields/src/Test.java rename to java/java-tests/testData/inspection/dataFlow/finalFields/src/Test.java diff --git a/testData/inspection/dataFlow/fixture/NullableAnonymousMethod.java b/java/java-tests/testData/inspection/dataFlow/fixture/NullableAnonymousMethod.java similarity index 100% rename from testData/inspection/dataFlow/fixture/NullableAnonymousMethod.java rename to java/java-tests/testData/inspection/dataFlow/fixture/NullableAnonymousMethod.java diff --git a/testData/inspection/dataFlow/fixture/NullableAnonymousParameter.java b/java/java-tests/testData/inspection/dataFlow/fixture/NullableAnonymousParameter.java similarity index 100% rename from testData/inspection/dataFlow/fixture/NullableAnonymousParameter.java rename to java/java-tests/testData/inspection/dataFlow/fixture/NullableAnonymousParameter.java diff --git a/testData/inspection/dataFlow/fixture/TryInAnonymous.java b/java/java-tests/testData/inspection/dataFlow/fixture/TryInAnonymous.java similarity index 100% rename from testData/inspection/dataFlow/fixture/TryInAnonymous.java rename to java/java-tests/testData/inspection/dataFlow/fixture/TryInAnonymous.java diff --git a/testData/inspection/dataFlow/inst/expected.xml b/java/java-tests/testData/inspection/dataFlow/inst/expected.xml similarity index 100% rename from testData/inspection/dataFlow/inst/expected.xml rename to java/java-tests/testData/inspection/dataFlow/inst/expected.xml diff --git a/testData/inspection/dataFlow/inst/src/Inst.java b/java/java-tests/testData/inspection/dataFlow/inst/src/Inst.java similarity index 100% rename from testData/inspection/dataFlow/inst/src/Inst.java rename to java/java-tests/testData/inspection/dataFlow/inst/src/Inst.java diff --git a/testData/inspection/dataFlow/jspTemplateStatement/src/Test.jsp b/java/java-tests/testData/inspection/dataFlow/jspTemplateStatement/src/Test.jsp similarity index 100% rename from testData/inspection/dataFlow/jspTemplateStatement/src/Test.jsp rename to java/java-tests/testData/inspection/dataFlow/jspTemplateStatement/src/Test.jsp diff --git a/testData/inspection/dataFlow/npe1/expected.xml b/java/java-tests/testData/inspection/dataFlow/npe1/expected.xml similarity index 100% rename from testData/inspection/dataFlow/npe1/expected.xml rename to java/java-tests/testData/inspection/dataFlow/npe1/expected.xml diff --git a/testData/inspection/dataFlow/npe1/src/Npe.java b/java/java-tests/testData/inspection/dataFlow/npe1/src/Npe.java similarity index 100% rename from testData/inspection/dataFlow/npe1/src/Npe.java rename to java/java-tests/testData/inspection/dataFlow/npe1/src/Npe.java diff --git a/testData/inspection/dataFlow/nullableField/expected.xml b/java/java-tests/testData/inspection/dataFlow/nullableField/expected.xml similarity index 100% rename from testData/inspection/dataFlow/nullableField/expected.xml rename to java/java-tests/testData/inspection/dataFlow/nullableField/expected.xml diff --git a/testData/inspection/dataFlow/nullableField/src/Test.java b/java/java-tests/testData/inspection/dataFlow/nullableField/src/Test.java similarity index 100% rename from testData/inspection/dataFlow/nullableField/src/Test.java rename to java/java-tests/testData/inspection/dataFlow/nullableField/src/Test.java diff --git a/testData/inspection/dataFlow/orBug/expected.xml b/java/java-tests/testData/inspection/dataFlow/orBug/expected.xml similarity index 100% rename from testData/inspection/dataFlow/orBug/expected.xml rename to java/java-tests/testData/inspection/dataFlow/orBug/expected.xml diff --git a/testData/inspection/dataFlow/orBug/src/Test.java b/java/java-tests/testData/inspection/dataFlow/orBug/src/Test.java similarity index 100% rename from testData/inspection/dataFlow/orBug/src/Test.java rename to java/java-tests/testData/inspection/dataFlow/orBug/src/Test.java diff --git a/testData/inspection/dataFlow/scrIDEA1/expected.xml b/java/java-tests/testData/inspection/dataFlow/scrIDEA1/expected.xml similarity index 100% rename from testData/inspection/dataFlow/scrIDEA1/expected.xml rename to java/java-tests/testData/inspection/dataFlow/scrIDEA1/expected.xml diff --git a/testData/inspection/dataFlow/scrIDEA1/src/Test.java b/java/java-tests/testData/inspection/dataFlow/scrIDEA1/src/Test.java similarity index 100% rename from testData/inspection/dataFlow/scrIDEA1/src/Test.java rename to java/java-tests/testData/inspection/dataFlow/scrIDEA1/src/Test.java diff --git a/testData/inspection/dataFlow/thisInstanceof/expected.xml b/java/java-tests/testData/inspection/dataFlow/thisInstanceof/expected.xml similarity index 100% rename from testData/inspection/dataFlow/thisInstanceof/expected.xml rename to java/java-tests/testData/inspection/dataFlow/thisInstanceof/expected.xml diff --git a/testData/inspection/dataFlow/thisInstanceof/src/Test.java b/java/java-tests/testData/inspection/dataFlow/thisInstanceof/src/Test.java similarity index 100% rename from testData/inspection/dataFlow/thisInstanceof/src/Test.java rename to java/java-tests/testData/inspection/dataFlow/thisInstanceof/src/Test.java diff --git a/testData/inspection/dataFlow/unboxingNPE/expected.xml b/java/java-tests/testData/inspection/dataFlow/unboxingNPE/expected.xml similarity index 100% rename from testData/inspection/dataFlow/unboxingNPE/expected.xml rename to java/java-tests/testData/inspection/dataFlow/unboxingNPE/expected.xml diff --git a/testData/inspection/dataFlow/unboxingNPE/src/Test.java b/java/java-tests/testData/inspection/dataFlow/unboxingNPE/src/Test.java similarity index 100% rename from testData/inspection/dataFlow/unboxingNPE/src/Test.java rename to java/java-tests/testData/inspection/dataFlow/unboxingNPE/src/Test.java diff --git a/testData/inspection/dataFlow/wrongEqualTypes/expected.xml b/java/java-tests/testData/inspection/dataFlow/wrongEqualTypes/expected.xml similarity index 100% rename from testData/inspection/dataFlow/wrongEqualTypes/expected.xml rename to java/java-tests/testData/inspection/dataFlow/wrongEqualTypes/expected.xml diff --git a/testData/inspection/dataFlow/wrongEqualTypes/src/Test.java b/java/java-tests/testData/inspection/dataFlow/wrongEqualTypes/src/Test.java similarity index 100% rename from testData/inspection/dataFlow/wrongEqualTypes/src/Test.java rename to java/java-tests/testData/inspection/dataFlow/wrongEqualTypes/src/Test.java diff --git a/testData/inspection/dataFlow/xor/expected.xml b/java/java-tests/testData/inspection/dataFlow/xor/expected.xml similarity index 100% rename from testData/inspection/dataFlow/xor/expected.xml rename to java/java-tests/testData/inspection/dataFlow/xor/expected.xml diff --git a/testData/inspection/dataFlow/xor/src/Test.java b/java/java-tests/testData/inspection/dataFlow/xor/src/Test.java similarity index 100% rename from testData/inspection/dataFlow/xor/src/Test.java rename to java/java-tests/testData/inspection/dataFlow/xor/src/Test.java diff --git a/inspections/tests/com/intellij/codeInspection/ConcatenationToMessageFormatActionTest.java b/java/java-tests/testSrc/com/intellij/codeInspection/ConcatenationToMessageFormatActionTest.java similarity index 100% rename from inspections/tests/com/intellij/codeInspection/ConcatenationToMessageFormatActionTest.java rename to java/java-tests/testSrc/com/intellij/codeInspection/ConcatenationToMessageFormatActionTest.java diff --git a/inspections/tests/com/intellij/codeInspection/DataFlowInspectionFixtureTest.java b/java/java-tests/testSrc/com/intellij/codeInspection/DataFlowInspectionFixtureTest.java similarity index 87% rename from inspections/tests/com/intellij/codeInspection/DataFlowInspectionFixtureTest.java rename to java/java-tests/testSrc/com/intellij/codeInspection/DataFlowInspectionFixtureTest.java index 3f7ea4c870c3..fe4ecf0d910c 100644 --- a/inspections/tests/com/intellij/codeInspection/DataFlowInspectionFixtureTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInspection/DataFlowInspectionFixtureTest.java @@ -1,8 +1,9 @@ package com.intellij.codeInspection; -import com.intellij.testFramework.fixtures.JavaCodeInsightFixtureTestCase; -import com.intellij.testFramework.builders.JavaModuleFixtureBuilder; +import com.intellij.JavaTestUtil; import com.intellij.codeInspection.dataFlow.DataFlowInspection; +import com.intellij.testFramework.builders.JavaModuleFixtureBuilder; +import com.intellij.testFramework.fixtures.JavaCodeInsightFixtureTestCase; /** * @author peter @@ -14,8 +15,8 @@ public class DataFlowInspectionFixtureTest extends JavaCodeInsightFixtureTestCas } @Override - protected String getBasePath() { - return "/testdata/inspection/dataFlow/fixture/"; + protected String getTestDataPath() { + return JavaTestUtil.getJavaTestDataPath() + "/inspection/dataFlow/fixture/"; } private void doTest() throws Throwable { diff --git a/inspections/tests/com/intellij/codeInspection/DataFlowInspectionTest.java b/java/java-tests/testSrc/com/intellij/codeInspection/DataFlowInspectionTest.java similarity index 97% rename from inspections/tests/com/intellij/codeInspection/DataFlowInspectionTest.java rename to java/java-tests/testSrc/com/intellij/codeInspection/DataFlowInspectionTest.java index 8a28e3a7cb64..97bf25393990 100644 --- a/inspections/tests/com/intellij/codeInspection/DataFlowInspectionTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInspection/DataFlowInspectionTest.java @@ -8,12 +8,18 @@ */ package com.intellij.codeInspection; +import com.intellij.JavaTestUtil; import com.intellij.codeInspection.dataFlow.DataFlowInspection; import com.intellij.codeInspection.ex.LocalInspectionToolWrapper; import com.intellij.testFramework.InspectionTestCase; import org.jetbrains.annotations.NonNls; public class DataFlowInspectionTest extends InspectionTestCase { + @Override + protected String getTestDataPath() { + return JavaTestUtil.getJavaTestDataPath() + "/inspection"; + } + private void doTest() throws Exception { doTest("dataFlow/" + getTestName(false), new DataFlowInspection()); } diff --git a/java/testFramework/src/com/intellij/testFramework/fixtures/JavaCodeInsightFixtureTestCase.java b/java/testFramework/src/com/intellij/testFramework/fixtures/JavaCodeInsightFixtureTestCase.java index 194d7b1d95c1..42757eb9a4b3 100644 --- a/java/testFramework/src/com/intellij/testFramework/fixtures/JavaCodeInsightFixtureTestCase.java +++ b/java/testFramework/src/com/intellij/testFramework/fixtures/JavaCodeInsightFixtureTestCase.java @@ -54,7 +54,7 @@ public abstract class JavaCodeInsightFixtureTestCase extends UsefulTestCase{ * @return absolute path to the test data. */ @NonNls - protected final String getTestDataPath() { + protected String getTestDataPath() { return PathManager.getHomePath().replace(File.separatorChar, '/') + getBasePath(); }