diff --git a/compiler/tests/org/jetbrains/jet/JetLightProjectDescriptor.java b/compiler/tests/org/jetbrains/jet/JetLightProjectDescriptor.java deleted file mode 100644 index 09ba2a6de52..00000000000 --- a/compiler/tests/org/jetbrains/jet/JetLightProjectDescriptor.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.jetbrains.jet; - -import com.intellij.openapi.projectRoots.Sdk; -import com.intellij.testFramework.fixtures.DefaultLightProjectDescriptor; - -/** - * @author yole - */ -public class JetLightProjectDescriptor extends DefaultLightProjectDescriptor { - public static JetLightProjectDescriptor INSTANCE = new JetLightProjectDescriptor(); - - @Override - public Sdk getSdk() { - return JetTestCaseBase.jdkFromIdeaHome(); - } -} diff --git a/compiler/tests/org/jetbrains/jet/JetTestCaseBase.java b/compiler/tests/org/jetbrains/jet/JetTestCaseBase.java index e53d7077cdd..d3c3deb7373 100644 --- a/compiler/tests/org/jetbrains/jet/JetTestCaseBase.java +++ b/compiler/tests/org/jetbrains/jet/JetTestCaseBase.java @@ -3,7 +3,6 @@ package org.jetbrains.jet; import com.intellij.codeInsight.daemon.LightDaemonAnalyzerTestCase; import com.intellij.openapi.application.PathManager; import com.intellij.openapi.projectRoots.Sdk; -import com.intellij.openapi.projectRoots.impl.JavaSdkImpl; import junit.framework.Test; import junit.framework.TestSuite; import org.jetbrains.annotations.NotNull; @@ -21,7 +20,6 @@ import java.util.List; public abstract class JetTestCaseBase extends LightDaemonAnalyzerTestCase { private static FilenameFilter emptyFilter; - private boolean checkInfos = false; private String dataPath; protected final String name; @@ -30,15 +28,6 @@ public abstract class JetTestCaseBase extends LightDaemonAnalyzerTestCase { this.name = name; } - public final JetTestCaseBase setCheckInfos(boolean checkInfos) { - this.checkInfos = checkInfos; - return this; - } - - public static Sdk jdkFromIdeaHome() { - return new JavaSdkImpl().createJdk("JDK", "compiler/testData/mockJDK-1.7/jre", true); - } - @Override protected String getTestDataPath() { return getTestDataPathBase(); @@ -52,26 +41,6 @@ public abstract class JetTestCaseBase extends LightDaemonAnalyzerTestCase { return new File(PathManager.getResourceRoot(JetTestCaseBase.class, "/org/jetbrains/jet/JetTestCaseBase.class")).getParentFile().getParentFile().getParent(); } - @Override - protected Sdk getProjectJDK() { - return jdkFromIdeaHome(); - } - - @Override - public String getName() { - return "test" + name; - } - - @Override - protected void runTest() throws Throwable { - doTest(getTestFilePath(), true, checkInfos); - } - - @NotNull - protected String getTestFilePath() { - return dataPath + File.separator + name + ".jet"; - } - protected String getDataPath() { return dataPath; } diff --git a/compiler/tests/org/jetbrains/jet/checkers/JetPsiCheckerTest.java b/compiler/tests/org/jetbrains/jet/checkers/JetPsiCheckerTest.java deleted file mode 100644 index bdc6af855cd..00000000000 --- a/compiler/tests/org/jetbrains/jet/checkers/JetPsiCheckerTest.java +++ /dev/null @@ -1,42 +0,0 @@ -package org.jetbrains.jet.checkers; - -import junit.framework.Test; -import junit.framework.TestSuite; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.JetTestCaseBase; - -/** - * @author abreslav - */ -public class JetPsiCheckerTest extends JetTestCaseBase { - - public JetPsiCheckerTest(String dataPath, String name) { - super(dataPath, name); - } - - public static Test suite() { - TestSuite suite = new TestSuite(); - suite.addTest(JetTestCaseBase.suiteForDirectory(getTestDataPathBase(), "/checker/", false, new JetTestCaseBase.NamedTestFactory() { - @NotNull - @Override - public Test createTest(@NotNull String dataPath, @NotNull String name) { - return new JetPsiCheckerTest(dataPath, name); - } - })); - suite.addTest(JetTestCaseBase.suiteForDirectory(getTestDataPathBase(), "/checker/regression/", false, new JetTestCaseBase.NamedTestFactory() { - @NotNull - @Override - public Test createTest(@NotNull String dataPath, @NotNull String name) { - return new JetPsiCheckerTest(dataPath, name); - } - })); - suite.addTest(JetTestCaseBase.suiteForDirectory(getTestDataPathBase(), "/checker/infos/", false, new JetTestCaseBase.NamedTestFactory() { - @NotNull - @Override - public Test createTest(@NotNull String dataPath, @NotNull String name) { - return new JetPsiCheckerTest(dataPath, name).setCheckInfos(true); - } - })); - return suite; - } -} diff --git a/compiler/tests/org/jetbrains/jet/resolve/JetResolveTest.java b/compiler/tests/org/jetbrains/jet/resolve/JetResolveTest.java index f93dda39119..7b1950d46df 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/JetResolveTest.java +++ b/compiler/tests/org/jetbrains/jet/resolve/JetResolveTest.java @@ -2,7 +2,6 @@ package org.jetbrains.jet.resolve; import com.intellij.openapi.application.PathManager; import com.intellij.openapi.project.Project; -import com.intellij.openapi.projectRoots.Sdk; import com.intellij.psi.JavaPsiFacade; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiElement; @@ -133,10 +132,12 @@ public class JetResolveTest extends ExtensibleResolveTestCase { return getHomeDirectory() + "/compiler/testData"; } +/* @Override protected Sdk getProjectJDK() { - return JetTestCaseBase.jdkFromIdeaHome(); + return PluginTestCaseBase.jdkFromIdeaHome(); } +*/ private static String getHomeDirectory() { return new File(PathManager.getResourceRoot(JetParsingTest.class, "/org/jetbrains/jet/parsing/JetParsingTest.class")).getParentFile().getParentFile().getParent(); diff --git a/compiler/testData/checker/Abstract.jet b/idea/testData/checker/Abstract.jet similarity index 100% rename from compiler/testData/checker/Abstract.jet rename to idea/testData/checker/Abstract.jet diff --git a/compiler/testData/checker/AnonymousInitializers.jet b/idea/testData/checker/AnonymousInitializers.jet similarity index 100% rename from compiler/testData/checker/AnonymousInitializers.jet rename to idea/testData/checker/AnonymousInitializers.jet diff --git a/compiler/testData/checker/BinaryCallsOnNullableValues.jet b/idea/testData/checker/BinaryCallsOnNullableValues.jet similarity index 100% rename from compiler/testData/checker/BinaryCallsOnNullableValues.jet rename to idea/testData/checker/BinaryCallsOnNullableValues.jet diff --git a/compiler/testData/checker/Bounds.jet b/idea/testData/checker/Bounds.jet similarity index 100% rename from compiler/testData/checker/Bounds.jet rename to idea/testData/checker/Bounds.jet diff --git a/compiler/testData/checker/BreakContinue.jet b/idea/testData/checker/BreakContinue.jet similarity index 100% rename from compiler/testData/checker/BreakContinue.jet rename to idea/testData/checker/BreakContinue.jet diff --git a/compiler/testData/checker/Builders.jet b/idea/testData/checker/Builders.jet similarity index 100% rename from compiler/testData/checker/Builders.jet rename to idea/testData/checker/Builders.jet diff --git a/compiler/testData/checker/Casts.jet b/idea/testData/checker/Casts.jet similarity index 100% rename from compiler/testData/checker/Casts.jet rename to idea/testData/checker/Casts.jet diff --git a/compiler/testData/checker/ClassObjects.jet b/idea/testData/checker/ClassObjects.jet similarity index 100% rename from compiler/testData/checker/ClassObjects.jet rename to idea/testData/checker/ClassObjects.jet diff --git a/compiler/testData/checker/Constants.jet b/idea/testData/checker/Constants.jet similarity index 100% rename from compiler/testData/checker/Constants.jet rename to idea/testData/checker/Constants.jet diff --git a/compiler/testData/checker/Constructors.jet b/idea/testData/checker/Constructors.jet similarity index 100% rename from compiler/testData/checker/Constructors.jet rename to idea/testData/checker/Constructors.jet diff --git a/compiler/testData/checker/CyclicHierarchy.jet b/idea/testData/checker/CyclicHierarchy.jet similarity index 100% rename from compiler/testData/checker/CyclicHierarchy.jet rename to idea/testData/checker/CyclicHierarchy.jet diff --git a/compiler/testData/checker/Enums.jet b/idea/testData/checker/Enums.jet similarity index 100% rename from compiler/testData/checker/Enums.jet rename to idea/testData/checker/Enums.jet diff --git a/compiler/testData/checker/ExtensionFunctions.jet b/idea/testData/checker/ExtensionFunctions.jet similarity index 100% rename from compiler/testData/checker/ExtensionFunctions.jet rename to idea/testData/checker/ExtensionFunctions.jet diff --git a/compiler/testData/checker/ForRangeConventions.jet b/idea/testData/checker/ForRangeConventions.jet similarity index 100% rename from compiler/testData/checker/ForRangeConventions.jet rename to idea/testData/checker/ForRangeConventions.jet diff --git a/compiler/testData/checker/FunctionReturnTypes.jet b/idea/testData/checker/FunctionReturnTypes.jet similarity index 100% rename from compiler/testData/checker/FunctionReturnTypes.jet rename to idea/testData/checker/FunctionReturnTypes.jet diff --git a/compiler/testData/checker/GenericArgumentConsistency.jet b/idea/testData/checker/GenericArgumentConsistency.jet similarity index 100% rename from compiler/testData/checker/GenericArgumentConsistency.jet rename to idea/testData/checker/GenericArgumentConsistency.jet diff --git a/compiler/testData/checker/IncDec.jet b/idea/testData/checker/IncDec.jet similarity index 100% rename from compiler/testData/checker/IncDec.jet rename to idea/testData/checker/IncDec.jet diff --git a/compiler/testData/checker/IsExpressions.jet b/idea/testData/checker/IsExpressions.jet similarity index 100% rename from compiler/testData/checker/IsExpressions.jet rename to idea/testData/checker/IsExpressions.jet diff --git a/compiler/testData/checker/MultipleBounds.jet b/idea/testData/checker/MultipleBounds.jet similarity index 100% rename from compiler/testData/checker/MultipleBounds.jet rename to idea/testData/checker/MultipleBounds.jet diff --git a/compiler/testData/checker/NamespaceAsExpression.jet b/idea/testData/checker/NamespaceAsExpression.jet similarity index 100% rename from compiler/testData/checker/NamespaceAsExpression.jet rename to idea/testData/checker/NamespaceAsExpression.jet diff --git a/compiler/testData/checker/NamespaceQualified.jet b/idea/testData/checker/NamespaceQualified.jet similarity index 100% rename from compiler/testData/checker/NamespaceQualified.jet rename to idea/testData/checker/NamespaceQualified.jet diff --git a/compiler/testData/checker/Nullability.jet b/idea/testData/checker/Nullability.jet similarity index 100% rename from compiler/testData/checker/Nullability.jet rename to idea/testData/checker/Nullability.jet diff --git a/compiler/testData/checker/Objects.jet b/idea/testData/checker/Objects.jet similarity index 100% rename from compiler/testData/checker/Objects.jet rename to idea/testData/checker/Objects.jet diff --git a/compiler/testData/checker/Override.jet b/idea/testData/checker/Override.jet similarity index 100% rename from compiler/testData/checker/Override.jet rename to idea/testData/checker/Override.jet diff --git a/compiler/testData/checker/PrimaryConstructors.jet b/idea/testData/checker/PrimaryConstructors.jet similarity index 100% rename from compiler/testData/checker/PrimaryConstructors.jet rename to idea/testData/checker/PrimaryConstructors.jet diff --git a/compiler/testData/checker/ProjectionsInSupertypes.jet b/idea/testData/checker/ProjectionsInSupertypes.jet similarity index 100% rename from compiler/testData/checker/ProjectionsInSupertypes.jet rename to idea/testData/checker/ProjectionsInSupertypes.jet diff --git a/compiler/testData/checker/Properties.jet b/idea/testData/checker/Properties.jet similarity index 100% rename from compiler/testData/checker/Properties.jet rename to idea/testData/checker/Properties.jet diff --git a/compiler/testData/checker/QualifiedExpressions.jet b/idea/testData/checker/QualifiedExpressions.jet similarity index 100% rename from compiler/testData/checker/QualifiedExpressions.jet rename to idea/testData/checker/QualifiedExpressions.jet diff --git a/compiler/testData/checker/QualifiedThis.jet b/idea/testData/checker/QualifiedThis.jet similarity index 100% rename from compiler/testData/checker/QualifiedThis.jet rename to idea/testData/checker/QualifiedThis.jet diff --git a/compiler/testData/checker/RecursiveTypeInference.jet b/idea/testData/checker/RecursiveTypeInference.jet similarity index 100% rename from compiler/testData/checker/RecursiveTypeInference.jet rename to idea/testData/checker/RecursiveTypeInference.jet diff --git a/compiler/testData/checker/Redeclarations.jet b/idea/testData/checker/Redeclarations.jet similarity index 100% rename from compiler/testData/checker/Redeclarations.jet rename to idea/testData/checker/Redeclarations.jet diff --git a/compiler/testData/checker/ResolveToJava.jet b/idea/testData/checker/ResolveToJava.jet similarity index 100% rename from compiler/testData/checker/ResolveToJava.jet rename to idea/testData/checker/ResolveToJava.jet diff --git a/compiler/testData/checker/StringTemplates.jet b/idea/testData/checker/StringTemplates.jet similarity index 100% rename from compiler/testData/checker/StringTemplates.jet rename to idea/testData/checker/StringTemplates.jet diff --git a/compiler/testData/checker/SupertypeListChecks.jet b/idea/testData/checker/SupertypeListChecks.jet similarity index 100% rename from compiler/testData/checker/SupertypeListChecks.jet rename to idea/testData/checker/SupertypeListChecks.jet diff --git a/compiler/testData/checker/TraitSupertypeList.jet b/idea/testData/checker/TraitSupertypeList.jet similarity index 100% rename from compiler/testData/checker/TraitSupertypeList.jet rename to idea/testData/checker/TraitSupertypeList.jet diff --git a/compiler/testData/checker/UnreachableCode.jet b/idea/testData/checker/UnreachableCode.jet similarity index 100% rename from compiler/testData/checker/UnreachableCode.jet rename to idea/testData/checker/UnreachableCode.jet diff --git a/compiler/testData/checker/Unresolved.jet b/idea/testData/checker/Unresolved.jet similarity index 100% rename from compiler/testData/checker/Unresolved.jet rename to idea/testData/checker/Unresolved.jet diff --git a/compiler/testData/checker/Variance.jet b/idea/testData/checker/Variance.jet similarity index 100% rename from compiler/testData/checker/Variance.jet rename to idea/testData/checker/Variance.jet diff --git a/compiler/testData/checker/When.jet b/idea/testData/checker/When.jet similarity index 100% rename from compiler/testData/checker/When.jet rename to idea/testData/checker/When.jet diff --git a/compiler/testData/checker/infos/Autocasts.jet b/idea/testData/checker/infos/Autocasts.jet similarity index 100% rename from compiler/testData/checker/infos/Autocasts.jet rename to idea/testData/checker/infos/Autocasts.jet diff --git a/compiler/testData/checker/infos/PropertiesWithBackingFields.jet b/idea/testData/checker/infos/PropertiesWithBackingFields.jet similarity index 100% rename from compiler/testData/checker/infos/PropertiesWithBackingFields.jet rename to idea/testData/checker/infos/PropertiesWithBackingFields.jet diff --git a/compiler/testData/checker/infos/WrapIntoRef.jet b/idea/testData/checker/infos/WrapIntoRef.jet similarity index 100% rename from compiler/testData/checker/infos/WrapIntoRef.jet rename to idea/testData/checker/infos/WrapIntoRef.jet diff --git a/compiler/testData/checker/regression/AmbiguityOnLazyTypeComputation.jet b/idea/testData/checker/regression/AmbiguityOnLazyTypeComputation.jet similarity index 100% rename from compiler/testData/checker/regression/AmbiguityOnLazyTypeComputation.jet rename to idea/testData/checker/regression/AmbiguityOnLazyTypeComputation.jet diff --git a/compiler/testData/checker/regression/AssignmentsUnderOperators.jet b/idea/testData/checker/regression/AssignmentsUnderOperators.jet similarity index 100% rename from compiler/testData/checker/regression/AssignmentsUnderOperators.jet rename to idea/testData/checker/regression/AssignmentsUnderOperators.jet diff --git a/compiler/testData/checker/regression/CoercionToUnit.jet b/idea/testData/checker/regression/CoercionToUnit.jet similarity index 100% rename from compiler/testData/checker/regression/CoercionToUnit.jet rename to idea/testData/checker/regression/CoercionToUnit.jet diff --git a/compiler/testData/checker/regression/DoubleDefine.jet b/idea/testData/checker/regression/DoubleDefine.jet similarity index 100% rename from compiler/testData/checker/regression/DoubleDefine.jet rename to idea/testData/checker/regression/DoubleDefine.jet diff --git a/compiler/testData/checker/regression/Jet11.jet b/idea/testData/checker/regression/Jet11.jet similarity index 100% rename from compiler/testData/checker/regression/Jet11.jet rename to idea/testData/checker/regression/Jet11.jet diff --git a/compiler/testData/checker/regression/Jet121.jet b/idea/testData/checker/regression/Jet121.jet similarity index 100% rename from compiler/testData/checker/regression/Jet121.jet rename to idea/testData/checker/regression/Jet121.jet diff --git a/compiler/testData/checker/regression/Jet124.jet b/idea/testData/checker/regression/Jet124.jet similarity index 100% rename from compiler/testData/checker/regression/Jet124.jet rename to idea/testData/checker/regression/Jet124.jet diff --git a/compiler/testData/checker/regression/Jet169.jet b/idea/testData/checker/regression/Jet169.jet similarity index 100% rename from compiler/testData/checker/regression/Jet169.jet rename to idea/testData/checker/regression/Jet169.jet diff --git a/compiler/testData/checker/regression/Jet17.jet b/idea/testData/checker/regression/Jet17.jet similarity index 100% rename from compiler/testData/checker/regression/Jet17.jet rename to idea/testData/checker/regression/Jet17.jet diff --git a/compiler/testData/checker/regression/Jet183-1.jet b/idea/testData/checker/regression/Jet183-1.jet similarity index 100% rename from compiler/testData/checker/regression/Jet183-1.jet rename to idea/testData/checker/regression/Jet183-1.jet diff --git a/compiler/testData/checker/regression/Jet183.jet b/idea/testData/checker/regression/Jet183.jet similarity index 100% rename from compiler/testData/checker/regression/Jet183.jet rename to idea/testData/checker/regression/Jet183.jet diff --git a/compiler/testData/checker/regression/Jet53.jet b/idea/testData/checker/regression/Jet53.jet similarity index 100% rename from compiler/testData/checker/regression/Jet53.jet rename to idea/testData/checker/regression/Jet53.jet diff --git a/compiler/testData/checker/regression/Jet67.jet b/idea/testData/checker/regression/Jet67.jet similarity index 100% rename from compiler/testData/checker/regression/Jet67.jet rename to idea/testData/checker/regression/Jet67.jet diff --git a/compiler/testData/checker/regression/Jet68.jet b/idea/testData/checker/regression/Jet68.jet similarity index 100% rename from compiler/testData/checker/regression/Jet68.jet rename to idea/testData/checker/regression/Jet68.jet diff --git a/compiler/testData/checker/regression/Jet69.jet b/idea/testData/checker/regression/Jet69.jet similarity index 100% rename from compiler/testData/checker/regression/Jet69.jet rename to idea/testData/checker/regression/Jet69.jet diff --git a/compiler/testData/checker/regression/Jet72.jet b/idea/testData/checker/regression/Jet72.jet similarity index 100% rename from compiler/testData/checker/regression/Jet72.jet rename to idea/testData/checker/regression/Jet72.jet diff --git a/compiler/testData/checker/regression/Jet81.jet b/idea/testData/checker/regression/Jet81.jet similarity index 100% rename from compiler/testData/checker/regression/Jet81.jet rename to idea/testData/checker/regression/Jet81.jet diff --git a/compiler/testData/checker/regression/OverrideResolution.jet b/idea/testData/checker/regression/OverrideResolution.jet similarity index 100% rename from compiler/testData/checker/regression/OverrideResolution.jet rename to idea/testData/checker/regression/OverrideResolution.jet diff --git a/compiler/testData/checker/regression/ScopeForSecondaryConstructors.jet b/idea/testData/checker/regression/ScopeForSecondaryConstructors.jet similarity index 100% rename from compiler/testData/checker/regression/ScopeForSecondaryConstructors.jet rename to idea/testData/checker/regression/ScopeForSecondaryConstructors.jet diff --git a/compiler/testData/checker/regression/SpecififcityByReceiver.jet b/idea/testData/checker/regression/SpecififcityByReceiver.jet similarity index 100% rename from compiler/testData/checker/regression/SpecififcityByReceiver.jet rename to idea/testData/checker/regression/SpecififcityByReceiver.jet diff --git a/compiler/testData/checker/regression/ThisConstructorInGenericClass.jet b/idea/testData/checker/regression/ThisConstructorInGenericClass.jet similarity index 100% rename from compiler/testData/checker/regression/ThisConstructorInGenericClass.jet rename to idea/testData/checker/regression/ThisConstructorInGenericClass.jet diff --git a/compiler/testData/checker/regression/WrongTraceInCallResolver.jet b/idea/testData/checker/regression/WrongTraceInCallResolver.jet similarity index 100% rename from compiler/testData/checker/regression/WrongTraceInCallResolver.jet rename to idea/testData/checker/regression/WrongTraceInCallResolver.jet diff --git a/compiler/testData/checker/regression/kt251.jet b/idea/testData/checker/regression/kt251.jet similarity index 100% rename from compiler/testData/checker/regression/kt251.jet rename to idea/testData/checker/regression/kt251.jet diff --git a/compiler/testData/checker/regression/kt303.jet b/idea/testData/checker/regression/kt303.jet similarity index 100% rename from compiler/testData/checker/regression/kt303.jet rename to idea/testData/checker/regression/kt303.jet diff --git a/idea/tests/org/jetbrains/jet/checkers/JetPsiCheckerTest.java b/idea/tests/org/jetbrains/jet/checkers/JetPsiCheckerTest.java new file mode 100644 index 00000000000..8aaef8089ea --- /dev/null +++ b/idea/tests/org/jetbrains/jet/checkers/JetPsiCheckerTest.java @@ -0,0 +1,81 @@ +package org.jetbrains.jet.checkers; + +import com.intellij.codeInsight.daemon.LightDaemonAnalyzerTestCase; +import com.intellij.openapi.projectRoots.Sdk; +import junit.framework.Test; +import junit.framework.TestSuite; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.JetTestCaseBase; +import org.jetbrains.jet.plugin.quickfix.PluginTestCaseBase; + +import java.io.File; + +/** + * @author abreslav + */ +public class JetPsiCheckerTest extends LightDaemonAnalyzerTestCase { + private boolean checkInfos = false; + private String myDataPath; + private String myName; + + public JetPsiCheckerTest(String dataPath, String name) { + myDataPath = dataPath; + myName = name; + } + + @Override + protected void runTest() throws Throwable { + doTest(getTestFilePath(), true, checkInfos); + } + + @NotNull + protected String getTestFilePath() { + return myDataPath + File.separator + myName + ".jet"; + } + + public final JetPsiCheckerTest setCheckInfos(boolean checkInfos) { + this.checkInfos = checkInfos; + return this; + } + + @Override + protected String getTestDataPath() { + return PluginTestCaseBase.getTestDataPathBase(); + } + + @Override + protected Sdk getProjectJDK() { + return PluginTestCaseBase.jdkFromIdeaHome(); + } + + @Override + public String getName() { + return "test" + myName; + } + + public static Test suite() { + TestSuite suite = new TestSuite(); + suite.addTest(JetTestCaseBase.suiteForDirectory(PluginTestCaseBase.getTestDataPathBase(), "/checker/", false, new JetTestCaseBase.NamedTestFactory() { + @NotNull + @Override + public Test createTest(@NotNull String dataPath, @NotNull String name) { + return new JetPsiCheckerTest(dataPath, name); + } + })); + suite.addTest(JetTestCaseBase.suiteForDirectory(PluginTestCaseBase.getTestDataPathBase(), "/checker/regression/", false, new JetTestCaseBase.NamedTestFactory() { + @NotNull + @Override + public Test createTest(@NotNull String dataPath, @NotNull String name) { + return new JetPsiCheckerTest(dataPath, name); + } + })); + suite.addTest(JetTestCaseBase.suiteForDirectory(PluginTestCaseBase.getTestDataPathBase(), "/checker/infos/", false, new JetTestCaseBase.NamedTestFactory() { + @NotNull + @Override + public Test createTest(@NotNull String dataPath, @NotNull String name) { + return new JetPsiCheckerTest(dataPath, name).setCheckInfos(true); + } + })); + return suite; + } +} diff --git a/idea/tests/org/jetbrains/jet/plugin/quickfix/JetQuickFixTest.java b/idea/tests/org/jetbrains/jet/plugin/quickfix/JetQuickFixTest.java index 85b900949db..cea1007b691 100644 --- a/idea/tests/org/jetbrains/jet/plugin/quickfix/JetQuickFixTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/quickfix/JetQuickFixTest.java @@ -91,6 +91,6 @@ public class JetQuickFixTest extends LightQuickFixTestCase { @Override protected Sdk getProjectJDK() { - return JetTestCaseBase.jdkFromIdeaHome(); + return PluginTestCaseBase.jdkFromIdeaHome(); } } diff --git a/idea/tests/org/jetbrains/jet/plugin/quickfix/PluginTestCaseBase.java b/idea/tests/org/jetbrains/jet/plugin/quickfix/PluginTestCaseBase.java index c65a3ff5e3f..abf84536c65 100644 --- a/idea/tests/org/jetbrains/jet/plugin/quickfix/PluginTestCaseBase.java +++ b/idea/tests/org/jetbrains/jet/plugin/quickfix/PluginTestCaseBase.java @@ -1,5 +1,7 @@ package org.jetbrains.jet.plugin.quickfix; +import com.intellij.openapi.projectRoots.Sdk; +import com.intellij.openapi.projectRoots.impl.JavaSdkImpl; import org.jetbrains.jet.JetTestCaseBase; /** @@ -9,4 +11,8 @@ public class PluginTestCaseBase { public static String getTestDataPathBase() { return JetTestCaseBase.getHomeDirectory() + "/idea/testData"; } + + public static Sdk jdkFromIdeaHome() { + return new JavaSdkImpl().createJdk("JDK", "compiler/testData/mockJDK-1.7/jre", true); + } }