Fix Android Extensions tests (descriptors)

plugins/android-compiler-plugin/testData/codegen/bytecodeShape/AndroidManifest.xml

@@ -1,7 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.myapp"
-          android:versionCode="1"
-          android:versionName="1.0" >
-
-
-</manifest>

plugins/android-compiler-plugin/testData/codegen/bytecodeShape/baseClass/baseClass.kt

@@ -1,4 +1,4 @@
-package com.myapp
+package test
 
 import android.app.Activity
 import kotlinx.android.synthetic.main.layout.*
@@ -8,7 +8,7 @@ fun Activity.a() {
     val y = this.login
 }
 
-// 2 GETSTATIC com/myapp/R\$id\.login
+// 2 GETSTATIC test/R\$id\.login
 // 2 INVOKEVIRTUAL android/app/Activity\.findViewById
 // 2 CHECKCAST android/widget/Button
 // 0  _\$_findCachedViewById

plugins/android-compiler-plugin/testData/codegen/bytecodeShape/baseClassFragment/baseClassFragment.kt

@@ -1,4 +1,4 @@
-package com.myapp
+package test
 
 import android.app.Fragment
 import kotlinx.android.synthetic.main.layout.*
@@ -8,7 +8,7 @@ fun Fragment.a() {
     val y = this.login
 }
 
-// 2 GETSTATIC com/myapp/R\$id\.login
+// 2 GETSTATIC test/R\$id\.login
 // 2 CHECKCAST android/widget/Button
 // 2 INVOKEVIRTUAL android/app/Fragment\.getView
 // 2 INVOKEVIRTUAL android/view/View\.findViewById

plugins/android-compiler-plugin/testData/codegen/bytecodeShape/clearCache/clearCache.kt

@@ -1,4 +1,4 @@
-package com.myapp
+package test
 
 import android.app.Activity
 import android.os.Bundle
