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

Call 'invokeBox' with proper class instance (not try to find it via reflection)

Browse Source
This commit is contained in:
Michael Bogdanov
2016-04-26 12:02:42 +03:00
parent 1eb3d2ec1d
commit 11e42c6472
3 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/android-tests/android-module/src/org/jetbrains/kotlin/android/tests/AbstractCodegenTestCaseOnAndroid.java
+1 -8
View File
@@ -22,11 +22,8 @@ import java.lang.reflect.Method;
public class AbstractCodegenTestCaseOnAndroid extends TestCase {
protected void invokeBoxMethod(String filePath, String expectedResult) throws Exception {
protected void invokeBoxMethod(Class clazz, String filePath, String expectedResult) throws Exception {
try {
String simpelName = filePath.substring(filePath.lastIndexOf("/") + 1);
String packageName = filePath.replaceAll("\\\\|-|\\.|/", "_");
Class clazz = Class.forName(packageName + "." + getPackageClassName(simpelName));
Method method = clazz.getMethod("box");
assertEquals(expectedResult, method.invoke(null));
}
@@ -34,8 +31,4 @@ public class AbstractCodegenTestCaseOnAndroid extends TestCase {
throw new RuntimeException("File: " + filePath, e);
}
}
public static String getPackageClassName(String fileName) {
return Character.toUpperCase(fileName.charAt(0)) + fileName.substring(1).replaceAll("\\.kt", "Kt");
}
}
compiler/android-tests/android-tests.iml
+1
View File
@@ -16,5 +16,6 @@
<orderEntry type="library" name="idea-full" level="project" />
<orderEntry type="module" module-name="util" />
<orderEntry type="module" module-name="descriptor.loader.java" scope="TEST" />
<orderEntry type="module" module-name="frontend.java" scope="TEST" />
</component>
</module>
compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java
+13 -6
View File
@@ -31,6 +31,8 @@ import org.jetbrains.kotlin.codegen.GenerationUtils;
import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime;
import org.jetbrains.kotlin.idea.KotlinFileType;
import org.jetbrains.kotlin.load.java.JvmAbi;
import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils;
import org.jetbrains.kotlin.name.FqName;
import org.jetbrains.kotlin.psi.KtFile;
import org.jetbrains.kotlin.test.ConfigurationKind;
import org.jetbrains.kotlin.test.InTextDirectivesUtils;
@@ -240,23 +242,28 @@ public class CodegenTestsOnAndroidGenerator extends UsefulTestCase {
CodegenTestFiles codegenFile = CodegenTestFiles.create(file.getName(), text, filesHolder.environment.getProject());
filesHolder.files.add(codegenFile.getPsiFile());
generateTestMethod(printer, generatedTestName, StringUtil.escapeStringCharacters(file.getPath()));
FqName className = PackagePartClassUtils.getPackagePartFqName(new FqName(packageName), file.getName());
generateTestMethod(printer, generatedTestName, className.toString(), StringUtil.escapeStringCharacters(file.getPath()));
}
}
}
}
private static boolean hasJvmNameAnnotation(String text) {
return text.contains("@file:JvmName") || text.contains("@file:kotlin.jvm.JvmName");
}
private static boolean hasBoxMethod(String text) {
return text.contains("fun box()");
}
private String changePackage(String testName, String text) {
private String changePackage(String packageName, String text) {
if (text.contains("package ")) {
Matcher matcher = packagePattern.matcher(text);
return matcher.replaceAll("package " + testName);
return matcher.replaceAll("package " + packageName);
}
else {
String packageDirective = "package " + testName + ";\n";
String packageDirective = "package " + packageName + ";\n";
if (text.contains("@file:")) {
int index = text.lastIndexOf("@file:");
int packageDirectiveIndex = text.indexOf("\n", index);
@@ -267,10 +274,10 @@ public class CodegenTestsOnAndroidGenerator extends UsefulTestCase {
}
}
private static void generateTestMethod(Printer p, String testName, String packageName) {
private static void generateTestMethod(Printer p, String testName, String className, String filePath) {
p.println("public void test" + testName + "() throws Exception {");
p.pushIndent();
p.println("invokeBoxMethod(\"" + packageName + "\", \"OK\");");
p.println("invokeBoxMethod(" + className + ".class, \"" + filePath + "\", \"OK\");");
p.popIndent();
p.println("}");
p.println();