Tests regenerated

compiler/tests/org/jetbrains/jet/asJava/KotlinLightClassTestGenerated.java

@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.asJava;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/asJava/lightClasses")
+@TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({KotlinLightClassTestGenerated.Delegation.class, KotlinLightClassTestGenerated.NullabilityAnnotations.class})
 public class KotlinLightClassTestGenerated extends AbstractKotlinLightClassTest {
     public void testAllFilesPresentInLightClasses() throws Exception {
@@ -35,6 +37,7 @@ public class KotlinLightClassTestGenerated extends AbstractKotlinLightClassTest
     }
     
     @TestMetadata("compiler/testData/asJava/lightClasses/delegation")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Delegation extends AbstractKotlinLightClassTest {
         public void testAllFilesPresentInDelegation() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/delegation"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -42,17 +45,20 @@ public class KotlinLightClassTestGenerated extends AbstractKotlinLightClassTest
         
         @TestMetadata("Function.kt")
         public void testFunction() throws Exception {
-            doTest("compiler/testData/asJava/lightClasses/delegation/Function.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/delegation/Function.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Property.kt")
         public void testProperty() throws Exception {
-            doTest("compiler/testData/asJava/lightClasses/delegation/Property.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/delegation/Property.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations")
+    @TestDataPath("$PROJECT_ROOT")
     public static class NullabilityAnnotations extends AbstractKotlinLightClassTest {
         public void testAllFilesPresentInNullabilityAnnotations() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/nullabilityAnnotations"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -60,92 +66,110 @@ public class KotlinLightClassTestGenerated extends AbstractKotlinLightClassTest
         
         @TestMetadata("Class.kt")
         public void testClass() throws Exception {
-            doTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ClassObjectField.kt")
         public void testClassObjectField() throws Exception {
-            doTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ClassWithConstructor.kt")
         public void testClassWithConstructor() throws Exception {
-            doTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructor.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructor.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ClassWithConstructorAndProperties.kt")
         public void testClassWithConstructorAndProperties() throws Exception {
-            doTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructorAndProperties.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructorAndProperties.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Generic.kt")
         public void testGeneric() throws Exception {
-            doTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Generic.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Generic.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("IntOverridesAny.kt")
         public void testIntOverridesAny() throws Exception {
-            doTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/IntOverridesAny.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/IntOverridesAny.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NullableUnitReturn.kt")
         public void testNullableUnitReturn() throws Exception {
-            doTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/NullableUnitReturn.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/NullableUnitReturn.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("OverrideAnyWithUnit.kt")
         public void testOverrideAnyWithUnit() throws Exception {
-            doTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Primitives.kt")
         public void testPrimitives() throws Exception {
-            doTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Primitives.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Primitives.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("PrivateInClass.kt")
         public void testPrivateInClass() throws Exception {
-            doTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("PrivateInTrait.kt")
         public void testPrivateInTrait() throws Exception {
-            doTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInTrait.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInTrait.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Synthetic.kt")
         public void testSynthetic() throws Exception {
-            doTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Synthetic.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Synthetic.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Trait.kt")
         public void testTrait() throws Exception {
-            doTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Trait.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Trait.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("TraitClassObjectField.kt")
         public void testTraitClassObjectField() throws Exception {
-            doTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/TraitClassObjectField.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/TraitClassObjectField.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("UnitAsGenericArgument.kt")
         public void testUnitAsGenericArgument() throws Exception {
-            doTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("UnitParameter.kt")
         public void testUnitParameter() throws Exception {
-            doTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitParameter.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("VoidReturn.kt")
         public void testVoidReturn() throws Exception {
-            doTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/VoidReturn.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/VoidReturn.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("_DefaultPackage.kt")
         public void test_DefaultPackage() throws Exception {
-            doTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/_DefaultPackage.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/_DefaultPackage.kt");
+            doTest(fileName);
         }
         
     }

compiler/tests/org/jetbrains/jet/cfg/ControlFlowTestGenerated.java

@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.cfg;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/cfg")
+@TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({ControlFlowTestGenerated.Arrays.class, ControlFlowTestGenerated.Basic.class, ControlFlowTestGenerated.Bugs.class, ControlFlowTestGenerated.ControlStructures.class, ControlFlowTestGenerated.Conventions.class, ControlFlowTestGenerated.DeadCode.class, ControlFlowTestGenerated.Declarations.class, ControlFlowTestGenerated.Expressions.class, ControlFlowTestGenerated.Functions.class, ControlFlowTestGenerated.TailCalls.class})
 public class ControlFlowTestGenerated extends AbstractControlFlowTest {
     public void testAllFilesPresentInCfg() throws Exception {
@@ -35,6 +37,7 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest {
     }
     
     @TestMetadata("compiler/testData/cfg/arrays")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Arrays extends AbstractControlFlowTest {
         public void testAllFilesPresentInArrays() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/arrays"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -42,37 +45,44 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest {
         
         @TestMetadata("ArrayAccess.kt")
         public void testArrayAccess() throws Exception {
-            doTest("compiler/testData/cfg/arrays/ArrayAccess.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/ArrayAccess.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("arrayAccessExpression.kt")
         public void testArrayAccessExpression() throws Exception {
-            doTest("compiler/testData/cfg/arrays/arrayAccessExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arrayAccessExpression.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("arrayInc.kt")
         public void testArrayInc() throws Exception {
-            doTest("compiler/testData/cfg/arrays/arrayInc.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arrayInc.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ArrayOfFunctions.kt")
         public void testArrayOfFunctions() throws Exception {
-            doTest("compiler/testData/cfg/arrays/ArrayOfFunctions.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/ArrayOfFunctions.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("arraySet.kt")
         public void testArraySet() throws Exception {
-            doTest("compiler/testData/cfg/arrays/arraySet.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arraySet.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("arraySetPlusAssign.kt")
         public void testArraySetPlusAssign() throws Exception {
-            doTest("compiler/testData/cfg/arrays/arraySetPlusAssign.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arraySetPlusAssign.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/cfg/basic")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Basic extends AbstractControlFlowTest {
         public void testAllFilesPresentInBasic() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/basic"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -80,22 +90,26 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest {
         
         @TestMetadata("Basic.kt")
         public void testBasic() throws Exception {
-            doTest("compiler/testData/cfg/basic/Basic.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/basic/Basic.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("EmptyFunction.kt")
         public void testEmptyFunction() throws Exception {
-            doTest("compiler/testData/cfg/basic/EmptyFunction.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/basic/EmptyFunction.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ShortFunction.kt")
         public void testShortFunction() throws Exception {
-            doTest("compiler/testData/cfg/basic/ShortFunction.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/basic/ShortFunction.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/cfg/bugs")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Bugs extends AbstractControlFlowTest {
         public void testAllFilesPresentInBugs() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/bugs"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -103,12 +117,14 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest {
         
         @TestMetadata("jumpToOuterScope.kt")
         public void testJumpToOuterScope() throws Exception {
-            doTest("compiler/testData/cfg/bugs/jumpToOuterScope.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/bugs/jumpToOuterScope.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/cfg/controlStructures")
+    @TestDataPath("$PROJECT_ROOT")
     public static class ControlStructures extends AbstractControlFlowTest {
         public void testAllFilesPresentInControlStructures() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/controlStructures"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -116,57 +132,68 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest {
         
         @TestMetadata("continueInDoWhile.kt")
         public void testContinueInDoWhile() throws Exception {
-            doTest("compiler/testData/cfg/controlStructures/continueInDoWhile.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/continueInDoWhile.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("continueInFor.kt")
         public void testContinueInFor() throws Exception {
-            doTest("compiler/testData/cfg/controlStructures/continueInFor.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/continueInFor.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("continueInWhile.kt")
         public void testContinueInWhile() throws Exception {
-            doTest("compiler/testData/cfg/controlStructures/continueInWhile.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/continueInWhile.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Finally.kt")
         public void testFinally() throws Exception {
-            doTest("compiler/testData/cfg/controlStructures/Finally.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/Finally.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("FinallyTestCopy.kt")
         public void testFinallyTestCopy() throws Exception {
-            doTest("compiler/testData/cfg/controlStructures/FinallyTestCopy.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/FinallyTestCopy.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("For.kt")
         public void testFor() throws Exception {
-            doTest("compiler/testData/cfg/controlStructures/For.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/For.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("If.kt")
         public void testIf() throws Exception {
-            doTest("compiler/testData/cfg/controlStructures/If.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/If.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("OnlyWhileInFunctionBody.kt")
         public void testOnlyWhileInFunctionBody() throws Exception {
-            doTest("compiler/testData/cfg/controlStructures/OnlyWhileInFunctionBody.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/OnlyWhileInFunctionBody.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("returnsInWhen.kt")
         public void testReturnsInWhen() throws Exception {
-            doTest("compiler/testData/cfg/controlStructures/returnsInWhen.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/returnsInWhen.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("whenConditions.kt")
         public void testWhenConditions() throws Exception {
-            doTest("compiler/testData/cfg/controlStructures/whenConditions.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/whenConditions.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/cfg/conventions")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Conventions extends AbstractControlFlowTest {
         public void testAllFilesPresentInConventions() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/conventions"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -174,32 +201,38 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest {
         
         @TestMetadata("bothReceivers.kt")
         public void testBothReceivers() throws Exception {
-            doTest("compiler/testData/cfg/conventions/bothReceivers.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/conventions/bothReceivers.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("equals.kt")
         public void testEquals() throws Exception {
-            doTest("compiler/testData/cfg/conventions/equals.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/conventions/equals.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("incrementAtTheEnd.kt")
         public void testIncrementAtTheEnd() throws Exception {
-            doTest("compiler/testData/cfg/conventions/incrementAtTheEnd.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/conventions/incrementAtTheEnd.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("invoke.kt")
         public void testInvoke() throws Exception {
-            doTest("compiler/testData/cfg/conventions/invoke.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/conventions/invoke.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("notEqual.kt")
         public void testNotEqual() throws Exception {
-            doTest("compiler/testData/cfg/conventions/notEqual.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/conventions/notEqual.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/cfg/deadCode")
+    @TestDataPath("$PROJECT_ROOT")
     public static class DeadCode extends AbstractControlFlowTest {
         public void testAllFilesPresentInDeadCode() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/deadCode"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -207,22 +240,26 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest {
         
         @TestMetadata("DeadCode.kt")
         public void testDeadCode() throws Exception {
-            doTest("compiler/testData/cfg/deadCode/DeadCode.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/deadCode/DeadCode.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("returnInElvis.kt")
         public void testReturnInElvis() throws Exception {
-            doTest("compiler/testData/cfg/deadCode/returnInElvis.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/deadCode/returnInElvis.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("stringTemplate.kt")
         public void testStringTemplate() throws Exception {
-            doTest("compiler/testData/cfg/deadCode/stringTemplate.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/deadCode/stringTemplate.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/cfg/declarations")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Declarations.ClassesAndObjects.class, Declarations.FunctionLiterals.class, Declarations.Functions.class, Declarations.Local.class, Declarations.MultiDeclaration.class, Declarations.Properties.class})
     public static class Declarations extends AbstractControlFlowTest {
         public void testAllFilesPresentInDeclarations() throws Exception {
@@ -230,6 +267,7 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest {
         }
         
         @TestMetadata("compiler/testData/cfg/declarations/classesAndObjects")
+        @TestDataPath("$PROJECT_ROOT")
         public static class ClassesAndObjects extends AbstractControlFlowTest {
             public void testAllFilesPresentInClassesAndObjects() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/classesAndObjects"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -237,22 +275,26 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest {
             
             @TestMetadata("AnonymousInitializers.kt")
             public void testAnonymousInitializers() throws Exception {
-                doTest("compiler/testData/cfg/declarations/classesAndObjects/AnonymousInitializers.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/classesAndObjects/AnonymousInitializers.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("delegationByExpression.kt")
             public void testDelegationByExpression() throws Exception {
-                doTest("compiler/testData/cfg/declarations/classesAndObjects/delegationByExpression.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/classesAndObjects/delegationByExpression.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("delegationBySuperCall.kt")
             public void testDelegationBySuperCall() throws Exception {
-                doTest("compiler/testData/cfg/declarations/classesAndObjects/delegationBySuperCall.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/classesAndObjects/delegationBySuperCall.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/cfg/declarations/functionLiterals")
+        @TestDataPath("$PROJECT_ROOT")
         public static class FunctionLiterals extends AbstractControlFlowTest {
             public void testAllFilesPresentInFunctionLiterals() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/functionLiterals"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -260,12 +302,14 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest {
             
             @TestMetadata("unusedFunctionLiteral.kt")
             public void testUnusedFunctionLiteral() throws Exception {
-                doTest("compiler/testData/cfg/declarations/functionLiterals/unusedFunctionLiteral.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/functionLiterals/unusedFunctionLiteral.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/cfg/declarations/functions")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Functions extends AbstractControlFlowTest {
             public void testAllFilesPresentInFunctions() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/functions"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -273,17 +317,20 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest {
             
             @TestMetadata("FailFunction.kt")
             public void testFailFunction() throws Exception {
-                doTest("compiler/testData/cfg/declarations/functions/FailFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/functions/FailFunction.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("typeParameter.kt")
             public void testTypeParameter() throws Exception {
-                doTest("compiler/testData/cfg/declarations/functions/typeParameter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/functions/typeParameter.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/cfg/declarations/local")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Local extends AbstractControlFlowTest {
             public void testAllFilesPresentInLocal() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/local"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -291,27 +338,32 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest {
             
             @TestMetadata("localClass.kt")
             public void testLocalClass() throws Exception {
-                doTest("compiler/testData/cfg/declarations/local/localClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/local/localClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("LocalDeclarations.kt")
             public void testLocalDeclarations() throws Exception {
-                doTest("compiler/testData/cfg/declarations/local/LocalDeclarations.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/local/LocalDeclarations.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("localProperty.kt")
             public void testLocalProperty() throws Exception {
-                doTest("compiler/testData/cfg/declarations/local/localProperty.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/local/localProperty.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ObjectExpression.kt")
             public void testObjectExpression() throws Exception {
-                doTest("compiler/testData/cfg/declarations/local/ObjectExpression.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/local/ObjectExpression.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/cfg/declarations/multiDeclaration")
+        @TestDataPath("$PROJECT_ROOT")
         public static class MultiDeclaration extends AbstractControlFlowTest {
             public void testAllFilesPresentInMultiDeclaration() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/multiDeclaration"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -319,17 +371,20 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest {
             
             @TestMetadata("MultiDecl.kt")
             public void testMultiDecl() throws Exception {
-                doTest("compiler/testData/cfg/declarations/multiDeclaration/MultiDecl.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/multiDeclaration/MultiDecl.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("multiDeclarationWithError.kt")
             public void testMultiDeclarationWithError() throws Exception {
-                doTest("compiler/testData/cfg/declarations/multiDeclaration/multiDeclarationWithError.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/multiDeclaration/multiDeclarationWithError.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/cfg/declarations/properties")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Properties extends AbstractControlFlowTest {
             public void testAllFilesPresentInProperties() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/properties"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -337,22 +392,26 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest {
             
             @TestMetadata("backingFieldAccess.kt")
             public void testBackingFieldAccess() throws Exception {
-                doTest("compiler/testData/cfg/declarations/properties/backingFieldAccess.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/properties/backingFieldAccess.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("backingFieldQualifiedWithThis.kt")
             public void testBackingFieldQualifiedWithThis() throws Exception {
-                doTest("compiler/testData/cfg/declarations/properties/backingFieldQualifiedWithThis.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/properties/backingFieldQualifiedWithThis.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("DelegatedProperty.kt")
             public void testDelegatedProperty() throws Exception {
-                doTest("compiler/testData/cfg/declarations/properties/DelegatedProperty.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/properties/DelegatedProperty.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("unreachableDelegation.kt")
             public void testUnreachableDelegation() throws Exception {
-                doTest("compiler/testData/cfg/declarations/properties/unreachableDelegation.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/properties/unreachableDelegation.kt");
+                doTest(fileName);
             }
             
         }
@@ -371,6 +430,7 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest {
     }
     
     @TestMetadata("compiler/testData/cfg/expressions")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Expressions extends AbstractControlFlowTest {
         public void testAllFilesPresentInExpressions() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/expressions"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -378,107 +438,128 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest {
         
         @TestMetadata("assignmentToThis.kt")
         public void testAssignmentToThis() throws Exception {
-            doTest("compiler/testData/cfg/expressions/assignmentToThis.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/assignmentToThis.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Assignments.kt")
         public void testAssignments() throws Exception {
-            doTest("compiler/testData/cfg/expressions/Assignments.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/Assignments.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("callableReferences.kt")
         public void testCallableReferences() throws Exception {
-            doTest("compiler/testData/cfg/expressions/callableReferences.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/callableReferences.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("casts.kt")
         public void testCasts() throws Exception {
-            doTest("compiler/testData/cfg/expressions/casts.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/casts.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("chainedQualifiedExpression.kt")
         public void testChainedQualifiedExpression() throws Exception {
-            doTest("compiler/testData/cfg/expressions/chainedQualifiedExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/chainedQualifiedExpression.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("expressionAsFunction.kt")
         public void testExpressionAsFunction() throws Exception {
-            doTest("compiler/testData/cfg/expressions/expressionAsFunction.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/expressionAsFunction.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("incdec.kt")
         public void testIncdec() throws Exception {
-            doTest("compiler/testData/cfg/expressions/incdec.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/incdec.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("invalidVariableCall.kt")
         public void testInvalidVariableCall() throws Exception {
-            doTest("compiler/testData/cfg/expressions/invalidVariableCall.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/invalidVariableCall.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("LazyBooleans.kt")
         public void testLazyBooleans() throws Exception {
-            doTest("compiler/testData/cfg/expressions/LazyBooleans.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/LazyBooleans.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("nothingExpr.kt")
         public void testNothingExpr() throws Exception {
-            doTest("compiler/testData/cfg/expressions/nothingExpr.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/nothingExpr.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("parenthesizedSelector.kt")
         public void testParenthesizedSelector() throws Exception {
-            doTest("compiler/testData/cfg/expressions/parenthesizedSelector.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/parenthesizedSelector.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("propertySafeCall.kt")
         public void testPropertySafeCall() throws Exception {
-            doTest("compiler/testData/cfg/expressions/propertySafeCall.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/propertySafeCall.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("qualifiedExpressionWithoutSelector.kt")
         public void testQualifiedExpressionWithoutSelector() throws Exception {
-            doTest("compiler/testData/cfg/expressions/qualifiedExpressionWithoutSelector.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/qualifiedExpressionWithoutSelector.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ReturnFromExpression.kt")
         public void testReturnFromExpression() throws Exception {
-            doTest("compiler/testData/cfg/expressions/ReturnFromExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/ReturnFromExpression.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("thisExpression.kt")
         public void testThisExpression() throws Exception {
-            doTest("compiler/testData/cfg/expressions/thisExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/thisExpression.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("unresolvedCall.kt")
         public void testUnresolvedCall() throws Exception {
-            doTest("compiler/testData/cfg/expressions/unresolvedCall.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/unresolvedCall.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("unresolvedProperty.kt")
         public void testUnresolvedProperty() throws Exception {
-            doTest("compiler/testData/cfg/expressions/unresolvedProperty.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/unresolvedProperty.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("unresolvedWriteLHS.kt")
         public void testUnresolvedWriteLHS() throws Exception {
-            doTest("compiler/testData/cfg/expressions/unresolvedWriteLHS.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/unresolvedWriteLHS.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("unsupportedReturns.kt")
         public void testUnsupportedReturns() throws Exception {
-            doTest("compiler/testData/cfg/expressions/unsupportedReturns.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/unsupportedReturns.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("unusedExpressionSimpleName.kt")
         public void testUnusedExpressionSimpleName() throws Exception {
-            doTest("compiler/testData/cfg/expressions/unusedExpressionSimpleName.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/unusedExpressionSimpleName.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/cfg/functions")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Functions extends AbstractControlFlowTest {
         public void testAllFilesPresentInFunctions() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/functions"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -486,17 +567,20 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest {
         
         @TestMetadata("DefaultValuesForArguments.kt")
         public void testDefaultValuesForArguments() throws Exception {
-            doTest("compiler/testData/cfg/functions/DefaultValuesForArguments.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/functions/DefaultValuesForArguments.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("unmappedArgs.kt")
         public void testUnmappedArgs() throws Exception {
-            doTest("compiler/testData/cfg/functions/unmappedArgs.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/functions/unmappedArgs.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/cfg/tailCalls")
+    @TestDataPath("$PROJECT_ROOT")
     public static class TailCalls extends AbstractControlFlowTest {
         public void testAllFilesPresentInTailCalls() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/tailCalls"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -504,27 +588,32 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest {
         
         @TestMetadata("finally.kt")
         public void testFinally() throws Exception {
-            doTest("compiler/testData/cfg/tailCalls/finally.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/tailCalls/finally.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("finallyWithReturn.kt")
         public void testFinallyWithReturn() throws Exception {
-            doTest("compiler/testData/cfg/tailCalls/finallyWithReturn.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/tailCalls/finallyWithReturn.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("sum.kt")
         public void testSum() throws Exception {
-            doTest("compiler/testData/cfg/tailCalls/sum.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/tailCalls/sum.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("try.kt")
         public void testTry() throws Exception {
-            doTest("compiler/testData/cfg/tailCalls/try.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/tailCalls/try.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("tryCatchFinally.kt")
         public void testTryCatchFinally() throws Exception {
-            doTest("compiler/testData/cfg/tailCalls/tryCatchFinally.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/tailCalls/tryCatchFinally.kt");
+            doTest(fileName);
         }
         
     }

compiler/tests/org/jetbrains/jet/cfg/DataFlowTestGenerated.java

@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.cfg;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/cfg-variables")
+@TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({DataFlowTestGenerated.Basic.class, DataFlowTestGenerated.Bugs.class, DataFlowTestGenerated.LexicalScopes.class})
 public class DataFlowTestGenerated extends AbstractDataFlowTest {
     public void testAllFilesPresentInCfg_variables() throws Exception {
@@ -35,6 +37,7 @@ public class DataFlowTestGenerated extends AbstractDataFlowTest {
     }
     
     @TestMetadata("compiler/testData/cfg-variables/basic")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Basic extends AbstractDataFlowTest {
         public void testAllFilesPresentInBasic() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg-variables/basic"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -42,32 +45,38 @@ public class DataFlowTestGenerated extends AbstractDataFlowTest {
         
         @TestMetadata("IfWithUninitialized.kt")
         public void testIfWithUninitialized() throws Exception {
-            doTest("compiler/testData/cfg-variables/basic/IfWithUninitialized.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/basic/IfWithUninitialized.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InitializedNotDeclared.kt")
         public void testInitializedNotDeclared() throws Exception {
-            doTest("compiler/testData/cfg-variables/basic/InitializedNotDeclared.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/basic/InitializedNotDeclared.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("UsageInFunctionLiteral.kt")
         public void testUsageInFunctionLiteral() throws Exception {
-            doTest("compiler/testData/cfg-variables/basic/UsageInFunctionLiteral.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/basic/UsageInFunctionLiteral.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("VariablesInitialization.kt")
         public void testVariablesInitialization() throws Exception {
-            doTest("compiler/testData/cfg-variables/basic/VariablesInitialization.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/basic/VariablesInitialization.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("VariablesUsage.kt")
         public void testVariablesUsage() throws Exception {
-            doTest("compiler/testData/cfg-variables/basic/VariablesUsage.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/basic/VariablesUsage.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/cfg-variables/bugs")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Bugs extends AbstractDataFlowTest {
         public void testAllFilesPresentInBugs() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg-variables/bugs"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -75,22 +84,26 @@ public class DataFlowTestGenerated extends AbstractDataFlowTest {
         
         @TestMetadata("referenceToPropertyInitializer.kt")
         public void testReferenceToPropertyInitializer() throws Exception {
-            doTest("compiler/testData/cfg-variables/bugs/referenceToPropertyInitializer.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/bugs/referenceToPropertyInitializer.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("varInitializationInIf.kt")
         public void testVarInitializationInIf() throws Exception {
-            doTest("compiler/testData/cfg-variables/bugs/varInitializationInIf.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/bugs/varInitializationInIf.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("varInitializationInIfInCycle.kt")
         public void testVarInitializationInIfInCycle() throws Exception {
-            doTest("compiler/testData/cfg-variables/bugs/varInitializationInIfInCycle.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/bugs/varInitializationInIfInCycle.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/cfg-variables/lexicalScopes")
+    @TestDataPath("$PROJECT_ROOT")
     public static class LexicalScopes extends AbstractDataFlowTest {
         public void testAllFilesPresentInLexicalScopes() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg-variables/lexicalScopes"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -98,62 +111,74 @@ public class DataFlowTestGenerated extends AbstractDataFlowTest {
         
         @TestMetadata("doWhileScope.kt")
         public void testDoWhileScope() throws Exception {
-            doTest("compiler/testData/cfg-variables/lexicalScopes/doWhileScope.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/doWhileScope.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("forScope.kt")
         public void testForScope() throws Exception {
-            doTest("compiler/testData/cfg-variables/lexicalScopes/forScope.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/forScope.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("functionLiteralScope.kt")
         public void testFunctionLiteralScope() throws Exception {
-            doTest("compiler/testData/cfg-variables/lexicalScopes/functionLiteralScope.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/functionLiteralScope.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ifScope.kt")
         public void testIfScope() throws Exception {
-            doTest("compiler/testData/cfg-variables/lexicalScopes/ifScope.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/ifScope.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("localClass.kt")
         public void testLocalClass() throws Exception {
-            doTest("compiler/testData/cfg-variables/lexicalScopes/localClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/localClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("localFunctionScope.kt")
         public void testLocalFunctionScope() throws Exception {
-            doTest("compiler/testData/cfg-variables/lexicalScopes/localFunctionScope.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/localFunctionScope.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("localFunctionScopeWithoutBody.kt")
         public void testLocalFunctionScopeWithoutBody() throws Exception {
-            doTest("compiler/testData/cfg-variables/lexicalScopes/localFunctionScopeWithoutBody.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/localFunctionScopeWithoutBody.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("localObject.kt")
         public void testLocalObject() throws Exception {
-            doTest("compiler/testData/cfg-variables/lexicalScopes/localObject.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/localObject.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("objectLiteralScope.kt")
         public void testObjectLiteralScope() throws Exception {
-            doTest("compiler/testData/cfg-variables/lexicalScopes/objectLiteralScope.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/objectLiteralScope.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("propertyAccessorScope.kt")
         public void testPropertyAccessorScope() throws Exception {
-            doTest("compiler/testData/cfg-variables/lexicalScopes/propertyAccessorScope.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/propertyAccessorScope.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("tryScope.kt")
         public void testTryScope() throws Exception {
-            doTest("compiler/testData/cfg-variables/lexicalScopes/tryScope.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/tryScope.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("whileScope.kt")
         public void testWhileScope() throws Exception {
-            doTest("compiler/testData/cfg-variables/lexicalScopes/whileScope.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/whileScope.kt");
+            doTest(fileName);
         }
         
     }

compiler/tests/org/jetbrains/jet/cfg/PseudoValueTestGenerated.java

@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.cfg;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -30,6 +31,7 @@ import java.util.regex.Pattern;
 @InnerTestClasses({PseudoValueTestGenerated.Cfg.class, PseudoValueTestGenerated.Cfg_variables.class})
 public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
     @TestMetadata("compiler/testData/cfg")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Cfg.Arrays.class, Cfg.Basic.class, Cfg.Bugs.class, Cfg.ControlStructures.class, Cfg.Conventions.class, Cfg.DeadCode.class, Cfg.Declarations.class, Cfg.Expressions.class, Cfg.Functions.class, Cfg.TailCalls.class})
     public static class Cfg extends AbstractPseudoValueTest {
         public void testAllFilesPresentInCfg() throws Exception {
@@ -37,6 +39,7 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
         }
         
         @TestMetadata("compiler/testData/cfg/arrays")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Arrays extends AbstractPseudoValueTest {
             public void testAllFilesPresentInArrays() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/arrays"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -44,37 +47,44 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
             
             @TestMetadata("ArrayAccess.kt")
             public void testArrayAccess() throws Exception {
-                doTest("compiler/testData/cfg/arrays/ArrayAccess.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/ArrayAccess.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("arrayAccessExpression.kt")
             public void testArrayAccessExpression() throws Exception {
-                doTest("compiler/testData/cfg/arrays/arrayAccessExpression.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arrayAccessExpression.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("arrayInc.kt")
             public void testArrayInc() throws Exception {
-                doTest("compiler/testData/cfg/arrays/arrayInc.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arrayInc.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ArrayOfFunctions.kt")
             public void testArrayOfFunctions() throws Exception {
-                doTest("compiler/testData/cfg/arrays/ArrayOfFunctions.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/ArrayOfFunctions.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("arraySet.kt")
             public void testArraySet() throws Exception {
-                doTest("compiler/testData/cfg/arrays/arraySet.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arraySet.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("arraySetPlusAssign.kt")
             public void testArraySetPlusAssign() throws Exception {
-                doTest("compiler/testData/cfg/arrays/arraySetPlusAssign.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arraySetPlusAssign.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/cfg/basic")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Basic extends AbstractPseudoValueTest {
             public void testAllFilesPresentInBasic() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/basic"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -82,22 +92,26 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
             
             @TestMetadata("Basic.kt")
             public void testBasic() throws Exception {
-                doTest("compiler/testData/cfg/basic/Basic.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/basic/Basic.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("EmptyFunction.kt")
             public void testEmptyFunction() throws Exception {
-                doTest("compiler/testData/cfg/basic/EmptyFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/basic/EmptyFunction.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ShortFunction.kt")
             public void testShortFunction() throws Exception {
-                doTest("compiler/testData/cfg/basic/ShortFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/basic/ShortFunction.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/cfg/bugs")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Bugs extends AbstractPseudoValueTest {
             public void testAllFilesPresentInBugs() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/bugs"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -105,12 +119,14 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
             
             @TestMetadata("jumpToOuterScope.kt")
             public void testJumpToOuterScope() throws Exception {
-                doTest("compiler/testData/cfg/bugs/jumpToOuterScope.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/bugs/jumpToOuterScope.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/cfg/controlStructures")
+        @TestDataPath("$PROJECT_ROOT")
         public static class ControlStructures extends AbstractPseudoValueTest {
             public void testAllFilesPresentInControlStructures() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/controlStructures"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -118,57 +134,68 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
             
             @TestMetadata("continueInDoWhile.kt")
             public void testContinueInDoWhile() throws Exception {
-                doTest("compiler/testData/cfg/controlStructures/continueInDoWhile.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/continueInDoWhile.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("continueInFor.kt")
             public void testContinueInFor() throws Exception {
-                doTest("compiler/testData/cfg/controlStructures/continueInFor.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/continueInFor.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("continueInWhile.kt")
             public void testContinueInWhile() throws Exception {
-                doTest("compiler/testData/cfg/controlStructures/continueInWhile.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/continueInWhile.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Finally.kt")
             public void testFinally() throws Exception {
-                doTest("compiler/testData/cfg/controlStructures/Finally.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/Finally.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("FinallyTestCopy.kt")
             public void testFinallyTestCopy() throws Exception {
-                doTest("compiler/testData/cfg/controlStructures/FinallyTestCopy.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/FinallyTestCopy.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("For.kt")
             public void testFor() throws Exception {
-                doTest("compiler/testData/cfg/controlStructures/For.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/For.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("If.kt")
             public void testIf() throws Exception {
-                doTest("compiler/testData/cfg/controlStructures/If.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/If.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("OnlyWhileInFunctionBody.kt")
             public void testOnlyWhileInFunctionBody() throws Exception {
-                doTest("compiler/testData/cfg/controlStructures/OnlyWhileInFunctionBody.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/OnlyWhileInFunctionBody.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("returnsInWhen.kt")
             public void testReturnsInWhen() throws Exception {
-                doTest("compiler/testData/cfg/controlStructures/returnsInWhen.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/returnsInWhen.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("whenConditions.kt")
             public void testWhenConditions() throws Exception {
-                doTest("compiler/testData/cfg/controlStructures/whenConditions.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/whenConditions.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/cfg/conventions")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Conventions extends AbstractPseudoValueTest {
             public void testAllFilesPresentInConventions() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/conventions"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -176,32 +203,38 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
             
             @TestMetadata("bothReceivers.kt")
             public void testBothReceivers() throws Exception {
-                doTest("compiler/testData/cfg/conventions/bothReceivers.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/conventions/bothReceivers.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("equals.kt")
             public void testEquals() throws Exception {
-                doTest("compiler/testData/cfg/conventions/equals.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/conventions/equals.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("incrementAtTheEnd.kt")
             public void testIncrementAtTheEnd() throws Exception {
-                doTest("compiler/testData/cfg/conventions/incrementAtTheEnd.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/conventions/incrementAtTheEnd.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("invoke.kt")
             public void testInvoke() throws Exception {
-                doTest("compiler/testData/cfg/conventions/invoke.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/conventions/invoke.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("notEqual.kt")
             public void testNotEqual() throws Exception {
-                doTest("compiler/testData/cfg/conventions/notEqual.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/conventions/notEqual.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/cfg/deadCode")
+        @TestDataPath("$PROJECT_ROOT")
         public static class DeadCode extends AbstractPseudoValueTest {
             public void testAllFilesPresentInDeadCode() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/deadCode"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -209,22 +242,26 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
             
             @TestMetadata("DeadCode.kt")
             public void testDeadCode() throws Exception {
-                doTest("compiler/testData/cfg/deadCode/DeadCode.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/deadCode/DeadCode.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("returnInElvis.kt")
             public void testReturnInElvis() throws Exception {
-                doTest("compiler/testData/cfg/deadCode/returnInElvis.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/deadCode/returnInElvis.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("stringTemplate.kt")
             public void testStringTemplate() throws Exception {
-                doTest("compiler/testData/cfg/deadCode/stringTemplate.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/deadCode/stringTemplate.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/cfg/declarations")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({Declarations.ClassesAndObjects.class, Declarations.FunctionLiterals.class, Declarations.Functions.class, Declarations.Local.class, Declarations.MultiDeclaration.class, Declarations.Properties.class})
         public static class Declarations extends AbstractPseudoValueTest {
             public void testAllFilesPresentInDeclarations() throws Exception {
@@ -232,6 +269,7 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
             }
             
             @TestMetadata("compiler/testData/cfg/declarations/classesAndObjects")
+            @TestDataPath("$PROJECT_ROOT")
             public static class ClassesAndObjects extends AbstractPseudoValueTest {
                 public void testAllFilesPresentInClassesAndObjects() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/classesAndObjects"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -239,22 +277,26 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
                 
                 @TestMetadata("AnonymousInitializers.kt")
                 public void testAnonymousInitializers() throws Exception {
-                    doTest("compiler/testData/cfg/declarations/classesAndObjects/AnonymousInitializers.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/classesAndObjects/AnonymousInitializers.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("delegationByExpression.kt")
                 public void testDelegationByExpression() throws Exception {
-                    doTest("compiler/testData/cfg/declarations/classesAndObjects/delegationByExpression.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/classesAndObjects/delegationByExpression.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("delegationBySuperCall.kt")
                 public void testDelegationBySuperCall() throws Exception {
-                    doTest("compiler/testData/cfg/declarations/classesAndObjects/delegationBySuperCall.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/classesAndObjects/delegationBySuperCall.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/cfg/declarations/functionLiterals")
+            @TestDataPath("$PROJECT_ROOT")
             public static class FunctionLiterals extends AbstractPseudoValueTest {
                 public void testAllFilesPresentInFunctionLiterals() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/functionLiterals"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -262,12 +304,14 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
                 
                 @TestMetadata("unusedFunctionLiteral.kt")
                 public void testUnusedFunctionLiteral() throws Exception {
-                    doTest("compiler/testData/cfg/declarations/functionLiterals/unusedFunctionLiteral.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/functionLiterals/unusedFunctionLiteral.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/cfg/declarations/functions")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Functions extends AbstractPseudoValueTest {
                 public void testAllFilesPresentInFunctions() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/functions"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -275,17 +319,20 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
                 
                 @TestMetadata("FailFunction.kt")
                 public void testFailFunction() throws Exception {
-                    doTest("compiler/testData/cfg/declarations/functions/FailFunction.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/functions/FailFunction.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("typeParameter.kt")
                 public void testTypeParameter() throws Exception {
-                    doTest("compiler/testData/cfg/declarations/functions/typeParameter.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/functions/typeParameter.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/cfg/declarations/local")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Local extends AbstractPseudoValueTest {
                 public void testAllFilesPresentInLocal() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/local"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -293,27 +340,32 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
                 
                 @TestMetadata("localClass.kt")
                 public void testLocalClass() throws Exception {
-                    doTest("compiler/testData/cfg/declarations/local/localClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/local/localClass.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("LocalDeclarations.kt")
                 public void testLocalDeclarations() throws Exception {
-                    doTest("compiler/testData/cfg/declarations/local/LocalDeclarations.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/local/LocalDeclarations.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("localProperty.kt")
                 public void testLocalProperty() throws Exception {
-                    doTest("compiler/testData/cfg/declarations/local/localProperty.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/local/localProperty.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ObjectExpression.kt")
                 public void testObjectExpression() throws Exception {
-                    doTest("compiler/testData/cfg/declarations/local/ObjectExpression.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/local/ObjectExpression.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/cfg/declarations/multiDeclaration")
+            @TestDataPath("$PROJECT_ROOT")
             public static class MultiDeclaration extends AbstractPseudoValueTest {
                 public void testAllFilesPresentInMultiDeclaration() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/multiDeclaration"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -321,17 +373,20 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
                 
                 @TestMetadata("MultiDecl.kt")
                 public void testMultiDecl() throws Exception {
-                    doTest("compiler/testData/cfg/declarations/multiDeclaration/MultiDecl.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/multiDeclaration/MultiDecl.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("multiDeclarationWithError.kt")
                 public void testMultiDeclarationWithError() throws Exception {
-                    doTest("compiler/testData/cfg/declarations/multiDeclaration/multiDeclarationWithError.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/multiDeclaration/multiDeclarationWithError.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/cfg/declarations/properties")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Properties extends AbstractPseudoValueTest {
                 public void testAllFilesPresentInProperties() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/properties"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -339,22 +394,26 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
                 
                 @TestMetadata("backingFieldAccess.kt")
                 public void testBackingFieldAccess() throws Exception {
-                    doTest("compiler/testData/cfg/declarations/properties/backingFieldAccess.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/properties/backingFieldAccess.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("backingFieldQualifiedWithThis.kt")
                 public void testBackingFieldQualifiedWithThis() throws Exception {
-                    doTest("compiler/testData/cfg/declarations/properties/backingFieldQualifiedWithThis.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/properties/backingFieldQualifiedWithThis.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("DelegatedProperty.kt")
                 public void testDelegatedProperty() throws Exception {
-                    doTest("compiler/testData/cfg/declarations/properties/DelegatedProperty.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/properties/DelegatedProperty.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("unreachableDelegation.kt")
                 public void testUnreachableDelegation() throws Exception {
-                    doTest("compiler/testData/cfg/declarations/properties/unreachableDelegation.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/properties/unreachableDelegation.kt");
+                    doTest(fileName);
                 }
                 
             }
@@ -373,6 +432,7 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
         }
         
         @TestMetadata("compiler/testData/cfg/expressions")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Expressions extends AbstractPseudoValueTest {
             public void testAllFilesPresentInExpressions() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/expressions"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -380,107 +440,128 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
             
             @TestMetadata("assignmentToThis.kt")
             public void testAssignmentToThis() throws Exception {
-                doTest("compiler/testData/cfg/expressions/assignmentToThis.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/assignmentToThis.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Assignments.kt")
             public void testAssignments() throws Exception {
-                doTest("compiler/testData/cfg/expressions/Assignments.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/Assignments.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("callableReferences.kt")
             public void testCallableReferences() throws Exception {
-                doTest("compiler/testData/cfg/expressions/callableReferences.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/callableReferences.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("casts.kt")
             public void testCasts() throws Exception {
-                doTest("compiler/testData/cfg/expressions/casts.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/casts.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("chainedQualifiedExpression.kt")
             public void testChainedQualifiedExpression() throws Exception {
-                doTest("compiler/testData/cfg/expressions/chainedQualifiedExpression.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/chainedQualifiedExpression.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("expressionAsFunction.kt")
             public void testExpressionAsFunction() throws Exception {
-                doTest("compiler/testData/cfg/expressions/expressionAsFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/expressionAsFunction.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("incdec.kt")
             public void testIncdec() throws Exception {
-                doTest("compiler/testData/cfg/expressions/incdec.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/incdec.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("invalidVariableCall.kt")
             public void testInvalidVariableCall() throws Exception {
-                doTest("compiler/testData/cfg/expressions/invalidVariableCall.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/invalidVariableCall.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("LazyBooleans.kt")
             public void testLazyBooleans() throws Exception {
-                doTest("compiler/testData/cfg/expressions/LazyBooleans.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/LazyBooleans.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("nothingExpr.kt")
             public void testNothingExpr() throws Exception {
-                doTest("compiler/testData/cfg/expressions/nothingExpr.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/nothingExpr.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("parenthesizedSelector.kt")
             public void testParenthesizedSelector() throws Exception {
-                doTest("compiler/testData/cfg/expressions/parenthesizedSelector.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/parenthesizedSelector.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("propertySafeCall.kt")
             public void testPropertySafeCall() throws Exception {
-                doTest("compiler/testData/cfg/expressions/propertySafeCall.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/propertySafeCall.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("qualifiedExpressionWithoutSelector.kt")
             public void testQualifiedExpressionWithoutSelector() throws Exception {
-                doTest("compiler/testData/cfg/expressions/qualifiedExpressionWithoutSelector.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/qualifiedExpressionWithoutSelector.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ReturnFromExpression.kt")
             public void testReturnFromExpression() throws Exception {
-                doTest("compiler/testData/cfg/expressions/ReturnFromExpression.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/ReturnFromExpression.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("thisExpression.kt")
             public void testThisExpression() throws Exception {
-                doTest("compiler/testData/cfg/expressions/thisExpression.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/thisExpression.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("unresolvedCall.kt")
             public void testUnresolvedCall() throws Exception {
-                doTest("compiler/testData/cfg/expressions/unresolvedCall.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/unresolvedCall.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("unresolvedProperty.kt")
             public void testUnresolvedProperty() throws Exception {
-                doTest("compiler/testData/cfg/expressions/unresolvedProperty.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/unresolvedProperty.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("unresolvedWriteLHS.kt")
             public void testUnresolvedWriteLHS() throws Exception {
-                doTest("compiler/testData/cfg/expressions/unresolvedWriteLHS.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/unresolvedWriteLHS.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("unsupportedReturns.kt")
             public void testUnsupportedReturns() throws Exception {
-                doTest("compiler/testData/cfg/expressions/unsupportedReturns.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/unsupportedReturns.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("unusedExpressionSimpleName.kt")
             public void testUnusedExpressionSimpleName() throws Exception {
-                doTest("compiler/testData/cfg/expressions/unusedExpressionSimpleName.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/unusedExpressionSimpleName.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/cfg/functions")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Functions extends AbstractPseudoValueTest {
             public void testAllFilesPresentInFunctions() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/functions"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -488,17 +569,20 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
             
             @TestMetadata("DefaultValuesForArguments.kt")
             public void testDefaultValuesForArguments() throws Exception {
-                doTest("compiler/testData/cfg/functions/DefaultValuesForArguments.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/functions/DefaultValuesForArguments.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("unmappedArgs.kt")
             public void testUnmappedArgs() throws Exception {
-                doTest("compiler/testData/cfg/functions/unmappedArgs.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/functions/unmappedArgs.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/cfg/tailCalls")
+        @TestDataPath("$PROJECT_ROOT")
         public static class TailCalls extends AbstractPseudoValueTest {
             public void testAllFilesPresentInTailCalls() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/tailCalls"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -506,27 +590,32 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
             
             @TestMetadata("finally.kt")
             public void testFinally() throws Exception {
-                doTest("compiler/testData/cfg/tailCalls/finally.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/tailCalls/finally.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("finallyWithReturn.kt")
             public void testFinallyWithReturn() throws Exception {
-                doTest("compiler/testData/cfg/tailCalls/finallyWithReturn.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/tailCalls/finallyWithReturn.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("sum.kt")
             public void testSum() throws Exception {
-                doTest("compiler/testData/cfg/tailCalls/sum.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/tailCalls/sum.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("try.kt")
             public void testTry() throws Exception {
-                doTest("compiler/testData/cfg/tailCalls/try.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/tailCalls/try.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("tryCatchFinally.kt")
             public void testTryCatchFinally() throws Exception {
-                doTest("compiler/testData/cfg/tailCalls/tryCatchFinally.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/tailCalls/tryCatchFinally.kt");
+                doTest(fileName);
             }
             
         }
@@ -549,6 +638,7 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
     }
     
     @TestMetadata("compiler/testData/cfg-variables")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Cfg_variables.Basic.class, Cfg_variables.Bugs.class, Cfg_variables.LexicalScopes.class})
     public static class Cfg_variables extends AbstractPseudoValueTest {
         public void testAllFilesPresentInCfg_variables() throws Exception {
@@ -556,6 +646,7 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
         }
         
         @TestMetadata("compiler/testData/cfg-variables/basic")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Basic extends AbstractPseudoValueTest {
             public void testAllFilesPresentInBasic() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg-variables/basic"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -563,32 +654,38 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
             
             @TestMetadata("IfWithUninitialized.kt")
             public void testIfWithUninitialized() throws Exception {
-                doTest("compiler/testData/cfg-variables/basic/IfWithUninitialized.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/basic/IfWithUninitialized.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("InitializedNotDeclared.kt")
             public void testInitializedNotDeclared() throws Exception {
-                doTest("compiler/testData/cfg-variables/basic/InitializedNotDeclared.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/basic/InitializedNotDeclared.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("UsageInFunctionLiteral.kt")
             public void testUsageInFunctionLiteral() throws Exception {
-                doTest("compiler/testData/cfg-variables/basic/UsageInFunctionLiteral.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/basic/UsageInFunctionLiteral.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("VariablesInitialization.kt")
             public void testVariablesInitialization() throws Exception {
-                doTest("compiler/testData/cfg-variables/basic/VariablesInitialization.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/basic/VariablesInitialization.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("VariablesUsage.kt")
             public void testVariablesUsage() throws Exception {
-                doTest("compiler/testData/cfg-variables/basic/VariablesUsage.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/basic/VariablesUsage.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/cfg-variables/bugs")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Bugs extends AbstractPseudoValueTest {
             public void testAllFilesPresentInBugs() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg-variables/bugs"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -596,22 +693,26 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
             
             @TestMetadata("referenceToPropertyInitializer.kt")
             public void testReferenceToPropertyInitializer() throws Exception {
-                doTest("compiler/testData/cfg-variables/bugs/referenceToPropertyInitializer.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/bugs/referenceToPropertyInitializer.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("varInitializationInIf.kt")
             public void testVarInitializationInIf() throws Exception {
-                doTest("compiler/testData/cfg-variables/bugs/varInitializationInIf.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/bugs/varInitializationInIf.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("varInitializationInIfInCycle.kt")
             public void testVarInitializationInIfInCycle() throws Exception {
-                doTest("compiler/testData/cfg-variables/bugs/varInitializationInIfInCycle.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/bugs/varInitializationInIfInCycle.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/cfg-variables/lexicalScopes")
+        @TestDataPath("$PROJECT_ROOT")
         public static class LexicalScopes extends AbstractPseudoValueTest {
             public void testAllFilesPresentInLexicalScopes() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg-variables/lexicalScopes"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -619,62 +720,74 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
             
             @TestMetadata("doWhileScope.kt")
             public void testDoWhileScope() throws Exception {
-                doTest("compiler/testData/cfg-variables/lexicalScopes/doWhileScope.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/doWhileScope.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("forScope.kt")
             public void testForScope() throws Exception {
-                doTest("compiler/testData/cfg-variables/lexicalScopes/forScope.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/forScope.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("functionLiteralScope.kt")
             public void testFunctionLiteralScope() throws Exception {
-                doTest("compiler/testData/cfg-variables/lexicalScopes/functionLiteralScope.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/functionLiteralScope.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ifScope.kt")
             public void testIfScope() throws Exception {
-                doTest("compiler/testData/cfg-variables/lexicalScopes/ifScope.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/ifScope.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("localClass.kt")
             public void testLocalClass() throws Exception {
-                doTest("compiler/testData/cfg-variables/lexicalScopes/localClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/localClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("localFunctionScope.kt")
             public void testLocalFunctionScope() throws Exception {
-                doTest("compiler/testData/cfg-variables/lexicalScopes/localFunctionScope.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/localFunctionScope.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("localFunctionScopeWithoutBody.kt")
             public void testLocalFunctionScopeWithoutBody() throws Exception {
-                doTest("compiler/testData/cfg-variables/lexicalScopes/localFunctionScopeWithoutBody.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/localFunctionScopeWithoutBody.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("localObject.kt")
             public void testLocalObject() throws Exception {
-                doTest("compiler/testData/cfg-variables/lexicalScopes/localObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/localObject.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("objectLiteralScope.kt")
             public void testObjectLiteralScope() throws Exception {
-                doTest("compiler/testData/cfg-variables/lexicalScopes/objectLiteralScope.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/objectLiteralScope.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("propertyAccessorScope.kt")
             public void testPropertyAccessorScope() throws Exception {
-                doTest("compiler/testData/cfg-variables/lexicalScopes/propertyAccessorScope.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/propertyAccessorScope.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("tryScope.kt")
             public void testTryScope() throws Exception {
-                doTest("compiler/testData/cfg-variables/lexicalScopes/tryScope.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/tryScope.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("whileScope.kt")
             public void testWhileScope() throws Exception {
-                doTest("compiler/testData/cfg-variables/lexicalScopes/whileScope.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/whileScope.kt");
+                doTest(fileName);
             }
             
         }

compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestWithStdLibGenerated.java

@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.checkers;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/diagnostics/testsWithStdLib")
+@TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({JetDiagnosticsTestWithStdLibGenerated.Annotations.class, JetDiagnosticsTestWithStdLibGenerated.CallableReference.class, JetDiagnosticsTestWithStdLibGenerated.DuplicateJvmSignature.class, JetDiagnosticsTestWithStdLibGenerated.FunctionLiterals.class, JetDiagnosticsTestWithStdLibGenerated.KotlinSignature.class, JetDiagnosticsTestWithStdLibGenerated.NonLocalReturns.class})
 public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnosticsTestWithStdLib {
     public void testAllFilesPresentInTestsWithStdLib() throws Exception {
@@ -35,6 +37,7 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic
     }
     
     @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Annotations.AnnotationApplicability.class, Annotations.AnnotationParameterMustBeConstant.class})
     public static class Annotations extends AbstractJetDiagnosticsTestWithStdLib {
         public void testAllFilesPresentInAnnotations() throws Exception {
@@ -43,10 +46,12 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic
         
         @TestMetadata("ClassObjectAnnotatedWithItsClass.kt")
         public void testClassObjectAnnotatedWithItsClass() throws Exception {
-            doTest("compiler/testData/diagnostics/testsWithStdLib/annotations/ClassObjectAnnotatedWithItsClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/ClassObjectAnnotatedWithItsClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability")
+        @TestDataPath("$PROJECT_ROOT")
         public static class AnnotationApplicability extends AbstractJetDiagnosticsTestWithStdLib {
             public void testAllFilesPresentInAnnotationApplicability() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -54,17 +59,20 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic
             
             @TestMetadata("illegalPlatformName.kt")
             public void testIllegalPlatformName() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/illegalPlatformName.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/illegalPlatformName.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("platformName.kt")
             public void testPlatformName() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/platformName.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/platformName.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant")
+        @TestDataPath("$PROJECT_ROOT")
         public static class AnnotationParameterMustBeConstant extends AbstractJetDiagnosticsTestWithStdLib {
             public void testAllFilesPresentInAnnotationParameterMustBeConstant() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -72,22 +80,26 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic
             
             @TestMetadata("array.kt")
             public void testArray() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/array.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/array.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("classLiteral.kt")
             public void testClassLiteral() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/classLiteral.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/classLiteral.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("simple.kt")
             public void testSimple() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/simple.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/simple.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("vararg.kt")
             public void testVararg() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/vararg.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/vararg.kt");
+                doTest(fileName);
             }
             
         }
@@ -102,6 +114,7 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic
     }
     
     @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({CallableReference.Function.class, CallableReference.Property.class})
     public static class CallableReference extends AbstractJetDiagnosticsTestWithStdLib {
         public void testAllFilesPresentInCallableReference() throws Exception {
@@ -110,14 +123,17 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic
         
         @TestMetadata("unused.kt")
         public void testUnused() throws Exception {
-            doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/unused.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/unused.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Function extends AbstractJetDiagnosticsTestWithStdLib {
             @TestMetadata("abstractClassConstructors.kt")
             public void testAbstractClassConstructors() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/abstractClassConstructors.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/abstractClassConstructors.kt");
+                doTest(fileName);
             }
             
             public void testAllFilesPresentInFunction() throws Exception {
@@ -126,256 +142,307 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic
             
             @TestMetadata("ambiguityTopLevelVsTopLevel.kt")
             public void testAmbiguityTopLevelVsTopLevel() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/ambiguityTopLevelVsTopLevel.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/ambiguityTopLevelVsTopLevel.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("callableRefrenceOnNestedObject.kt")
             public void testCallableRefrenceOnNestedObject() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/callableRefrenceOnNestedObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/callableRefrenceOnNestedObject.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("constructorFromClass.kt")
             public void testConstructorFromClass() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("constructorFromExtension.kt")
             public void testConstructorFromExtension() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtension.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtension.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("constructorFromExtensionInClass.kt")
             public void testConstructorFromExtensionInClass() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtensionInClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtensionInClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("constructorFromTopLevel.kt")
             public void testConstructorFromTopLevel() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromTopLevel.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromTopLevel.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("differentPackageClass.kt")
             public void testDifferentPackageClass() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("differentPackageExtension.kt")
             public void testDifferentPackageExtension() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageExtension.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageExtension.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("differentPackageTopLevel.kt")
             public void testDifferentPackageTopLevel() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageTopLevel.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageTopLevel.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("empty.kt")
             public void testEmpty() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/empty.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/empty.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("extensionFromClass.kt")
             public void testExtensionFromClass() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("extensionFromExtension.kt")
             public void testExtensionFromExtension() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtension.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtension.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("extensionFromExtensionInClass.kt")
             public void testExtensionFromExtensionInClass() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtensionInClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtensionInClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("extensionFromTopLevel.kt")
             public void testExtensionFromTopLevel() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromTopLevel.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromTopLevel.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("extensionInClassDisallowed.kt")
             public void testExtensionInClassDisallowed() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionInClassDisallowed.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionInClassDisallowed.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("extensionOnNullable.kt")
             public void testExtensionOnNullable() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionOnNullable.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionOnNullable.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("genericClassFromTopLevel.kt")
             public void testGenericClassFromTopLevel() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/genericClassFromTopLevel.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/genericClassFromTopLevel.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("importedInnerConstructor.kt")
             public void testImportedInnerConstructor() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/importedInnerConstructor.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/importedInnerConstructor.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("innerConstructorFromClass.kt")
             public void testInnerConstructorFromClass() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("innerConstructorFromExtension.kt")
             public void testInnerConstructorFromExtension() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromExtension.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromExtension.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("innerConstructorFromTopLevel.kt")
             public void testInnerConstructorFromTopLevel() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromTopLevel.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromTopLevel.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("lhsNotAClass.kt")
             public void testLhsNotAClass() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/lhsNotAClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/lhsNotAClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("localConstructor.kt")
             public void testLocalConstructor() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructor.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructor.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("localConstructorFromExtensionInLocalClass.kt")
             public void testLocalConstructorFromExtensionInLocalClass() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromExtensionInLocalClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromExtensionInLocalClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("localConstructorFromLocalClass.kt")
             public void testLocalConstructorFromLocalClass() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("localConstructorFromLocalExtension.kt")
             public void testLocalConstructorFromLocalExtension() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalExtension.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalExtension.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("localNamedFun.kt")
             public void testLocalNamedFun() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFun.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFun.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("localNamedFunFromExtensionInLocalClass.kt")
             public void testLocalNamedFunFromExtensionInLocalClass() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromExtensionInLocalClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromExtensionInLocalClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("localNamedFunFromLocalClass.kt")
             public void testLocalNamedFunFromLocalClass() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("localNamedFunFromLocalExtension.kt")
             public void testLocalNamedFunFromLocalExtension() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalExtension.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalExtension.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("longQualifiedName.kt")
             public void testLongQualifiedName() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedName.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedName.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("longQualifiedNameGeneric.kt")
             public void testLongQualifiedNameGeneric() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedNameGeneric.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedNameGeneric.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("memberFromClass.kt")
             public void testMemberFromClass() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("memberFromExtension.kt")
             public void testMemberFromExtension() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtension.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtension.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("memberFromExtensionInClass.kt")
             public void testMemberFromExtensionInClass() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtensionInClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtensionInClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("memberFromTopLevel.kt")
             public void testMemberFromTopLevel() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromTopLevel.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromTopLevel.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("nestedConstructorFromClass.kt")
             public void testNestedConstructorFromClass() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("nestedConstructorFromExtension.kt")
             public void testNestedConstructorFromExtension() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromExtension.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromExtension.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("nestedConstructorFromTopLevel.kt")
             public void testNestedConstructorFromTopLevel() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromTopLevel.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromTopLevel.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("noAmbiguityLocalVsTopLevel.kt")
             public void testNoAmbiguityLocalVsTopLevel() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityLocalVsTopLevel.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityLocalVsTopLevel.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("noAmbiguityMemberVsExtension.kt")
             public void testNoAmbiguityMemberVsExtension() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsExtension.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsExtension.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("noAmbiguityMemberVsTopLevel.kt")
             public void testNoAmbiguityMemberVsTopLevel() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsTopLevel.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsTopLevel.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("renameOnImport.kt")
             public void testRenameOnImport() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/renameOnImport.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/renameOnImport.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("topLevelFromClass.kt")
             public void testTopLevelFromClass() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("topLevelFromExtension.kt")
             public void testTopLevelFromExtension() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromExtension.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromExtension.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("topLevelFromExtensionInClass.kt")
             public void testTopLevelFromExtensionInClass() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromExtensionInClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromExtensionInClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("topLevelFromTopLevel.kt")
             public void testTopLevelFromTopLevel() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromTopLevel.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromTopLevel.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("unresolved.kt")
             public void testUnresolved() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/unresolved.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/unresolved.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/property")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Property extends AbstractJetDiagnosticsTestWithStdLib {
             @TestMetadata("abstractPropertyViaSubclasses.kt")
             public void testAbstractPropertyViaSubclasses() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/abstractPropertyViaSubclasses.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/abstractPropertyViaSubclasses.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("accessViaSubclass.kt")
             public void testAccessViaSubclass() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/accessViaSubclass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/accessViaSubclass.kt");
+                doTest(fileName);
             }
             
             public void testAllFilesPresentInProperty() throws Exception {
@@ -384,57 +451,68 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic
             
             @TestMetadata("classFromClass.kt")
             public void testClassFromClass() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/classFromClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/classFromClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("extensionFromClass.kt")
             public void testExtensionFromClass() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionFromClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionFromClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("extensionFromTopLevel.kt")
             public void testExtensionFromTopLevel() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionFromTopLevel.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionFromTopLevel.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("extensionPropertyOnNullable.kt")
             public void testExtensionPropertyOnNullable() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionPropertyOnNullable.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionPropertyOnNullable.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("genericClass.kt")
             public void testGenericClass() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/genericClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/genericClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("javaInstanceField.kt")
             public void testJavaInstanceField() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/javaInstanceField.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/javaInstanceField.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("javaStaticFieldViaImport.kt")
             public void testJavaStaticFieldViaImport() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/javaStaticFieldViaImport.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/javaStaticFieldViaImport.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("localVariable.kt")
             public void testLocalVariable() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/localVariable.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/localVariable.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("memberFromExtension.kt")
             public void testMemberFromExtension() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/memberFromExtension.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/memberFromExtension.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("memberFromTopLevel.kt")
             public void testMemberFromTopLevel() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/memberFromTopLevel.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/memberFromTopLevel.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("topLevelFromTopLevel.kt")
             public void testTopLevelFromTopLevel() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/topLevelFromTopLevel.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/topLevelFromTopLevel.kt");
+                doTest(fileName);
             }
             
         }
@@ -449,6 +527,7 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic
     }
     
     @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature")
+    @TestDataPath("$PROJECT_ROOT")
     public static class DuplicateJvmSignature extends AbstractJetDiagnosticsTestWithStdLib {
         public void testAllFilesPresentInDuplicateJvmSignature() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -456,22 +535,26 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic
         
         @TestMetadata("delegatedProperty.kt")
         public void testDelegatedProperty() throws Exception {
-            doTest("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/delegatedProperty.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/delegatedProperty.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("platformNames.kt")
         public void testPlatformNames() throws Exception {
-            doTest("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNames.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNames.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("platformNamesDuplicate.kt")
         public void testPlatformNamesDuplicate() throws Exception {
-            doTest("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNamesDuplicate.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNamesDuplicate.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/functionLiterals")
+    @TestDataPath("$PROJECT_ROOT")
     public static class FunctionLiterals extends AbstractJetDiagnosticsTestWithStdLib {
         public void testAllFilesPresentInFunctionLiterals() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/functionLiterals"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -479,12 +562,14 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic
         
         @TestMetadata("pseudocodeMemoryOverhead.kt")
         public void testPseudocodeMemoryOverhead() throws Exception {
-            doTest("compiler/testData/diagnostics/testsWithStdLib/functionLiterals/pseudocodeMemoryOverhead.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/functionLiterals/pseudocodeMemoryOverhead.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/kotlinSignature")
+    @TestDataPath("$PROJECT_ROOT")
     public static class KotlinSignature extends AbstractJetDiagnosticsTestWithStdLib {
         public void testAllFilesPresentInKotlinSignature() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/kotlinSignature"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -492,17 +577,20 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic
         
         @TestMetadata("constructorNamedArguments.kt")
         public void testConstructorNamedArguments() throws Exception {
-            doTest("compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/constructorNamedArguments.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/constructorNamedArguments.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("parameterNames.kt")
         public void testParameterNames() throws Exception {
-            doTest("compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/parameterNames.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/parameterNames.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/nonLocalReturns")
+    @TestDataPath("$PROJECT_ROOT")
     public static class NonLocalReturns extends AbstractJetDiagnosticsTestWithStdLib {
         public void testAllFilesPresentInNonLocalReturns() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/nonLocalReturns"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -510,7 +598,8 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic
         
         @TestMetadata("prohibitNonLocalReturnOutOfTryCatchFinally.kt")
         public void testProhibitNonLocalReturnOutOfTryCatchFinally() throws Exception {
-            doTest("compiler/testData/diagnostics/testsWithStdLib/nonLocalReturns/prohibitNonLocalReturnOutOfTryCatchFinally.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/nonLocalReturns/prohibitNonLocalReturnOutOfTryCatchFinally.kt");
+            doTest(fileName);
         }
         
     }

compiler/tests/org/jetbrains/jet/cli/KotlincExecutableTestGenerated.java

@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.cli;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -30,6 +31,7 @@ import java.util.regex.Pattern;
 @InnerTestClasses({KotlincExecutableTestGenerated.Jvm.class, KotlincExecutableTestGenerated.Js.class})
 public class KotlincExecutableTestGenerated extends AbstractKotlincExecutableTest {
     @TestMetadata("compiler/testData/cli/jvm")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Jvm.WrongAbiVersionLib.class})
     public static class Jvm extends AbstractKotlincExecutableTest {
         public void testAllFilesPresentInJvm() throws Exception {
@@ -38,90 +40,108 @@ public class KotlincExecutableTestGenerated extends AbstractKotlincExecutableTes
         
         @TestMetadata("classpath.args")
         public void testClasspath() throws Exception {
-            doJvmTest("compiler/testData/cli/jvm/classpath.args");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/classpath.args");
+            doJvmTest(fileName);
         }
         
         @TestMetadata("conflictingOverloads.args")
         public void testConflictingOverloads() throws Exception {
-            doJvmTest("compiler/testData/cli/jvm/conflictingOverloads.args");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/conflictingOverloads.args");
+            doJvmTest(fileName);
         }
         
         @TestMetadata("diagnosticsOrder.args")
         public void testDiagnosticsOrder() throws Exception {
-            doJvmTest("compiler/testData/cli/jvm/diagnosticsOrder.args");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/diagnosticsOrder.args");
+            doJvmTest(fileName);
         }
         
         @TestMetadata("duplicateSources.args")
         public void testDuplicateSources() throws Exception {
-            doJvmTest("compiler/testData/cli/jvm/duplicateSources.args");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/duplicateSources.args");
+            doJvmTest(fileName);
         }
         
         @TestMetadata("duplicateSourcesInModule.args")
         public void testDuplicateSourcesInModule() throws Exception {
-            doJvmTest("compiler/testData/cli/jvm/duplicateSourcesInModule.args");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/duplicateSourcesInModule.args");
+            doJvmTest(fileName);
         }
         
         @TestMetadata("extraHelp.args")
         public void testExtraHelp() throws Exception {
-            doJvmTest("compiler/testData/cli/jvm/extraHelp.args");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/extraHelp.args");
+            doJvmTest(fileName);
         }
         
         @TestMetadata("help.args")
         public void testHelp() throws Exception {
-            doJvmTest("compiler/testData/cli/jvm/help.args");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/help.args");
+            doJvmTest(fileName);
         }
         
         @TestMetadata("multipleTextRangesInDiagnosticsOrder.args")
         public void testMultipleTextRangesInDiagnosticsOrder() throws Exception {
-            doJvmTest("compiler/testData/cli/jvm/multipleTextRangesInDiagnosticsOrder.args");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/multipleTextRangesInDiagnosticsOrder.args");
+            doJvmTest(fileName);
         }
         
         @TestMetadata("nonExistingClassPathAndAnnotationsPath.args")
         public void testNonExistingClassPathAndAnnotationsPath() throws Exception {
-            doJvmTest("compiler/testData/cli/jvm/nonExistingClassPathAndAnnotationsPath.args");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/nonExistingClassPathAndAnnotationsPath.args");
+            doJvmTest(fileName);
         }
         
         @TestMetadata("nonExistingSourcePath.args")
         public void testNonExistingSourcePath() throws Exception {
-            doJvmTest("compiler/testData/cli/jvm/nonExistingSourcePath.args");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/nonExistingSourcePath.args");
+            doJvmTest(fileName);
         }
         
         @TestMetadata("signatureClash.args")
         public void testSignatureClash() throws Exception {
-            doJvmTest("compiler/testData/cli/jvm/signatureClash.args");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/signatureClash.args");
+            doJvmTest(fileName);
         }
         
         @TestMetadata("simple.args")
         public void testSimple() throws Exception {
-            doJvmTest("compiler/testData/cli/jvm/simple.args");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/simple.args");
+            doJvmTest(fileName);
         }
         
         @TestMetadata("suppressAllWarningsJvm.args")
         public void testSuppressAllWarningsJvm() throws Exception {
-            doJvmTest("compiler/testData/cli/jvm/suppressAllWarningsJvm.args");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/suppressAllWarningsJvm.args");
+            doJvmTest(fileName);
         }
         
         @TestMetadata("wrongAbiVersion.args")
         public void testWrongAbiVersion() throws Exception {
-            doJvmTest("compiler/testData/cli/jvm/wrongAbiVersion.args");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/wrongAbiVersion.args");
+            doJvmTest(fileName);
         }
         
         @TestMetadata("wrongArgument.args")
         public void testWrongArgument() throws Exception {
-            doJvmTest("compiler/testData/cli/jvm/wrongArgument.args");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/wrongArgument.args");
+            doJvmTest(fileName);
         }
         
         @TestMetadata("wrongKotlinSignature.args")
         public void testWrongKotlinSignature() throws Exception {
-            doJvmTest("compiler/testData/cli/jvm/wrongKotlinSignature.args");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/wrongKotlinSignature.args");
+            doJvmTest(fileName);
         }
         
         @TestMetadata("wrongScriptWithNoSource.args")
         public void testWrongScriptWithNoSource() throws Exception {
-            doJvmTest("compiler/testData/cli/jvm/wrongScriptWithNoSource.args");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/wrongScriptWithNoSource.args");
+            doJvmTest(fileName);
         }
         
         @TestMetadata("compiler/testData/cli/jvm/wrongAbiVersionLib")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({})
         public static class WrongAbiVersionLib extends AbstractKotlincExecutableTest {
             public void testAllFilesPresentInWrongAbiVersionLib() throws Exception {
@@ -144,6 +164,7 @@ public class KotlincExecutableTestGenerated extends AbstractKotlincExecutableTes
     }
     
     @TestMetadata("compiler/testData/cli/js")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Js extends AbstractKotlincExecutableTest {
         public void testAllFilesPresentInJs() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cli/js"), Pattern.compile("^(.+)\\.args$"), true);
@@ -151,32 +172,38 @@ public class KotlincExecutableTestGenerated extends AbstractKotlincExecutableTes
         
         @TestMetadata("jsExtraHelp.args")
         public void testJsExtraHelp() throws Exception {
-            doJsTest("compiler/testData/cli/js/jsExtraHelp.args");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/js/jsExtraHelp.args");
+            doJsTest(fileName);
         }
         
         @TestMetadata("jsHelp.args")
         public void testJsHelp() throws Exception {
-            doJsTest("compiler/testData/cli/js/jsHelp.args");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/js/jsHelp.args");
+            doJsTest(fileName);
         }
         
         @TestMetadata("outputPostfixFileNotFound.args")
         public void testOutputPostfixFileNotFound() throws Exception {
-            doJsTest("compiler/testData/cli/js/outputPostfixFileNotFound.args");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/js/outputPostfixFileNotFound.args");
+            doJsTest(fileName);
         }
         
         @TestMetadata("outputPrefixFileNotFound.args")
         public void testOutputPrefixFileNotFound() throws Exception {
-            doJsTest("compiler/testData/cli/js/outputPrefixFileNotFound.args");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/js/outputPrefixFileNotFound.args");
+            doJsTest(fileName);
         }
         
         @TestMetadata("simple2js.args")
         public void testSimple2js() throws Exception {
-            doJsTest("compiler/testData/cli/js/simple2js.args");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/js/simple2js.args");
+            doJsTest(fileName);
         }
         
         @TestMetadata("suppressAllWarningsJS.args")
         public void testSuppressAllWarningsJS() throws Exception {
-            doJsTest("compiler/testData/cli/js/suppressAllWarningsJS.args");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/js/suppressAllWarningsJS.args");
+            doJsTest(fileName);
         }
         
     }

compiler/tests/org/jetbrains/jet/codegen/BytecodeTextTestGenerated.java

@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.codegen;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,11 +29,13 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/codegen/bytecodeText")
+@TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({BytecodeTextTestGenerated.BoxingOptimization.class, BytecodeTextTestGenerated.Constants.class, BytecodeTextTestGenerated.DirectInvoke.class, BytecodeTextTestGenerated.Statements.class, BytecodeTextTestGenerated.When.class, BytecodeTextTestGenerated.WhenEnumOptimization.class, BytecodeTextTestGenerated.WhenStringOptimization.class})
 public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest {
     @TestMetadata("accessorForProtected.kt")
     public void testAccessorForProtected() throws Exception {
-        doTest("compiler/testData/codegen/bytecodeText/accessorForProtected.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/accessorForProtected.kt");
+        doTest(fileName);
     }
     
     public void testAllFilesPresentInBytecodeText() throws Exception {
@@ -41,120 +44,144 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest {
     
     @TestMetadata("annotationRetentionPolicyClass.kt")
     public void testAnnotationRetentionPolicyClass() throws Exception {
-        doTest("compiler/testData/codegen/bytecodeText/annotationRetentionPolicyClass.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/annotationRetentionPolicyClass.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("annotationRetentionPolicyRuntime.kt")
     public void testAnnotationRetentionPolicyRuntime() throws Exception {
-        doTest("compiler/testData/codegen/bytecodeText/annotationRetentionPolicyRuntime.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/annotationRetentionPolicyRuntime.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("annotationRetentionPolicySource.kt")
     public void testAnnotationRetentionPolicySource() throws Exception {
-        doTest("compiler/testData/codegen/bytecodeText/annotationRetentionPolicySource.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/annotationRetentionPolicySource.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("bridgeForFakeOverride.kt")
     public void testBridgeForFakeOverride() throws Exception {
-        doTest("compiler/testData/codegen/bytecodeText/bridgeForFakeOverride.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/bridgeForFakeOverride.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("componentEvaluatesOnlyOnce.kt")
     public void testComponentEvaluatesOnlyOnce() throws Exception {
-        doTest("compiler/testData/codegen/bytecodeText/componentEvaluatesOnlyOnce.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/componentEvaluatesOnlyOnce.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("constClosureOptimization.kt")
     public void testConstClosureOptimization() throws Exception {
-        doTest("compiler/testData/codegen/bytecodeText/constClosureOptimization.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/constClosureOptimization.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("defaultDelegation.kt")
     public void testDefaultDelegation() throws Exception {
-        doTest("compiler/testData/codegen/bytecodeText/defaultDelegation.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/defaultDelegation.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("inlineFromOtherModule.kt")
     public void testInlineFromOtherModule() throws Exception {
-        doTest("compiler/testData/codegen/bytecodeText/inlineFromOtherModule.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/inlineFromOtherModule.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("intConstantNotNull.kt")
     public void testIntConstantNotNull() throws Exception {
-        doTest("compiler/testData/codegen/bytecodeText/intConstantNotNull.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/intConstantNotNull.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("intConstantNullable.kt")
     public void testIntConstantNullable() throws Exception {
-        doTest("compiler/testData/codegen/bytecodeText/intConstantNullable.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/intConstantNullable.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("intConstantNullableSafeCall.kt")
     public void testIntConstantNullableSafeCall() throws Exception {
-        doTest("compiler/testData/codegen/bytecodeText/intConstantNullableSafeCall.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/intConstantNullableSafeCall.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("intConstantSafeCall.kt")
     public void testIntConstantSafeCall() throws Exception {
-        doTest("compiler/testData/codegen/bytecodeText/intConstantSafeCall.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/intConstantSafeCall.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("kt2202.kt")
     public void testKt2202() throws Exception {
-        doTest("compiler/testData/codegen/bytecodeText/kt2202.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/kt2202.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("kt2887.kt")
     public void testKt2887() throws Exception {
-        doTest("compiler/testData/codegen/bytecodeText/kt2887.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/kt2887.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("kt3845.kt")
     public void testKt3845() throws Exception {
-        doTest("compiler/testData/codegen/bytecodeText/kt3845.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/kt3845.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("kt5016.kt")
     public void testKt5016() throws Exception {
-        doTest("compiler/testData/codegen/bytecodeText/kt5016.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/kt5016.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("kt5016int.kt")
     public void testKt5016int() throws Exception {
-        doTest("compiler/testData/codegen/bytecodeText/kt5016int.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/kt5016int.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("kt5016intOrNull.kt")
     public void testKt5016intOrNull() throws Exception {
-        doTest("compiler/testData/codegen/bytecodeText/kt5016intOrNull.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/kt5016intOrNull.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("noFlagAnnotations.kt")
     public void testNoFlagAnnotations() throws Exception {
-        doTest("compiler/testData/codegen/bytecodeText/noFlagAnnotations.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/noFlagAnnotations.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("noWrapperForMethodReturningPrimitive.kt")
     public void testNoWrapperForMethodReturningPrimitive() throws Exception {
-        doTest("compiler/testData/codegen/bytecodeText/noWrapperForMethodReturningPrimitive.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/noWrapperForMethodReturningPrimitive.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("privateDefaultArgs.kt")
     public void testPrivateDefaultArgs() throws Exception {
-        doTest("compiler/testData/codegen/bytecodeText/privateDefaultArgs.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/privateDefaultArgs.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("topLevelFunWithDefaultArgs.kt")
     public void testTopLevelFunWithDefaultArgs() throws Exception {
-        doTest("compiler/testData/codegen/bytecodeText/topLevelFunWithDefaultArgs.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/topLevelFunWithDefaultArgs.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("traitImplGeneratedOnce.kt")
     public void testTraitImplGeneratedOnce() throws Exception {
-        doTest("compiler/testData/codegen/bytecodeText/traitImplGeneratedOnce.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/traitImplGeneratedOnce.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("compiler/testData/codegen/bytecodeText/boxingOptimization")
+    @TestDataPath("$PROJECT_ROOT")
     public static class BoxingOptimization extends AbstractBytecodeTextTest {
         public void testAllFilesPresentInBoxingOptimization() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/boxingOptimization"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -162,62 +189,74 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest {
         
         @TestMetadata("casts.kt")
         public void testCasts() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/boxingOptimization/casts.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/boxingOptimization/casts.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("checkcastAndInstanceOf.kt")
         public void testCheckcastAndInstanceOf() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/boxingOptimization/checkcastAndInstanceOf.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/boxingOptimization/checkcastAndInstanceOf.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("fold.kt")
         public void testFold() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/boxingOptimization/fold.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/boxingOptimization/fold.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("nullCheck.kt")
         public void testNullCheck() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/boxingOptimization/nullCheck.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/boxingOptimization/nullCheck.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("progressions.kt")
         public void testProgressions() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/boxingOptimization/progressions.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/boxingOptimization/progressions.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("safeCallWithElvis.kt")
         public void testSafeCallWithElvis() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/boxingOptimization/safeCallWithElvis.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/boxingOptimization/safeCallWithElvis.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("severalInlines.kt")
         public void testSeveralInlines() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/boxingOptimization/severalInlines.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/boxingOptimization/severalInlines.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("simple.kt")
         public void testSimple() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/boxingOptimization/simple.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/boxingOptimization/simple.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("unsafeRemoving.kt")
         public void testUnsafeRemoving() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/boxingOptimization/unsafeRemoving.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/boxingOptimization/unsafeRemoving.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("variableClash.kt")
         public void testVariableClash() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/boxingOptimization/variableClash.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/boxingOptimization/variableClash.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("variables.kt")
         public void testVariables() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/boxingOptimization/variables.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/boxingOptimization/variables.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/bytecodeText/constants")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Constants extends AbstractBytecodeTextTest {
         public void testAllFilesPresentInConstants() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/constants"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -225,22 +264,26 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest {
         
         @TestMetadata("byte.kt")
         public void testByte() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/constants/byte.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/constants/byte.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("nullableByteAndShort.kt")
         public void testNullableByteAndShort() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/constants/nullableByteAndShort.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/constants/nullableByteAndShort.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("short.kt")
         public void testShort() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/constants/short.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/constants/short.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/bytecodeText/directInvoke")
+    @TestDataPath("$PROJECT_ROOT")
     public static class DirectInvoke extends AbstractBytecodeTextTest {
         public void testAllFilesPresentInDirectInvoke() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/directInvoke"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -248,22 +291,26 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest {
         
         @TestMetadata("callableReference.kt")
         public void testCallableReference() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/directInvoke/callableReference.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/directInvoke/callableReference.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("inplaceClosure.kt")
         public void testInplaceClosure() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/directInvoke/inplaceClosure.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/directInvoke/inplaceClosure.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("localFun.kt")
         public void testLocalFun() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/directInvoke/localFun.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/directInvoke/localFun.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/bytecodeText/statements")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Statements extends AbstractBytecodeTextTest {
         public void testAllFilesPresentInStatements() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/statements"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -271,37 +318,44 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest {
         
         @TestMetadata("ifSingleBranch.kt")
         public void testIfSingleBranch() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/statements/ifSingleBranch.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/statements/ifSingleBranch.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ifThenElse.kt")
         public void testIfThenElse() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/statements/ifThenElse.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/statements/ifThenElse.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ifThenElseEmpty.kt")
         public void testIfThenElseEmpty() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/statements/ifThenElseEmpty.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/statements/ifThenElseEmpty.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("tryCatchFinally.kt")
         public void testTryCatchFinally() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/statements/tryCatchFinally.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/statements/tryCatchFinally.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("when.kt")
         public void testWhen() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/statements/when.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/statements/when.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("whenSubject.kt")
         public void testWhenSubject() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/statements/whenSubject.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/statements/whenSubject.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/bytecodeText/when")
+    @TestDataPath("$PROJECT_ROOT")
     public static class When extends AbstractBytecodeTextTest {
         public void testAllFilesPresentInWhen() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/when"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -309,12 +363,14 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest {
         
         @TestMetadata("integralWhenWithNoInlinedConstants.kt")
         public void testIntegralWhenWithNoInlinedConstants() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/when/integralWhenWithNoInlinedConstants.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/when/integralWhenWithNoInlinedConstants.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/bytecodeText/whenEnumOptimization")
+    @TestDataPath("$PROJECT_ROOT")
     public static class WhenEnumOptimization extends AbstractBytecodeTextTest {
         public void testAllFilesPresentInWhenEnumOptimization() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/whenEnumOptimization"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -322,52 +378,62 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest {
         
         @TestMetadata("bigEnum.kt")
         public void testBigEnum() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/whenEnumOptimization/bigEnum.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenEnumOptimization/bigEnum.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("duplicatingItems.kt")
         public void testDuplicatingItems() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/whenEnumOptimization/duplicatingItems.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenEnumOptimization/duplicatingItems.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("expression.kt")
         public void testExpression() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/whenEnumOptimization/expression.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenEnumOptimization/expression.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("functionLiteralInTopLevel.kt")
         public void testFunctionLiteralInTopLevel() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/whenEnumOptimization/functionLiteralInTopLevel.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenEnumOptimization/functionLiteralInTopLevel.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("manyWhensWithinClass.kt")
         public void testManyWhensWithinClass() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/whenEnumOptimization/manyWhensWithinClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenEnumOptimization/manyWhensWithinClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("nonConstantEnum.kt")
         public void testNonConstantEnum() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/whenEnumOptimization/nonConstantEnum.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenEnumOptimization/nonConstantEnum.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("nullability.kt")
         public void testNullability() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/whenEnumOptimization/nullability.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenEnumOptimization/nullability.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("subjectAny.kt")
         public void testSubjectAny() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/whenEnumOptimization/subjectAny.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenEnumOptimization/subjectAny.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("withoutElse.kt")
         public void testWithoutElse() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/whenEnumOptimization/withoutElse.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenEnumOptimization/withoutElse.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/bytecodeText/whenStringOptimization")
+    @TestDataPath("$PROJECT_ROOT")
     public static class WhenStringOptimization extends AbstractBytecodeTextTest {
         public void testAllFilesPresentInWhenStringOptimization() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/whenStringOptimization"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -375,42 +441,50 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest {
         
         @TestMetadata("denseHashCode.kt")
         public void testDenseHashCode() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/whenStringOptimization/denseHashCode.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenStringOptimization/denseHashCode.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("duplicatingItems.kt")
         public void testDuplicatingItems() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/whenStringOptimization/duplicatingItems.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenStringOptimization/duplicatingItems.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("duplicatingItemsSameHashCode.kt")
         public void testDuplicatingItemsSameHashCode() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/whenStringOptimization/duplicatingItemsSameHashCode.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenStringOptimization/duplicatingItemsSameHashCode.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("expression.kt")
         public void testExpression() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/whenStringOptimization/expression.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenStringOptimization/expression.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("nonInlinedConst.kt")
         public void testNonInlinedConst() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/whenStringOptimization/nonInlinedConst.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenStringOptimization/nonInlinedConst.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("nullability.kt")
         public void testNullability() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/whenStringOptimization/nullability.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenStringOptimization/nullability.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("sameHashCode.kt")
         public void testSameHashCode() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/whenStringOptimization/sameHashCode.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenStringOptimization/sameHashCode.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("statement.kt")
         public void testStatement() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/whenStringOptimization/statement.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenStringOptimization/statement.kt");
+            doTest(fileName);
         }
         
     }

compiler/tests/org/jetbrains/jet/codegen/CheckLocalVariablesTableTestGenerated.java

@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.codegen;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/checkLocalVariablesTable")
+@TestDataPath("$PROJECT_ROOT")
 public class CheckLocalVariablesTableTestGenerated extends AbstractCheckLocalVariablesTableTest {
     public void testAllFilesPresentInCheckLocalVariablesTable() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/checkLocalVariablesTable"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -35,52 +37,62 @@ public class CheckLocalVariablesTableTestGenerated extends AbstractCheckLocalVar
     
     @TestMetadata("catchClause.kt")
     public void testCatchClause() throws Exception {
-        doTest("compiler/testData/checkLocalVariablesTable/catchClause.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/checkLocalVariablesTable/catchClause.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("copyFunction.kt")
     public void testCopyFunction() throws Exception {
-        doTest("compiler/testData/checkLocalVariablesTable/copyFunction.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/checkLocalVariablesTable/copyFunction.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("inlineLambdaWithItParam.kt")
     public void testInlineLambdaWithItParam() throws Exception {
-        doTest("compiler/testData/checkLocalVariablesTable/inlineLambdaWithItParam.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/checkLocalVariablesTable/inlineLambdaWithItParam.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("inlineLambdaWithParam.kt")
     public void testInlineLambdaWithParam() throws Exception {
-        doTest("compiler/testData/checkLocalVariablesTable/inlineLambdaWithParam.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/checkLocalVariablesTable/inlineLambdaWithParam.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("inlineSimple.kt")
     public void testInlineSimple() throws Exception {
-        doTest("compiler/testData/checkLocalVariablesTable/inlineSimple.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/checkLocalVariablesTable/inlineSimple.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("inlineSimpleChain.kt")
     public void testInlineSimpleChain() throws Exception {
-        doTest("compiler/testData/checkLocalVariablesTable/inlineSimpleChain.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/checkLocalVariablesTable/inlineSimpleChain.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("itInLambda.kt")
     public void testItInLambda() throws Exception {
-        doTest("compiler/testData/checkLocalVariablesTable/itInLambda.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/checkLocalVariablesTable/itInLambda.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("itInReturnedLambda.kt")
     public void testItInReturnedLambda() throws Exception {
-        doTest("compiler/testData/checkLocalVariablesTable/itInReturnedLambda.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/checkLocalVariablesTable/itInReturnedLambda.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("lambdaAsVar.kt")
     public void testLambdaAsVar() throws Exception {
-        doTest("compiler/testData/checkLocalVariablesTable/lambdaAsVar.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/checkLocalVariablesTable/lambdaAsVar.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("localFun.kt")
     public void testLocalFun() throws Exception {
-        doTest("compiler/testData/checkLocalVariablesTable/localFun.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/checkLocalVariablesTable/localFun.kt");
+        doTest(fileName);
     }
     
 }

compiler/tests/org/jetbrains/jet/codegen/ScriptCodegenTestGenerated.java

@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.codegen;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/codegen/script")
+@TestDataPath("$PROJECT_ROOT")
 public class ScriptCodegenTestGenerated extends AbstractScriptCodegenTest {
     public void testAllFilesPresentInScript() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/script"), Pattern.compile("^(.+)\\.kts$"), true);
@@ -35,72 +37,86 @@ public class ScriptCodegenTestGenerated extends AbstractScriptCodegenTest {
     
     @TestMetadata("empty.kts")
     public void testEmpty() throws Exception {
-        doTest("compiler/testData/codegen/script/empty.kts");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/script/empty.kts");
+        doTest(fileName);
     }
     
     @TestMetadata("helloWorld.kts")
     public void testHelloWorld() throws Exception {
-        doTest("compiler/testData/codegen/script/helloWorld.kts");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/script/helloWorld.kts");
+        doTest(fileName);
     }
     
     @TestMetadata("parameter.kts")
     public void testParameter() throws Exception {
-        doTest("compiler/testData/codegen/script/parameter.kts");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/script/parameter.kts");
+        doTest(fileName);
     }
     
     @TestMetadata("parameterArray.kts")
     public void testParameterArray() throws Exception {
-        doTest("compiler/testData/codegen/script/parameterArray.kts");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/script/parameterArray.kts");
+        doTest(fileName);
     }
     
     @TestMetadata("parameterClosure.kts")
     public void testParameterClosure() throws Exception {
-        doTest("compiler/testData/codegen/script/parameterClosure.kts");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/script/parameterClosure.kts");
+        doTest(fileName);
     }
     
     @TestMetadata("parameterLong.kts")
     public void testParameterLong() throws Exception {
-        doTest("compiler/testData/codegen/script/parameterLong.kts");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/script/parameterLong.kts");
+        doTest(fileName);
     }
     
     @TestMetadata("secondLevelFunction.kts")
     public void testSecondLevelFunction() throws Exception {
-        doTest("compiler/testData/codegen/script/secondLevelFunction.kts");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/script/secondLevelFunction.kts");
+        doTest(fileName);
     }
     
     @TestMetadata("secondLevelFunctionClosure.kts")
     public void testSecondLevelFunctionClosure() throws Exception {
-        doTest("compiler/testData/codegen/script/secondLevelFunctionClosure.kts");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/script/secondLevelFunctionClosure.kts");
+        doTest(fileName);
     }
     
     @TestMetadata("secondLevelVal.kts")
     public void testSecondLevelVal() throws Exception {
-        doTest("compiler/testData/codegen/script/secondLevelVal.kts");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/script/secondLevelVal.kts");
+        doTest(fileName);
     }
     
     @TestMetadata("simpleClass.kts")
     public void testSimpleClass() throws Exception {
-        doTest("compiler/testData/codegen/script/simpleClass.kts");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/script/simpleClass.kts");
+        doTest(fileName);
     }
     
     @TestMetadata("string.kts")
     public void testString() throws Exception {
-        doTest("compiler/testData/codegen/script/string.kts");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/script/string.kts");
+        doTest(fileName);
     }
     
     @TestMetadata("topLevelFunction.kts")
     public void testTopLevelFunction() throws Exception {
-        doTest("compiler/testData/codegen/script/topLevelFunction.kts");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/script/topLevelFunction.kts");
+        doTest(fileName);
     }
     
     @TestMetadata("topLevelFunctionClosure.kts")
     public void testTopLevelFunctionClosure() throws Exception {
-        doTest("compiler/testData/codegen/script/topLevelFunctionClosure.kts");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/script/topLevelFunctionClosure.kts");
+        doTest(fileName);
     }
     
     @TestMetadata("topLevelProperty.kts")
     public void testTopLevelProperty() throws Exception {
-        doTest("compiler/testData/codegen/script/topLevelProperty.kts");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/script/topLevelProperty.kts");
+        doTest(fileName);
     }
     
 }

compiler/tests/org/jetbrains/jet/codegen/TopLevelMembersInvocationTestGenerated.java

@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.codegen;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/codegen/topLevelMemberInvocation")
+@TestDataPath("$PROJECT_ROOT")
 public class TopLevelMembersInvocationTestGenerated extends AbstractTopLevelMembersInvocationTest {
     public void testAllFilesPresentInTopLevelMemberInvocation() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/topLevelMemberInvocation"), Pattern.compile("^([^\\.]+)$"), false);
@@ -35,37 +37,44 @@ public class TopLevelMembersInvocationTestGenerated extends AbstractTopLevelMemb
     
     @TestMetadata("extensionFunction")
     public void testExtensionFunction() throws Exception {
-        doTest("compiler/testData/codegen/topLevelMemberInvocation/extensionFunction/");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/topLevelMemberInvocation/extensionFunction/");
+        doTest(fileName);
     }
     
     @TestMetadata("functionDifferentPackage")
     public void testFunctionDifferentPackage() throws Exception {
-        doTest("compiler/testData/codegen/topLevelMemberInvocation/functionDifferentPackage/");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/topLevelMemberInvocation/functionDifferentPackage/");
+        doTest(fileName);
     }
     
     @TestMetadata("functionInMultiFilePackage")
     public void testFunctionInMultiFilePackage() throws Exception {
-        doTest("compiler/testData/codegen/topLevelMemberInvocation/functionInMultiFilePackage/");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/topLevelMemberInvocation/functionInMultiFilePackage/");
+        doTest(fileName);
     }
     
     @TestMetadata("functionSamePackage")
     public void testFunctionSamePackage() throws Exception {
-        doTest("compiler/testData/codegen/topLevelMemberInvocation/functionSamePackage/");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/topLevelMemberInvocation/functionSamePackage/");
+        doTest(fileName);
     }
     
     @TestMetadata("property")
     public void testProperty() throws Exception {
-        doTest("compiler/testData/codegen/topLevelMemberInvocation/property/");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/topLevelMemberInvocation/property/");
+        doTest(fileName);
     }
     
     @TestMetadata("propertyWithGetter")
     public void testPropertyWithGetter() throws Exception {
-        doTest("compiler/testData/codegen/topLevelMemberInvocation/propertyWithGetter/");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/topLevelMemberInvocation/propertyWithGetter/");
+        doTest(fileName);
     }
     
     @TestMetadata("twoModules")
     public void testTwoModules() throws Exception {
-        doTest("compiler/testData/codegen/topLevelMemberInvocation/twoModules/");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/topLevelMemberInvocation/twoModules/");
+        doTest(fileName);
     }
     
 }

compiler/tests/org/jetbrains/jet/codegen/defaultConstructor/DefaultArgumentsReflectionTestGenerated.java

@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.codegen.defaultConstructor;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/codegen/defaultArguments/reflection")
+@TestDataPath("$PROJECT_ROOT")
 public class DefaultArgumentsReflectionTestGenerated extends AbstractDefaultArgumentsReflectionTest {
     public void testAllFilesPresentInReflection() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/defaultArguments/reflection"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -35,62 +37,74 @@ public class DefaultArgumentsReflectionTestGenerated extends AbstractDefaultArgu
     
     @TestMetadata("classInClassObject.kt")
     public void testClassInClassObject() throws Exception {
-        doTest("compiler/testData/codegen/defaultArguments/reflection/classInClassObject.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/defaultArguments/reflection/classInClassObject.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("classInObject.kt")
     public void testClassInObject() throws Exception {
-        doTest("compiler/testData/codegen/defaultArguments/reflection/classInObject.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/defaultArguments/reflection/classInObject.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("classWithTwoDefaultArgs.kt")
     public void testClassWithTwoDefaultArgs() throws Exception {
-        doTest("compiler/testData/codegen/defaultArguments/reflection/classWithTwoDefaultArgs.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/defaultArguments/reflection/classWithTwoDefaultArgs.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("classWithVararg.kt")
     public void testClassWithVararg() throws Exception {
-        doTest("compiler/testData/codegen/defaultArguments/reflection/classWithVararg.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/defaultArguments/reflection/classWithVararg.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("enum.kt")
     public void testEnum() throws Exception {
-        doTest("compiler/testData/codegen/defaultArguments/reflection/enum.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/defaultArguments/reflection/enum.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("internalClass.kt")
     public void testInternalClass() throws Exception {
-        doTest("compiler/testData/codegen/defaultArguments/reflection/internalClass.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/defaultArguments/reflection/internalClass.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("privateClass.kt")
     public void testPrivateClass() throws Exception {
-        doTest("compiler/testData/codegen/defaultArguments/reflection/privateClass.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/defaultArguments/reflection/privateClass.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("privateConstructor.kt")
     public void testPrivateConstructor() throws Exception {
-        doTest("compiler/testData/codegen/defaultArguments/reflection/privateConstructor.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/defaultArguments/reflection/privateConstructor.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("publicClass.kt")
     public void testPublicClass() throws Exception {
-        doTest("compiler/testData/codegen/defaultArguments/reflection/publicClass.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/defaultArguments/reflection/publicClass.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("publicClassWoDefArgs.kt")
     public void testPublicClassWoDefArgs() throws Exception {
-        doTest("compiler/testData/codegen/defaultArguments/reflection/publicClassWoDefArgs.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/defaultArguments/reflection/publicClassWoDefArgs.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("publicInnerClass.kt")
     public void testPublicInnerClass() throws Exception {
-        doTest("compiler/testData/codegen/defaultArguments/reflection/publicInnerClass.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/defaultArguments/reflection/publicInnerClass.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("publicInnerClassInPrivateClass.kt")
     public void testPublicInnerClassInPrivateClass() throws Exception {
-        doTest("compiler/testData/codegen/defaultArguments/reflection/publicInnerClassInPrivateClass.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/defaultArguments/reflection/publicInnerClassInPrivateClass.kt");
+        doTest(fileName);
     }
     
 }

compiler/tests/org/jetbrains/jet/codegen/flags/WriteFlagsTestGenerated.java

@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.codegen.flags;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/writeFlags")
+@TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({WriteFlagsTestGenerated.Class.class, WriteFlagsTestGenerated.Function.class, WriteFlagsTestGenerated.InnerClass.class, WriteFlagsTestGenerated.Property.class})
 public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
     public void testAllFilesPresentInWriteFlags() throws Exception {
@@ -35,6 +37,7 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
     }
     
     @TestMetadata("compiler/testData/writeFlags/class")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Class.AccessFlags.class, Class.DeprecatedFlag.class, Class.Visibility.class})
     public static class Class extends AbstractWriteFlagsTest {
         public void testAllFilesPresentInClass() throws Exception {
@@ -42,6 +45,7 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
         }
         
         @TestMetadata("compiler/testData/writeFlags/class/accessFlags")
+        @TestDataPath("$PROJECT_ROOT")
         public static class AccessFlags extends AbstractWriteFlagsTest {
             public void testAllFilesPresentInAccessFlags() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/class/accessFlags"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -49,32 +53,38 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
             
             @TestMetadata("objectLiteral.kt")
             public void testObjectLiteral() throws Exception {
-                doTest("compiler/testData/writeFlags/class/accessFlags/objectLiteral.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/accessFlags/objectLiteral.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("publicFinalClass.kt")
             public void testPublicFinalClass() throws Exception {
-                doTest("compiler/testData/writeFlags/class/accessFlags/publicFinalClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/accessFlags/publicFinalClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("publicFinalInnerClass.kt")
             public void testPublicFinalInnerClass() throws Exception {
-                doTest("compiler/testData/writeFlags/class/accessFlags/publicFinalInnerClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/accessFlags/publicFinalInnerClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("publicInnerInterface.kt")
             public void testPublicInnerInterface() throws Exception {
-                doTest("compiler/testData/writeFlags/class/accessFlags/publicInnerInterface.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/accessFlags/publicInnerInterface.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("publicInterface.kt")
             public void testPublicInterface() throws Exception {
-                doTest("compiler/testData/writeFlags/class/accessFlags/publicInterface.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/accessFlags/publicInterface.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/writeFlags/class/deprecatedFlag")
+        @TestDataPath("$PROJECT_ROOT")
         public static class DeprecatedFlag extends AbstractWriteFlagsTest {
             public void testAllFilesPresentInDeprecatedFlag() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/class/deprecatedFlag"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -82,32 +92,38 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
             
             @TestMetadata("class.kt")
             public void testClass() throws Exception {
-                doTest("compiler/testData/writeFlags/class/deprecatedFlag/class.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/deprecatedFlag/class.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("classObject.kt")
             public void testClassObject() throws Exception {
-                doTest("compiler/testData/writeFlags/class/deprecatedFlag/classObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/deprecatedFlag/classObject.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("enumClass.kt")
             public void testEnumClass() throws Exception {
-                doTest("compiler/testData/writeFlags/class/deprecatedFlag/enumClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/deprecatedFlag/enumClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("innerClass.kt")
             public void testInnerClass() throws Exception {
-                doTest("compiler/testData/writeFlags/class/deprecatedFlag/innerClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/deprecatedFlag/innerClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("trait.kt")
             public void testTrait() throws Exception {
-                doTest("compiler/testData/writeFlags/class/deprecatedFlag/trait.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/deprecatedFlag/trait.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/writeFlags/class/visibility")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({Visibility.Internal.class, Visibility.Private.class, Visibility.Public.class})
         public static class Visibility extends AbstractWriteFlagsTest {
             public void testAllFilesPresentInVisibility() throws Exception {
@@ -115,6 +131,7 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
             }
             
             @TestMetadata("compiler/testData/writeFlags/class/visibility/internal")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Internal extends AbstractWriteFlagsTest {
                 public void testAllFilesPresentInInternal() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/class/visibility/internal"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -122,47 +139,56 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
                 
                 @TestMetadata("class.kt")
                 public void testClass() throws Exception {
-                    doTest("compiler/testData/writeFlags/class/visibility/internal/class.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/internal/class.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("enum.kt")
                 public void testEnum() throws Exception {
-                    doTest("compiler/testData/writeFlags/class/visibility/internal/enum.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/internal/enum.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("innerClass.kt")
                 public void testInnerClass() throws Exception {
-                    doTest("compiler/testData/writeFlags/class/visibility/internal/innerClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/internal/innerClass.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("innerEnum.kt")
                 public void testInnerEnum() throws Exception {
-                    doTest("compiler/testData/writeFlags/class/visibility/internal/innerEnum.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/internal/innerEnum.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("innerObject.kt")
                 public void testInnerObject() throws Exception {
-                    doTest("compiler/testData/writeFlags/class/visibility/internal/innerObject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/internal/innerObject.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("innerTrait.kt")
                 public void testInnerTrait() throws Exception {
-                    doTest("compiler/testData/writeFlags/class/visibility/internal/innerTrait.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/internal/innerTrait.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("object.kt")
                 public void testObject() throws Exception {
-                    doTest("compiler/testData/writeFlags/class/visibility/internal/object.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/internal/object.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("trait.kt")
                 public void testTrait() throws Exception {
-                    doTest("compiler/testData/writeFlags/class/visibility/internal/trait.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/internal/trait.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/writeFlags/class/visibility/private")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Private extends AbstractWriteFlagsTest {
                 public void testAllFilesPresentInPrivate() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/class/visibility/private"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -170,47 +196,56 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
                 
                 @TestMetadata("class.kt")
                 public void testClass() throws Exception {
-                    doTest("compiler/testData/writeFlags/class/visibility/private/class.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/private/class.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("enum.kt")
                 public void testEnum() throws Exception {
-                    doTest("compiler/testData/writeFlags/class/visibility/private/enum.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/private/enum.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("innerClass.kt")
                 public void testInnerClass() throws Exception {
-                    doTest("compiler/testData/writeFlags/class/visibility/private/innerClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/private/innerClass.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("innerEnum.kt")
                 public void testInnerEnum() throws Exception {
-                    doTest("compiler/testData/writeFlags/class/visibility/private/innerEnum.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/private/innerEnum.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("innerObject.kt")
                 public void testInnerObject() throws Exception {
-                    doTest("compiler/testData/writeFlags/class/visibility/private/innerObject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/private/innerObject.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("innerTrait.kt")
                 public void testInnerTrait() throws Exception {
-                    doTest("compiler/testData/writeFlags/class/visibility/private/innerTrait.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/private/innerTrait.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("object.kt")
                 public void testObject() throws Exception {
-                    doTest("compiler/testData/writeFlags/class/visibility/private/object.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/private/object.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("trait.kt")
                 public void testTrait() throws Exception {
-                    doTest("compiler/testData/writeFlags/class/visibility/private/trait.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/private/trait.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/writeFlags/class/visibility/public")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Public extends AbstractWriteFlagsTest {
                 public void testAllFilesPresentInPublic() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/class/visibility/public"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -218,42 +253,50 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
                 
                 @TestMetadata("class.kt")
                 public void testClass() throws Exception {
-                    doTest("compiler/testData/writeFlags/class/visibility/public/class.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/public/class.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("enum.kt")
                 public void testEnum() throws Exception {
-                    doTest("compiler/testData/writeFlags/class/visibility/public/enum.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/public/enum.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("innerClass.kt")
                 public void testInnerClass() throws Exception {
-                    doTest("compiler/testData/writeFlags/class/visibility/public/innerClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/public/innerClass.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("innerEnum.kt")
                 public void testInnerEnum() throws Exception {
-                    doTest("compiler/testData/writeFlags/class/visibility/public/innerEnum.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/public/innerEnum.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("innerObject.kt")
                 public void testInnerObject() throws Exception {
-                    doTest("compiler/testData/writeFlags/class/visibility/public/innerObject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/public/innerObject.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("innerTrait.kt")
                 public void testInnerTrait() throws Exception {
-                    doTest("compiler/testData/writeFlags/class/visibility/public/innerTrait.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/public/innerTrait.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("object.kt")
                 public void testObject() throws Exception {
-                    doTest("compiler/testData/writeFlags/class/visibility/public/object.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/public/object.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("trait.kt")
                 public void testTrait() throws Exception {
-                    doTest("compiler/testData/writeFlags/class/visibility/public/trait.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/public/trait.kt");
+                    doTest(fileName);
                 }
                 
             }
@@ -279,6 +322,7 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
     }
     
     @TestMetadata("compiler/testData/writeFlags/function")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Function.ClassObjectPrivate.class, Function.Constructors.class, Function.DeprecatedFlag.class})
     public static class Function extends AbstractWriteFlagsTest {
         public void testAllFilesPresentInFunction() throws Exception {
@@ -286,6 +330,7 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
         }
         
         @TestMetadata("compiler/testData/writeFlags/function/classObjectPrivate")
+        @TestDataPath("$PROJECT_ROOT")
         public static class ClassObjectPrivate extends AbstractWriteFlagsTest {
             public void testAllFilesPresentInClassObjectPrivate() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/function/classObjectPrivate"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -293,22 +338,26 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
             
             @TestMetadata("privateFun.kt")
             public void testPrivateFun() throws Exception {
-                doTest("compiler/testData/writeFlags/function/classObjectPrivate/privateFun.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/classObjectPrivate/privateFun.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("privateVal.kt")
             public void testPrivateVal() throws Exception {
-                doTest("compiler/testData/writeFlags/function/classObjectPrivate/privateVal.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/classObjectPrivate/privateVal.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("privateVar.kt")
             public void testPrivateVar() throws Exception {
-                doTest("compiler/testData/writeFlags/function/classObjectPrivate/privateVar.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/classObjectPrivate/privateVar.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/writeFlags/function/constructors")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Constructors extends AbstractWriteFlagsTest {
             public void testAllFilesPresentInConstructors() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/function/constructors"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -316,27 +365,32 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
             
             @TestMetadata("classObject.kt")
             public void testClassObject() throws Exception {
-                doTest("compiler/testData/writeFlags/function/constructors/classObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/constructors/classObject.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("objectInClass.kt")
             public void testObjectInClass() throws Exception {
-                doTest("compiler/testData/writeFlags/function/constructors/objectInClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/constructors/objectInClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("objectLiteral.kt")
             public void testObjectLiteral() throws Exception {
-                doTest("compiler/testData/writeFlags/function/constructors/objectLiteral.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/constructors/objectLiteral.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("topLevelObject.kt")
             public void testTopLevelObject() throws Exception {
-                doTest("compiler/testData/writeFlags/function/constructors/topLevelObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/constructors/topLevelObject.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/writeFlags/function/deprecatedFlag")
+        @TestDataPath("$PROJECT_ROOT")
         public static class DeprecatedFlag extends AbstractWriteFlagsTest {
             public void testAllFilesPresentInDeprecatedFlag() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/function/deprecatedFlag"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -344,62 +398,74 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
             
             @TestMetadata("emptyGetter.kt")
             public void testEmptyGetter() throws Exception {
-                doTest("compiler/testData/writeFlags/function/deprecatedFlag/emptyGetter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/deprecatedFlag/emptyGetter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("emptySetter.kt")
             public void testEmptySetter() throws Exception {
-                doTest("compiler/testData/writeFlags/function/deprecatedFlag/emptySetter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/deprecatedFlag/emptySetter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("extentionFun.kt")
             public void testExtentionFun() throws Exception {
-                doTest("compiler/testData/writeFlags/function/deprecatedFlag/extentionFun.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/deprecatedFlag/extentionFun.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("funInClass.kt")
             public void testFunInClass() throws Exception {
-                doTest("compiler/testData/writeFlags/function/deprecatedFlag/funInClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/deprecatedFlag/funInClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("funInClassObject.kt")
             public void testFunInClassObject() throws Exception {
-                doTest("compiler/testData/writeFlags/function/deprecatedFlag/funInClassObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/deprecatedFlag/funInClassObject.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("getter.kt")
             public void testGetter() throws Exception {
-                doTest("compiler/testData/writeFlags/function/deprecatedFlag/getter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/deprecatedFlag/getter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("getterAnnotationOnProperty.kt")
             public void testGetterAnnotationOnProperty() throws Exception {
-                doTest("compiler/testData/writeFlags/function/deprecatedFlag/getterAnnotationOnProperty.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/deprecatedFlag/getterAnnotationOnProperty.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("getterForPropertyInConstructor.kt")
             public void testGetterForPropertyInConstructor() throws Exception {
-                doTest("compiler/testData/writeFlags/function/deprecatedFlag/getterForPropertyInConstructor.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/deprecatedFlag/getterForPropertyInConstructor.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("setter.kt")
             public void testSetter() throws Exception {
-                doTest("compiler/testData/writeFlags/function/deprecatedFlag/setter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/deprecatedFlag/setter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("setterAnnotationOnProperty.kt")
             public void testSetterAnnotationOnProperty() throws Exception {
-                doTest("compiler/testData/writeFlags/function/deprecatedFlag/setterAnnotationOnProperty.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/deprecatedFlag/setterAnnotationOnProperty.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("setterForPropertyInConstructor.kt")
             public void testSetterForPropertyInConstructor() throws Exception {
-                doTest("compiler/testData/writeFlags/function/deprecatedFlag/setterForPropertyInConstructor.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/deprecatedFlag/setterForPropertyInConstructor.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("topLevelFun.kt")
             public void testTopLevelFun() throws Exception {
-                doTest("compiler/testData/writeFlags/function/deprecatedFlag/topLevelFun.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/deprecatedFlag/topLevelFun.kt");
+                doTest(fileName);
             }
             
         }
@@ -415,6 +481,7 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
     }
     
     @TestMetadata("compiler/testData/writeFlags/innerClass")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({InnerClass.Visibility.class})
     public static class InnerClass extends AbstractWriteFlagsTest {
         public void testAllFilesPresentInInnerClass() throws Exception {
@@ -422,6 +489,7 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
         }
         
         @TestMetadata("compiler/testData/writeFlags/innerClass/visibility")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Visibility extends AbstractWriteFlagsTest {
             public void testAllFilesPresentInVisibility() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/innerClass/visibility"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -429,32 +497,38 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
             
             @TestMetadata("internal.kt")
             public void testInternal() throws Exception {
-                doTest("compiler/testData/writeFlags/innerClass/visibility/internal.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/innerClass/visibility/internal.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("internalClassObject.kt")
             public void testInternalClassObject() throws Exception {
-                doTest("compiler/testData/writeFlags/innerClass/visibility/internalClassObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/innerClass/visibility/internalClassObject.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("private.kt")
             public void testPrivate() throws Exception {
-                doTest("compiler/testData/writeFlags/innerClass/visibility/private.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/innerClass/visibility/private.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("privateClassObject.kt")
             public void testPrivateClassObject() throws Exception {
-                doTest("compiler/testData/writeFlags/innerClass/visibility/privateClassObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/innerClass/visibility/privateClassObject.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("public.kt")
             public void testPublic() throws Exception {
-                doTest("compiler/testData/writeFlags/innerClass/visibility/public.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/innerClass/visibility/public.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("publicClassObject.kt")
             public void testPublicClassObject() throws Exception {
-                doTest("compiler/testData/writeFlags/innerClass/visibility/publicClassObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/innerClass/visibility/publicClassObject.kt");
+                doTest(fileName);
             }
             
         }
@@ -468,6 +542,7 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
     }
     
     @TestMetadata("compiler/testData/writeFlags/property")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Property.ClassObject.class, Property.DeprecatedFlag.class, Property.Visibility.class})
     public static class Property extends AbstractWriteFlagsTest {
         public void testAllFilesPresentInProperty() throws Exception {
@@ -475,6 +550,7 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
         }
         
         @TestMetadata("compiler/testData/writeFlags/property/classObject")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({ClassObject.Class.class, ClassObject.Rename.class, ClassObject.Trait.class})
         public static class ClassObject extends AbstractWriteFlagsTest {
             public void testAllFilesPresentInClassObject() throws Exception {
@@ -482,6 +558,7 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
             }
             
             @TestMetadata("compiler/testData/writeFlags/property/classObject/class")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Class extends AbstractWriteFlagsTest {
                 public void testAllFilesPresentInClass() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/property/classObject/class"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -489,92 +566,110 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
                 
                 @TestMetadata("delegatedProtectedVar.kt")
                 public void testDelegatedProtectedVar() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/class/delegatedProtectedVar.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/delegatedProtectedVar.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("delegatedPublicVal.kt")
                 public void testDelegatedPublicVal() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/class/delegatedPublicVal.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/delegatedPublicVal.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("internalVal.kt")
                 public void testInternalVal() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/class/internalVal.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/internalVal.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("internalVar.kt")
                 public void testInternalVar() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/class/internalVar.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/internalVar.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("internalVarPrivateSet.kt")
                 public void testInternalVarPrivateSet() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/class/internalVarPrivateSet.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/internalVarPrivateSet.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("noBackingField.kt")
                 public void testNoBackingField() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/class/noBackingField.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/noBackingField.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("privateVal.kt")
                 public void testPrivateVal() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/class/privateVal.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/privateVal.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("privateVar.kt")
                 public void testPrivateVar() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/class/privateVar.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/privateVar.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("protectedVal.kt")
                 public void testProtectedVal() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/class/protectedVal.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/protectedVal.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("protectedVarPrivateSet.kt")
                 public void testProtectedVarPrivateSet() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/class/protectedVarPrivateSet.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/protectedVarPrivateSet.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("publicVal.kt")
                 public void testPublicVal() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/class/publicVal.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/publicVal.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("publicValNonDefault.kt")
                 public void testPublicValNonDefault() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/class/publicValNonDefault.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/publicValNonDefault.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("publicVar.kt")
                 public void testPublicVar() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/class/publicVar.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/publicVar.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("publicVarNonDefault.kt")
                 public void testPublicVarNonDefault() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/class/publicVarNonDefault.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/publicVarNonDefault.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("publicVarPrivateSet.kt")
                 public void testPublicVarPrivateSet() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/class/publicVarPrivateSet.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/publicVarPrivateSet.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("publicVarProtectedSet.kt")
                 public void testPublicVarProtectedSet() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/class/publicVarProtectedSet.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/publicVarProtectedSet.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("publicVarPublicSet.kt")
                 public void testPublicVarPublicSet() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/class/publicVarPublicSet.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/publicVarPublicSet.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/writeFlags/property/classObject/rename")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Rename extends AbstractWriteFlagsTest {
                 public void testAllFilesPresentInRename() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/property/classObject/rename"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -582,27 +677,32 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
                 
                 @TestMetadata("constructorAndClassObject.kt")
                 public void testConstructorAndClassObject() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/rename/constructorAndClassObject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/rename/constructorAndClassObject.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("delegatedAndDelegated.kt")
                 public void testDelegatedAndDelegated() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/rename/delegatedAndDelegated.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/rename/delegatedAndDelegated.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("delegatedAndProperty.kt")
                 public void testDelegatedAndProperty() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/rename/delegatedAndProperty.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/rename/delegatedAndProperty.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("propertyAndProperty.kt")
                 public void testPropertyAndProperty() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/rename/propertyAndProperty.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/rename/propertyAndProperty.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/writeFlags/property/classObject/trait")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Trait extends AbstractWriteFlagsTest {
                 public void testAllFilesPresentInTrait() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/property/classObject/trait"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -610,87 +710,104 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
                 
                 @TestMetadata("delegatedProtectedVar.kt")
                 public void testDelegatedProtectedVar() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/trait/delegatedProtectedVar.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/delegatedProtectedVar.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("delegatedPublicVal.kt")
                 public void testDelegatedPublicVal() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/trait/delegatedPublicVal.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/delegatedPublicVal.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("internalVal.kt")
                 public void testInternalVal() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/trait/internalVal.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/internalVal.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("internalVar.kt")
                 public void testInternalVar() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/trait/internalVar.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/internalVar.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("internalVarPrivateSet.kt")
                 public void testInternalVarPrivateSet() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/trait/internalVarPrivateSet.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/internalVarPrivateSet.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("noBackingField.kt")
                 public void testNoBackingField() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/trait/noBackingField.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/noBackingField.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("privateVal.kt")
                 public void testPrivateVal() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/trait/privateVal.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/privateVal.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("privateVar.kt")
                 public void testPrivateVar() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/trait/privateVar.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/privateVar.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("protectedVal.kt")
                 public void testProtectedVal() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/trait/protectedVal.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/protectedVal.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("protectedVarPrivateSet.kt")
                 public void testProtectedVarPrivateSet() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/trait/protectedVarPrivateSet.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/protectedVarPrivateSet.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("publicVal.kt")
                 public void testPublicVal() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/trait/publicVal.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/publicVal.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("publicValNonDefault.kt")
                 public void testPublicValNonDefault() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/trait/publicValNonDefault.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/publicValNonDefault.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("publicVar.kt")
                 public void testPublicVar() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/trait/publicVar.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/publicVar.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("publicVarNonDefault.kt")
                 public void testPublicVarNonDefault() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/trait/publicVarNonDefault.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/publicVarNonDefault.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("publicVarPrivateSet.kt")
                 public void testPublicVarPrivateSet() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/trait/publicVarPrivateSet.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/publicVarPrivateSet.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("publicVarProtectedSet.kt")
                 public void testPublicVarProtectedSet() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/trait/publicVarProtectedSet.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/publicVarProtectedSet.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("publicVarPublicSet.kt")
                 public void testPublicVarPublicSet() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/trait/publicVarPublicSet.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/publicVarPublicSet.kt");
+                    doTest(fileName);
                 }
                 
             }
@@ -706,6 +823,7 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
         }
         
         @TestMetadata("compiler/testData/writeFlags/property/deprecatedFlag")
+        @TestDataPath("$PROJECT_ROOT")
         public static class DeprecatedFlag extends AbstractWriteFlagsTest {
             public void testAllFilesPresentInDeprecatedFlag() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/property/deprecatedFlag"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -713,17 +831,20 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
             
             @TestMetadata("propertyInClass.kt")
             public void testPropertyInClass() throws Exception {
-                doTest("compiler/testData/writeFlags/property/deprecatedFlag/propertyInClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/deprecatedFlag/propertyInClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("topLevelProperty.kt")
             public void testTopLevelProperty() throws Exception {
-                doTest("compiler/testData/writeFlags/property/deprecatedFlag/topLevelProperty.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/deprecatedFlag/topLevelProperty.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/writeFlags/property/visibility")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Visibility extends AbstractWriteFlagsTest {
             public void testAllFilesPresentInVisibility() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/property/visibility"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -731,17 +852,20 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
             
             @TestMetadata("internal.kt")
             public void testInternal() throws Exception {
-                doTest("compiler/testData/writeFlags/property/visibility/internal.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/visibility/internal.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("private.kt")
             public void testPrivate() throws Exception {
-                doTest("compiler/testData/writeFlags/property/visibility/private.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/visibility/private.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("public.kt")
             public void testPublic() throws Exception {
-                doTest("compiler/testData/writeFlags/property/visibility/public.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/visibility/public.kt");
+                doTest(fileName);
             }
             
         }

compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxAgainstJavaCodegenTestGenerated.java

@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.codegen.generated;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/codegen/boxAgainstJava")
+@TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({BlackBoxAgainstJavaCodegenTestGenerated.Annotations.class, BlackBoxAgainstJavaCodegenTestGenerated.CallableReference.class, BlackBoxAgainstJavaCodegenTestGenerated.Constructor.class, BlackBoxAgainstJavaCodegenTestGenerated.Delegation.class, BlackBoxAgainstJavaCodegenTestGenerated.Enum.class, BlackBoxAgainstJavaCodegenTestGenerated.Functions.class, BlackBoxAgainstJavaCodegenTestGenerated.InnerClass.class, BlackBoxAgainstJavaCodegenTestGenerated.Property.class, BlackBoxAgainstJavaCodegenTestGenerated.Reflection.class, BlackBoxAgainstJavaCodegenTestGenerated.Sam.class, BlackBoxAgainstJavaCodegenTestGenerated.StaticFun.class, BlackBoxAgainstJavaCodegenTestGenerated.Visibility.class})
 public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
     public void testAllFilesPresentInBoxAgainstJava() throws Exception {
@@ -35,6 +37,7 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod
     }
     
     @TestMetadata("compiler/testData/codegen/boxAgainstJava/annotations")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Annotations extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInAnnotations() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/annotations"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -42,37 +45,44 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod
         
         @TestMetadata("javaAnnotationCall.kt")
         public void testJavaAnnotationCall() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationCall.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationCall.kt");
+            doTestAgainstJava(fileName);
         }
         
         @TestMetadata("javaAnnotationDefault.kt")
         public void testJavaAnnotationDefault() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationDefault.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationDefault.kt");
+            doTestAgainstJava(fileName);
         }
         
         @TestMetadata("javaNegativePropertyAsAnnotationParameter.kt")
         public void testJavaNegativePropertyAsAnnotationParameter() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/annotations/javaNegativePropertyAsAnnotationParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/javaNegativePropertyAsAnnotationParameter.kt");
+            doTestAgainstJava(fileName);
         }
         
         @TestMetadata("javaPropertyAsAnnotationParameter.kt")
         public void testJavaPropertyAsAnnotationParameter() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/annotations/javaPropertyAsAnnotationParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/javaPropertyAsAnnotationParameter.kt");
+            doTestAgainstJava(fileName);
         }
         
         @TestMetadata("javaPropertyWithIntInitializer.kt")
         public void testJavaPropertyWithIntInitializer() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/annotations/javaPropertyWithIntInitializer.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/javaPropertyWithIntInitializer.kt");
+            doTestAgainstJava(fileName);
         }
         
         @TestMetadata("retentionInJava.kt")
         public void testRetentionInJava() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/annotations/retentionInJava.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/retentionInJava.kt");
+            doTestAgainstJava(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxAgainstJava/callableReference")
+    @TestDataPath("$PROJECT_ROOT")
     public static class CallableReference extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInCallableReference() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/callableReference"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -80,22 +90,26 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod
         
         @TestMetadata("constructor.kt")
         public void testConstructor() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/callableReference/constructor.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/callableReference/constructor.kt");
+            doTestAgainstJava(fileName);
         }
         
         @TestMetadata("publicFinalField.kt")
         public void testPublicFinalField() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/callableReference/publicFinalField.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/callableReference/publicFinalField.kt");
+            doTestAgainstJava(fileName);
         }
         
         @TestMetadata("publicMutableField.kt")
         public void testPublicMutableField() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/callableReference/publicMutableField.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/callableReference/publicMutableField.kt");
+            doTestAgainstJava(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxAgainstJava/constructor")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Constructor extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInConstructor() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/constructor"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -103,12 +117,14 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod
         
         @TestMetadata("genericConstructor.kt")
         public void testGenericConstructor() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/constructor/genericConstructor.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/constructor/genericConstructor.kt");
+            doTestAgainstJava(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxAgainstJava/delegation")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Delegation extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInDelegation() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/delegation"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -116,12 +132,14 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod
         
         @TestMetadata("delegationAndInheritanceFromJava.kt")
         public void testDelegationAndInheritanceFromJava() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/delegation/delegationAndInheritanceFromJava.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/delegation/delegationAndInheritanceFromJava.kt");
+            doTestAgainstJava(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxAgainstJava/enum")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Enum extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInEnum() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/enum"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -129,37 +147,44 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod
         
         @TestMetadata("simpleJavaEnum.kt")
         public void testSimpleJavaEnum() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/enum/simpleJavaEnum.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/enum/simpleJavaEnum.kt");
+            doTestAgainstJava(fileName);
         }
         
         @TestMetadata("simpleJavaEnumWithFunction.kt")
         public void testSimpleJavaEnumWithFunction() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/enum/simpleJavaEnumWithFunction.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/enum/simpleJavaEnumWithFunction.kt");
+            doTestAgainstJava(fileName);
         }
         
         @TestMetadata("simpleJavaEnumWithStaticImport.kt")
         public void testSimpleJavaEnumWithStaticImport() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/enum/simpleJavaEnumWithStaticImport.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/enum/simpleJavaEnumWithStaticImport.kt");
+            doTestAgainstJava(fileName);
         }
         
         @TestMetadata("simpleJavaInnerEnum.kt")
         public void testSimpleJavaInnerEnum() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/enum/simpleJavaInnerEnum.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/enum/simpleJavaInnerEnum.kt");
+            doTestAgainstJava(fileName);
         }
         
         @TestMetadata("staticField.kt")
         public void testStaticField() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/enum/staticField.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/enum/staticField.kt");
+            doTestAgainstJava(fileName);
         }
         
         @TestMetadata("staticMethod.kt")
         public void testStaticMethod() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/enum/staticMethod.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/enum/staticMethod.kt");
+            doTestAgainstJava(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxAgainstJava/functions")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Functions extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInFunctions() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/functions"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -167,32 +192,38 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod
         
         @TestMetadata("constructor.kt")
         public void testConstructor() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/functions/constructor.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/functions/constructor.kt");
+            doTestAgainstJava(fileName);
         }
         
         @TestMetadata("max.kt")
         public void testMax() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/functions/max.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/functions/max.kt");
+            doTestAgainstJava(fileName);
         }
         
         @TestMetadata("referencesStaticInnerClassMethod.kt")
         public void testReferencesStaticInnerClassMethod() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/functions/referencesStaticInnerClassMethod.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/functions/referencesStaticInnerClassMethod.kt");
+            doTestAgainstJava(fileName);
         }
         
         @TestMetadata("referencesStaticInnerClassMethodL2.kt")
         public void testReferencesStaticInnerClassMethodL2() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/functions/referencesStaticInnerClassMethodL2.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/functions/referencesStaticInnerClassMethodL2.kt");
+            doTestAgainstJava(fileName);
         }
         
         @TestMetadata("unrelatedUpperBounds.kt")
         public void testUnrelatedUpperBounds() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/functions/unrelatedUpperBounds.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/functions/unrelatedUpperBounds.kt");
+            doTestAgainstJava(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxAgainstJava/innerClass")
+    @TestDataPath("$PROJECT_ROOT")
     public static class InnerClass extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInInnerClass() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/innerClass"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -200,22 +231,26 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod
         
         @TestMetadata("kt3532.kt")
         public void testKt3532() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/innerClass/kt3532.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/innerClass/kt3532.kt");
+            doTestAgainstJava(fileName);
         }
         
         @TestMetadata("kt3812.kt")
         public void testKt3812() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/innerClass/kt3812.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/innerClass/kt3812.kt");
+            doTestAgainstJava(fileName);
         }
         
         @TestMetadata("kt4036.kt")
         public void testKt4036() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/innerClass/kt4036.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/innerClass/kt4036.kt");
+            doTestAgainstJava(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxAgainstJava/property")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Property extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInProperty() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/property"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -223,17 +258,20 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod
         
         @TestMetadata("fieldAccessFromExtensionInTraitImpl.kt")
         public void testFieldAccessFromExtensionInTraitImpl() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/property/fieldAccessFromExtensionInTraitImpl.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/property/fieldAccessFromExtensionInTraitImpl.kt");
+            doTestAgainstJava(fileName);
         }
         
         @TestMetadata("fieldAccessViaSubclass.kt")
         public void testFieldAccessViaSubclass() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/property/fieldAccessViaSubclass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/property/fieldAccessViaSubclass.kt");
+            doTestAgainstJava(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxAgainstJava/reflection")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Reflection.Mapping.class})
     public static class Reflection extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInReflection() throws Exception {
@@ -241,6 +279,7 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod
         }
         
         @TestMetadata("compiler/testData/codegen/boxAgainstJava/reflection/mapping")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Mapping extends AbstractBlackBoxCodegenTest {
             public void testAllFilesPresentInMapping() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/reflection/mapping"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -248,12 +287,14 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod
             
             @TestMetadata("jClass2kClass.kt")
             public void testJClass2kClass() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/reflection/mapping/jClass2kClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/reflection/mapping/jClass2kClass.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("javaFields.kt")
             public void testJavaFields() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/reflection/mapping/javaFields.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/reflection/mapping/javaFields.kt");
+                doTestAgainstJava(fileName);
             }
             
         }
@@ -267,6 +308,7 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod
     }
     
     @TestMetadata("compiler/testData/codegen/boxAgainstJava/sam")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Sam.Adapters.class})
     public static class Sam extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInSam() throws Exception {
@@ -275,15 +317,18 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod
         
         @TestMetadata("differentFqNames.kt")
         public void testDifferentFqNames() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/differentFqNames.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/differentFqNames.kt");
+            doTestAgainstJava(fileName);
         }
         
         @TestMetadata("samConstructorGenericSignature.kt")
         public void testSamConstructorGenericSignature() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/samConstructorGenericSignature.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/samConstructorGenericSignature.kt");
+            doTestAgainstJava(fileName);
         }
         
         @TestMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({Adapters.Operators.class})
         public static class Adapters extends AbstractBlackBoxCodegenTest {
             public void testAllFilesPresentInAdapters() throws Exception {
@@ -292,105 +337,126 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod
             
             @TestMetadata("callAbstractAdapter.kt")
             public void testCallAbstractAdapter() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/callAbstractAdapter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/callAbstractAdapter.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("comparator.kt")
             public void testComparator() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/comparator.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/comparator.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("constructor.kt")
             public void testConstructor() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/constructor.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/constructor.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("fileFilter.kt")
             public void testFileFilter() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/fileFilter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/fileFilter.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("genericSignature.kt")
             public void testGenericSignature() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/genericSignature.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/genericSignature.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("implementAdapter.kt")
             public void testImplementAdapter() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/implementAdapter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/implementAdapter.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("inheritedInKotlin.kt")
             public void testInheritedInKotlin() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/inheritedInKotlin.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/inheritedInKotlin.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("inheritedOverriddenAdapter.kt")
             public void testInheritedOverriddenAdapter() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/inheritedOverriddenAdapter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/inheritedOverriddenAdapter.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("inheritedSimple.kt")
             public void testInheritedSimple() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/inheritedSimple.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/inheritedSimple.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("nonLiteralAndLiteralRunnable.kt")
             public void testNonLiteralAndLiteralRunnable() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/nonLiteralAndLiteralRunnable.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/nonLiteralAndLiteralRunnable.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("nonLiteralComparator.kt")
             public void testNonLiteralComparator() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/nonLiteralComparator.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/nonLiteralComparator.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("nonLiteralInConstructor.kt")
             public void testNonLiteralInConstructor() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/nonLiteralInConstructor.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/nonLiteralInConstructor.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("nonLiteralNull.kt")
             public void testNonLiteralNull() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/nonLiteralNull.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/nonLiteralNull.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("nonLiteralRunnable.kt")
             public void testNonLiteralRunnable() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/nonLiteralRunnable.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/nonLiteralRunnable.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("severalSamParameters.kt")
             public void testSeveralSamParameters() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/severalSamParameters.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/severalSamParameters.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("simplest.kt")
             public void testSimplest() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/simplest.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/simplest.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("superconstructor.kt")
             public void testSuperconstructor() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/superconstructor.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/superconstructor.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("typeParameterOfClass.kt")
             public void testTypeParameterOfClass() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/typeParameterOfClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/typeParameterOfClass.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("typeParameterOfMethod.kt")
             public void testTypeParameterOfMethod() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/typeParameterOfMethod.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/typeParameterOfMethod.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("typeParameterOfOuterClass.kt")
             public void testTypeParameterOfOuterClass() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/typeParameterOfOuterClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/typeParameterOfOuterClass.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Operators extends AbstractBlackBoxCodegenTest {
                 public void testAllFilesPresentInOperators() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -398,62 +464,74 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod
                 
                 @TestMetadata("augmentedAssignmentAndSquareBrackets.kt")
                 public void testAugmentedAssignmentAndSquareBrackets() throws Exception {
-                    doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/augmentedAssignmentAndSquareBrackets.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/augmentedAssignmentAndSquareBrackets.kt");
+                    doTestAgainstJava(fileName);
                 }
                 
                 @TestMetadata("augmentedAssignmentPure.kt")
                 public void testAugmentedAssignmentPure() throws Exception {
-                    doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/augmentedAssignmentPure.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/augmentedAssignmentPure.kt");
+                    doTestAgainstJava(fileName);
                 }
                 
                 @TestMetadata("augmentedAssignmentViaSimpleBinary.kt")
                 public void testAugmentedAssignmentViaSimpleBinary() throws Exception {
-                    doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/augmentedAssignmentViaSimpleBinary.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/augmentedAssignmentViaSimpleBinary.kt");
+                    doTestAgainstJava(fileName);
                 }
                 
                 @TestMetadata("binary.kt")
                 public void testBinary() throws Exception {
-                    doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/binary.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/binary.kt");
+                    doTestAgainstJava(fileName);
                 }
                 
                 @TestMetadata("compareTo.kt")
                 public void testCompareTo() throws Exception {
-                    doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/compareTo.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/compareTo.kt");
+                    doTestAgainstJava(fileName);
                 }
                 
                 @TestMetadata("contains.kt")
                 public void testContains() throws Exception {
-                    doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/contains.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/contains.kt");
+                    doTestAgainstJava(fileName);
                 }
                 
                 @TestMetadata("get.kt")
                 public void testGet() throws Exception {
-                    doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/get.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/get.kt");
+                    doTestAgainstJava(fileName);
                 }
                 
                 @TestMetadata("infixCall.kt")
                 public void testInfixCall() throws Exception {
-                    doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/infixCall.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/infixCall.kt");
+                    doTestAgainstJava(fileName);
                 }
                 
                 @TestMetadata("invoke.kt")
                 public void testInvoke() throws Exception {
-                    doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/invoke.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/invoke.kt");
+                    doTestAgainstJava(fileName);
                 }
                 
                 @TestMetadata("multiGetSet.kt")
                 public void testMultiGetSet() throws Exception {
-                    doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/multiGetSet.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/multiGetSet.kt");
+                    doTestAgainstJava(fileName);
                 }
                 
                 @TestMetadata("multiInvoke.kt")
                 public void testMultiInvoke() throws Exception {
-                    doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/multiInvoke.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/multiInvoke.kt");
+                    doTestAgainstJava(fileName);
                 }
                 
                 @TestMetadata("set.kt")
                 public void testSet() throws Exception {
-                    doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/set.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/set.kt");
+                    doTestAgainstJava(fileName);
                 }
                 
             }
@@ -475,6 +553,7 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod
     }
     
     @TestMetadata("compiler/testData/codegen/boxAgainstJava/staticFun")
+    @TestDataPath("$PROJECT_ROOT")
     public static class StaticFun extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInStaticFun() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/staticFun"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -482,12 +561,14 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod
         
         @TestMetadata("classWithNestedEnum.kt")
         public void testClassWithNestedEnum() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/staticFun/classWithNestedEnum.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/staticFun/classWithNestedEnum.kt");
+            doTestAgainstJava(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxAgainstJava/visibility")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Visibility.Package.class, Visibility.ProtectedAndPackage.class, Visibility.ProtectedStatic.class})
     public static class Visibility extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInVisibility() throws Exception {
@@ -495,6 +576,7 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod
         }
         
         @TestMetadata("compiler/testData/codegen/boxAgainstJava/visibility/package")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Package extends AbstractBlackBoxCodegenTest {
             public void testAllFilesPresentInPackage() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/visibility/package"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -502,27 +584,32 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod
             
             @TestMetadata("kt2781.kt")
             public void testKt2781() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/package/kt2781.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/package/kt2781.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("packageClass.kt")
             public void testPackageClass() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/package/packageClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/package/packageClass.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("packageFun.kt")
             public void testPackageFun() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/package/packageFun.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/package/packageFun.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("packageProperty.kt")
             public void testPackageProperty() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/package/packageProperty.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/package/packageProperty.kt");
+                doTestAgainstJava(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedAndPackage")
+        @TestDataPath("$PROJECT_ROOT")
         public static class ProtectedAndPackage extends AbstractBlackBoxCodegenTest {
             public void testAllFilesPresentInProtectedAndPackage() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/visibility/protectedAndPackage"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -530,27 +617,32 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod
             
             @TestMetadata("overrideProtectedFunInPackage.kt")
             public void testOverrideProtectedFunInPackage() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/protectedAndPackage/overrideProtectedFunInPackage.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedAndPackage/overrideProtectedFunInPackage.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("protectedFunInPackage.kt")
             public void testProtectedFunInPackage() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/protectedAndPackage/protectedFunInPackage.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedAndPackage/protectedFunInPackage.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("protectedPropertyInPackage.kt")
             public void testProtectedPropertyInPackage() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/protectedAndPackage/protectedPropertyInPackage.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedAndPackage/protectedPropertyInPackage.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("protectedStaticClass.kt")
             public void testProtectedStaticClass() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/protectedAndPackage/protectedStaticClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedAndPackage/protectedStaticClass.kt");
+                doTestAgainstJava(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic")
+        @TestDataPath("$PROJECT_ROOT")
         public static class ProtectedStatic extends AbstractBlackBoxCodegenTest {
             public void testAllFilesPresentInProtectedStatic() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -558,62 +650,74 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod
             
             @TestMetadata("funCallInConstructor.kt")
             public void testFunCallInConstructor() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funCallInConstructor.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funCallInConstructor.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("funClassObject.kt")
             public void testFunClassObject() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funClassObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funClassObject.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("funGenericClass.kt")
             public void testFunGenericClass() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funGenericClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funGenericClass.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("funNestedStaticClass.kt")
             public void testFunNestedStaticClass() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funNestedStaticClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funNestedStaticClass.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("funNestedStaticClass2.kt")
             public void testFunNestedStaticClass2() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funNestedStaticClass2.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funNestedStaticClass2.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("funNestedStaticGenericClass.kt")
             public void testFunNestedStaticGenericClass() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funNestedStaticGenericClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funNestedStaticGenericClass.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("funNotDirectSuperClass.kt")
             public void testFunNotDirectSuperClass() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funNotDirectSuperClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funNotDirectSuperClass.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("funObject.kt")
             public void testFunObject() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funObject.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("simpleClass.kt")
             public void testSimpleClass() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/simpleClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/simpleClass.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("simpleClass2.kt")
             public void testSimpleClass2() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/simpleClass2.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/simpleClass2.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("simpleFun.kt")
             public void testSimpleFun() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/simpleFun.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/simpleFun.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("simpleProperty.kt")
             public void testSimpleProperty() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/simpleProperty.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/simpleProperty.kt");
+                doTestAgainstJava(fileName);
             }
             
         }

compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxInlineCodegenTestGenerated.java

@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.codegen.generated;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/codegen/boxInline")
+@TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({BlackBoxInlineCodegenTestGenerated.AnonymousObject.class, BlackBoxInlineCodegenTestGenerated.Builders.class, BlackBoxInlineCodegenTestGenerated.Capture.class, BlackBoxInlineCodegenTestGenerated.Complex.class, BlackBoxInlineCodegenTestGenerated.DefaultValues.class, BlackBoxInlineCodegenTestGenerated.LambdaClassClash.class, BlackBoxInlineCodegenTestGenerated.LambdaTransformation.class, BlackBoxInlineCodegenTestGenerated.LocalFunInLambda.class, BlackBoxInlineCodegenTestGenerated.NoInline.class, BlackBoxInlineCodegenTestGenerated.NonLocalReturns.class, BlackBoxInlineCodegenTestGenerated.Simple.class, BlackBoxInlineCodegenTestGenerated.Special.class, BlackBoxInlineCodegenTestGenerated.Trait.class, BlackBoxInlineCodegenTestGenerated.TryCatchFinally.class})
 public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
     public void testAllFilesPresentInBoxInline() throws Exception {
@@ -35,6 +37,7 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenT
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/anonymousObject")
+    @TestDataPath("$PROJECT_ROOT")
     public static class AnonymousObject extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInAnonymousObject() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/anonymousObject"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -42,27 +45,32 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenT
         
         @TestMetadata("anonymousObjectOnCallSite.1.kt")
         public void testAnonymousObjectOnCallSite() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnCallSite.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnCallSite.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("anonymousObjectOnCallSiteSuperParams.1.kt")
         public void testAnonymousObjectOnCallSiteSuperParams() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnCallSiteSuperParams.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnCallSiteSuperParams.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("anonymousObjectOnDeclarationSite.1.kt")
         public void testAnonymousObjectOnDeclarationSite() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnDeclarationSite.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnDeclarationSite.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("anonymousObjectOnDeclarationSiteSuperParams.1.kt")
         public void testAnonymousObjectOnDeclarationSiteSuperParams() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnDeclarationSiteSuperParams.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnDeclarationSiteSuperParams.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/builders")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Builders extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInBuilders() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/builders"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -70,17 +78,20 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenT
         
         @TestMetadata("builders.1.kt")
         public void testBuilders() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/builders/builders.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/builders/builders.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("buildersAndLambdaCapturing.1.kt")
         public void testBuildersAndLambdaCapturing() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/builders/buildersAndLambdaCapturing.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/builders/buildersAndLambdaCapturing.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/capture")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Capture extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInCapture() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/capture"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -88,37 +99,44 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenT
         
         @TestMetadata("captureInlinable.1.kt")
         public void testCaptureInlinable() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/capture/captureInlinable.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/capture/captureInlinable.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("captureInlinableAndOther.1.kt")
         public void testCaptureInlinableAndOther() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/capture/captureInlinableAndOther.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/capture/captureInlinableAndOther.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("captureThisAndReceiver.1.kt")
         public void testCaptureThisAndReceiver() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/capture/captureThisAndReceiver.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/capture/captureThisAndReceiver.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("generics.1.kt")
         public void testGenerics() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/capture/generics.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/capture/generics.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("simpleCapturingInClass.1.kt")
         public void testSimpleCapturingInClass() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/capture/simpleCapturingInClass.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/capture/simpleCapturingInClass.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("simpleCapturingInPackage.1.kt")
         public void testSimpleCapturingInPackage() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/capture/simpleCapturingInPackage.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/capture/simpleCapturingInPackage.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/complex")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Complex extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInComplex() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/complex"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -126,32 +144,38 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenT
         
         @TestMetadata("closureChain.1.kt")
         public void testClosureChain() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/complex/closureChain.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/complex/closureChain.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("forEachLine.1.kt")
         public void testForEachLine() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/complex/forEachLine.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/complex/forEachLine.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("lambdaInLambda.1.kt")
         public void testLambdaInLambda() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/complex/lambdaInLambda.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/complex/lambdaInLambda.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("use.1.kt")
         public void testUse() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/complex/use.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/complex/use.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("with.1.kt")
         public void testWith() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/complex/with.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/complex/with.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/defaultValues")
+    @TestDataPath("$PROJECT_ROOT")
     public static class DefaultValues extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInDefaultValues() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/defaultValues"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -159,32 +183,38 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenT
         
         @TestMetadata("defaultInExtension.1.kt")
         public void testDefaultInExtension() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/defaultValues/defaultInExtension.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/defaultInExtension.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("defaultMethod.1.kt")
         public void testDefaultMethod() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/defaultValues/defaultMethod.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/defaultMethod.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("defaultMethodInClass.1.kt")
         public void testDefaultMethodInClass() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/defaultValues/defaultMethodInClass.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/defaultMethodInClass.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("inlineInDefaultParameter.1.kt")
         public void testInlineInDefaultParameter() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/defaultValues/inlineInDefaultParameter.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/inlineInDefaultParameter.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("simpleDefaultMethod.1.kt")
         public void testSimpleDefaultMethod() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/defaultValues/simpleDefaultMethod.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/simpleDefaultMethod.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/lambdaClassClash")
+    @TestDataPath("$PROJECT_ROOT")
     public static class LambdaClassClash extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInLambdaClassClash() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/lambdaClassClash"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -192,17 +222,20 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenT
         
         @TestMetadata("lambdaClassClash.1.kt")
         public void testLambdaClassClash() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/lambdaClassClash/lambdaClassClash.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaClassClash/lambdaClassClash.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("noInlineLambdaX2.1.kt")
         public void testNoInlineLambdaX2() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/lambdaClassClash/noInlineLambdaX2.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaClassClash/noInlineLambdaX2.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/lambdaTransformation")
+    @TestDataPath("$PROJECT_ROOT")
     public static class LambdaTransformation extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInLambdaTransformation() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/lambdaTransformation"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -210,32 +243,38 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenT
         
         @TestMetadata("lambdaCloning.1.kt")
         public void testLambdaCloning() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/lambdaTransformation/lambdaCloning.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaTransformation/lambdaCloning.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("lambdaInLambda2.1.kt")
         public void testLambdaInLambda2() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/lambdaTransformation/lambdaInLambda2.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaTransformation/lambdaInLambda2.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("lambdaInLambdaNoInline.1.kt")
         public void testLambdaInLambdaNoInline() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/lambdaTransformation/lambdaInLambdaNoInline.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaTransformation/lambdaInLambdaNoInline.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("regeneratedLambdaName.1.kt")
         public void testRegeneratedLambdaName() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/lambdaTransformation/regeneratedLambdaName.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaTransformation/regeneratedLambdaName.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("sameCaptured.1.kt")
         public void testSameCaptured() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/lambdaTransformation/sameCaptured.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaTransformation/sameCaptured.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/localFunInLambda")
+    @TestDataPath("$PROJECT_ROOT")
     public static class LocalFunInLambda extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInLocalFunInLambda() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/localFunInLambda"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -243,12 +282,14 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenT
         
         @TestMetadata("localFunInLambda.1.kt")
         public void testLocalFunInLambda() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/localFunInLambda/localFunInLambda.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/localFunInLambda/localFunInLambda.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/noInline")
+    @TestDataPath("$PROJECT_ROOT")
     public static class NoInline extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInNoInline() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/noInline"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -256,27 +297,32 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenT
         
         @TestMetadata("noInline.1.kt")
         public void testNoInline() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/noInline/noInline.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/noInline/noInline.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("noInlineLambdaChain.1.kt")
         public void testNoInlineLambdaChain() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/noInline/noInlineLambdaChain.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/noInline/noInlineLambdaChain.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("noInlineLambdaChainWithCapturedInline.1.kt")
         public void testNoInlineLambdaChainWithCapturedInline() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/noInline/noInlineLambdaChainWithCapturedInline.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/noInline/noInlineLambdaChainWithCapturedInline.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("withoutInline.1.kt")
         public void testWithoutInline() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/noInline/withoutInline.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/noInline/withoutInline.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/nonLocalReturns")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({NonLocalReturns.Deparenthesize.class, NonLocalReturns.TryFinally.class})
     public static class NonLocalReturns extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInNonLocalReturns() throws Exception {
@@ -285,40 +331,48 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenT
         
         @TestMetadata("explicitLocalReturn.1.kt")
         public void testExplicitLocalReturn() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/nonLocalReturns/explicitLocalReturn.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/explicitLocalReturn.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("justReturnInLambda.1.kt")
         public void testJustReturnInLambda() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/nonLocalReturns/justReturnInLambda.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/justReturnInLambda.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("nestedNonLocals.1.kt")
         public void testNestedNonLocals() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/nonLocalReturns/nestedNonLocals.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/nestedNonLocals.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("noInlineLocalReturn.1.kt")
         public void testNoInlineLocalReturn() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/nonLocalReturns/noInlineLocalReturn.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/noInlineLocalReturn.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("propertyAccessors.1.kt")
         public void testPropertyAccessors() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/nonLocalReturns/propertyAccessors.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/propertyAccessors.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("simple.1.kt")
         public void testSimple() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/nonLocalReturns/simple.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/simple.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("simpleVoid.1.kt")
         public void testSimpleVoid() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/nonLocalReturns/simpleVoid.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/simpleVoid.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/deparenthesize")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Deparenthesize extends AbstractBlackBoxCodegenTest {
             public void testAllFilesPresentInDeparenthesize() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/nonLocalReturns/deparenthesize"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -326,17 +380,20 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenT
             
             @TestMetadata("bracket.1.kt")
             public void testBracket() throws Exception {
-                doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/nonLocalReturns/deparenthesize/bracket.1.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/deparenthesize/bracket.1.kt");
+                doTestMultiFileWithInlineCheck(fileName);
             }
             
             @TestMetadata("labeled.1.kt")
             public void testLabeled() throws Exception {
-                doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/nonLocalReturns/deparenthesize/labeled.1.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/deparenthesize/labeled.1.kt");
+                doTestMultiFileWithInlineCheck(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally")
+        @TestDataPath("$PROJECT_ROOT")
         public static class TryFinally extends AbstractBlackBoxCodegenTest {
             public void testAllFilesPresentInTryFinally() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -344,7 +401,8 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenT
             
             @TestMetadata("external.1.kt")
             public void testExternal() throws Exception {
-                doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/external.1.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/external.1.kt");
+                doTestMultiFileWithInlineCheck(fileName);
             }
             
         }
@@ -359,6 +417,7 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenT
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/simple")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Simple extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInSimple() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/simple"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -366,72 +425,86 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenT
         
         @TestMetadata("classObject.1.kt")
         public void testClassObject() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simple/classObject.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/classObject.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("extension.1.kt")
         public void testExtension() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simple/extension.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/extension.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("params.1.kt")
         public void testParams() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simple/params.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/params.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("rootConstructor.1.kt")
         public void testRootConstructor() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simple/rootConstructor.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/rootConstructor.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("severalClosures.1.kt")
         public void testSeveralClosures() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simple/severalClosures.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/severalClosures.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("severalUsage.1.kt")
         public void testSeveralUsage() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simple/severalUsage.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/severalUsage.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("simpleDouble.1.kt")
         public void testSimpleDouble() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simple/simpleDouble.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/simpleDouble.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("simpleEnum.1.kt")
         public void testSimpleEnum() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simple/simpleEnum.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/simpleEnum.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("simpleGenerics.1.kt")
         public void testSimpleGenerics() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simple/simpleGenerics.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/simpleGenerics.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("simpleInt.1.kt")
         public void testSimpleInt() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simple/simpleInt.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/simpleInt.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("simpleLambda.1.kt")
         public void testSimpleLambda() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simple/simpleLambda.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/simpleLambda.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("simpleObject.1.kt")
         public void testSimpleObject() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simple/simpleObject.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/simpleObject.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("vararg.1.kt")
         public void testVararg() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simple/vararg.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/vararg.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/special")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Special extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInSpecial() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/special"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -439,37 +512,44 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenT
         
         @TestMetadata("identityCheck.1.kt")
         public void testIdentityCheck() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/special/identityCheck.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/special/identityCheck.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("ifBranches.1.kt")
         public void testIfBranches() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/special/ifBranches.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/special/ifBranches.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("iinc.1.kt")
         public void testIinc() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/special/iinc.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/special/iinc.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("inlineChain.1.kt")
         public void testInlineChain() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/special/inlineChain.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/special/inlineChain.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("plusAssign.1.kt")
         public void testPlusAssign() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/special/plusAssign.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/special/plusAssign.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("stackHeightBug.1.kt")
         public void testStackHeightBug() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/special/stackHeightBug.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/special/stackHeightBug.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/trait")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Trait extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInTrait() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/trait"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -477,12 +557,14 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenT
         
         @TestMetadata("trait.1.kt")
         public void testTrait() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/trait/trait.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/trait/trait.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/tryCatchFinally")
+    @TestDataPath("$PROJECT_ROOT")
     public static class TryCatchFinally extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInTryCatchFinally() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/tryCatchFinally"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -490,17 +572,20 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenT
         
         @TestMetadata("tryCatch.1.kt")
         public void testTryCatch() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/tryCatchFinally/tryCatch.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/tryCatchFinally/tryCatch.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("tryCatch2.1.kt")
         public void testTryCatch2() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/tryCatchFinally/tryCatch2.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/tryCatchFinally/tryCatch2.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("tryCatchFinally.1.kt")
         public void testTryCatchFinally() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/tryCatchFinally/tryCatchFinally.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/tryCatchFinally/tryCatchFinally.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
     }

compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxMultiFileCodegenTestGenerated.java

@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.codegen.generated;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,10 +29,12 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/codegen/boxMultiFile")
+@TestDataPath("$PROJECT_ROOT")
 public class BlackBoxMultiFileCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
     @TestMetadata("accessorForProtected")
     public void testAccessorForProtected() throws Exception {
-        doTestMultiFile("compiler/testData/codegen/boxMultiFile/accessorForProtected/");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/accessorForProtected/");
+        doTestMultiFile(fileName);
     }
     
     public void testAllFilesPresentInBoxMultiFile() throws Exception {
@@ -40,52 +43,62 @@ public class BlackBoxMultiFileCodegenTestGenerated extends AbstractBlackBoxCodeg
     
     @TestMetadata("internalVisibility")
     public void testInternalVisibility() throws Exception {
-        doTestMultiFile("compiler/testData/codegen/boxMultiFile/internalVisibility/");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/internalVisibility/");
+        doTestMultiFile(fileName);
     }
     
     @TestMetadata("kt1515")
     public void testKt1515() throws Exception {
-        doTestMultiFile("compiler/testData/codegen/boxMultiFile/kt1515/");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/kt1515/");
+        doTestMultiFile(fileName);
     }
     
     @TestMetadata("kt1528")
     public void testKt1528() throws Exception {
-        doTestMultiFile("compiler/testData/codegen/boxMultiFile/kt1528/");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/kt1528/");
+        doTestMultiFile(fileName);
     }
     
     @TestMetadata("kt1845")
     public void testKt1845() throws Exception {
-        doTestMultiFile("compiler/testData/codegen/boxMultiFile/kt1845/");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/kt1845/");
+        doTestMultiFile(fileName);
     }
     
     @TestMetadata("kt2060")
     public void testKt2060() throws Exception {
-        doTestMultiFile("compiler/testData/codegen/boxMultiFile/kt2060/");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/kt2060/");
+        doTestMultiFile(fileName);
     }
     
     @TestMetadata("kt2257")
     public void testKt2257() throws Exception {
-        doTestMultiFile("compiler/testData/codegen/boxMultiFile/kt2257/");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/kt2257/");
+        doTestMultiFile(fileName);
     }
     
     @TestMetadata("nestedPackages")
     public void testNestedPackages() throws Exception {
-        doTestMultiFile("compiler/testData/codegen/boxMultiFile/nestedPackages/");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/nestedPackages/");
+        doTestMultiFile(fileName);
     }
     
     @TestMetadata("samWrappersDifferentFiles")
     public void testSamWrappersDifferentFiles() throws Exception {
-        doTestMultiFile("compiler/testData/codegen/boxMultiFile/samWrappersDifferentFiles/");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/samWrappersDifferentFiles/");
+        doTestMultiFile(fileName);
     }
     
     @TestMetadata("sameFileName")
     public void testSameFileName() throws Exception {
-        doTestMultiFile("compiler/testData/codegen/boxMultiFile/sameFileName/");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/sameFileName/");
+        doTestMultiFile(fileName);
     }
     
     @TestMetadata("simple")
     public void testSimple() throws Exception {
-        doTestMultiFile("compiler/testData/codegen/boxMultiFile/simple/");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/simple/");
+        doTestMultiFile(fileName);
     }
     
 }

compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java

@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.codegen.generated;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/codegen/boxWithJava")
+@TestDataPath("$PROJECT_ROOT")
 public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
     public void testAllFilesPresentInBoxWithJava() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithJava"), Pattern.compile("^([^\\.]+)$"), false);
@@ -35,7 +37,8 @@ public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodege
     
     @TestMetadata("referenceToJavaFieldOfKotlinSubclass")
     public void testReferenceToJavaFieldOfKotlinSubclass() throws Exception {
-        doTestWithJava("compiler/testData/codegen/boxWithJava/referenceToJavaFieldOfKotlinSubclass/");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/referenceToJavaFieldOfKotlinSubclass/");
+        doTestWithJava(fileName);
     }
     
 }

compiler/tests/org/jetbrains/jet/evaluate/EvaluateExpressionTestGenerated.java

@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.evaluate;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -30,6 +31,7 @@ import java.util.regex.Pattern;
 @InnerTestClasses({EvaluateExpressionTestGenerated.Constant.class, EvaluateExpressionTestGenerated.IsPure.class, EvaluateExpressionTestGenerated.UsesVariableAsConstant.class})
 public class EvaluateExpressionTestGenerated extends AbstractEvaluateExpressionTest {
     @TestMetadata("compiler/testData/evaluate/constant")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Constant extends AbstractEvaluateExpressionTest {
         public void testAllFilesPresentInConstant() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/evaluate/constant"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -37,102 +39,122 @@ public class EvaluateExpressionTestGenerated extends AbstractEvaluateExpressionT
         
         @TestMetadata("classObjectProperty.kt")
         public void testClassObjectProperty() throws Exception {
-            doConstantTest("compiler/testData/evaluate/constant/classObjectProperty.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/classObjectProperty.kt");
+            doConstantTest(fileName);
         }
         
         @TestMetadata("compareTo.kt")
         public void testCompareTo() throws Exception {
-            doConstantTest("compiler/testData/evaluate/constant/compareTo.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/compareTo.kt");
+            doConstantTest(fileName);
         }
         
         @TestMetadata("differentTypes.kt")
         public void testDifferentTypes() throws Exception {
-            doConstantTest("compiler/testData/evaluate/constant/differentTypes.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/differentTypes.kt");
+            doConstantTest(fileName);
         }
         
         @TestMetadata("divideByZero.kt")
         public void testDivideByZero() throws Exception {
-            doConstantTest("compiler/testData/evaluate/constant/divideByZero.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/divideByZero.kt");
+            doConstantTest(fileName);
         }
         
         @TestMetadata("equals.kt")
         public void testEquals() throws Exception {
-            doConstantTest("compiler/testData/evaluate/constant/equals.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/equals.kt");
+            doConstantTest(fileName);
         }
         
         @TestMetadata("exceptionWhenEvaluate.kt")
         public void testExceptionWhenEvaluate() throws Exception {
-            doConstantTest("compiler/testData/evaluate/constant/exceptionWhenEvaluate.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/exceptionWhenEvaluate.kt");
+            doConstantTest(fileName);
         }
         
         @TestMetadata("finalProperty.kt")
         public void testFinalProperty() throws Exception {
-            doConstantTest("compiler/testData/evaluate/constant/finalProperty.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/finalProperty.kt");
+            doConstantTest(fileName);
         }
         
         @TestMetadata("float.kt")
         public void testFloat() throws Exception {
-            doConstantTest("compiler/testData/evaluate/constant/float.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/float.kt");
+            doConstantTest(fileName);
         }
         
         @TestMetadata("floatsAndDoubles.kt")
         public void testFloatsAndDoubles() throws Exception {
-            doConstantTest("compiler/testData/evaluate/constant/floatsAndDoubles.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/floatsAndDoubles.kt");
+            doConstantTest(fileName);
         }
         
         @TestMetadata("integer.kt")
         public void testInteger() throws Exception {
-            doConstantTest("compiler/testData/evaluate/constant/integer.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/integer.kt");
+            doConstantTest(fileName);
         }
         
         @TestMetadata("integers.kt")
         public void testIntegers() throws Exception {
-            doConstantTest("compiler/testData/evaluate/constant/integers.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/integers.kt");
+            doConstantTest(fileName);
         }
         
         @TestMetadata("localVal.kt")
         public void testLocalVal() throws Exception {
-            doConstantTest("compiler/testData/evaluate/constant/localVal.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/localVal.kt");
+            doConstantTest(fileName);
         }
         
         @TestMetadata("localVar.kt")
         public void testLocalVar() throws Exception {
-            doConstantTest("compiler/testData/evaluate/constant/localVar.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/localVar.kt");
+            doConstantTest(fileName);
         }
         
         @TestMetadata("nonFinalProperty.kt")
         public void testNonFinalProperty() throws Exception {
-            doConstantTest("compiler/testData/evaluate/constant/nonFinalProperty.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/nonFinalProperty.kt");
+            doConstantTest(fileName);
         }
         
         @TestMetadata("strings.kt")
         public void testStrings() throws Exception {
-            doConstantTest("compiler/testData/evaluate/constant/strings.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/strings.kt");
+            doConstantTest(fileName);
         }
         
         @TestMetadata("topLevelVal.kt")
         public void testTopLevelVal() throws Exception {
-            doConstantTest("compiler/testData/evaluate/constant/topLevelVal.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/topLevelVal.kt");
+            doConstantTest(fileName);
         }
         
         @TestMetadata("topLevelVar.kt")
         public void testTopLevelVar() throws Exception {
-            doConstantTest("compiler/testData/evaluate/constant/topLevelVar.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/topLevelVar.kt");
+            doConstantTest(fileName);
         }
         
         @TestMetadata("unaryMinusIndepWoExpType.kt")
         public void testUnaryMinusIndepWoExpType() throws Exception {
-            doConstantTest("compiler/testData/evaluate/constant/unaryMinusIndepWoExpType.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/unaryMinusIndepWoExpType.kt");
+            doConstantTest(fileName);
         }
         
         @TestMetadata("unaryMinusIndependentExpType.kt")
         public void testUnaryMinusIndependentExpType() throws Exception {
-            doConstantTest("compiler/testData/evaluate/constant/unaryMinusIndependentExpType.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/unaryMinusIndependentExpType.kt");
+            doConstantTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/evaluate/isPure")
+    @TestDataPath("$PROJECT_ROOT")
     public static class IsPure extends AbstractEvaluateExpressionTest {
         public void testAllFilesPresentInIsPure() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/evaluate/isPure"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -140,32 +162,38 @@ public class EvaluateExpressionTestGenerated extends AbstractEvaluateExpressionT
         
         @TestMetadata("innerToType.kt")
         public void testInnerToType() throws Exception {
-            doIsPureTest("compiler/testData/evaluate/isPure/innerToType.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/isPure/innerToType.kt");
+            doIsPureTest(fileName);
         }
         
         @TestMetadata("namedConstants.kt")
         public void testNamedConstants() throws Exception {
-            doIsPureTest("compiler/testData/evaluate/isPure/namedConstants.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/isPure/namedConstants.kt");
+            doIsPureTest(fileName);
         }
         
         @TestMetadata("toType.kt")
         public void testToType() throws Exception {
-            doIsPureTest("compiler/testData/evaluate/isPure/toType.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/isPure/toType.kt");
+            doIsPureTest(fileName);
         }
         
         @TestMetadata("unaryMinusIndepWoExpType.kt")
         public void testUnaryMinusIndepWoExpType() throws Exception {
-            doIsPureTest("compiler/testData/evaluate/isPure/unaryMinusIndepWoExpType.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/isPure/unaryMinusIndepWoExpType.kt");
+            doIsPureTest(fileName);
         }
         
         @TestMetadata("unaryMinusIndependentExpType.kt")
         public void testUnaryMinusIndependentExpType() throws Exception {
-            doIsPureTest("compiler/testData/evaluate/isPure/unaryMinusIndependentExpType.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/isPure/unaryMinusIndependentExpType.kt");
+            doIsPureTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/evaluate/usesVariableAsConstant")
+    @TestDataPath("$PROJECT_ROOT")
     public static class UsesVariableAsConstant extends AbstractEvaluateExpressionTest {
         public void testAllFilesPresentInUsesVariableAsConstant() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/evaluate/usesVariableAsConstant"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -173,22 +201,26 @@ public class EvaluateExpressionTestGenerated extends AbstractEvaluateExpressionT
         
         @TestMetadata("binaryTypes.kt")
         public void testBinaryTypes() throws Exception {
-            doUsesVariableAsConstantTest("compiler/testData/evaluate/usesVariableAsConstant/binaryTypes.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/usesVariableAsConstant/binaryTypes.kt");
+            doUsesVariableAsConstantTest(fileName);
         }
         
         @TestMetadata("NamedConstants.kt")
         public void testNamedConstants() throws Exception {
-            doUsesVariableAsConstantTest("compiler/testData/evaluate/usesVariableAsConstant/NamedConstants.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/usesVariableAsConstant/NamedConstants.kt");
+            doUsesVariableAsConstantTest(fileName);
         }
         
         @TestMetadata("OtherTypes.kt")
         public void testOtherTypes() throws Exception {
-            doUsesVariableAsConstantTest("compiler/testData/evaluate/usesVariableAsConstant/OtherTypes.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/usesVariableAsConstant/OtherTypes.kt");
+            doUsesVariableAsConstantTest(fileName);
         }
         
         @TestMetadata("simpleTypes.kt")
         public void testSimpleTypes() throws Exception {
-            doUsesVariableAsConstantTest("compiler/testData/evaluate/usesVariableAsConstant/simpleTypes.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/usesVariableAsConstant/simpleTypes.kt");
+            doUsesVariableAsConstantTest(fileName);
         }
         
     }

compiler/tests/org/jetbrains/jet/jvm/compiler/CompileJavaAgainstKotlinTestGenerated.java

@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.jvm.compiler;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/compileJavaAgainstKotlin")
+@TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({CompileJavaAgainstKotlinTestGenerated.Class.class, CompileJavaAgainstKotlinTestGenerated.Method.class, CompileJavaAgainstKotlinTestGenerated.Property.class, CompileJavaAgainstKotlinTestGenerated.StaticFields.class})
 public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAgainstKotlinTest {
     public void testAllFilesPresentInCompileJavaAgainstKotlin() throws Exception {
@@ -35,6 +37,7 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg
     }
     
     @TestMetadata("compiler/testData/compileJavaAgainstKotlin/class")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Class extends AbstractCompileJavaAgainstKotlinTest {
         public void testAllFilesPresentInClass() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/class"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -42,72 +45,86 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg
         
         @TestMetadata("ClassObject.kt")
         public void testClassObject() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/class/ClassObject.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/class/ClassObject.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("DefaultConstructor.kt")
         public void testDefaultConstructor() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/class/DefaultConstructor.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/class/DefaultConstructor.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("DefaultConstructorWithTwoArgs.kt")
         public void testDefaultConstructorWithTwoArgs() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/class/DefaultConstructorWithTwoArgs.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/class/DefaultConstructorWithTwoArgs.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ExtendsAbstractListT.kt")
         public void testExtendsAbstractListT() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/class/ExtendsAbstractListT.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/class/ExtendsAbstractListT.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ImplementsListString.kt")
         public void testImplementsListString() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/class/ImplementsListString.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/class/ImplementsListString.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ImplementsMapPP.kt")
         public void testImplementsMapPP() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/class/ImplementsMapPP.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/class/ImplementsMapPP.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InnerClass.kt")
         public void testInnerClass() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/class/InnerClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/class/InnerClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InnerClassConstructors.kt")
         public void testInnerClassConstructors() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/class/InnerClassConstructors.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/class/InnerClassConstructors.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InnerClassOfGeneric.kt")
         public void testInnerClassOfGeneric() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/class/InnerClassOfGeneric.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/class/InnerClassOfGeneric.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3561.kt")
         public void testKt3561() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/class/kt3561.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/class/kt3561.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt4050.kt")
         public void testKt4050() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/class/kt4050.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/class/kt4050.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Simple.kt")
         public void testSimple() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/class/Simple.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/class/Simple.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/compileJavaAgainstKotlin/method")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Method.PlatformName.class, Method.PrimitiveOverride.class, Method.Throws.class})
     public static class Method extends AbstractCompileJavaAgainstKotlinTest {
         @TestMetadata("AccessorGenericSignature.kt")
         public void testAccessorGenericSignature() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/method/AccessorGenericSignature.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/AccessorGenericSignature.kt");
+            doTest(fileName);
         }
         
         public void testAllFilesPresentInMethod() throws Exception {
@@ -116,120 +133,144 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg
         
         @TestMetadata("Any.kt")
         public void testAny() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/method/Any.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/Any.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ArrayOfIntArray.kt")
         public void testArrayOfIntArray() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntArray.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntArray.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ArrayOfIntegerArray.kt")
         public void testArrayOfIntegerArray() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntegerArray.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntegerArray.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ClashingSignaturesWithoutReturnType.kt")
         public void testClashingSignaturesWithoutReturnType() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/method/ClashingSignaturesWithoutReturnType.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/ClashingSignaturesWithoutReturnType.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("DefaultMethod.kt")
         public void testDefaultMethod() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/method/DefaultMethod.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/DefaultMethod.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Delegation.kt")
         public void testDelegation() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/method/Delegation.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/Delegation.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Extensions.kt")
         public void testExtensions() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/method/Extensions.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/Extensions.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("GenericArray.kt")
         public void testGenericArray() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/method/GenericArray.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/GenericArray.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Hello.kt")
         public void testHello() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/method/Hello.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/Hello.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Int.kt")
         public void testInt() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/method/Int.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/Int.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("IntArray.kt")
         public void testIntArray() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/method/IntArray.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/IntArray.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("IntWithDefault.kt")
         public void testIntWithDefault() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/method/IntWithDefault.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/IntWithDefault.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("IntegerArray.kt")
         public void testIntegerArray() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/method/IntegerArray.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/IntegerArray.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ListOfInt.kt")
         public void testListOfInt() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/method/ListOfInt.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/ListOfInt.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ListOfString.kt")
         public void testListOfString() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/method/ListOfString.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/ListOfString.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ListOfT.kt")
         public void testListOfT() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/method/ListOfT.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/ListOfT.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("MapOfKString.kt")
         public void testMapOfKString() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/method/MapOfKString.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/MapOfKString.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("MapOfStringIntQ.kt")
         public void testMapOfStringIntQ() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/method/MapOfStringIntQ.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/MapOfStringIntQ.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("QExtendsListString.kt")
         public void testQExtendsListString() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/method/QExtendsListString.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/QExtendsListString.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("QExtendsString.kt")
         public void testQExtendsString() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/method/QExtendsString.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/QExtendsString.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("TraitImpl.kt")
         public void testTraitImpl() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/method/TraitImpl.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/TraitImpl.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Vararg.kt")
         public void testVararg() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/method/Vararg.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/Vararg.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Void.kt")
         public void testVoid() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/method/Void.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/Void.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("compiler/testData/compileJavaAgainstKotlin/method/platformName")
+        @TestDataPath("$PROJECT_ROOT")
         public static class PlatformName extends AbstractCompileJavaAgainstKotlinTest {
             public void testAllFilesPresentInPlatformName() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/method/platformName"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -237,12 +278,14 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg
             
             @TestMetadata("PlatformName.kt")
             public void testPlatformName() throws Exception {
-                doTest("compiler/testData/compileJavaAgainstKotlin/method/platformName/PlatformName.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/platformName/PlatformName.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride")
+        @TestDataPath("$PROJECT_ROOT")
         public static class PrimitiveOverride extends AbstractCompileJavaAgainstKotlinTest {
             public void testAllFilesPresentInPrimitiveOverride() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -250,62 +293,74 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg
             
             @TestMetadata("ByteOverridesObject.kt")
             public void testByteOverridesObject() throws Exception {
-                doTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/ByteOverridesObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/ByteOverridesObject.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("CallFinalNotInSubclass.kt")
             public void testCallFinalNotInSubclass() throws Exception {
-                doTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CallFinalNotInSubclass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CallFinalNotInSubclass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("CallNotInSubclass.kt")
             public void testCallNotInSubclass() throws Exception {
-                doTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CallNotInSubclass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CallNotInSubclass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("CovariantReturnTypeOverride.kt")
             public void testCovariantReturnTypeOverride() throws Exception {
-                doTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CovariantReturnTypeOverride.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CovariantReturnTypeOverride.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("FinalOverride.kt")
             public void testFinalOverride() throws Exception {
-                doTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/FinalOverride.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/FinalOverride.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("IntOverridesComparable.kt")
             public void testIntOverridesComparable() throws Exception {
-                doTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesComparable.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesComparable.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("IntOverridesNumber.kt")
             public void testIntOverridesNumber() throws Exception {
-                doTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesNumber.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesNumber.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("IntOverridesObject.kt")
             public void testIntOverridesObject() throws Exception {
-                doTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesObject.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ManyClassesHierarchy.kt")
             public void testManyClassesHierarchy() throws Exception {
-                doTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/ManyClassesHierarchy.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/ManyClassesHierarchy.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("NullableIntOverridesObject.kt")
             public void testNullableIntOverridesObject() throws Exception {
-                doTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/NullableIntOverridesObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/NullableIntOverridesObject.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("OverrideInJava.kt")
             public void testOverrideInJava() throws Exception {
-                doTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/OverrideInJava.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/OverrideInJava.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/compileJavaAgainstKotlin/method/throws")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Throws extends AbstractCompileJavaAgainstKotlinTest {
             public void testAllFilesPresentInThrows() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/method/throws"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -313,37 +368,44 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg
             
             @TestMetadata("ClassMembers.kt")
             public void testClassMembers() throws Exception {
-                doTest("compiler/testData/compileJavaAgainstKotlin/method/throws/ClassMembers.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/throws/ClassMembers.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Constructor.kt")
             public void testConstructor() throws Exception {
-                doTest("compiler/testData/compileJavaAgainstKotlin/method/throws/Constructor.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/throws/Constructor.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("DefaultArgs.kt")
             public void testDefaultArgs() throws Exception {
-                doTest("compiler/testData/compileJavaAgainstKotlin/method/throws/DefaultArgs.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/throws/DefaultArgs.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Delegation.kt")
             public void testDelegation() throws Exception {
-                doTest("compiler/testData/compileJavaAgainstKotlin/method/throws/Delegation.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/throws/Delegation.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("GenericSubstitution.kt")
             public void testGenericSubstitution() throws Exception {
-                doTest("compiler/testData/compileJavaAgainstKotlin/method/throws/GenericSubstitution.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/throws/GenericSubstitution.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("TopLevel.kt")
             public void testTopLevel() throws Exception {
-                doTest("compiler/testData/compileJavaAgainstKotlin/method/throws/TopLevel.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/throws/TopLevel.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("TraitMembers.kt")
             public void testTraitMembers() throws Exception {
-                doTest("compiler/testData/compileJavaAgainstKotlin/method/throws/TraitMembers.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/throws/TraitMembers.kt");
+                doTest(fileName);
             }
             
         }
@@ -359,6 +421,7 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg
     }
     
     @TestMetadata("compiler/testData/compileJavaAgainstKotlin/property")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Property.PlatformName.class})
     public static class Property extends AbstractCompileJavaAgainstKotlinTest {
         public void testAllFilesPresentInProperty() throws Exception {
@@ -367,15 +430,18 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg
         
         @TestMetadata("Extensions.kt")
         public void testExtensions() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/property/Extensions.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/property/Extensions.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("GenericProperty.kt")
         public void testGenericProperty() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/property/GenericProperty.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/property/GenericProperty.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("compiler/testData/compileJavaAgainstKotlin/property/platformName")
+        @TestDataPath("$PROJECT_ROOT")
         public static class PlatformName extends AbstractCompileJavaAgainstKotlinTest {
             public void testAllFilesPresentInPlatformName() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/property/platformName"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -383,7 +449,8 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg
             
             @TestMetadata("PlatformName.kt")
             public void testPlatformName() throws Exception {
-                doTest("compiler/testData/compileJavaAgainstKotlin/property/platformName/PlatformName.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/property/platformName/PlatformName.kt");
+                doTest(fileName);
             }
             
         }
@@ -397,6 +464,7 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg
     }
     
     @TestMetadata("compiler/testData/compileJavaAgainstKotlin/staticFields")
+    @TestDataPath("$PROJECT_ROOT")
     public static class StaticFields extends AbstractCompileJavaAgainstKotlinTest {
         public void testAllFilesPresentInStaticFields() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/staticFields"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -404,27 +472,32 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg
         
         @TestMetadata("AnnotationClass.kt")
         public void testAnnotationClass() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("AnnotationTrait.kt")
         public void testAnnotationTrait() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationTrait.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationTrait.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3698.kt")
         public void testKt3698() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/staticFields/kt3698.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/staticFields/kt3698.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("staticClassProperty.kt")
         public void testStaticClassProperty() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/staticFields/staticClassProperty.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/staticFields/staticClassProperty.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("staticTraitProperty.kt")
         public void testStaticTraitProperty() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/staticFields/staticTraitProperty.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/staticFields/staticTraitProperty.kt");
+            doTest(fileName);
         }
         
     }

compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstInlineKotlinTestGenerated.java

@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.jvm.compiler;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/codegen/boxInline")
+@TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({CompileKotlinAgainstInlineKotlinTestGenerated.AnonymousObject.class, CompileKotlinAgainstInlineKotlinTestGenerated.Builders.class, CompileKotlinAgainstInlineKotlinTestGenerated.Capture.class, CompileKotlinAgainstInlineKotlinTestGenerated.Complex.class, CompileKotlinAgainstInlineKotlinTestGenerated.DefaultValues.class, CompileKotlinAgainstInlineKotlinTestGenerated.LambdaClassClash.class, CompileKotlinAgainstInlineKotlinTestGenerated.LambdaTransformation.class, CompileKotlinAgainstInlineKotlinTestGenerated.LocalFunInLambda.class, CompileKotlinAgainstInlineKotlinTestGenerated.NoInline.class, CompileKotlinAgainstInlineKotlinTestGenerated.NonLocalReturns.class, CompileKotlinAgainstInlineKotlinTestGenerated.Simple.class, CompileKotlinAgainstInlineKotlinTestGenerated.Special.class, CompileKotlinAgainstInlineKotlinTestGenerated.Trait.class, CompileKotlinAgainstInlineKotlinTestGenerated.TryCatchFinally.class})
 public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompileKotlinAgainstKotlinTest {
     public void testAllFilesPresentInBoxInline() throws Exception {
@@ -35,6 +37,7 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/anonymousObject")
+    @TestDataPath("$PROJECT_ROOT")
     public static class AnonymousObject extends AbstractCompileKotlinAgainstKotlinTest {
         public void testAllFilesPresentInAnonymousObject() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/anonymousObject"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -42,27 +45,32 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi
         
         @TestMetadata("anonymousObjectOnCallSite.1.kt")
         public void testAnonymousObjectOnCallSite() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnCallSite.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnCallSite.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("anonymousObjectOnCallSiteSuperParams.1.kt")
         public void testAnonymousObjectOnCallSiteSuperParams() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnCallSiteSuperParams.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnCallSiteSuperParams.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("anonymousObjectOnDeclarationSite.1.kt")
         public void testAnonymousObjectOnDeclarationSite() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnDeclarationSite.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnDeclarationSite.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("anonymousObjectOnDeclarationSiteSuperParams.1.kt")
         public void testAnonymousObjectOnDeclarationSiteSuperParams() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnDeclarationSiteSuperParams.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnDeclarationSiteSuperParams.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/builders")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Builders extends AbstractCompileKotlinAgainstKotlinTest {
         public void testAllFilesPresentInBuilders() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/builders"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -70,17 +78,20 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi
         
         @TestMetadata("builders.1.kt")
         public void testBuilders() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/builders/builders.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/builders/builders.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("buildersAndLambdaCapturing.1.kt")
         public void testBuildersAndLambdaCapturing() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/builders/buildersAndLambdaCapturing.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/builders/buildersAndLambdaCapturing.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/capture")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Capture extends AbstractCompileKotlinAgainstKotlinTest {
         public void testAllFilesPresentInCapture() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/capture"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -88,37 +99,44 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi
         
         @TestMetadata("captureInlinable.1.kt")
         public void testCaptureInlinable() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/capture/captureInlinable.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/capture/captureInlinable.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("captureInlinableAndOther.1.kt")
         public void testCaptureInlinableAndOther() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/capture/captureInlinableAndOther.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/capture/captureInlinableAndOther.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("captureThisAndReceiver.1.kt")
         public void testCaptureThisAndReceiver() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/capture/captureThisAndReceiver.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/capture/captureThisAndReceiver.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("generics.1.kt")
         public void testGenerics() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/capture/generics.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/capture/generics.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("simpleCapturingInClass.1.kt")
         public void testSimpleCapturingInClass() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/capture/simpleCapturingInClass.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/capture/simpleCapturingInClass.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("simpleCapturingInPackage.1.kt")
         public void testSimpleCapturingInPackage() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/capture/simpleCapturingInPackage.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/capture/simpleCapturingInPackage.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/complex")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Complex extends AbstractCompileKotlinAgainstKotlinTest {
         public void testAllFilesPresentInComplex() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/complex"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -126,32 +144,38 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi
         
         @TestMetadata("closureChain.1.kt")
         public void testClosureChain() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/complex/closureChain.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/complex/closureChain.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("forEachLine.1.kt")
         public void testForEachLine() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/complex/forEachLine.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/complex/forEachLine.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("lambdaInLambda.1.kt")
         public void testLambdaInLambda() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/complex/lambdaInLambda.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/complex/lambdaInLambda.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("use.1.kt")
         public void testUse() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/complex/use.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/complex/use.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("with.1.kt")
         public void testWith() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/complex/with.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/complex/with.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/defaultValues")
+    @TestDataPath("$PROJECT_ROOT")
     public static class DefaultValues extends AbstractCompileKotlinAgainstKotlinTest {
         public void testAllFilesPresentInDefaultValues() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/defaultValues"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -159,32 +183,38 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi
         
         @TestMetadata("defaultInExtension.1.kt")
         public void testDefaultInExtension() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/defaultValues/defaultInExtension.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/defaultInExtension.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("defaultMethod.1.kt")
         public void testDefaultMethod() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/defaultValues/defaultMethod.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/defaultMethod.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("defaultMethodInClass.1.kt")
         public void testDefaultMethodInClass() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/defaultValues/defaultMethodInClass.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/defaultMethodInClass.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("inlineInDefaultParameter.1.kt")
         public void testInlineInDefaultParameter() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/defaultValues/inlineInDefaultParameter.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/inlineInDefaultParameter.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("simpleDefaultMethod.1.kt")
         public void testSimpleDefaultMethod() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/defaultValues/simpleDefaultMethod.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/simpleDefaultMethod.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/lambdaClassClash")
+    @TestDataPath("$PROJECT_ROOT")
     public static class LambdaClassClash extends AbstractCompileKotlinAgainstKotlinTest {
         public void testAllFilesPresentInLambdaClassClash() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/lambdaClassClash"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -192,17 +222,20 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi
         
         @TestMetadata("lambdaClassClash.1.kt")
         public void testLambdaClassClash() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/lambdaClassClash/lambdaClassClash.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaClassClash/lambdaClassClash.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("noInlineLambdaX2.1.kt")
         public void testNoInlineLambdaX2() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/lambdaClassClash/noInlineLambdaX2.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaClassClash/noInlineLambdaX2.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/lambdaTransformation")
+    @TestDataPath("$PROJECT_ROOT")
     public static class LambdaTransformation extends AbstractCompileKotlinAgainstKotlinTest {
         public void testAllFilesPresentInLambdaTransformation() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/lambdaTransformation"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -210,32 +243,38 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi
         
         @TestMetadata("lambdaCloning.1.kt")
         public void testLambdaCloning() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/lambdaTransformation/lambdaCloning.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaTransformation/lambdaCloning.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("lambdaInLambda2.1.kt")
         public void testLambdaInLambda2() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/lambdaTransformation/lambdaInLambda2.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaTransformation/lambdaInLambda2.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("lambdaInLambdaNoInline.1.kt")
         public void testLambdaInLambdaNoInline() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/lambdaTransformation/lambdaInLambdaNoInline.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaTransformation/lambdaInLambdaNoInline.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("regeneratedLambdaName.1.kt")
         public void testRegeneratedLambdaName() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/lambdaTransformation/regeneratedLambdaName.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaTransformation/regeneratedLambdaName.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("sameCaptured.1.kt")
         public void testSameCaptured() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/lambdaTransformation/sameCaptured.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaTransformation/sameCaptured.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/localFunInLambda")
+    @TestDataPath("$PROJECT_ROOT")
     public static class LocalFunInLambda extends AbstractCompileKotlinAgainstKotlinTest {
         public void testAllFilesPresentInLocalFunInLambda() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/localFunInLambda"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -243,12 +282,14 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi
         
         @TestMetadata("localFunInLambda.1.kt")
         public void testLocalFunInLambda() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/localFunInLambda/localFunInLambda.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/localFunInLambda/localFunInLambda.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/noInline")
+    @TestDataPath("$PROJECT_ROOT")
     public static class NoInline extends AbstractCompileKotlinAgainstKotlinTest {
         public void testAllFilesPresentInNoInline() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/noInline"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -256,27 +297,32 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi
         
         @TestMetadata("noInline.1.kt")
         public void testNoInline() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/noInline/noInline.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/noInline/noInline.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("noInlineLambdaChain.1.kt")
         public void testNoInlineLambdaChain() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/noInline/noInlineLambdaChain.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/noInline/noInlineLambdaChain.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("noInlineLambdaChainWithCapturedInline.1.kt")
         public void testNoInlineLambdaChainWithCapturedInline() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/noInline/noInlineLambdaChainWithCapturedInline.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/noInline/noInlineLambdaChainWithCapturedInline.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("withoutInline.1.kt")
         public void testWithoutInline() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/noInline/withoutInline.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/noInline/withoutInline.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/nonLocalReturns")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({NonLocalReturns.Deparenthesize.class, NonLocalReturns.TryFinally.class})
     public static class NonLocalReturns extends AbstractCompileKotlinAgainstKotlinTest {
         public void testAllFilesPresentInNonLocalReturns() throws Exception {
@@ -285,40 +331,48 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi
         
         @TestMetadata("explicitLocalReturn.1.kt")
         public void testExplicitLocalReturn() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/nonLocalReturns/explicitLocalReturn.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/explicitLocalReturn.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("justReturnInLambda.1.kt")
         public void testJustReturnInLambda() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/nonLocalReturns/justReturnInLambda.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/justReturnInLambda.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("nestedNonLocals.1.kt")
         public void testNestedNonLocals() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/nonLocalReturns/nestedNonLocals.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/nestedNonLocals.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("noInlineLocalReturn.1.kt")
         public void testNoInlineLocalReturn() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/nonLocalReturns/noInlineLocalReturn.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/noInlineLocalReturn.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("propertyAccessors.1.kt")
         public void testPropertyAccessors() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/nonLocalReturns/propertyAccessors.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/propertyAccessors.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("simple.1.kt")
         public void testSimple() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/nonLocalReturns/simple.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/simple.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("simpleVoid.1.kt")
         public void testSimpleVoid() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/nonLocalReturns/simpleVoid.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/simpleVoid.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/deparenthesize")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Deparenthesize extends AbstractCompileKotlinAgainstKotlinTest {
             public void testAllFilesPresentInDeparenthesize() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/nonLocalReturns/deparenthesize"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -326,17 +380,20 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi
             
             @TestMetadata("bracket.1.kt")
             public void testBracket() throws Exception {
-                doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/nonLocalReturns/deparenthesize/bracket.1.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/deparenthesize/bracket.1.kt");
+                doBoxTestWithInlineCheck(fileName);
             }
             
             @TestMetadata("labeled.1.kt")
             public void testLabeled() throws Exception {
-                doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/nonLocalReturns/deparenthesize/labeled.1.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/deparenthesize/labeled.1.kt");
+                doBoxTestWithInlineCheck(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally")
+        @TestDataPath("$PROJECT_ROOT")
         public static class TryFinally extends AbstractCompileKotlinAgainstKotlinTest {
             public void testAllFilesPresentInTryFinally() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -344,7 +401,8 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi
             
             @TestMetadata("external.1.kt")
             public void testExternal() throws Exception {
-                doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/external.1.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/external.1.kt");
+                doBoxTestWithInlineCheck(fileName);
             }
             
         }
@@ -359,6 +417,7 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/simple")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Simple extends AbstractCompileKotlinAgainstKotlinTest {
         public void testAllFilesPresentInSimple() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/simple"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -366,72 +425,86 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi
         
         @TestMetadata("classObject.1.kt")
         public void testClassObject() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simple/classObject.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/classObject.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("extension.1.kt")
         public void testExtension() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simple/extension.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/extension.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("params.1.kt")
         public void testParams() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simple/params.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/params.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("rootConstructor.1.kt")
         public void testRootConstructor() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simple/rootConstructor.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/rootConstructor.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("severalClosures.1.kt")
         public void testSeveralClosures() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simple/severalClosures.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/severalClosures.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("severalUsage.1.kt")
         public void testSeveralUsage() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simple/severalUsage.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/severalUsage.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("simpleDouble.1.kt")
         public void testSimpleDouble() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simple/simpleDouble.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/simpleDouble.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("simpleEnum.1.kt")
         public void testSimpleEnum() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simple/simpleEnum.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/simpleEnum.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("simpleGenerics.1.kt")
         public void testSimpleGenerics() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simple/simpleGenerics.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/simpleGenerics.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("simpleInt.1.kt")
         public void testSimpleInt() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simple/simpleInt.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/simpleInt.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("simpleLambda.1.kt")
         public void testSimpleLambda() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simple/simpleLambda.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/simpleLambda.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("simpleObject.1.kt")
         public void testSimpleObject() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simple/simpleObject.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/simpleObject.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("vararg.1.kt")
         public void testVararg() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simple/vararg.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/vararg.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/special")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Special extends AbstractCompileKotlinAgainstKotlinTest {
         public void testAllFilesPresentInSpecial() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/special"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -439,37 +512,44 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi
         
         @TestMetadata("identityCheck.1.kt")
         public void testIdentityCheck() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/special/identityCheck.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/special/identityCheck.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("ifBranches.1.kt")
         public void testIfBranches() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/special/ifBranches.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/special/ifBranches.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("iinc.1.kt")
         public void testIinc() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/special/iinc.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/special/iinc.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("inlineChain.1.kt")
         public void testInlineChain() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/special/inlineChain.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/special/inlineChain.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("plusAssign.1.kt")
         public void testPlusAssign() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/special/plusAssign.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/special/plusAssign.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("stackHeightBug.1.kt")
         public void testStackHeightBug() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/special/stackHeightBug.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/special/stackHeightBug.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/trait")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Trait extends AbstractCompileKotlinAgainstKotlinTest {
         public void testAllFilesPresentInTrait() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/trait"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -477,12 +557,14 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi
         
         @TestMetadata("trait.1.kt")
         public void testTrait() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/trait/trait.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/trait/trait.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/tryCatchFinally")
+    @TestDataPath("$PROJECT_ROOT")
     public static class TryCatchFinally extends AbstractCompileKotlinAgainstKotlinTest {
         public void testAllFilesPresentInTryCatchFinally() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/tryCatchFinally"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -490,17 +572,20 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi
         
         @TestMetadata("tryCatch.1.kt")
         public void testTryCatch() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/tryCatchFinally/tryCatch.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/tryCatchFinally/tryCatch.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("tryCatch2.1.kt")
         public void testTryCatch2() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/tryCatchFinally/tryCatch2.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/tryCatchFinally/tryCatch2.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("tryCatchFinally.1.kt")
         public void testTryCatchFinally() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/tryCatchFinally/tryCatchFinally.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/tryCatchFinally/tryCatchFinally.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
     }

compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstKotlinTestGenerated.java

@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.jvm.compiler;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/compileKotlinAgainstKotlin")
+@TestDataPath("$PROJECT_ROOT")
 public class CompileKotlinAgainstKotlinTestGenerated extends AbstractCompileKotlinAgainstKotlinTest {
     public void testAllFilesPresentInCompileKotlinAgainstKotlin() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileKotlinAgainstKotlin"), Pattern.compile("^(.+)\\.A.kt$"), true);
@@ -35,87 +37,104 @@ public class CompileKotlinAgainstKotlinTestGenerated extends AbstractCompileKotl
     
     @TestMetadata("ClassInObject.A.kt")
     public void testClassInObject() throws Exception {
-        doTest("compiler/testData/compileKotlinAgainstKotlin/ClassInObject.A.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/ClassInObject.A.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ClassObjectMember.A.kt")
     public void testClassObjectMember() throws Exception {
-        doTest("compiler/testData/compileKotlinAgainstKotlin/ClassObjectMember.A.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/ClassObjectMember.A.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ConstructorVararg.A.kt")
     public void testConstructorVararg() throws Exception {
-        doTest("compiler/testData/compileKotlinAgainstKotlin/ConstructorVararg.A.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/ConstructorVararg.A.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("DefaultConstructor.A.kt")
     public void testDefaultConstructor() throws Exception {
-        doTest("compiler/testData/compileKotlinAgainstKotlin/DefaultConstructor.A.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/DefaultConstructor.A.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("DoublyNestedClass.A.kt")
     public void testDoublyNestedClass() throws Exception {
-        doTest("compiler/testData/compileKotlinAgainstKotlin/DoublyNestedClass.A.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/DoublyNestedClass.A.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("Enum.A.kt")
     public void testEnum() throws Exception {
-        doTest("compiler/testData/compileKotlinAgainstKotlin/Enum.A.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/Enum.A.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ImportObject.A.kt")
     public void testImportObject() throws Exception {
-        doTest("compiler/testData/compileKotlinAgainstKotlin/ImportObject.A.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/ImportObject.A.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InlinedConstants.A.kt")
     public void testInlinedConstants() throws Exception {
-        doTest("compiler/testData/compileKotlinAgainstKotlin/InlinedConstants.A.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/InlinedConstants.A.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InnerClassConstructor.A.kt")
     public void testInnerClassConstructor() throws Exception {
-        doTest("compiler/testData/compileKotlinAgainstKotlin/InnerClassConstructor.A.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/InnerClassConstructor.A.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("KotlinPropertyAsAnnotationParameter.A.kt")
     public void testKotlinPropertyAsAnnotationParameter() throws Exception {
-        doTest("compiler/testData/compileKotlinAgainstKotlin/KotlinPropertyAsAnnotationParameter.A.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/KotlinPropertyAsAnnotationParameter.A.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("NestedClass.A.kt")
     public void testNestedClass() throws Exception {
-        doTest("compiler/testData/compileKotlinAgainstKotlin/NestedClass.A.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/NestedClass.A.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("NestedEnum.A.kt")
     public void testNestedEnum() throws Exception {
-        doTest("compiler/testData/compileKotlinAgainstKotlin/NestedEnum.A.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/NestedEnum.A.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("NestedObject.A.kt")
     public void testNestedObject() throws Exception {
-        doTest("compiler/testData/compileKotlinAgainstKotlin/NestedObject.A.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/NestedObject.A.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("PlatformNames.A.kt")
     public void testPlatformNames() throws Exception {
-        doTest("compiler/testData/compileKotlinAgainstKotlin/PlatformNames.A.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/PlatformNames.A.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("PropertyReference.A.kt")
     public void testPropertyReference() throws Exception {
-        doTest("compiler/testData/compileKotlinAgainstKotlin/PropertyReference.A.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/PropertyReference.A.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("Simple.A.kt")
     public void testSimple() throws Exception {
-        doTest("compiler/testData/compileKotlinAgainstKotlin/Simple.A.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/Simple.A.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("StarImportEnum.A.kt")
     public void testStarImportEnum() throws Exception {
-        doTest("compiler/testData/compileKotlinAgainstKotlin/StarImportEnum.A.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/StarImportEnum.A.kt");
+        doTest(fileName);
     }
     
 }

compiler/tests/org/jetbrains/jet/jvm/compiler/WriteSignatureTestGenerated.java

@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.jvm.compiler;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/writeSignature")
+@TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({WriteSignatureTestGenerated.Constructor.class, WriteSignatureTestGenerated.DeclarationSiteVariance.class, WriteSignatureTestGenerated.Nothing.class})
 public class WriteSignatureTestGenerated extends AbstractWriteSignatureTest {
     public void testAllFilesPresentInWriteSignature() throws Exception {
@@ -36,75 +38,90 @@ public class WriteSignatureTestGenerated extends AbstractWriteSignatureTest {
     
     @TestMetadata("ArrayOfCharSequence.kt")
     public void testArrayOfCharSequence() throws Exception {
-        doTest("compiler/testData/writeSignature/ArrayOfCharSequence.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/ArrayOfCharSequence.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ArrayOfInt.kt")
     public void testArrayOfInt() throws Exception {
-        doTest("compiler/testData/writeSignature/ArrayOfInt.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/ArrayOfInt.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("Comparable.kt")
     public void testComparable() throws Exception {
-        doTest("compiler/testData/writeSignature/Comparable.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/Comparable.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("Int.kt")
     public void testInt() throws Exception {
-        doTest("compiler/testData/writeSignature/Int.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/Int.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("IntArray.kt")
     public void testIntArray() throws Exception {
-        doTest("compiler/testData/writeSignature/IntArray.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/IntArray.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("IntQ.kt")
     public void testIntQ() throws Exception {
-        doTest("compiler/testData/writeSignature/IntQ.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/IntQ.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("jlString.kt")
     public void testJlString() throws Exception {
-        doTest("compiler/testData/writeSignature/jlString.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/jlString.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ListOfCharSequence.kt")
     public void testListOfCharSequence() throws Exception {
-        doTest("compiler/testData/writeSignature/ListOfCharSequence.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/ListOfCharSequence.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ListOfStar.kt")
     public void testListOfStar() throws Exception {
-        doTest("compiler/testData/writeSignature/ListOfStar.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/ListOfStar.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("MapEntry.kt")
     public void testMapEntry() throws Exception {
-        doTest("compiler/testData/writeSignature/MapEntry.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/MapEntry.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("MutableMapEntry.kt")
     public void testMutableMapEntry() throws Exception {
-        doTest("compiler/testData/writeSignature/MutableMapEntry.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/MutableMapEntry.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("NonGeneric.kt")
     public void testNonGeneric() throws Exception {
-        doTest("compiler/testData/writeSignature/NonGeneric.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/NonGeneric.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("VarargCharSequence.kt")
     public void testVarargCharSequence() throws Exception {
-        doTest("compiler/testData/writeSignature/VarargCharSequence.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/VarargCharSequence.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("VarargGeneric.kt")
     public void testVarargGeneric() throws Exception {
-        doTest("compiler/testData/writeSignature/VarargGeneric.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/VarargGeneric.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("compiler/testData/writeSignature/constructor")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Constructor extends AbstractWriteSignatureTest {
         public void testAllFilesPresentInConstructor() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeSignature/constructor"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -112,27 +129,32 @@ public class WriteSignatureTestGenerated extends AbstractWriteSignatureTest {
         
         @TestMetadata("Constructor0.kt")
         public void testConstructor0() throws Exception {
-            doTest("compiler/testData/writeSignature/constructor/Constructor0.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/constructor/Constructor0.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ConstructorCollectionParameter.kt")
         public void testConstructorCollectionParameter() throws Exception {
-            doTest("compiler/testData/writeSignature/constructor/ConstructorCollectionParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/constructor/ConstructorCollectionParameter.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ConstructorWithTypeParameter.kt")
         public void testConstructorWithTypeParameter() throws Exception {
-            doTest("compiler/testData/writeSignature/constructor/ConstructorWithTypeParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/constructor/ConstructorWithTypeParameter.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ConstructorWithTypeParameterAndValueParameterP.kt")
         public void testConstructorWithTypeParameterAndValueParameterP() throws Exception {
-            doTest("compiler/testData/writeSignature/constructor/ConstructorWithTypeParameterAndValueParameterP.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/constructor/ConstructorWithTypeParameterAndValueParameterP.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/writeSignature/declarationSiteVariance")
+    @TestDataPath("$PROJECT_ROOT")
     public static class DeclarationSiteVariance extends AbstractWriteSignatureTest {
         public void testAllFilesPresentInDeclarationSiteVariance() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeSignature/declarationSiteVariance"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -140,117 +162,140 @@ public class WriteSignatureTestGenerated extends AbstractWriteSignatureTest {
         
         @TestMetadata("FunctionTwoTypeParameters.kt")
         public void testFunctionTwoTypeParameters() throws Exception {
-            doTest("compiler/testData/writeSignature/declarationSiteVariance/FunctionTwoTypeParameters.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/FunctionTwoTypeParameters.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InInInPosition.kt")
         public void testInInInPosition() throws Exception {
-            doTest("compiler/testData/writeSignature/declarationSiteVariance/InInInPosition.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/InInInPosition.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InInOutPosition.kt")
         public void testInInOutPosition() throws Exception {
-            doTest("compiler/testData/writeSignature/declarationSiteVariance/InInOutPosition.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/InInOutPosition.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InOfInInInPosition.kt")
         public void testInOfInInInPosition() throws Exception {
-            doTest("compiler/testData/writeSignature/declarationSiteVariance/InOfInInInPosition.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/InOfInInInPosition.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InOfInInOutPosition.kt")
         public void testInOfInInOutPosition() throws Exception {
-            doTest("compiler/testData/writeSignature/declarationSiteVariance/InOfInInOutPosition.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/InOfInInOutPosition.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InOfOutInInPosition.kt")
         public void testInOfOutInInPosition() throws Exception {
-            doTest("compiler/testData/writeSignature/declarationSiteVariance/InOfOutInInPosition.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/InOfOutInInPosition.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InOfOutInOutPosition.kt")
         public void testInOfOutInOutPosition() throws Exception {
-            doTest("compiler/testData/writeSignature/declarationSiteVariance/InOfOutInOutPosition.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/InOfOutInOutPosition.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("MappedSupertypeWithVariance.kt")
         public void testMappedSupertypeWithVariance() throws Exception {
-            doTest("compiler/testData/writeSignature/declarationSiteVariance/MappedSupertypeWithVariance.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/MappedSupertypeWithVariance.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("OutInInPosition.kt")
         public void testOutInInPosition() throws Exception {
-            doTest("compiler/testData/writeSignature/declarationSiteVariance/OutInInPosition.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/OutInInPosition.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("OutInOutPosition.kt")
         public void testOutInOutPosition() throws Exception {
-            doTest("compiler/testData/writeSignature/declarationSiteVariance/OutInOutPosition.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/OutInOutPosition.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("OutOfInInInPosition.kt")
         public void testOutOfInInInPosition() throws Exception {
-            doTest("compiler/testData/writeSignature/declarationSiteVariance/OutOfInInInPosition.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/OutOfInInInPosition.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("OutOfInInOutPosition.kt")
         public void testOutOfInInOutPosition() throws Exception {
-            doTest("compiler/testData/writeSignature/declarationSiteVariance/OutOfInInOutPosition.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/OutOfInInOutPosition.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("OutOfOutInInPosition.kt")
         public void testOutOfOutInInPosition() throws Exception {
-            doTest("compiler/testData/writeSignature/declarationSiteVariance/OutOfOutInInPosition.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/OutOfOutInInPosition.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("OutOfOutInOutPosition.kt")
         public void testOutOfOutInOutPosition() throws Exception {
-            doTest("compiler/testData/writeSignature/declarationSiteVariance/OutOfOutInOutPosition.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/OutOfOutInOutPosition.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("PropertyGetterIn.kt")
         public void testPropertyGetterIn() throws Exception {
-            doTest("compiler/testData/writeSignature/declarationSiteVariance/PropertyGetterIn.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/PropertyGetterIn.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("PropertyGetterOut.kt")
         public void testPropertyGetterOut() throws Exception {
-            doTest("compiler/testData/writeSignature/declarationSiteVariance/PropertyGetterOut.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/PropertyGetterOut.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("PropertyGetterTwoParams.kt")
         public void testPropertyGetterTwoParams() throws Exception {
-            doTest("compiler/testData/writeSignature/declarationSiteVariance/PropertyGetterTwoParams.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/PropertyGetterTwoParams.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("PropertySetterIn.kt")
         public void testPropertySetterIn() throws Exception {
-            doTest("compiler/testData/writeSignature/declarationSiteVariance/PropertySetterIn.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/PropertySetterIn.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("PropertySetterOut.kt")
         public void testPropertySetterOut() throws Exception {
-            doTest("compiler/testData/writeSignature/declarationSiteVariance/PropertySetterOut.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/PropertySetterOut.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("SuperClassWithVariance.kt")
         public void testSuperClassWithVariance() throws Exception {
-            doTest("compiler/testData/writeSignature/declarationSiteVariance/SuperClassWithVariance.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/SuperClassWithVariance.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("SuperTraitWithVariance.kt")
         public void testSuperTraitWithVariance() throws Exception {
-            doTest("compiler/testData/writeSignature/declarationSiteVariance/SuperTraitWithVariance.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/SuperTraitWithVariance.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("SuperTypeWithVarianceInArguments.kt")
         public void testSuperTypeWithVarianceInArguments() throws Exception {
-            doTest("compiler/testData/writeSignature/declarationSiteVariance/SuperTypeWithVarianceInArguments.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/SuperTypeWithVarianceInArguments.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/writeSignature/nothing")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Nothing extends AbstractWriteSignatureTest {
         public void testAllFilesPresentInNothing() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeSignature/nothing"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -258,12 +303,14 @@ public class WriteSignatureTestGenerated extends AbstractWriteSignatureTest {
         
         @TestMetadata("nothing.kt")
         public void testNothing() throws Exception {
-            doTest("compiler/testData/writeSignature/nothing/nothing.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/nothing/nothing.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("nullableNothing.kt")
         public void testNullableNothing() throws Exception {
-            doTest("compiler/testData/writeSignature/nothing/nullableNothing.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/nothing/nullableNothing.kt");
+            doTest(fileName);
         }
         
     }

compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveDescriptorRendererTestGenerated.java

@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.lang.resolve.lazy;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/renderer")
+@TestDataPath("$PROJECT_ROOT")
 public class LazyResolveDescriptorRendererTestGenerated extends AbstractLazyResolveDescriptorRendererTest {
     public void testAllFilesPresentInRenderer() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/renderer"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -35,47 +37,56 @@ public class LazyResolveDescriptorRendererTestGenerated extends AbstractLazyReso
     
     @TestMetadata("Classes.kt")
     public void testClasses() throws Exception {
-        doTest("compiler/testData/renderer/Classes.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderer/Classes.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("Enum.kt")
     public void testEnum() throws Exception {
-        doTest("compiler/testData/renderer/Enum.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderer/Enum.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ErrorType.kt")
     public void testErrorType() throws Exception {
-        doTest("compiler/testData/renderer/ErrorType.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderer/ErrorType.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("FunctionTypes.kt")
     public void testFunctionTypes() throws Exception {
-        doTest("compiler/testData/renderer/FunctionTypes.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderer/FunctionTypes.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("GlobalFunctions.kt")
     public void testGlobalFunctions() throws Exception {
-        doTest("compiler/testData/renderer/GlobalFunctions.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderer/GlobalFunctions.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("GlobalProperties.kt")
     public void testGlobalProperties() throws Exception {
-        doTest("compiler/testData/renderer/GlobalProperties.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderer/GlobalProperties.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InheritedMembersVisibility.kt")
     public void testInheritedMembersVisibility() throws Exception {
-        doTest("compiler/testData/renderer/InheritedMembersVisibility.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderer/InheritedMembersVisibility.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("KeywordsInNames.kt")
     public void testKeywordsInNames() throws Exception {
-        doTest("compiler/testData/renderer/KeywordsInNames.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderer/KeywordsInNames.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("UnitType.kt")
     public void testUnitType() throws Exception {
-        doTest("compiler/testData/renderer/UnitType.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderer/UnitType.kt");
+        doTest(fileName);
     }
     
 }

compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestGenerated.java

@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.lang.resolve.lazy;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/resolve/imports")
+@TestDataPath("$PROJECT_ROOT")
 public class LazyResolveTestGenerated extends AbstractLazyResolveTest {
     public void testAllFilesPresentInImports() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolve/imports"), Pattern.compile("^(.+)\\.resolve$"), false);
@@ -35,62 +37,74 @@ public class LazyResolveTestGenerated extends AbstractLazyResolveTest {
     
     @TestMetadata("ImportConflictAllPackage.resolve")
     public void testImportConflictAllPackage() throws Exception {
-        doTest("compiler/testData/resolve/imports/ImportConflictAllPackage.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictAllPackage.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("ImportConflictBetweenImportedAndRootPackage.resolve")
     public void testImportConflictBetweenImportedAndRootPackage() throws Exception {
-        doTest("compiler/testData/resolve/imports/ImportConflictBetweenImportedAndRootPackage.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictBetweenImportedAndRootPackage.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("ImportConflictBetweenImportedAndSamePackage.resolve")
     public void testImportConflictBetweenImportedAndSamePackage() throws Exception {
-        doTest("compiler/testData/resolve/imports/ImportConflictBetweenImportedAndSamePackage.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictBetweenImportedAndSamePackage.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("ImportConflictForFunctions.resolve")
     public void testImportConflictForFunctions() throws Exception {
-        doTest("compiler/testData/resolve/imports/ImportConflictForFunctions.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictForFunctions.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("ImportConflictPackageAndClass.resolve")
     public void testImportConflictPackageAndClass() throws Exception {
-        doTest("compiler/testData/resolve/imports/ImportConflictPackageAndClass.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictPackageAndClass.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("ImportConflictSameNameClass.resolve")
     public void testImportConflictSameNameClass() throws Exception {
-        doTest("compiler/testData/resolve/imports/ImportConflictSameNameClass.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictSameNameClass.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("ImportConflictWithClassObject.resolve")
     public void testImportConflictWithClassObject() throws Exception {
-        doTest("compiler/testData/resolve/imports/ImportConflictWithClassObject.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictWithClassObject.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("ImportConflictWithInFileClass.resolve")
     public void testImportConflictWithInFileClass() throws Exception {
-        doTest("compiler/testData/resolve/imports/ImportConflictWithInFileClass.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictWithInFileClass.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("ImportConflictWithInnerClass.resolve")
     public void testImportConflictWithInnerClass() throws Exception {
-        doTest("compiler/testData/resolve/imports/ImportConflictWithInnerClass.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictWithInnerClass.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("ImportConflictsWithMappedToJava.resolve")
     public void testImportConflictsWithMappedToJava() throws Exception {
-        doTest("compiler/testData/resolve/imports/ImportConflictsWithMappedToJava.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictsWithMappedToJava.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("ImportNonBlockingAnalysis.resolve")
     public void testImportNonBlockingAnalysis() throws Exception {
-        doTest("compiler/testData/resolve/imports/ImportNonBlockingAnalysis.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportNonBlockingAnalysis.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("ImportResolveOrderStable.resolve")
     public void testImportResolveOrderStable() throws Exception {
-        doTest("compiler/testData/resolve/imports/ImportResolveOrderStable.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportResolveOrderStable.resolve");
+        doTest(fileName);
     }
     
 }

compiler/tests/org/jetbrains/jet/modules/xml/ModuleXmlParserTestGenerated.java

@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.modules.xml;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/modules.xml")
+@TestDataPath("$PROJECT_ROOT")
 public class ModuleXmlParserTestGenerated extends AbstractModuleXmlParserTest {
     public void testAllFilesPresentInModules_xml() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/modules.xml"), Pattern.compile("^(.+)\\.xml$"), true);
@@ -35,37 +37,44 @@ public class ModuleXmlParserTestGenerated extends AbstractModuleXmlParserTest {
     
     @TestMetadata("allOnce.xml")
     public void testAllOnce() throws Exception {
-        doTest("compiler/testData/modules.xml/allOnce.xml");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/modules.xml/allOnce.xml");
+        doTest(fileName);
     }
     
     @TestMetadata("comments.xml")
     public void testComments() throws Exception {
-        doTest("compiler/testData/modules.xml/comments.xml");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/modules.xml/comments.xml");
+        doTest(fileName);
     }
     
     @TestMetadata("empty.xml")
     public void testEmpty() throws Exception {
-        doTest("compiler/testData/modules.xml/empty.xml");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/modules.xml/empty.xml");
+        doTest(fileName);
     }
     
     @TestMetadata("emptyModule.xml")
     public void testEmptyModule() throws Exception {
-        doTest("compiler/testData/modules.xml/emptyModule.xml");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/modules.xml/emptyModule.xml");
+        doTest(fileName);
     }
     
     @TestMetadata("manyTimes.xml")
     public void testManyTimes() throws Exception {
-        doTest("compiler/testData/modules.xml/manyTimes.xml");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/modules.xml/manyTimes.xml");
+        doTest(fileName);
     }
     
     @TestMetadata("onlySources.xml")
     public void testOnlySources() throws Exception {
-        doTest("compiler/testData/modules.xml/onlySources.xml");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/modules.xml/onlySources.xml");
+        doTest(fileName);
     }
     
     @TestMetadata("twoModules.xml")
     public void testTwoModules() throws Exception {
-        doTest("compiler/testData/modules.xml/twoModules.xml");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/modules.xml/twoModules.xml");
+        doTest(fileName);
     }
     
 }

compiler/tests/org/jetbrains/jet/repl/ReplInterpreterTestGenerated.java

@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.repl;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/repl")
+@TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({ReplInterpreterTestGenerated.Classes.class, ReplInterpreterTestGenerated.Multiline.class, ReplInterpreterTestGenerated.Objects.class, ReplInterpreterTestGenerated.PrimitiveTypes.class, ReplInterpreterTestGenerated.Reflection.class})
 public class ReplInterpreterTestGenerated extends AbstractReplInterpreterTest {
     public void testAllFilesPresentInRepl() throws Exception {
@@ -36,65 +38,78 @@ public class ReplInterpreterTestGenerated extends AbstractReplInterpreterTest {
     
     @TestMetadata("analyzeErrors.repl")
     public void testAnalyzeErrors() throws Exception {
-        doTest("compiler/testData/repl/analyzeErrors.repl");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/analyzeErrors.repl");
+        doTest(fileName);
     }
     
     @TestMetadata("constants.repl")
     public void testConstants() throws Exception {
-        doTest("compiler/testData/repl/constants.repl");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/constants.repl");
+        doTest(fileName);
     }
     
     @TestMetadata("empty.repl")
     public void testEmpty() throws Exception {
-        doTest("compiler/testData/repl/empty.repl");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/empty.repl");
+        doTest(fileName);
     }
     
     @TestMetadata("evaluationErrors.repl")
     public void testEvaluationErrors() throws Exception {
-        doTest("compiler/testData/repl/evaluationErrors.repl");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/evaluationErrors.repl");
+        doTest(fileName);
     }
     
     @TestMetadata("function.repl")
     public void testFunction() throws Exception {
-        doTest("compiler/testData/repl/function.repl");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/function.repl");
+        doTest(fileName);
     }
     
     @TestMetadata("functionOverloadResolution.repl")
     public void testFunctionOverloadResolution() throws Exception {
-        doTest("compiler/testData/repl/functionOverloadResolution.repl");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/functionOverloadResolution.repl");
+        doTest(fileName);
     }
     
     @TestMetadata("functionOverloadResolutionAnyBeatsString.repl")
     public void testFunctionOverloadResolutionAnyBeatsString() throws Exception {
-        doTest("compiler/testData/repl/functionOverloadResolutionAnyBeatsString.repl");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/functionOverloadResolutionAnyBeatsString.repl");
+        doTest(fileName);
     }
     
     @TestMetadata("functionReferencesPrev.repl")
     public void testFunctionReferencesPrev() throws Exception {
-        doTest("compiler/testData/repl/functionReferencesPrev.repl");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/functionReferencesPrev.repl");
+        doTest(fileName);
     }
     
     @TestMetadata("imports.repl")
     public void testImports() throws Exception {
-        doTest("compiler/testData/repl/imports.repl");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/imports.repl");
+        doTest(fileName);
     }
     
     @TestMetadata("simple.repl")
     public void testSimple() throws Exception {
-        doTest("compiler/testData/repl/simple.repl");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/simple.repl");
+        doTest(fileName);
     }
     
     @TestMetadata("syntaxErrors.repl")
     public void testSyntaxErrors() throws Exception {
-        doTest("compiler/testData/repl/syntaxErrors.repl");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/syntaxErrors.repl");
+        doTest(fileName);
     }
     
     @TestMetadata("twoClosures.repl")
     public void testTwoClosures() throws Exception {
-        doTest("compiler/testData/repl/twoClosures.repl");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/twoClosures.repl");
+        doTest(fileName);
     }
     
     @TestMetadata("compiler/testData/repl/classes")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Classes extends AbstractReplInterpreterTest {
         public void testAllFilesPresentInClasses() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/repl/classes"), Pattern.compile("^(.+)\\.repl$"), true);
@@ -102,52 +117,62 @@ public class ReplInterpreterTestGenerated extends AbstractReplInterpreterTest {
         
         @TestMetadata("classInheritance.repl")
         public void testClassInheritance() throws Exception {
-            doTest("compiler/testData/repl/classes/classInheritance.repl");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/classes/classInheritance.repl");
+            doTest(fileName);
         }
         
         @TestMetadata("classRedeclaration.repl")
         public void testClassRedeclaration() throws Exception {
-            doTest("compiler/testData/repl/classes/classRedeclaration.repl");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/classes/classRedeclaration.repl");
+            doTest(fileName);
         }
         
         @TestMetadata("emptyClass.repl")
         public void testEmptyClass() throws Exception {
-            doTest("compiler/testData/repl/classes/emptyClass.repl");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/classes/emptyClass.repl");
+            doTest(fileName);
         }
         
         @TestMetadata("emptyClassRedeclaration.repl")
         public void testEmptyClassRedeclaration() throws Exception {
-            doTest("compiler/testData/repl/classes/emptyClassRedeclaration.repl");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/classes/emptyClassRedeclaration.repl");
+            doTest(fileName);
         }
         
         @TestMetadata("enumEntrySubclass.repl")
         public void testEnumEntrySubclass() throws Exception {
-            doTest("compiler/testData/repl/classes/enumEntrySubclass.repl");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/classes/enumEntrySubclass.repl");
+            doTest(fileName);
         }
         
         @TestMetadata("import.repl")
         public void testImport() throws Exception {
-            doTest("compiler/testData/repl/classes/import.repl");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/classes/import.repl");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleClass.repl")
         public void testSimpleClass() throws Exception {
-            doTest("compiler/testData/repl/classes/simpleClass.repl");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/classes/simpleClass.repl");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleEnum.repl")
         public void testSimpleEnum() throws Exception {
-            doTest("compiler/testData/repl/classes/simpleEnum.repl");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/classes/simpleEnum.repl");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleTrait.repl")
         public void testSimpleTrait() throws Exception {
-            doTest("compiler/testData/repl/classes/simpleTrait.repl");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/classes/simpleTrait.repl");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/repl/multiline")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Multiline extends AbstractReplInterpreterTest {
         public void testAllFilesPresentInMultiline() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/repl/multiline"), Pattern.compile("^(.+)\\.repl$"), true);
@@ -155,27 +180,32 @@ public class ReplInterpreterTestGenerated extends AbstractReplInterpreterTest {
         
         @TestMetadata("functionOnSeveralLines.repl")
         public void testFunctionOnSeveralLines() throws Exception {
-            doTest("compiler/testData/repl/multiline/functionOnSeveralLines.repl");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/multiline/functionOnSeveralLines.repl");
+            doTest(fileName);
         }
         
         @TestMetadata("multilineFunctionInvocation.repl")
         public void testMultilineFunctionInvocation() throws Exception {
-            doTest("compiler/testData/repl/multiline/multilineFunctionInvocation.repl");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/multiline/multilineFunctionInvocation.repl");
+            doTest(fileName);
         }
         
         @TestMetadata("openParenthesisIncomplete.repl")
         public void testOpenParenthesisIncomplete() throws Exception {
-            doTest("compiler/testData/repl/multiline/openParenthesisIncomplete.repl");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/multiline/openParenthesisIncomplete.repl");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleFunctionBodyOnNextLine.repl")
         public void testSimpleFunctionBodyOnNextLine() throws Exception {
-            doTest("compiler/testData/repl/multiline/simpleFunctionBodyOnNextLine.repl");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/multiline/simpleFunctionBodyOnNextLine.repl");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/repl/objects")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Objects extends AbstractReplInterpreterTest {
         public void testAllFilesPresentInObjects() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/repl/objects"), Pattern.compile("^(.+)\\.repl$"), true);
@@ -183,22 +213,26 @@ public class ReplInterpreterTestGenerated extends AbstractReplInterpreterTest {
         
         @TestMetadata("emptyObject.repl")
         public void testEmptyObject() throws Exception {
-            doTest("compiler/testData/repl/objects/emptyObject.repl");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/objects/emptyObject.repl");
+            doTest(fileName);
         }
         
         @TestMetadata("localObject.repl")
         public void testLocalObject() throws Exception {
-            doTest("compiler/testData/repl/objects/localObject.repl");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/objects/localObject.repl");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleObjectDeclaration.repl")
         public void testSimpleObjectDeclaration() throws Exception {
-            doTest("compiler/testData/repl/objects/simpleObjectDeclaration.repl");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/objects/simpleObjectDeclaration.repl");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/repl/primitiveTypes")
+    @TestDataPath("$PROJECT_ROOT")
     public static class PrimitiveTypes extends AbstractReplInterpreterTest {
         public void testAllFilesPresentInPrimitiveTypes() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/repl/primitiveTypes"), Pattern.compile("^(.+)\\.repl$"), true);
@@ -206,17 +240,20 @@ public class ReplInterpreterTestGenerated extends AbstractReplInterpreterTest {
         
         @TestMetadata("arrayOfBoxed.repl")
         public void testArrayOfBoxed() throws Exception {
-            doTest("compiler/testData/repl/primitiveTypes/arrayOfBoxed.repl");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/primitiveTypes/arrayOfBoxed.repl");
+            doTest(fileName);
         }
         
         @TestMetadata("boxingOnPurpose.repl")
         public void testBoxingOnPurpose() throws Exception {
-            doTest("compiler/testData/repl/primitiveTypes/boxingOnPurpose.repl");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/primitiveTypes/boxingOnPurpose.repl");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/repl/reflection")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Reflection extends AbstractReplInterpreterTest {
         public void testAllFilesPresentInReflection() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/repl/reflection"), Pattern.compile("^(.+)\\.repl$"), true);
@@ -224,7 +261,8 @@ public class ReplInterpreterTestGenerated extends AbstractReplInterpreterTest {
         
         @TestMetadata("propertyReference.repl")
         public void testPropertyReference() throws Exception {
-            doTest("compiler/testData/repl/reflection/propertyReference.repl");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/reflection/propertyReference.repl");
+            doTest(fileName);
         }
         
     }

compiler/tests/org/jetbrains/jet/resolve/ResolveTestGenerated.java

@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.resolve;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/resolve")
+@TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({ResolveTestGenerated.CandidatesPriority.class, ResolveTestGenerated.DelegatedProperty.class, ResolveTestGenerated.Imports.class, ResolveTestGenerated.Labels.class, ResolveTestGenerated.Regressions.class, ResolveTestGenerated.Varargs.class})
 public class ResolveTestGenerated extends AbstractResolveTest {
     public void testAllFilesPresentInResolve() throws Exception {
@@ -36,145 +38,174 @@ public class ResolveTestGenerated extends AbstractResolveTest {
     
     @TestMetadata("Basic.resolve")
     public void testBasic() throws Exception {
-        doTest("compiler/testData/resolve/Basic.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/Basic.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("ClassObjects.resolve")
     public void testClassObjects() throws Exception {
-        doTest("compiler/testData/resolve/ClassObjects.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/ClassObjects.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("Classifiers.resolve")
     public void testClassifiers() throws Exception {
-        doTest("compiler/testData/resolve/Classifiers.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/Classifiers.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("DefaultParamsOfLocalFunctions.resolve")
     public void testDefaultParamsOfLocalFunctions() throws Exception {
-        doTest("compiler/testData/resolve/DefaultParamsOfLocalFunctions.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/DefaultParamsOfLocalFunctions.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("DontImportRootScope.resolve")
     public void testDontImportRootScope() throws Exception {
-        doTest("compiler/testData/resolve/DontImportRootScope.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/DontImportRootScope.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("ErrorSupertype.resolve")
     public void testErrorSupertype() throws Exception {
-        doTest("compiler/testData/resolve/ErrorSupertype.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/ErrorSupertype.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("ExtensionFunctions.resolve")
     public void testExtensionFunctions() throws Exception {
-        doTest("compiler/testData/resolve/ExtensionFunctions.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/ExtensionFunctions.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("FunctionVariable.resolve")
     public void testFunctionVariable() throws Exception {
-        doTest("compiler/testData/resolve/FunctionVariable.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/FunctionVariable.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("ImportingRootScopeWhenProcessingImports.resolve")
     public void testImportingRootScopeWhenProcessingImports() throws Exception {
-        doTest("compiler/testData/resolve/ImportingRootScopeWhenProcessingImports.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/ImportingRootScopeWhenProcessingImports.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("kt304.resolve")
     public void testKt304() throws Exception {
-        doTest("compiler/testData/resolve/kt304.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/kt304.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("LocalObjects.resolve")
     public void testLocalObjects() throws Exception {
-        doTest("compiler/testData/resolve/LocalObjects.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/LocalObjects.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("NestedObjects.resolve")
     public void testNestedObjects() throws Exception {
-        doTest("compiler/testData/resolve/NestedObjects.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/NestedObjects.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("NoReferenceForErrorAnnotation.resolve")
     public void testNoReferenceForErrorAnnotation() throws Exception {
-        doTest("compiler/testData/resolve/NoReferenceForErrorAnnotation.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/NoReferenceForErrorAnnotation.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("Objects.resolve")
     public void testObjects() throws Exception {
-        doTest("compiler/testData/resolve/Objects.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/Objects.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("Packages.resolve")
     public void testPackages() throws Exception {
-        doTest("compiler/testData/resolve/Packages.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/Packages.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("PrimaryConstructorParameters.resolve")
     public void testPrimaryConstructorParameters() throws Exception {
-        doTest("compiler/testData/resolve/PrimaryConstructorParameters.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/PrimaryConstructorParameters.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("PrimaryConstructors.resolve")
     public void testPrimaryConstructors() throws Exception {
-        doTest("compiler/testData/resolve/PrimaryConstructors.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/PrimaryConstructors.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("Projections.resolve")
     public void testProjections() throws Exception {
-        doTest("compiler/testData/resolve/Projections.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/Projections.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("PropertyAndFunctionNameClash.resolve")
     public void testPropertyAndFunctionNameClash() throws Exception {
-        doTest("compiler/testData/resolve/PropertyAndFunctionNameClash.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/PropertyAndFunctionNameClash.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("ResolveOfInfixExpressions.resolve")
     public void testResolveOfInfixExpressions() throws Exception {
-        doTest("compiler/testData/resolve/ResolveOfInfixExpressions.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/ResolveOfInfixExpressions.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("ResolveToJava.resolve")
     public void testResolveToJava() throws Exception {
-        doTest("compiler/testData/resolve/ResolveToJava.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/ResolveToJava.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("ResolveToJava2.resolve")
     public void testResolveToJava2() throws Exception {
-        doTest("compiler/testData/resolve/ResolveToJava2.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/ResolveToJava2.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("ResolveToJava3.resolve")
     public void testResolveToJava3() throws Exception {
-        doTest("compiler/testData/resolve/ResolveToJava3.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/ResolveToJava3.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("ResolveToJavaTypeTransform.resolve")
     public void testResolveToJavaTypeTransform() throws Exception {
-        doTest("compiler/testData/resolve/ResolveToJavaTypeTransform.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/ResolveToJavaTypeTransform.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("ScopeInteraction.resolve")
     public void testScopeInteraction() throws Exception {
-        doTest("compiler/testData/resolve/ScopeInteraction.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/ScopeInteraction.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("StringTemplates.resolve")
     public void testStringTemplates() throws Exception {
-        doTest("compiler/testData/resolve/StringTemplates.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/StringTemplates.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("Super.resolve")
     public void testSuper() throws Exception {
-        doTest("compiler/testData/resolve/Super.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/Super.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("TryCatch.resolve")
     public void testTryCatch() throws Exception {
-        doTest("compiler/testData/resolve/TryCatch.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/TryCatch.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("compiler/testData/resolve/candidatesPriority")
+    @TestDataPath("$PROJECT_ROOT")
     public static class CandidatesPriority extends AbstractResolveTest {
         public void testAllFilesPresentInCandidatesPriority() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolve/candidatesPriority"), Pattern.compile("^(.+)\\.resolve$"), true);
@@ -182,92 +213,110 @@ public class ResolveTestGenerated extends AbstractResolveTest {
         
         @TestMetadata("classObjectOuterResolve.resolve")
         public void testClassObjectOuterResolve() throws Exception {
-            doTest("compiler/testData/resolve/candidatesPriority/classObjectOuterResolve.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/classObjectOuterResolve.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("closerReceiver1.resolve")
         public void testCloserReceiver1() throws Exception {
-            doTest("compiler/testData/resolve/candidatesPriority/closerReceiver1.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/closerReceiver1.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("closerReceiver2.resolve")
         public void testCloserReceiver2() throws Exception {
-            doTest("compiler/testData/resolve/candidatesPriority/closerReceiver2.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/closerReceiver2.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("closerReceiver3.resolve")
         public void testCloserReceiver3() throws Exception {
-            doTest("compiler/testData/resolve/candidatesPriority/closerReceiver3.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/closerReceiver3.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("closerScope.resolve")
         public void testCloserScope() throws Exception {
-            doTest("compiler/testData/resolve/candidatesPriority/closerScope.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/closerScope.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("extensionToCloserReceiverVsMember.resolve")
         public void testExtensionToCloserReceiverVsMember() throws Exception {
-            doTest("compiler/testData/resolve/candidatesPriority/extensionToCloserReceiverVsMember.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/extensionToCloserReceiverVsMember.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("implicitThisVsNoReceiver.resolve")
         public void testImplicitThisVsNoReceiver() throws Exception {
-            doTest("compiler/testData/resolve/candidatesPriority/implicitThisVsNoReceiver.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/implicitThisVsNoReceiver.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("implicitThisVsNoReceiver2.resolve")
         public void testImplicitThisVsNoReceiver2() throws Exception {
-            doTest("compiler/testData/resolve/candidatesPriority/implicitThisVsNoReceiver2.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/implicitThisVsNoReceiver2.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("localVsImplicitThis.resolve")
         public void testLocalVsImplicitThis() throws Exception {
-            doTest("compiler/testData/resolve/candidatesPriority/localVsImplicitThis.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/localVsImplicitThis.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("memberVsExtension1.resolve")
         public void testMemberVsExtension1() throws Exception {
-            doTest("compiler/testData/resolve/candidatesPriority/memberVsExtension1.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/memberVsExtension1.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("memberVsExtension2.resolve")
         public void testMemberVsExtension2() throws Exception {
-            doTest("compiler/testData/resolve/candidatesPriority/memberVsExtension2.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/memberVsExtension2.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("memberVsExtension3.resolve")
         public void testMemberVsExtension3() throws Exception {
-            doTest("compiler/testData/resolve/candidatesPriority/memberVsExtension3.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/memberVsExtension3.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("memberVsLocalExtension.resolve")
         public void testMemberVsLocalExtension() throws Exception {
-            doTest("compiler/testData/resolve/candidatesPriority/memberVsLocalExtension.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/memberVsLocalExtension.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("memberWithInvokeVsNonLocal.resolve")
         public void testMemberWithInvokeVsNonLocal() throws Exception {
-            doTest("compiler/testData/resolve/candidatesPriority/memberWithInvokeVsNonLocal.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/memberWithInvokeVsNonLocal.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("receiverVsThisObject.resolve")
         public void testReceiverVsThisObject() throws Exception {
-            doTest("compiler/testData/resolve/candidatesPriority/receiverVsThisObject.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/receiverVsThisObject.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("receiverVsThisObject2.resolve")
         public void testReceiverVsThisObject2() throws Exception {
-            doTest("compiler/testData/resolve/candidatesPriority/receiverVsThisObject2.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/receiverVsThisObject2.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("wrongReceiverVsOtherError.resolve")
         public void testWrongReceiverVsOtherError() throws Exception {
-            doTest("compiler/testData/resolve/candidatesPriority/wrongReceiverVsOtherError.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/wrongReceiverVsOtherError.resolve");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/resolve/delegatedProperty")
+    @TestDataPath("$PROJECT_ROOT")
     public static class DelegatedProperty extends AbstractResolveTest {
         public void testAllFilesPresentInDelegatedProperty() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolve/delegatedProperty"), Pattern.compile("^(.+)\\.resolve$"), true);
@@ -275,42 +324,50 @@ public class ResolveTestGenerated extends AbstractResolveTest {
         
         @TestMetadata("delegationByCall.resolve")
         public void testDelegationByCall() throws Exception {
-            doTest("compiler/testData/resolve/delegatedProperty/delegationByCall.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/delegatedProperty/delegationByCall.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("delegationByConstructor.resolve")
         public void testDelegationByConstructor() throws Exception {
-            doTest("compiler/testData/resolve/delegatedProperty/delegationByConstructor.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/delegatedProperty/delegationByConstructor.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("delegationByFun.resolve")
         public void testDelegationByFun() throws Exception {
-            doTest("compiler/testData/resolve/delegatedProperty/delegationByFun.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/delegatedProperty/delegationByFun.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("delegationByObject.resolve")
         public void testDelegationByObject() throws Exception {
-            doTest("compiler/testData/resolve/delegatedProperty/delegationByObject.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/delegatedProperty/delegationByObject.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("delegationByProperty.resolve")
         public void testDelegationByProperty() throws Exception {
-            doTest("compiler/testData/resolve/delegatedProperty/delegationByProperty.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/delegatedProperty/delegationByProperty.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("delegationInClass.resolve")
         public void testDelegationInClass() throws Exception {
-            doTest("compiler/testData/resolve/delegatedProperty/delegationInClass.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/delegatedProperty/delegationInClass.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("localDelegation.resolve")
         public void testLocalDelegation() throws Exception {
-            doTest("compiler/testData/resolve/delegatedProperty/localDelegation.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/delegatedProperty/localDelegation.resolve");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/resolve/imports")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Imports extends AbstractResolveTest {
         public void testAllFilesPresentInImports() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolve/imports"), Pattern.compile("^(.+)\\.resolve$"), true);
@@ -318,67 +375,80 @@ public class ResolveTestGenerated extends AbstractResolveTest {
         
         @TestMetadata("ImportConflictAllPackage.resolve")
         public void testImportConflictAllPackage() throws Exception {
-            doTest("compiler/testData/resolve/imports/ImportConflictAllPackage.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictAllPackage.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("ImportConflictBetweenImportedAndRootPackage.resolve")
         public void testImportConflictBetweenImportedAndRootPackage() throws Exception {
-            doTest("compiler/testData/resolve/imports/ImportConflictBetweenImportedAndRootPackage.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictBetweenImportedAndRootPackage.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("ImportConflictBetweenImportedAndSamePackage.resolve")
         public void testImportConflictBetweenImportedAndSamePackage() throws Exception {
-            doTest("compiler/testData/resolve/imports/ImportConflictBetweenImportedAndSamePackage.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictBetweenImportedAndSamePackage.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("ImportConflictForFunctions.resolve")
         public void testImportConflictForFunctions() throws Exception {
-            doTest("compiler/testData/resolve/imports/ImportConflictForFunctions.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictForFunctions.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("ImportConflictPackageAndClass.resolve")
         public void testImportConflictPackageAndClass() throws Exception {
-            doTest("compiler/testData/resolve/imports/ImportConflictPackageAndClass.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictPackageAndClass.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("ImportConflictSameNameClass.resolve")
         public void testImportConflictSameNameClass() throws Exception {
-            doTest("compiler/testData/resolve/imports/ImportConflictSameNameClass.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictSameNameClass.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("ImportConflictWithClassObject.resolve")
         public void testImportConflictWithClassObject() throws Exception {
-            doTest("compiler/testData/resolve/imports/ImportConflictWithClassObject.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictWithClassObject.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("ImportConflictWithInFileClass.resolve")
         public void testImportConflictWithInFileClass() throws Exception {
-            doTest("compiler/testData/resolve/imports/ImportConflictWithInFileClass.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictWithInFileClass.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("ImportConflictWithInnerClass.resolve")
         public void testImportConflictWithInnerClass() throws Exception {
-            doTest("compiler/testData/resolve/imports/ImportConflictWithInnerClass.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictWithInnerClass.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("ImportConflictsWithMappedToJava.resolve")
         public void testImportConflictsWithMappedToJava() throws Exception {
-            doTest("compiler/testData/resolve/imports/ImportConflictsWithMappedToJava.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictsWithMappedToJava.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("ImportNonBlockingAnalysis.resolve")
         public void testImportNonBlockingAnalysis() throws Exception {
-            doTest("compiler/testData/resolve/imports/ImportNonBlockingAnalysis.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportNonBlockingAnalysis.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("ImportResolveOrderStable.resolve")
         public void testImportResolveOrderStable() throws Exception {
-            doTest("compiler/testData/resolve/imports/ImportResolveOrderStable.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportResolveOrderStable.resolve");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/resolve/labels")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Labels extends AbstractResolveTest {
         public void testAllFilesPresentInLabels() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolve/labels"), Pattern.compile("^(.+)\\.resolve$"), true);
@@ -386,17 +456,20 @@ public class ResolveTestGenerated extends AbstractResolveTest {
         
         @TestMetadata("labelForPropertyInGetter.resolve")
         public void testLabelForPropertyInGetter() throws Exception {
-            doTest("compiler/testData/resolve/labels/labelForPropertyInGetter.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/labels/labelForPropertyInGetter.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("labelForPropertyInSetter.resolve")
         public void testLabelForPropertyInSetter() throws Exception {
-            doTest("compiler/testData/resolve/labels/labelForPropertyInSetter.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/labels/labelForPropertyInSetter.resolve");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/resolve/regressions")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Regressions extends AbstractResolveTest {
         public void testAllFilesPresentInRegressions() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolve/regressions"), Pattern.compile("^(.+)\\.resolve$"), true);
@@ -404,12 +477,14 @@ public class ResolveTestGenerated extends AbstractResolveTest {
         
         @TestMetadata("kt300.resolve")
         public void testKt300() throws Exception {
-            doTest("compiler/testData/resolve/regressions/kt300.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/regressions/kt300.resolve");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/resolve/varargs")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Varargs extends AbstractResolveTest {
         public void testAllFilesPresentInVarargs() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolve/varargs"), Pattern.compile("^(.+)\\.resolve$"), true);
@@ -417,17 +492,20 @@ public class ResolveTestGenerated extends AbstractResolveTest {
         
         @TestMetadata("MoreSpecificVarargsOfEqualLength.resolve")
         public void testMoreSpecificVarargsOfEqualLength() throws Exception {
-            doTest("compiler/testData/resolve/varargs/MoreSpecificVarargsOfEqualLength.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/varargs/MoreSpecificVarargsOfEqualLength.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("NilaryVsVararg.resolve")
         public void testNilaryVsVararg() throws Exception {
-            doTest("compiler/testData/resolve/varargs/NilaryVsVararg.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/varargs/NilaryVsVararg.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("UnaryVsVararg.resolve")
         public void testUnaryVsVararg() throws Exception {
-            doTest("compiler/testData/resolve/varargs/UnaryVsVararg.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/varargs/UnaryVsVararg.resolve");
+            doTest(fileName);
         }
         
     }

compiler/tests/org/jetbrains/jet/resolve/annotation/AnnotationParameterTestGenerated.java

@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.resolve.annotation;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/resolveAnnotations/parameters")
+@TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({AnnotationParameterTestGenerated.Expressions.class})
 public class AnnotationParameterTestGenerated extends AbstractAnnotationParameterTest {
     public void testAllFilesPresentInParameters() throws Exception {
@@ -36,40 +38,48 @@ public class AnnotationParameterTestGenerated extends AbstractAnnotationParamete
     
     @TestMetadata("byte.kt")
     public void testByte() throws Exception {
-        doTest("compiler/testData/resolveAnnotations/parameters/byte.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/byte.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("char.kt")
     public void testChar() throws Exception {
-        doTest("compiler/testData/resolveAnnotations/parameters/char.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/char.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("double.kt")
     public void testDouble() throws Exception {
-        doTest("compiler/testData/resolveAnnotations/parameters/double.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/double.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("float.kt")
     public void testFloat() throws Exception {
-        doTest("compiler/testData/resolveAnnotations/parameters/float.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/float.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("int.kt")
     public void testInt() throws Exception {
-        doTest("compiler/testData/resolveAnnotations/parameters/int.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/int.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("long.kt")
     public void testLong() throws Exception {
-        doTest("compiler/testData/resolveAnnotations/parameters/long.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/long.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("short.kt")
     public void testShort() throws Exception {
-        doTest("compiler/testData/resolveAnnotations/parameters/short.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/short.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("compiler/testData/resolveAnnotations/parameters/expressions")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Expressions extends AbstractAnnotationParameterTest {
         public void testAllFilesPresentInExpressions() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolveAnnotations/parameters/expressions"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -77,177 +87,212 @@ public class AnnotationParameterTestGenerated extends AbstractAnnotationParamete
         
         @TestMetadata("andAnd.kt")
         public void testAndAnd() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/andAnd.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/andAnd.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("boolean.kt")
         public void testBoolean() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/boolean.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/boolean.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("char.kt")
         public void testChar() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/char.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/char.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("compositeCallBinary.kt")
         public void testCompositeCallBinary() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/compositeCallBinary.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/compositeCallBinary.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("divide.kt")
         public void testDivide() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/divide.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/divide.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("double.kt")
         public void testDouble() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/double.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/double.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("eqeq.kt")
         public void testEqeq() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/eqeq.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/eqeq.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("escapedString.kt")
         public void testEscapedString() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/escapedString.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/escapedString.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("float.kt")
         public void testFloat() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/float.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/float.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("gt.kt")
         public void testGt() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/gt.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/gt.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("gteq.kt")
         public void testGteq() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/gteq.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/gteq.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("infixCallBinary.kt")
         public void testInfixCallBinary() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/infixCallBinary.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/infixCallBinary.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("intrincics.kt")
         public void testIntrincics() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/intrincics.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/intrincics.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("labeled.kt")
         public void testLabeled() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/labeled.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/labeled.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("long.kt")
         public void testLong() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/long.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/long.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("lt.kt")
         public void testLt() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/lt.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/lt.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("lteq.kt")
         public void testLteq() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/lteq.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/lteq.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("maxValue.kt")
         public void testMaxValue() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/maxValue.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/maxValue.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("maxValueByte.kt")
         public void testMaxValueByte() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/maxValueByte.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/maxValueByte.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("maxValueInt.kt")
         public void testMaxValueInt() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/maxValueInt.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/maxValueInt.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("miltiply.kt")
         public void testMiltiply() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/miltiply.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/miltiply.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("minus.kt")
         public void testMinus() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/minus.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/minus.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("mod.kt")
         public void testMod() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/mod.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/mod.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("multilineString.kt")
         public void testMultilineString() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/multilineString.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/multilineString.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("not.kt")
         public void testNot() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/not.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/not.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("noteq.kt")
         public void testNoteq() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/noteq.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/noteq.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("orOr.kt")
         public void testOrOr() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/orOr.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/orOr.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("paranthesized.kt")
         public void testParanthesized() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/paranthesized.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/paranthesized.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("plus.kt")
         public void testPlus() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/plus.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/plus.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleCallBinary.kt")
         public void testSimpleCallBinary() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/simpleCallBinary.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/simpleCallBinary.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("stringPlusInt.kt")
         public void testStringPlusInt() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/stringPlusInt.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/stringPlusInt.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("stringTemplate.kt")
         public void testStringTemplate() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/stringTemplate.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/stringTemplate.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("strings.kt")
         public void testStrings() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/strings.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/strings.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("unaryMinus.kt")
         public void testUnaryMinus() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/unaryMinus.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/unaryMinus.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("unaryPlus.kt")
         public void testUnaryPlus() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/unaryPlus.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/unaryPlus.kt");
+            doTest(fileName);
         }
         
     }

compiler/tests/org/jetbrains/jet/resolve/calls/ResolvedCallsTestGenerated.java

@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.resolve.calls;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/resolvedCalls")
+@TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({ResolvedCallsTestGenerated.Arguments.class, ResolvedCallsTestGenerated.DifferentCallElements.class, ResolvedCallsTestGenerated.FunctionTypes.class, ResolvedCallsTestGenerated.Invoke.class, ResolvedCallsTestGenerated.ObjectsAndClassObjects.class, ResolvedCallsTestGenerated.RealExamples.class, ResolvedCallsTestGenerated.Resolve.class, ResolvedCallsTestGenerated.ThisOrSuper.class})
 public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest {
     public void testAllFilesPresentInResolvedCalls() throws Exception {
@@ -36,45 +38,54 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest {
     
     @TestMetadata("explicitReceiverIsReceiverArgument.kt")
     public void testExplicitReceiverIsReceiverArgument() throws Exception {
-        doTest("compiler/testData/resolvedCalls/explicitReceiverIsReceiverArgument.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/explicitReceiverIsReceiverArgument.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("explicitReceiverIsThisObject.kt")
     public void testExplicitReceiverIsThisObject() throws Exception {
-        doTest("compiler/testData/resolvedCalls/explicitReceiverIsThisObject.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/explicitReceiverIsThisObject.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("hasBothThisObjectAndReceiverArgument.kt")
     public void testHasBothThisObjectAndReceiverArgument() throws Exception {
-        doTest("compiler/testData/resolvedCalls/hasBothThisObjectAndReceiverArgument.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/hasBothThisObjectAndReceiverArgument.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("hasBothThisObjectAndReceiverArgumentWithoutExplicitReceiver.kt")
     public void testHasBothThisObjectAndReceiverArgumentWithoutExplicitReceiver() throws Exception {
-        doTest("compiler/testData/resolvedCalls/hasBothThisObjectAndReceiverArgumentWithoutExplicitReceiver.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/hasBothThisObjectAndReceiverArgumentWithoutExplicitReceiver.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("implicitReceiverIsReceiverArgument.kt")
     public void testImplicitReceiverIsReceiverArgument() throws Exception {
-        doTest("compiler/testData/resolvedCalls/implicitReceiverIsReceiverArgument.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/implicitReceiverIsReceiverArgument.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("implicitReceiverIsThisObject.kt")
     public void testImplicitReceiverIsThisObject() throws Exception {
-        doTest("compiler/testData/resolvedCalls/implicitReceiverIsThisObject.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/implicitReceiverIsThisObject.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("impliedThisNoExplicitReceiver.kt")
     public void testImpliedThisNoExplicitReceiver() throws Exception {
-        doTest("compiler/testData/resolvedCalls/impliedThisNoExplicitReceiver.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/impliedThisNoExplicitReceiver.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("simpleCall.kt")
     public void testSimpleCall() throws Exception {
-        doTest("compiler/testData/resolvedCalls/simpleCall.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/simpleCall.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("compiler/testData/resolvedCalls/arguments")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Arguments.FunctionLiterals.class, Arguments.GenericCalls.class, Arguments.NamedArguments.class, Arguments.OneArgument.class, Arguments.RealExamples.class, Arguments.SeveralCandidates.class})
     public static class Arguments extends AbstractResolvedCallsTest {
         public void testAllFilesPresentInArguments() throws Exception {
@@ -82,6 +93,7 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest {
         }
         
         @TestMetadata("compiler/testData/resolvedCalls/arguments/functionLiterals")
+        @TestDataPath("$PROJECT_ROOT")
         public static class FunctionLiterals extends AbstractResolvedCallsTest {
             public void testAllFilesPresentInFunctionLiterals() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/arguments/functionLiterals"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -89,37 +101,44 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest {
             
             @TestMetadata("chainedLambdas.kt")
             public void testChainedLambdas() throws Exception {
-                doTest("compiler/testData/resolvedCalls/arguments/functionLiterals/chainedLambdas.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/functionLiterals/chainedLambdas.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("notInferredLambdaReturnType.kt")
             public void testNotInferredLambdaReturnType() throws Exception {
-                doTest("compiler/testData/resolvedCalls/arguments/functionLiterals/notInferredLambdaReturnType.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/functionLiterals/notInferredLambdaReturnType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("notInferredLambdaType.kt")
             public void testNotInferredLambdaType() throws Exception {
-                doTest("compiler/testData/resolvedCalls/arguments/functionLiterals/notInferredLambdaType.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/functionLiterals/notInferredLambdaType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("simpleGenericLambda.kt")
             public void testSimpleGenericLambda() throws Exception {
-                doTest("compiler/testData/resolvedCalls/arguments/functionLiterals/simpleGenericLambda.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/functionLiterals/simpleGenericLambda.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("simpleLambda.kt")
             public void testSimpleLambda() throws Exception {
-                doTest("compiler/testData/resolvedCalls/arguments/functionLiterals/simpleLambda.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/functionLiterals/simpleLambda.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("unmappedLambda.kt")
             public void testUnmappedLambda() throws Exception {
-                doTest("compiler/testData/resolvedCalls/arguments/functionLiterals/unmappedLambda.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/functionLiterals/unmappedLambda.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/resolvedCalls/arguments/genericCalls")
+        @TestDataPath("$PROJECT_ROOT")
         public static class GenericCalls extends AbstractResolvedCallsTest {
             public void testAllFilesPresentInGenericCalls() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/arguments/genericCalls"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -127,27 +146,32 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest {
             
             @TestMetadata("inferredParameter.kt")
             public void testInferredParameter() throws Exception {
-                doTest("compiler/testData/resolvedCalls/arguments/genericCalls/inferredParameter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/genericCalls/inferredParameter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("simpleGeneric.kt")
             public void testSimpleGeneric() throws Exception {
-                doTest("compiler/testData/resolvedCalls/arguments/genericCalls/simpleGeneric.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/genericCalls/simpleGeneric.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("uninferredParameter.kt")
             public void testUninferredParameter() throws Exception {
-                doTest("compiler/testData/resolvedCalls/arguments/genericCalls/uninferredParameter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/genericCalls/uninferredParameter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("uninferredParameterTypeMismatch.kt")
             public void testUninferredParameterTypeMismatch() throws Exception {
-                doTest("compiler/testData/resolvedCalls/arguments/genericCalls/uninferredParameterTypeMismatch.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/genericCalls/uninferredParameterTypeMismatch.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/resolvedCalls/arguments/namedArguments")
+        @TestDataPath("$PROJECT_ROOT")
         public static class NamedArguments extends AbstractResolvedCallsTest {
             public void testAllFilesPresentInNamedArguments() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/arguments/namedArguments"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -155,17 +179,20 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest {
             
             @TestMetadata("positionedAfterNamed.kt")
             public void testPositionedAfterNamed() throws Exception {
-                doTest("compiler/testData/resolvedCalls/arguments/namedArguments/positionedAfterNamed.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/namedArguments/positionedAfterNamed.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("shiftedArgsMatch.kt")
             public void testShiftedArgsMatch() throws Exception {
-                doTest("compiler/testData/resolvedCalls/arguments/namedArguments/shiftedArgsMatch.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/namedArguments/shiftedArgsMatch.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/resolvedCalls/arguments/oneArgument")
+        @TestDataPath("$PROJECT_ROOT")
         public static class OneArgument extends AbstractResolvedCallsTest {
             public void testAllFilesPresentInOneArgument() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/arguments/oneArgument"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -173,27 +200,32 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest {
             
             @TestMetadata("argumentHasNoType.kt")
             public void testArgumentHasNoType() throws Exception {
-                doTest("compiler/testData/resolvedCalls/arguments/oneArgument/argumentHasNoType.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/oneArgument/argumentHasNoType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("simpleMatch.kt")
             public void testSimpleMatch() throws Exception {
-                doTest("compiler/testData/resolvedCalls/arguments/oneArgument/simpleMatch.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/oneArgument/simpleMatch.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("typeMismatch.kt")
             public void testTypeMismatch() throws Exception {
-                doTest("compiler/testData/resolvedCalls/arguments/oneArgument/typeMismatch.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/oneArgument/typeMismatch.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("unmappedArgument.kt")
             public void testUnmappedArgument() throws Exception {
-                doTest("compiler/testData/resolvedCalls/arguments/oneArgument/unmappedArgument.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/oneArgument/unmappedArgument.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/resolvedCalls/arguments/realExamples")
+        @TestDataPath("$PROJECT_ROOT")
         public static class RealExamples extends AbstractResolvedCallsTest {
             public void testAllFilesPresentInRealExamples() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/arguments/realExamples"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -201,17 +233,20 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest {
             
             @TestMetadata("emptyList.kt")
             public void testEmptyList() throws Exception {
-                doTest("compiler/testData/resolvedCalls/arguments/realExamples/emptyList.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/realExamples/emptyList.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("emptyMutableList.kt")
             public void testEmptyMutableList() throws Exception {
-                doTest("compiler/testData/resolvedCalls/arguments/realExamples/emptyMutableList.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/realExamples/emptyMutableList.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/resolvedCalls/arguments/severalCandidates")
+        @TestDataPath("$PROJECT_ROOT")
         public static class SeveralCandidates extends AbstractResolvedCallsTest {
             public void testAllFilesPresentInSeveralCandidates() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/arguments/severalCandidates"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -219,7 +254,8 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest {
             
             @TestMetadata("mostSpecific.kt")
             public void testMostSpecific() throws Exception {
-                doTest("compiler/testData/resolvedCalls/arguments/severalCandidates/mostSpecific.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/severalCandidates/mostSpecific.kt");
+                doTest(fileName);
             }
             
         }
@@ -238,6 +274,7 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest {
     }
     
     @TestMetadata("compiler/testData/resolvedCalls/differentCallElements")
+    @TestDataPath("$PROJECT_ROOT")
     public static class DifferentCallElements extends AbstractResolvedCallsTest {
         public void testAllFilesPresentInDifferentCallElements() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/differentCallElements"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -245,22 +282,26 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest {
         
         @TestMetadata("annotationCall.kt")
         public void testAnnotationCall() throws Exception {
-            doTest("compiler/testData/resolvedCalls/differentCallElements/annotationCall.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/differentCallElements/annotationCall.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("delegatorToSuperCall.kt")
         public void testDelegatorToSuperCall() throws Exception {
-            doTest("compiler/testData/resolvedCalls/differentCallElements/delegatorToSuperCall.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/differentCallElements/delegatorToSuperCall.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleArrayAccess.kt")
         public void testSimpleArrayAccess() throws Exception {
-            doTest("compiler/testData/resolvedCalls/differentCallElements/simpleArrayAccess.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/differentCallElements/simpleArrayAccess.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/resolvedCalls/functionTypes")
+    @TestDataPath("$PROJECT_ROOT")
     public static class FunctionTypes extends AbstractResolvedCallsTest {
         public void testAllFilesPresentInFunctionTypes() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/functionTypes"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -268,37 +309,44 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest {
         
         @TestMetadata("invokeForExtensionFunctionType.kt")
         public void testInvokeForExtensionFunctionType() throws Exception {
-            doTest("compiler/testData/resolvedCalls/functionTypes/invokeForExtensionFunctionType.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/functionTypes/invokeForExtensionFunctionType.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("invokeForFunctionType.kt")
         public void testInvokeForFunctionType() throws Exception {
-            doTest("compiler/testData/resolvedCalls/functionTypes/invokeForFunctionType.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/functionTypes/invokeForFunctionType.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("valOfExtensionFunctionType.kt")
         public void testValOfExtensionFunctionType() throws Exception {
-            doTest("compiler/testData/resolvedCalls/functionTypes/valOfExtensionFunctionType.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/functionTypes/valOfExtensionFunctionType.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("valOfExtensionFunctionTypeInvoke.kt")
         public void testValOfExtensionFunctionTypeInvoke() throws Exception {
-            doTest("compiler/testData/resolvedCalls/functionTypes/valOfExtensionFunctionTypeInvoke.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/functionTypes/valOfExtensionFunctionTypeInvoke.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("valOfFunctionType.kt")
         public void testValOfFunctionType() throws Exception {
-            doTest("compiler/testData/resolvedCalls/functionTypes/valOfFunctionType.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/functionTypes/valOfFunctionType.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("valOfFunctionTypeInvoke.kt")
         public void testValOfFunctionTypeInvoke() throws Exception {
-            doTest("compiler/testData/resolvedCalls/functionTypes/valOfFunctionTypeInvoke.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/functionTypes/valOfFunctionTypeInvoke.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/resolvedCalls/invoke")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Invoke extends AbstractResolvedCallsTest {
         public void testAllFilesPresentInInvoke() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/invoke"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -306,57 +354,68 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest {
         
         @TestMetadata("bothReceivers.kt")
         public void testBothReceivers() throws Exception {
-            doTest("compiler/testData/resolvedCalls/invoke/bothReceivers.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/invoke/bothReceivers.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("implicitReceiverForInvoke.kt")
         public void testImplicitReceiverForInvoke() throws Exception {
-            doTest("compiler/testData/resolvedCalls/invoke/implicitReceiverForInvoke.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/invoke/implicitReceiverForInvoke.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("invokeOnClassObject1.kt")
         public void testInvokeOnClassObject1() throws Exception {
-            doTest("compiler/testData/resolvedCalls/invoke/invokeOnClassObject1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/invoke/invokeOnClassObject1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("invokeOnClassObject2.kt")
         public void testInvokeOnClassObject2() throws Exception {
-            doTest("compiler/testData/resolvedCalls/invoke/invokeOnClassObject2.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/invoke/invokeOnClassObject2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("invokeOnEnumEntry1.kt")
         public void testInvokeOnEnumEntry1() throws Exception {
-            doTest("compiler/testData/resolvedCalls/invoke/invokeOnEnumEntry1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/invoke/invokeOnEnumEntry1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("invokeOnEnumEntry2.kt")
         public void testInvokeOnEnumEntry2() throws Exception {
-            doTest("compiler/testData/resolvedCalls/invoke/invokeOnEnumEntry2.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/invoke/invokeOnEnumEntry2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("invokeOnObject1.kt")
         public void testInvokeOnObject1() throws Exception {
-            doTest("compiler/testData/resolvedCalls/invoke/invokeOnObject1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/invoke/invokeOnObject1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("invokeOnObject2.kt")
         public void testInvokeOnObject2() throws Exception {
-            doTest("compiler/testData/resolvedCalls/invoke/invokeOnObject2.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/invoke/invokeOnObject2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("receiverArgumentAsReceiverForInvoke.kt")
         public void testReceiverArgumentAsReceiverForInvoke() throws Exception {
-            doTest("compiler/testData/resolvedCalls/invoke/receiverArgumentAsReceiverForInvoke.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/invoke/receiverArgumentAsReceiverForInvoke.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("thisObjectAsReceiverForInvoke.kt")
         public void testThisObjectAsReceiverForInvoke() throws Exception {
-            doTest("compiler/testData/resolvedCalls/invoke/thisObjectAsReceiverForInvoke.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/invoke/thisObjectAsReceiverForInvoke.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/resolvedCalls/objectsAndClassObjects")
+    @TestDataPath("$PROJECT_ROOT")
     public static class ObjectsAndClassObjects extends AbstractResolvedCallsTest {
         public void testAllFilesPresentInObjectsAndClassObjects() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/objectsAndClassObjects"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -364,22 +423,26 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest {
         
         @TestMetadata("classObject.kt")
         public void testClassObject() throws Exception {
-            doTest("compiler/testData/resolvedCalls/objectsAndClassObjects/classObject.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/objectsAndClassObjects/classObject.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt5308IntRangeConstant.kt")
         public void testKt5308IntRangeConstant() throws Exception {
-            doTest("compiler/testData/resolvedCalls/objectsAndClassObjects/kt5308IntRangeConstant.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/objectsAndClassObjects/kt5308IntRangeConstant.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("object.kt")
         public void testObject() throws Exception {
-            doTest("compiler/testData/resolvedCalls/objectsAndClassObjects/object.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/objectsAndClassObjects/object.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/resolvedCalls/realExamples")
+    @TestDataPath("$PROJECT_ROOT")
     public static class RealExamples extends AbstractResolvedCallsTest {
         public void testAllFilesPresentInRealExamples() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/realExamples"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -387,12 +450,14 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest {
         
         @TestMetadata("stringPlusInBuilders.kt")
         public void testStringPlusInBuilders() throws Exception {
-            doTest("compiler/testData/resolvedCalls/realExamples/stringPlusInBuilders.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/realExamples/stringPlusInBuilders.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/resolvedCalls/resolve")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Resolve extends AbstractResolvedCallsTest {
         public void testAllFilesPresentInResolve() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/resolve"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -400,17 +465,20 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest {
         
         @TestMetadata("mostSpecificUninferredParam.kt")
         public void testMostSpecificUninferredParam() throws Exception {
-            doTest("compiler/testData/resolvedCalls/resolve/mostSpecificUninferredParam.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/resolve/mostSpecificUninferredParam.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("mostSpecificWithLambda.kt")
         public void testMostSpecificWithLambda() throws Exception {
-            doTest("compiler/testData/resolvedCalls/resolve/mostSpecificWithLambda.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/resolve/mostSpecificWithLambda.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/resolvedCalls/thisOrSuper")
+    @TestDataPath("$PROJECT_ROOT")
     public static class ThisOrSuper extends AbstractResolvedCallsTest {
         public void testAllFilesPresentInThisOrSuper() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/thisOrSuper"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -418,27 +486,32 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest {
         
         @TestMetadata("labeledSuper.kt")
         public void testLabeledSuper() throws Exception {
-            doTest("compiler/testData/resolvedCalls/thisOrSuper/labeledSuper.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/thisOrSuper/labeledSuper.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("labeledThis.kt")
         public void testLabeledThis() throws Exception {
-            doTest("compiler/testData/resolvedCalls/thisOrSuper/labeledThis.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/thisOrSuper/labeledThis.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleSuper.kt")
         public void testSimpleSuper() throws Exception {
-            doTest("compiler/testData/resolvedCalls/thisOrSuper/simpleSuper.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/thisOrSuper/simpleSuper.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleThis.kt")
         public void testSimpleThis() throws Exception {
-            doTest("compiler/testData/resolvedCalls/thisOrSuper/simpleThis.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/thisOrSuper/simpleThis.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("thisInExtensionFunction.kt")
         public void testThisInExtensionFunction() throws Exception {
-            doTest("compiler/testData/resolvedCalls/thisOrSuper/thisInExtensionFunction.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/thisOrSuper/thisInExtensionFunction.kt");
+            doTest(fileName);
         }
         
     }

compiler/tests/org/jetbrains/jet/resolve/constraintSystem/ConstraintSystemTestGenerated.java

@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.resolve.constraintSystem;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/constraintSystem")
+@TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({ConstraintSystemTestGenerated.CheckStatus.class, ConstraintSystemTestGenerated.ComputeValues.class, ConstraintSystemTestGenerated.IntegerValueTypes.class, ConstraintSystemTestGenerated.SeveralVariables.class, ConstraintSystemTestGenerated.Variance.class})
 public class ConstraintSystemTestGenerated extends AbstractConstraintSystemTest {
     public void testAllFilesPresentInConstraintSystem() throws Exception {
@@ -35,6 +37,7 @@ public class ConstraintSystemTestGenerated extends AbstractConstraintSystemTest
     }
     
     @TestMetadata("compiler/testData/constraintSystem/checkStatus")
+    @TestDataPath("$PROJECT_ROOT")
     public static class CheckStatus extends AbstractConstraintSystemTest {
         public void testAllFilesPresentInCheckStatus() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem/checkStatus"), Pattern.compile("^(.+)\\.bounds$"), true);
@@ -42,32 +45,38 @@ public class ConstraintSystemTestGenerated extends AbstractConstraintSystemTest
         
         @TestMetadata("conflictingConstraints.bounds")
         public void testConflictingConstraints() throws Exception {
-            doTest("compiler/testData/constraintSystem/checkStatus/conflictingConstraints.bounds");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/checkStatus/conflictingConstraints.bounds");
+            doTest(fileName);
         }
         
         @TestMetadata("successful.bounds")
         public void testSuccessful() throws Exception {
-            doTest("compiler/testData/constraintSystem/checkStatus/successful.bounds");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/checkStatus/successful.bounds");
+            doTest(fileName);
         }
         
         @TestMetadata("typeConstructorMismatch.bounds")
         public void testTypeConstructorMismatch() throws Exception {
-            doTest("compiler/testData/constraintSystem/checkStatus/typeConstructorMismatch.bounds");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/checkStatus/typeConstructorMismatch.bounds");
+            doTest(fileName);
         }
         
         @TestMetadata("unknownParameters.bounds")
         public void testUnknownParameters() throws Exception {
-            doTest("compiler/testData/constraintSystem/checkStatus/unknownParameters.bounds");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/checkStatus/unknownParameters.bounds");
+            doTest(fileName);
         }
         
         @TestMetadata("violatedUpperBound.bounds")
         public void testViolatedUpperBound() throws Exception {
-            doTest("compiler/testData/constraintSystem/checkStatus/violatedUpperBound.bounds");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/checkStatus/violatedUpperBound.bounds");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/constraintSystem/computeValues")
+    @TestDataPath("$PROJECT_ROOT")
     public static class ComputeValues extends AbstractConstraintSystemTest {
         public void testAllFilesPresentInComputeValues() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem/computeValues"), Pattern.compile("^(.+)\\.bounds$"), true);
@@ -75,27 +84,32 @@ public class ConstraintSystemTestGenerated extends AbstractConstraintSystemTest
         
         @TestMetadata("contradiction.bounds")
         public void testContradiction() throws Exception {
-            doTest("compiler/testData/constraintSystem/computeValues/contradiction.bounds");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/computeValues/contradiction.bounds");
+            doTest(fileName);
         }
         
         @TestMetadata("subTypeOfUpperBounds.bounds")
         public void testSubTypeOfUpperBounds() throws Exception {
-            doTest("compiler/testData/constraintSystem/computeValues/subTypeOfUpperBounds.bounds");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/computeValues/subTypeOfUpperBounds.bounds");
+            doTest(fileName);
         }
         
         @TestMetadata("superTypeOfLowerBounds1.bounds")
         public void testSuperTypeOfLowerBounds1() throws Exception {
-            doTest("compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds1.bounds");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds1.bounds");
+            doTest(fileName);
         }
         
         @TestMetadata("superTypeOfLowerBounds2.bounds")
         public void testSuperTypeOfLowerBounds2() throws Exception {
-            doTest("compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds2.bounds");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds2.bounds");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/constraintSystem/integerValueTypes")
+    @TestDataPath("$PROJECT_ROOT")
     public static class IntegerValueTypes extends AbstractConstraintSystemTest {
         public void testAllFilesPresentInIntegerValueTypes() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem/integerValueTypes"), Pattern.compile("^(.+)\\.bounds$"), true);
@@ -103,47 +117,56 @@ public class ConstraintSystemTestGenerated extends AbstractConstraintSystemTest
         
         @TestMetadata("byteOverflow.bounds")
         public void testByteOverflow() throws Exception {
-            doTest("compiler/testData/constraintSystem/integerValueTypes/byteOverflow.bounds");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/integerValueTypes/byteOverflow.bounds");
+            doTest(fileName);
         }
         
         @TestMetadata("defaultLong.bounds")
         public void testDefaultLong() throws Exception {
-            doTest("compiler/testData/constraintSystem/integerValueTypes/defaultLong.bounds");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/integerValueTypes/defaultLong.bounds");
+            doTest(fileName);
         }
         
         @TestMetadata("numberAndAny.bounds")
         public void testNumberAndAny() throws Exception {
-            doTest("compiler/testData/constraintSystem/integerValueTypes/numberAndAny.bounds");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/integerValueTypes/numberAndAny.bounds");
+            doTest(fileName);
         }
         
         @TestMetadata("numberAndString.bounds")
         public void testNumberAndString() throws Exception {
-            doTest("compiler/testData/constraintSystem/integerValueTypes/numberAndString.bounds");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/integerValueTypes/numberAndString.bounds");
+            doTest(fileName);
         }
         
         @TestMetadata("severalNumbers.bounds")
         public void testSeveralNumbers() throws Exception {
-            doTest("compiler/testData/constraintSystem/integerValueTypes/severalNumbers.bounds");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/integerValueTypes/severalNumbers.bounds");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleByte.bounds")
         public void testSimpleByte() throws Exception {
-            doTest("compiler/testData/constraintSystem/integerValueTypes/simpleByte.bounds");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/integerValueTypes/simpleByte.bounds");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleInt.bounds")
         public void testSimpleInt() throws Exception {
-            doTest("compiler/testData/constraintSystem/integerValueTypes/simpleInt.bounds");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/integerValueTypes/simpleInt.bounds");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleShort.bounds")
         public void testSimpleShort() throws Exception {
-            doTest("compiler/testData/constraintSystem/integerValueTypes/simpleShort.bounds");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/integerValueTypes/simpleShort.bounds");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/constraintSystem/severalVariables")
+    @TestDataPath("$PROJECT_ROOT")
     public static class SeveralVariables extends AbstractConstraintSystemTest {
         public void testAllFilesPresentInSeveralVariables() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem/severalVariables"), Pattern.compile("^(.+)\\.bounds$"), true);
@@ -151,12 +174,14 @@ public class ConstraintSystemTestGenerated extends AbstractConstraintSystemTest
         
         @TestMetadata("simpleDependency.bounds")
         public void testSimpleDependency() throws Exception {
-            doTest("compiler/testData/constraintSystem/severalVariables/simpleDependency.bounds");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/simpleDependency.bounds");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/constraintSystem/variance")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Variance extends AbstractConstraintSystemTest {
         public void testAllFilesPresentInVariance() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem/variance"), Pattern.compile("^(.+)\\.bounds$"), true);
@@ -164,17 +189,20 @@ public class ConstraintSystemTestGenerated extends AbstractConstraintSystemTest
         
         @TestMetadata("consumer.bounds")
         public void testConsumer() throws Exception {
-            doTest("compiler/testData/constraintSystem/variance/consumer.bounds");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/variance/consumer.bounds");
+            doTest(fileName);
         }
         
         @TestMetadata("invariant.bounds")
         public void testInvariant() throws Exception {
-            doTest("compiler/testData/constraintSystem/variance/invariant.bounds");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/variance/invariant.bounds");
+            doTest(fileName);
         }
         
         @TestMetadata("producer.bounds")
         public void testProducer() throws Exception {
-            doTest("compiler/testData/constraintSystem/variance/producer.bounds");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/variance/producer.bounds");
+            doTest(fileName);
         }
         
     }