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

add android xml bridge invocation test

Browse Source
This commit is contained in:
dedoz
2014-07-24 20:14:26 +04:00
committed by Yan Zhulanow
parent 2801253a9c
commit 8495e06285
10 changed files with 231 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/android/converter/AndroidManifest.xml → compiler/testData/android/converter/singleFile/AndroidManifest.xml
View File
compiler/testData/android/converter/singleFile/MyActivity.kt
+27
View File
@@ -0,0 +1,27 @@
package com.myapp
import android.app.Activity
import android.view.View
import android.widget.*
class MyActivity(): Activity() {
val textViewWidget = TextView()
val editTextWidget = EditText()
val buttonWidget = Button()
override fun findViewById(id: Int): View? {
return when (id) {
R.id.textView1 -> textViewWidget
R.id.password -> editTextWidget
R.id.login -> buttonWidget
else -> null
}
}
fun test(): String {
return if (password.toString() == "EditText" &&
textView1.toString() == "TextView" &&
login.toString() == "Button" )
"OK" else "NOTOK"
}
}
compiler/testData/android/converter/singleFile/R.kt
+6 -5
View File
@@ -1,13 +1,14 @@
package com.myapp
class R {
class id {
class object {
val item_detail_container = 0
val textView1 = 0
val password = 0
val textView2 = 0
val passwordConfirmation = 0
val login = 0
val textView1 = 1
val password = 2
val textView2 = 3
val passwordConfirmation = 4
val login = 5
}
}
}
compiler/testData/android/converter/singleFile/layout.kt
+6 -4
View File
@@ -1,16 +1,18 @@
package com.myapp
import android.app.Activity
import android.view.View
import android.widget.*
val Activity.item_detail_container: FrameLayout
get() = findViewById(R.id.item_detail_container) as FrameLayout
get() = findViewById(0) as FrameLayout
val Activity.textView1: TextView
get() = findViewById(R.id.textView1) as TextView
get() = findViewById(0) as TextView
val Activity.password: EditText
get() = findViewById(R.id.password) as EditText
get() = findViewById(0) as EditText
val Activity.login: Button
get() = findViewById(R.id.login) as Button
get() = findViewById(0) as Button
compiler/testData/android/converter/singleFile/res/layout.xml → compiler/testData/android/converter/singleFile/res/layout/layout.xml
View File
compiler/testData/android/fakeHelpers/Activity.kt
+2 -2
View File
@@ -1,6 +1,6 @@
package android.app
import android.view.View
trait Activity {
fun findViewById(id: Int): View?
abstract class Activity {
open abstract fun findViewById(id: Int): View?
}
compiler/testData/android/fakeHelpers/View.kt
+1 -1
View File
@@ -1,3 +1,3 @@
package android.view
class View
trait View
compiler/testData/android/fakeHelpers/Widgets.kt
+14 -4
View File
@@ -1,6 +1,16 @@
package android.widget
class EditText
class TextView
class Button
class FrameLayout
import android.view.View
class EditText: View {
override fun toString(): String {return "EditText"}
}
class TextView: View {
override fun toString(): String {return "TextView"}
}
class Button: View {
override fun toString(): String {return "Button"}
}
class FrameLayout: View {
override fun toString(): String {return "FrameLayout"}
}
compiler/tests/org/jetbrains/jet/codegen/AndroidXmlTest.java
-83
View File
@@ -1,83 +0,0 @@
package org.jetbrains.jet.codegen;
import com.intellij.openapi.util.Disposer;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.ConfigurationKind;
import org.jetbrains.jet.JetTestCaseBuilder;
import org.jetbrains.jet.JetTestUtils;
import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.resolve.android.AndroidUIXmlParser;
import org.jetbrains.jet.lang.resolve.android.CliAndroidUIXmlParser;
import org.jetbrains.jet.test.TestCaseWithTmpdir;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Scanner;
public class AndroidXmlTest extends TestCaseWithTmpdir {
private final File singleFileDir = new File(getTestDataPath() + "/converter/singleFile/res/");
private final File fakeActivitySrc = new File(getTestDataPath() + "/fakeHelpers/Activity.kt");
private final File fakeViewSrc = new File(getTestDataPath() + "/fakeHelpers/View.kt");
private final File fakeWidgetsSrc = new File(getTestDataPath() + "/fakeHelpers/Widgets.kt");
@Override
public void setUp() throws Exception {
super.setUp();
}
@NotNull
private static String getTestDataPath() {
return JetTestCaseBuilder.getTestDataPathBase() + "/android";
}
@SuppressWarnings({"ResultOfMethodCallIgnored", "IOResourceOpenedButNotSafelyClosed"})
protected static String loadOrCreate(File file, String data) throws IOException {
try {
return new Scanner(file, "UTF-8" ).useDelimiter("\\A").next();
} catch (IOException e) {
file.createNewFile();
FileWriter fileWriter = new FileWriter(file);
fileWriter.write(data);
fileWriter.close();
fail("Empty expected data, creating from actual");
return data;
}
}
public void testCompileResult() throws Exception {
JetCoreEnvironment jetCoreEnvironment = JetTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations(getTestRootDisposable(),
ConfigurationKind.ALL);
String text = new CliAndroidUIXmlParser(jetCoreEnvironment.getProject(), singleFileDir.getAbsolutePath()).parseToString();
JetFile psiFile = JetTestUtils.createFile("dummy.kt", text, jetCoreEnvironment.getProject());
JetFile fakeActivity = JetTestUtils.loadJetFile(jetCoreEnvironment.getProject(), fakeActivitySrc);
JetFile fakeView = JetTestUtils.loadJetFile(jetCoreEnvironment.getProject(), fakeViewSrc);
JetFile fakeWidgets = JetTestUtils.loadJetFile(jetCoreEnvironment.getProject(), fakeWidgetsSrc);
JetFile fakeRClass = JetTestUtils.loadJetFile(jetCoreEnvironment.getProject(),
new File(getTestDataPath() + "/converter/singleFile/R.kt"));
List<JetFile> files = new ArrayList<JetFile>();
files.add(psiFile);
files.add(fakeActivity);
files.add(fakeView);
files.add(fakeRClass);
files.add(fakeWidgets);
GenerationUtils.compileManyFilesGetGenerationStateForTest(jetCoreEnvironment.getProject(), files);
Disposer.dispose(getTestRootDisposable());
}
public void testConverterOneFile() throws Exception {
JetCoreEnvironment jetCoreEnvironment = JetTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations(getTestRootDisposable(),
ConfigurationKind.ALL);
AndroidUIXmlParser parser = new CliAndroidUIXmlParser(jetCoreEnvironment.getProject(), singleFileDir.getAbsolutePath());
String actual = parser.parseToString();
String expected = loadOrCreate(new File(getTestDataPath() + "/converter/singleFile/layout.kt"), actual);
assertEquals(expected, actual);
}
}
compiler/tests/org/jetbrains/jet/lang/resolve/android/AndroidXmlTest.java
+175
View File
@@ -0,0 +1,175 @@
package org.jetbrains.jet.lang.resolve.android;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Disposer;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.*;
import org.jetbrains.jet.cli.jvm.JVMConfigurationKeys;
import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
import org.jetbrains.jet.codegen.GenerationUtils;
import org.jetbrains.jet.codegen.state.GenerationState;
import org.jetbrains.jet.config.CompilerConfiguration;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.test.TestCaseWithTmpdir;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.net.URL;
import java.net.URLClassLoader;
import java.util.*;
public class AndroidXmlTest extends TestCaseWithTmpdir {
private final File singleFileDir = new File(getTestDataPath() + "/converter/singleFile/res/layout/");
private final File fakeActivitySrc = new File(getTestDataPath() + "/fakeHelpers/Activity.kt");
private final File fakeViewSrc = new File(getTestDataPath() + "/fakeHelpers/View.kt");
private final File fakeWidgetsSrc = new File(getTestDataPath() + "/fakeHelpers/Widgets.kt");
private final File fakeMyActivitySrc = new File(getTestDataPath() + "/converter/singleFile/MyActivity.kt");
private final String singleFileResPath = getTestDataPath() + "/converter/singleFile/res/layout/";
public static class ByteClassLoader extends URLClassLoader {
private Queue<OutputFile> q;
private final Map<String, Class> extraClassDefs = new HashMap<String, Class>();
@NotNull
@Override
protected Class<?> findClass(String name) throws ClassNotFoundException {
final Class aClass = extraClassDefs.get(name);
if (aClass != null) return aClass;
else return super.findClass(name);
}
public ByteClassLoader(URL[] urls, ClassLoader parent, List<OutputFile> files) {
super(urls, parent);
q = new LinkedList<OutputFile>(files);
}
private void loadBytes(OutputFile f) {
try {
final byte[] b = f.asByteArray();
final String name = relPathToClassName(f.getRelativePath());
final Class<?> aClass = defineClass(name, b, 0, b.length);
extraClassDefs.put(name, aClass);
q.remove(f);
} catch (NoClassDefFoundError e) {
OutputFile found = findByClassName(e.getMessage());
if (found == null) throw e;
else {
loadBytes(found);
loadBytes(f);
}
}
}
public void loadFiles() {
OutputFile f = q.peek();
while (f != null) {
loadBytes(f);
f = q.peek();
}
}
private OutputFile findByClassName(String name) {
String path = classNameToRelPath(name);
for (OutputFile file: q)
if (file.getRelativePath().equals(path)) return file;
return null;
}
private String relPathToClassName(String path) {
return path.replace(".class", "").replace("/", ".");
}
private String classNameToRelPath(String name) {
return name.replace(".", "/").concat(".class");
}
}
@Override
public void setUp() throws Exception {
super.setUp();
}
@NotNull
private static String getTestDataPath() {
return JetTestCaseBuilder.getTestDataPathBase() + "/android";
}
@SuppressWarnings({"ResultOfMethodCallIgnored", "IOResourceOpenedButNotSafelyClosed"})
protected static String loadOrCreate(File file, String data) throws IOException {
try {
return new Scanner(file, "UTF-8" ).useDelimiter("\\A").next();
} catch (IOException e) {
file.createNewFile();
FileWriter fileWriter = new FileWriter(file);
fileWriter.write(data);
fileWriter.close();
fail("Empty expected data, creating from actual");
return data;
}
}
private GenerationState compileManyFilesGetGenerationState(List<File> files, String resPath) throws IOException {
JetCoreEnvironment jetCoreEnvironment = getEnvironment(resPath);
Project project = jetCoreEnvironment.getProject();
List<JetFile> jetFiles = new ArrayList<JetFile>(files.size());
for (File file: files) {
jetFiles.add(JetTestUtils.loadJetFile(project, file));
}
return GenerationUtils.compileManyFilesGetGenerationStateForTest(project, jetFiles);
}
private JetCoreEnvironment getEnvironment(String resPath) {
CompilerConfiguration configuration = JetTestUtils.compilerConfigurationForTests(ConfigurationKind.ALL,
TestJdkKind.MOCK_JDK);
configuration.put(JVMConfigurationKeys.ANDROID_RES_PATH, resPath);
return JetCoreEnvironment.createForTests(getTestRootDisposable(),
configuration);
}
public void testCompileResult() throws Exception {
List<File> files = addDefaultFiles();
compileManyFilesGetGenerationState(files, singleFileResPath);
Disposer.dispose(getTestRootDisposable());
}
private List<File> addDefaultFiles() {
final File fakeRClass = new File(getTestDataPath() + "/converter/singleFile/R.kt");
List<File> files = new ArrayList<File>();
files.add(fakeActivitySrc);
files.add(fakeViewSrc);
files.add(fakeRClass);
files.add(fakeWidgetsSrc);
return files;
}
public void testConverterOneFile() throws Exception {
JetCoreEnvironment jetCoreEnvironment = getEnvironment(singleFileResPath);
AndroidUIXmlParser parser = new CliAndroidUIXmlParser(jetCoreEnvironment.getProject(), singleFileDir.getAbsolutePath());
String actual = parser.parseToString();
String expected = loadOrCreate(new File(getTestDataPath() + "/converter/singleFile/layout.kt"), actual);
assertEquals(expected, actual);
}
public void testGeneratedByteCode() throws Exception {
String resPath = getTestDataPath() + "/converter/singleFile/res/layout/";
List<File> files = addDefaultFiles();
files.add(fakeMyActivitySrc);
GenerationState state = compileManyFilesGetGenerationState(files, resPath);
ByteClassLoader classLoader = new ByteClassLoader(new URL[] {}, getClass().getClassLoader(), state.getFactory().asList());
classLoader.loadFiles();
final Class<?> activity = classLoader.findClass("com.myapp.MyActivity");
String res =(String) activity.getMethod("test").invoke(activity.newInstance());
Disposer.dispose(getTestRootDisposable());
assertEquals("OK", res);
}
}