From 10f557105b9a150a0c48f24b75560655b689b89c Mon Sep 17 00:00:00 2001 From: Michael Bogdanov Date: Fri, 22 Apr 2016 16:20:20 +0300 Subject: [PATCH] File name to package class mapping updated to new single file facade scheme --- .../tests/AbstractCodegenTestCaseOnAndroid.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/compiler/android-tests/android-module/src/org/jetbrains/kotlin/android/tests/AbstractCodegenTestCaseOnAndroid.java b/compiler/android-tests/android-module/src/org/jetbrains/kotlin/android/tests/AbstractCodegenTestCaseOnAndroid.java index 2f3d6ab7b3e..2010512d246 100644 --- a/compiler/android-tests/android-module/src/org/jetbrains/kotlin/android/tests/AbstractCodegenTestCaseOnAndroid.java +++ b/compiler/android-tests/android-module/src/org/jetbrains/kotlin/android/tests/AbstractCodegenTestCaseOnAndroid.java @@ -24,11 +24,10 @@ public class AbstractCodegenTestCaseOnAndroid extends TestCase { protected void invokeBoxMethod(String filePath, String expectedResult) throws Exception { try { - Class clazz; + String simpelName = filePath.substring(filePath.lastIndexOf("/") + 1); String packageName = filePath.replaceAll("\\\\|-|\\.|/", "_"); - clazz = Class.forName(packageName + "." + getPackageClassName(packageName)); - Method method; - method = clazz.getMethod("box"); + Class clazz = Class.forName(packageName + "." + getPackageClassName(simpelName)); + Method method = clazz.getMethod("box"); assertEquals(expectedResult, method.invoke(null)); } catch (Throwable e) { @@ -36,7 +35,7 @@ public class AbstractCodegenTestCaseOnAndroid extends TestCase { } } - public static String getPackageClassName(String packageName) { - return Character.toUpperCase(packageName.charAt(0)) + packageName.substring(1, packageName.length()) + "Package"; + public static String getPackageClassName(String fileName) { + return Character.toUpperCase(fileName.charAt(0)) + fileName.substring(1).replaceAll("\\.kt", "Kt"); } }