@@ -11,4 +11,4 @@ public class MyActivity : Activity() {
 
 // 1 public _\$_findCachedViewById
 // 1 public _\$_clearFindViewByIdCache
-// 1 INVOKEVIRTUAL com/myapp/MyActivity\._\$_clearFindViewByIdCache
+// 1 INVOKEVIRTUAL test/MyActivity\._\$_clearFindViewByIdCache

plugins/android-compiler-plugin/testData/codegen/bytecodeShape/clearCacheBaseClass/clearCacheBaseClass.kt

@@ -1,4 +1,4 @@
-package com.myapp
+package test
 
 import android.app.Activity
 import android.os.Bundle

plugins/android-compiler-plugin/testData/codegen/bytecodeShape/extensionFunctions/extensionFunctions.kt

@@ -1,4 +1,4 @@
-package com.myapp
+package test
 
 import android.app.Activity
 import android.os.Bundle
@@ -16,6 +16,6 @@ fun MyActivity.b() {
 
 // 1 public _\$_findCachedViewById
 // 1 public _\$_clearFindViewByIdCache
-// 2 GETSTATIC com/myapp/R\$id\.login
-// 2 INVOKEVIRTUAL com/myapp/MyActivity\._\$_findCachedViewById
+// 2 GETSTATIC test/R\$id\.login
+// 2 INVOKEVIRTUAL test/MyActivity\._\$_findCachedViewById
 // 2 CHECKCAST android/widget/Button

plugins/android-compiler-plugin/testData/codegen/bytecodeShape/extensionFunctionsFragment/extensionFunctionsFragment.kt

@@ -1,4 +1,4 @@
-package com.myapp
+package test
 
 import android.app.Fragment
 import android.os.Bundle
@@ -14,7 +14,7 @@ fun MyFragment.b() {
 
 // 1 public _\$_findCachedViewById
 // 1 public _\$_clearFindViewByIdCache
-// 1 INVOKEVIRTUAL com/myapp/MyFragment\.getView
-// 2 GETSTATIC com/myapp/R\$id\.login
-// 2 INVOKEVIRTUAL com/myapp/MyFragment\._\$_findCachedViewById
+// 1 INVOKEVIRTUAL test/MyFragment\.getView
+// 2 GETSTATIC test/R\$id\.login
+// 2 INVOKEVIRTUAL test/MyFragment\._\$_findCachedViewById
 // 2 CHECKCAST android/widget/Button

plugins/android-compiler-plugin/testData/codegen/bytecodeShape/extensionFunctionsView/extensionFunctionsView.kt

@@ -1,4 +1,4 @@
-package com.myapp
+package test
 
 import android.view.View
 import kotlinx.android.synthetic.main.layout.view.*
@@ -8,7 +8,7 @@ fun View.a() {
     val y = this.login
 }
 
-// 2 GETSTATIC com/myapp/R\$id\.login
+// 2 GETSTATIC test/R\$id\.login
 // 2 INVOKEVIRTUAL android/view/View\.findViewById
 // 2 CHECKCAST android/widget/Button
 // 0 _\$_findCachedViewById

plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInAttr/fqNameInAttr.kt

@@ -1,4 +1,4 @@
-package com.myapp
+package test
 
 import android.app.Activity
 import kotlinx.android.synthetic.main.layout.*
@@ -10,6 +10,6 @@ class MyActivity: Activity() {
 
 // 1 public _\$_findCachedViewById
 // 1 public _\$_clearFindViewByIdCache
-// 2 GETSTATIC com/myapp/R\$id\.MyButton
-// 2 INVOKEVIRTUAL com/myapp/MyActivity\._\$_findCachedViewById
+// 2 GETSTATIC test/R\$id\.MyButton
+// 2 INVOKEVIRTUAL test/MyActivity\._\$_findCachedViewById
 // 2 CHECKCAST android/widget/Button

plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInAttrFragment/fqNameInAttrFragment.kt

@@ -1,4 +1,4 @@
-package com.myapp
+package test
 
 import android.app.Fragment
 import kotlinx.android.synthetic.main.layout.*
@@ -10,7 +10,7 @@ class MyFragment: Fragment() {
 
 // 1 public _\$_findCachedViewById
 // 1 public _\$_clearFindViewByIdCache
-// 1 INVOKEVIRTUAL com/myapp/MyFragment\.getView
-// 2 GETSTATIC com/myapp/R\$id\.MyButton
-// 2 INVOKEVIRTUAL com/myapp/MyFragment\._\$_findCachedViewById
+// 1 INVOKEVIRTUAL test/MyFragment\.getView
+// 2 GETSTATIC test/R\$id\.MyButton
+// 2 INVOKEVIRTUAL test/MyFragment\._\$_findCachedViewById
 // 2 CHECKCAST android/widget/Button

plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInTag/fqNameInTag.kt

@@ -1,4 +1,4 @@
-package com.myapp
+package test
 
 import android.app.Activity
 import kotlinx.android.synthetic.main.layout.*
@@ -10,6 +10,6 @@ class MyActivity: Activity() {
 
 // 1 public _\$_findCachedViewById
 // 1 public _\$_clearFindViewByIdCache
-// 2 GETSTATIC com/myapp/R\$id\.MyButton
-// 2 INVOKEVIRTUAL com/myapp/MyActivity\._\$_findCachedViewById
+// 2 GETSTATIC test/R\$id\.MyButton
+// 2 INVOKEVIRTUAL test/MyActivity\._\$_findCachedViewById
 // 2 CHECKCAST android/widget/Button

plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInTagFragment/fqNameInTagFragment.kt

@@ -1,4 +1,4 @@
-package com.myapp
+package test
 
 import android.app.Fragment
 import kotlinx.android.synthetic.main.layout.*
@@ -10,7 +10,7 @@ class MyFragment: Fragment() {
 
 // 1 public _\$_findCachedViewById
 // 1 public _\$_clearFindViewByIdCache
-// 1 INVOKEVIRTUAL com/myapp/MyFragment\.getView
-// 2 GETSTATIC com/myapp/R\$id\.MyButton
-// 2 INVOKEVIRTUAL com/myapp/MyFragment\._\$_findCachedViewById
+// 1 INVOKEVIRTUAL test/MyFragment\.getView
+// 2 GETSTATIC test/R\$id\.MyButton
+// 2 INVOKEVIRTUAL test/MyFragment\._\$_findCachedViewById
 // 2 CHECKCAST android/widget/Button

plugins/android-compiler-plugin/testData/codegen/bytecodeShape/multiFile/multiFile.kt

@@ -1,4 +1,4 @@
-package com.myapp
+package test
 
 import android.app.Activity
 import kotlinx.android.synthetic.main.layout.*
@@ -11,7 +11,7 @@ class MyActivity: Activity() {
 
 // 1 public _\$_findCachedViewById
 // 1 public _\$_clearFindViewByIdCache
-// 1 GETSTATIC com/myapp/R\$id\.login : I
-// 1 GETSTATIC com/myapp/R\$id\.loginButton : I
-// 2 INVOKEVIRTUAL com/myapp/MyActivity\._\$_findCachedViewById
+// 1 GETSTATIC test/R\$id\.login : I
+// 1 GETSTATIC test/R\$id\.loginButton : I
+// 2 INVOKEVIRTUAL test/MyActivity\._\$_findCachedViewById
 // 2 CHECKCAST android/widget/Button

plugins/android-compiler-plugin/testData/codegen/bytecodeShape/multiFileFragment/multiFileFragment.kt

@@ -1,4 +1,4 @@
-package com.myapp
+package test
 
 import android.app.Activity
 import android.app.Fragment
@@ -15,9 +15,9 @@ class MyFragment: Fragment() {
 
 // 2 public _\$_findCachedViewById
 // 2 public _\$_clearFindViewByIdCache
-// 1 INVOKEVIRTUAL com/myapp/MyFragment\.getView
-// 1 GETSTATIC com/myapp/R\$id\.login : I
-// 1 GETSTATIC com/myapp/R\$id\.loginButton : I
-// 1 INVOKEVIRTUAL com/myapp/MyActivity\._\$_findCachedViewById
-// 1 INVOKEVIRTUAL com/myapp/MyFragment\._\$_findCachedViewById
+// 1 INVOKEVIRTUAL test/MyFragment\.getView
+// 1 GETSTATIC test/R\$id\.login : I
+// 1 GETSTATIC test/R\$id\.loginButton : I
+// 1 INVOKEVIRTUAL test/MyActivity\._\$_findCachedViewById
+// 1 INVOKEVIRTUAL test/MyFragment\._\$_findCachedViewById
 // 2 CHECKCAST android/widget/Button

plugins/android-compiler-plugin/testData/codegen/bytecodeShape/onDestroyFragment/onDestroyFragment.kt

@@ -1,4 +1,4 @@
-package com.myapp
+package test
 
 import android.app.Fragment
 import java.io.File
@@ -19,5 +19,5 @@ public class MyFragment2 : Fragment() {
 }
 
 // 2 public onDestroy\(\)V
-// 1 INVOKEVIRTUAL com/myapp/MyFragment\._\$_clearFindViewByIdCache
-// 1 INVOKEVIRTUAL com/myapp/MyFragment2\._\$_clearFindViewByIdCache
+// 1 INVOKEVIRTUAL test/MyFragment\._\$_clearFindViewByIdCache
+// 1 INVOKEVIRTUAL test/MyFragment2\._\$_clearFindViewByIdCache

plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simple/simple.kt

@@ -1,4 +1,4 @@
-package com.myapp
+package test
 
 import android.app.Activity
 import android.os.Bundle
@@ -11,6 +11,6 @@ public class MyActivity : Activity() {
 
 // 1 public _\$_findCachedViewById
 // 1 public _\$_clearFindViewByIdCache
-// 1 GETSTATIC com/myapp/R\$id\.login
-// 1 INVOKEVIRTUAL com/myapp/MyActivity\._\$_findCachedViewById
+// 1 GETSTATIC test/R\$id\.login
+// 1 INVOKEVIRTUAL test/MyActivity\._\$_findCachedViewById
 // 1 CHECKCAST android/widget/Button

plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simpleFragment/simpleFragment.kt

@@ -1,4 +1,4 @@
-package com.myapp
+package test
 
 import android.app.Fragment
 import java.io.File
@@ -10,7 +10,7 @@ public class MyFragment : Fragment() {
 
 // 1 public _\$_findCachedViewById
 // 1 public _\$_clearFindViewByIdCache
-// 1 INVOKEVIRTUAL com/myapp/MyFragment\.getView
-// 1 GETSTATIC com/myapp/R\$id\.login
-// 1 INVOKEVIRTUAL com/myapp/MyFragment\._\$_findCachedViewById
+// 1 INVOKEVIRTUAL test/MyFragment\.getView
+// 1 GETSTATIC test/R\$id\.login
+// 1 INVOKEVIRTUAL test/MyFragment\._\$_findCachedViewById
 // 1 CHECKCAST android/widget/Button

plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simpleFragmentProperty/simpleFragmentProperty.kt

@@ -1,4 +1,4 @@
-package com.myapp
+package test
 
 import android.app.Activity
 import android.app.Fragment
@@ -16,6 +16,6 @@ public class MyFragment : Fragment() {
 
 // 1 INVOKEVIRTUAL android/app/Activity\.getFragmentManager
 // 1 INVOKEVIRTUAL android/app/Fragment\.getFragmentManager
-// 2 GETSTATIC com/myapp/R\$id\.fragm
+// 2 GETSTATIC test/R\$id\.fragm
 // 2 INVOKEVIRTUAL android/app/FragmentManager\.findFragmentById
 // 2 CHECKCAST android/app/Fragment

plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simpleView/simpleView.kt

@@ -1,4 +1,4 @@
-package com.myapp
+package test
 
 import android.view.View
 import android.app.Activity
@@ -9,9 +9,9 @@ public class MyActivity : Activity() {
 }
 
 // 1 public _\$_findCachedViewById
-// 1 INVOKEVIRTUAL com/myapp/MyActivity\.findViewById
+// 1 INVOKEVIRTUAL test/MyActivity\.findViewById
 // 1 public _\$_clearFindViewByIdCache
-// 1 GETSTATIC com/myapp/R\$id\.login
+// 1 GETSTATIC test/R\$id\.login
 // 1 INVOKEVIRTUAL android/view/View\.findViewById
-// 0 INVOKEVIRTUAL com/myapp/MyActivity\._\$_findCachedViewById
+// 0 INVOKEVIRTUAL test/MyActivity\._\$_findCachedViewById
 // 1 CHECKCAST android/widget/Button

plugins/android-compiler-plugin/testData/codegen/bytecodeShape/supportExtensionFunctionsFragment/supportExtensionFunctionsFragment.kt

@@ -21,6 +21,6 @@ fun MyFragment.b() {
 // 2 public _\$_findCachedViewById
 // 2 public _\$_clearFindViewByIdCache
 // 1 INVOKEVIRTUAL android/support/v4/app/MyFragment\.getView
-// 2 GETSTATIC com/myapp/R\$id\.login
+// 2 GETSTATIC test/R\$id\.login
 // 2 INVOKEVIRTUAL android/support/v4/app/MyFragment\._\$_findCachedViewById
 // 2 CHECKCAST android/widget/Button

plugins/android-compiler-plugin/testData/codegen/bytecodeShape/supportSimpleFragment/supportSimpleFragment.kt

@@ -17,6 +17,6 @@ public class MyFragment : Fragment() {
 // 2 public _\$_findCachedViewById
 // 2 public _\$_clearFindViewByIdCache
 // 1 INVOKEVIRTUAL android/support/v4/app/MyFragment\.getView
-// 1 GETSTATIC com/myapp/R\$id\.login
+// 1 GETSTATIC test/R\$id\.login
 // 1 INVOKEVIRTUAL android/support/v4/app/MyFragment\._\$_findCachedViewById
 // 1 CHECKCAST android/widget/Button

plugins/android-compiler-plugin/testData/codegen/bytecodeShape/supportSimpleFragmentProperty/supportSimpleFragmentProperty.kt

@@ -27,6 +27,6 @@ public class MyFragment : Fragment() {
 
 // 1 INVOKEVIRTUAL android/support/v4/app/FragmentActivity\.getSupportFragmentManager
 // 1 INVOKEVIRTUAL android/support/v4/app/Fragment\.getFragmentManager
-// 2 GETSTATIC com/myapp/R\$id\.fragm
+// 2 GETSTATIC test/R\$id\.fragm
 // 2 INVOKEVIRTUAL android/support/v4/app/FragmentManager\.findFragmentById
 // 2 CHECKCAST android/support/v4/app/Fragment