From f074366694de39c5081c77b650427d46a2d2d067 Mon Sep 17 00:00:00 2001 From: svtk Date: Mon, 24 Oct 2011 13:01:46 +0400 Subject: [PATCH] tests fixed --- .../org/jetbrains/jet/lang/diagnostics/Errors.java | 2 +- .../regression/AssignmentsUnderOperators.jet | 2 +- .../full/regression/AssignmentsUnderOperators.jet | 2 +- .../org/jetbrains/jet/cfg/JetControlFlowTest.java | 14 +++++++++----- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java index 4f4cfb16e36..ede21587970 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java @@ -142,7 +142,7 @@ public interface Errors { }; PsiElementOnlyDiagnosticFactory3 VIRTUAL_MEMBER_HIDDEN = PsiElementOnlyDiagnosticFactory3.create(ERROR, "''{0}'' hides ''{1}'' in class {2} and needs 'override' modifier", DescriptorRenderer.TEXT); - PsiElementOnlyDiagnosticFactory1 UNINITIALIZED_VARIABLE = PsiElementOnlyDiagnosticFactory1.create(ERROR, "Variable ''{0}'' must be uninitialized", NAME); + PsiElementOnlyDiagnosticFactory1 UNINITIALIZED_VARIABLE = PsiElementOnlyDiagnosticFactory1.create(ERROR, "Variable ''{0}'' must be initialized", NAME); PsiElementOnlyDiagnosticFactory1 VAL_REASSIGNMENT = PsiElementOnlyDiagnosticFactory1.create(ERROR, "Val can not be reassigned", NAME); SimpleDiagnosticFactory UNREACHABLE_CODE = SimpleDiagnosticFactory.create(ERROR, "Unreachable code"); diff --git a/compiler/testData/checker/regression/AssignmentsUnderOperators.jet b/compiler/testData/checker/regression/AssignmentsUnderOperators.jet index 5a7c24b7fd0..2acdbfdd984 100644 --- a/compiler/testData/checker/regression/AssignmentsUnderOperators.jet +++ b/compiler/testData/checker/regression/AssignmentsUnderOperators.jet @@ -1,5 +1,5 @@ fun test() { - val a : Any? = null + var a : Any? = null if (a is Any) else a = null; while (a is Any) a = null while (true) a = null diff --git a/compiler/testData/checkerWithErrorTypes/full/regression/AssignmentsUnderOperators.jet b/compiler/testData/checkerWithErrorTypes/full/regression/AssignmentsUnderOperators.jet index 5a7c24b7fd0..2acdbfdd984 100644 --- a/compiler/testData/checkerWithErrorTypes/full/regression/AssignmentsUnderOperators.jet +++ b/compiler/testData/checkerWithErrorTypes/full/regression/AssignmentsUnderOperators.jet @@ -1,5 +1,5 @@ fun test() { - val a : Any? = null + var a : Any? = null if (a is Any) else a = null; while (a is Any) a = null while (true) a = null diff --git a/compiler/tests/org/jetbrains/jet/cfg/JetControlFlowTest.java b/compiler/tests/org/jetbrains/jet/cfg/JetControlFlowTest.java index 4fa45ef3ed8..5d82577cda5 100644 --- a/compiler/tests/org/jetbrains/jet/cfg/JetControlFlowTest.java +++ b/compiler/tests/org/jetbrains/jet/cfg/JetControlFlowTest.java @@ -107,11 +107,15 @@ public class JetControlFlowTest extends JetTestCaseBase { //check edges directions Collection instructions = pseudocode.getInstructions(); for (Instruction instruction : instructions) { - for (Instruction nextInstruction : instruction.getNextInstructions()) { - assertTrue("instruction: " + instruction + " next: " + nextInstruction, nextInstruction.getPreviousInstructions().contains(instruction)); - } - for (Instruction prevInstruction : instruction.getPreviousInstructions()) { - assertTrue("instruction: " + instruction + " prev: " + prevInstruction, prevInstruction.getNextInstructions().contains(instruction)); + if (!((InstructionImpl) instruction).isDead()) { + for (Instruction nextInstruction : instruction.getNextInstructions()) { + assertTrue("instruction '" + instruction + "' has '" + nextInstruction + "' among next instructions list, but not vice versa", + nextInstruction.getPreviousInstructions().contains(instruction)); + } + for (Instruction prevInstruction : instruction.getPreviousInstructions()) { + assertTrue("instruction '" + instruction + "' has '" + prevInstruction + "' among previous instructions list, but not vice versa", + prevInstruction.getNextInstructions().contains(instruction)); + } } } }