azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android test: tests with mock jdk now run with jdk annotations

Browse Source
This commit is contained in:
Natalia
2012-09-06 12:44:49 +04:00
parent a96474845b
commit 1441f742bb
2 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/android-tests/tests/org/jetbrains/jet/compiler/android/CodegenTestsOnAndroidGenerator.java
+1 -6
View File
@@ -54,8 +54,7 @@ public class CodegenTestsOnAndroidGenerator extends UsefulTestCase {
private final String baseTestClassName = "AbstractCodegenTestCaseOnAndroid"; private final String baseTestClassName = "AbstractCodegenTestCaseOnAndroid";
private final String generatorName = "CodegenTestsOnAndroidGenerator"; private final String generatorName = "CodegenTestsOnAndroidGenerator";
private JetCoreEnvironment environmentWithMockJdk = JetTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations(myTestRootDisposable, ConfigurationKind.JDK_ONLY); private JetCoreEnvironment environmentWithMockJdk = JetTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations(myTestRootDisposable, ConfigurationKind.JDK_AND_ANNOTATIONS);
private JetCoreEnvironment environmentWithMockJdkAndExternalAnnotations = JetTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations(myTestRootDisposable, ConfigurationKind.JDK_AND_ANNOTATIONS);
private JetCoreEnvironment environmentWithFullJdk = JetTestUtils.createEnvironmentWithFullJdk(myTestRootDisposable); private JetCoreEnvironment environmentWithFullJdk = JetTestUtils.createEnvironmentWithFullJdk(myTestRootDisposable);
private JetCoreEnvironment environmentWithFullJdkAndJUnit; private JetCoreEnvironment environmentWithFullJdkAndJUnit;
@@ -136,7 +135,6 @@ public class CodegenTestsOnAndroidGenerator extends UsefulTestCase {
Set<String> excludedFiles = SpecialFiles.getExcludedFiles(); Set<String> excludedFiles = SpecialFiles.getExcludedFiles();
Set<String> filesCompiledWithoutStdLib = SpecialFiles.getFilesCompiledWithoutStdLib(); Set<String> filesCompiledWithoutStdLib = SpecialFiles.getFilesCompiledWithoutStdLib();
Set<String> filesCompiledWithJUnit = SpecialFiles.getFilesCompiledWithJUnit(); Set<String> filesCompiledWithJUnit = SpecialFiles.getFilesCompiledWithJUnit();
Set<String> filesCompiledWithExternalAnnotations = SpecialFiles.getFilesCompiledWithExternalAnnotations();
for (File file : files) { for (File file : files) {
if (excludedFiles.contains(file.getName())) { if (excludedFiles.contains(file.getName())) {
continue; continue;
@@ -158,9 +156,6 @@ public class CodegenTestsOnAndroidGenerator extends UsefulTestCase {
else if (filesCompiledWithJUnit.contains(file.getName())) { else if (filesCompiledWithJUnit.contains(file.getName())) {
factory = getFactoryFromText(file.getAbsolutePath(), text, environmentWithFullJdkAndJUnit); factory = getFactoryFromText(file.getAbsolutePath(), text, environmentWithFullJdkAndJUnit);
} }
else if (filesCompiledWithExternalAnnotations.contains(file.getName())) {
factory = getFactoryFromText(file.getAbsolutePath(), text, environmentWithMockJdkAndExternalAnnotations);
}
else { else {
factory = getFactoryFromText(file.getAbsolutePath(), text, environmentWithFullJdk); factory = getFactoryFromText(file.getAbsolutePath(), text, environmentWithFullJdk);
} }
compiler/android-tests/tests/org/jetbrains/jet/compiler/android/SpecialFiles.java
+1 -11
View File
@@ -31,20 +31,13 @@ public class SpecialFiles {
private static final Set<String> excludedFiles = Sets.newHashSet(); private static final Set<String> excludedFiles = Sets.newHashSet();
private static final Set<String> filesCompiledWithoutStdLib = Sets.newHashSet(); private static final Set<String> filesCompiledWithoutStdLib = Sets.newHashSet();
private static final Set<String> filesCompiledWithJUnit = Sets.newHashSet(); private static final Set<String> filesCompiledWithJUnit = Sets.newHashSet();
private static final Set<String> filesCompiledWithExternalAnnotations = Sets.newHashSet();
static { static {
fillExcludedFiles(); fillExcludedFiles();
fillFilesCompiledWithoutStdLib(); fillFilesCompiledWithoutStdLib();
fillFilesCompiledWithJUnit(); fillFilesCompiledWithJUnit();
fillFilesCompiledWithExternalAnnotations();
} }
public static Set<String> getFilesCompiledWithExternalAnnotations() {
return filesCompiledWithExternalAnnotations;
}
public static Set<String> getFilesCompiledWithJUnit() { public static Set<String> getFilesCompiledWithJUnit() {
return filesCompiledWithJUnit; return filesCompiledWithJUnit;
} }
@@ -61,11 +54,8 @@ public class SpecialFiles {
filesCompiledWithJUnit.add("kt2334.kt"); filesCompiledWithJUnit.add("kt2334.kt");
} }
private static void fillFilesCompiledWithExternalAnnotations() {
filesCompiledWithExternalAnnotations.add("kt1980.kt");
}
private static void fillFilesCompiledWithoutStdLib() { private static void fillFilesCompiledWithoutStdLib() {
filesCompiledWithoutStdLib.add("kt1980.kt");
filesCompiledWithoutStdLib.add("kt1953_class.kt"); // Exception in code filesCompiledWithoutStdLib.add("kt1953_class.kt"); // Exception in code
filesCompiledWithoutStdLib.add("basicmethodSuperClass.jet"); // Exception in code filesCompiledWithoutStdLib.add("basicmethodSuperClass.jet"); // Exception in code
filesCompiledWithoutStdLib.add("kt503.jet"); // OVERLOAD_RESOLUTION_AMBIGUITY filesCompiledWithoutStdLib.add("kt503.jet"); // OVERLOAD_RESOLUTION_AMBIGUITY