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

Rename package jet -> kotlin in android-tests

Browse Source 
org.jetbrains.jet.compiler.android -> org.jetbrains.kotlin.android.tests
This commit is contained in:
Alexander Udalov
2015-01-02 19:11:01 +03:00
parent 53079fd3f7
commit 60fcaf5a6e
18 changed files with 89 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/android-tests/android-module/AndroidManifest.xml
+3 -7
View File
@@ -1,12 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- package name must be unique so suffix with "tests" so package loader doesn't ignore us -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.jetbrains.jet.compiler.android"
package="org.jetbrains.kotlin.android.tests"
android:versionCode="1"
android:versionName="1.0">
<!-- We add an application tag here just so that we can indicate that
this package needs to link against the android.test library,
which is needed when building test cases. -->
<application>
<uses-library android:name="android.test.runner" />
</application>
@@ -16,6 +12,6 @@ which is needed when building test cases. -->
"adb shell am instrument -w com.example.tests/android.test.InstrumentationTestRunner"
-->
<instrumentation android:name="android.test.InstrumentationTestRunner"
android:targetPackage="org.jetbrains.jet.compiler.android"
android:label="Tests for org.jetbrains.jet.compiler.android"/>
android:targetPackage="org.jetbrains.kotlin.android.tests"
android:label="Tests for org.jetbrains.kotlin.android.tests"/>
</manifest>
compiler/android-tests/android-module/src/org/jetbrains/jet/compiler/android/AbstractCodegenTestCaseOnAndroid.java → compiler/android-tests/android-module/src/org/jetbrains/kotlin/android/tests/AbstractCodegenTestCaseOnAndroid.java
+2 -4
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2013 JetBrains s.r.o.
* Copyright 2010-2015 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,14 +14,12 @@
* limitations under the License.
*/
package org.jetbrains.jet.compiler.android;
package org.jetbrains.kotlin.android.tests;
import junit.framework.TestCase;
import java.lang.String;
import java.lang.reflect.Method;
public class AbstractCodegenTestCaseOnAndroid extends TestCase {
protected void invokeBoxMethod(String filePath, String expectedResult) throws Exception {
compiler/android-tests/android-module/src/org/jetbrains/jet/compiler/android/MyActivity.java → compiler/android-tests/android-module/src/org/jetbrains/kotlin/android/tests/MyActivity.java
+3 -3
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2013 JetBrains s.r.o.
* Copyright 2010-2015 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.compiler.android;
package org.jetbrains.kotlin.android.tests;
import android.app.Activity;
import android.os.Bundle;
@@ -24,4 +24,4 @@ public class MyActivity extends Activity {
super.onCreate(savedInstanceState);
System.out.println(R.string.app_name);
}
}
}