From 4145991bea1b00d551f43c8473c9bec8420c692c Mon Sep 17 00:00:00 2001 From: Mikhail Mutcianko Date: Thu, 18 Sep 2014 14:58:32 +0400 Subject: [PATCH] add android rename tests --- .../kotlin/generators/tests/GenerateTests.kt | 5 ++ .../rename/fqNameInAttr/fqNameInAttr.kt | 9 +++ .../rename/fqNameInAttr/res/layout/layout.xml | 15 +++++ .../android/rename/fqNameInTag/fqNameInTag.kt | 9 +++ .../rename/fqNameInTag/res/layout/layout.xml | 14 +++++ .../android/rename/multiFile/multiFile.kt | 10 +++ .../rename/multiFile/res/layout/layout.xml | 29 +++++++++ .../rename/multiFile/res/layout/layout1.xml | 29 +++++++++ .../rename/simple/res/layout/layout.xml | 17 +++++ idea/testData/android/rename/simple/simple.kt | 12 ++++ .../jet/android/AbstractAndroidRenameTest.kt | 60 ++++++++++++++++++ .../jet/android/AndroidGotoTestGenerated.java | 2 +- .../android/AndroidRenameTestGenerated.java | 62 +++++++++++++++++++ 13 files changed, 272 insertions(+), 1 deletion(-) create mode 100644 idea/testData/android/rename/fqNameInAttr/fqNameInAttr.kt create mode 100644 idea/testData/android/rename/fqNameInAttr/res/layout/layout.xml create mode 100644 idea/testData/android/rename/fqNameInTag/fqNameInTag.kt create mode 100644 idea/testData/android/rename/fqNameInTag/res/layout/layout.xml create mode 100644 idea/testData/android/rename/multiFile/multiFile.kt create mode 100644 idea/testData/android/rename/multiFile/res/layout/layout.xml create mode 100644 idea/testData/android/rename/multiFile/res/layout/layout1.xml create mode 100644 idea/testData/android/rename/simple/res/layout/layout.xml create mode 100644 idea/testData/android/rename/simple/simple.kt create mode 100644 idea/tests/org/jetbrains/jet/android/AbstractAndroidRenameTest.kt create mode 100644 idea/tests/org/jetbrains/jet/android/AndroidRenameTestGenerated.java diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index 62d2887adeb..87b5ed23f9a 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -148,6 +148,7 @@ import org.jetbrains.jet.lang.resolve.android.AbstractAndroidBoxTest import org.jetbrains.jet.android.AbstractAndroidCompletionTest import org.jetbrains.jet.android.AbstractAndroidGotoTest import org.jetbrains.jet.jps.build.android.AbstractAndroidJpsTestCase +import org.jetbrains.jet.android.AbstractAndroidRenameTest fun main(args: Array) { System.setProperty("java.awt.headless", "true") @@ -721,6 +722,10 @@ fun main(args: Array) { testClass(javaClass()) { model("android/goto", recursive = false, extension = null) } + + testClass(javaClass()) { + model("android/rename", recursive = false, extension = null) + } } testGroup("idea/tests", "compiler/testData") { diff --git a/idea/testData/android/rename/fqNameInAttr/fqNameInAttr.kt b/idea/testData/android/rename/fqNameInAttr/fqNameInAttr.kt new file mode 100644 index 00000000000..1c131f1da38 --- /dev/null +++ b/idea/testData/android/rename/fqNameInAttr/fqNameInAttr.kt @@ -0,0 +1,9 @@ +package com.myapp + +import android.app.Activity + + +class MyActivity: Activity() { + val button = this.MyButton +} + diff --git a/idea/testData/android/rename/fqNameInAttr/res/layout/layout.xml b/idea/testData/android/rename/fqNameInAttr/res/layout/layout.xml new file mode 100644 index 00000000000..a0ef9f3a1ed --- /dev/null +++ b/idea/testData/android/rename/fqNameInAttr/res/layout/layout.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/idea/testData/android/rename/fqNameInTag/fqNameInTag.kt b/idea/testData/android/rename/fqNameInTag/fqNameInTag.kt new file mode 100644 index 00000000000..1c131f1da38 --- /dev/null +++ b/idea/testData/android/rename/fqNameInTag/fqNameInTag.kt @@ -0,0 +1,9 @@ +package com.myapp + +import android.app.Activity + + +class MyActivity: Activity() { + val button = this.MyButton +} + diff --git a/idea/testData/android/rename/fqNameInTag/res/layout/layout.xml b/idea/testData/android/rename/fqNameInTag/res/layout/layout.xml new file mode 100644 index 00000000000..2ec85364e74 --- /dev/null +++ b/idea/testData/android/rename/fqNameInTag/res/layout/layout.xml @@ -0,0 +1,14 @@ + + + + + diff --git a/idea/testData/android/rename/multiFile/multiFile.kt b/idea/testData/android/rename/multiFile/multiFile.kt new file mode 100644 index 00000000000..fdd80a87ace --- /dev/null +++ b/idea/testData/android/rename/multiFile/multiFile.kt @@ -0,0 +1,10 @@ +package com.myapp + +import android.app.Activity + + +class MyActivity: Activity() { + val button = this.login + val button1 = this.loginButton +} + diff --git a/idea/testData/android/rename/multiFile/res/layout/layout.xml b/idea/testData/android/rename/multiFile/res/layout/layout.xml new file mode 100644 index 00000000000..f4736f6937b --- /dev/null +++ b/idea/testData/android/rename/multiFile/res/layout/layout.xml @@ -0,0 +1,29 @@ + + + + + + + +