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

Minor: fix AbstractAndroidSyntheticPropertyDescriptorTest test, sort descriptors

Browse Source
This commit is contained in:
Yan Zhulanow
2015-11-26 16:35:16 +03:00
parent d21985493e
commit 3d6bdd14b2
7 changed files with 76 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android-compiler-plugin/testData/descriptors/escapedLayoutName/result.txt
Vendored
+12 -12
View File
@@ -14,20 +14,20 @@ kotlinx.android.synthetic.get
public val android.app.Activity.item_detail_container: android.widget.FrameLayout!
public val android.app.Fragment.item_detail_container: android.widget.FrameLayout!
public val android.app.Activity.textView1: android.widget.TextView!
public val android.app.Fragment.textView1: android.widget.TextView!
public val android.app.Activity.password: android.widget.EditText!
public val android.app.Fragment.password: android.widget.EditText!
public val android.app.Activity.login: android.widget.Button!
public val android.app.Fragment.login: android.widget.Button!
public val android.app.Activity.password: android.widget.EditText!
public val android.app.Fragment.password: android.widget.EditText!
public val android.app.Activity.textView1: android.widget.TextView!
public val android.app.Fragment.textView1: android.widget.TextView!
kotlinx.android.synthetic.get.view
public val android.view.View.item_detail_container: android.widget.FrameLayout!
public val android.view.View.textView1: android.widget.TextView!
public val android.view.View.password: android.widget.EditText!
public val android.view.View.login: android.widget.Button!
public val android.view.View.password: android.widget.EditText!
public val android.view.View.textView1: android.widget.TextView!
kotlinx.android.synthetic.main
@@ -37,17 +37,17 @@ kotlinx.android.synthetic.main.get
public val android.app.Activity.item_detail_container: android.widget.FrameLayout!
public val android.app.Fragment.item_detail_container: android.widget.FrameLayout!
public val android.app.Activity.textView1: android.widget.TextView!
public val android.app.Fragment.textView1: android.widget.TextView!
public val android.app.Activity.password: android.widget.EditText!
public val android.app.Fragment.password: android.widget.EditText!
public val android.app.Activity.login: android.widget.Button!
public val android.app.Fragment.login: android.widget.Button!
public val android.app.Activity.password: android.widget.EditText!
public val android.app.Fragment.password: android.widget.EditText!
public val android.app.Activity.textView1: android.widget.TextView!
public val android.app.Fragment.textView1: android.widget.TextView!
kotlinx.android.synthetic.main.get.view
public val android.view.View.item_detail_container: android.widget.FrameLayout!
public val android.view.View.textView1: android.widget.TextView!
public val android.view.View.login: android.widget.Button!
public val android.view.View.password: android.widget.EditText!
public val android.view.View.login: android.widget.Button!
public val android.view.View.textView1: android.widget.TextView!
plugins/android-compiler-plugin/testData/descriptors/multiFile/result.txt
Vendored
+24 -24
View File
@@ -17,77 +17,77 @@ kotlinx.android.synthetic.main.test
public val android.app.Activity.item_detail_container: android.widget.FrameLayout!
public val android.app.Fragment.item_detail_container: android.widget.FrameLayout!
public val android.app.Activity.textView1: android.widget.TextView!
public val android.app.Fragment.textView1: android.widget.TextView!
public val android.app.Activity.password: android.widget.EditText!
public val android.app.Fragment.password: android.widget.EditText!
public val android.app.Activity.login: android.widget.Button!
public val android.app.Fragment.login: android.widget.Button!
public val android.app.Activity.password: android.widget.EditText!
public val android.app.Fragment.password: android.widget.EditText!
public val android.app.Activity.textView1: android.widget.TextView!
public val android.app.Fragment.textView1: android.widget.TextView!
kotlinx.android.synthetic.main.test.view
public val android.view.View.item_detail_container: android.widget.FrameLayout!
public val android.view.View.textView1: android.widget.TextView!
public val android.view.View.password: android.widget.EditText!
public val android.view.View.login: android.widget.Button!
public val android.view.View.password: android.widget.EditText!
public val android.view.View.textView1: android.widget.TextView!
kotlinx.android.synthetic.main.test1
public val android.app.Activity.frameLayout: android.widget.FrameLayout!
public val android.app.Fragment.frameLayout: android.widget.FrameLayout!
public val android.app.Activity.passwordField: android.widget.TextView!
public val android.app.Fragment.passwordField: android.widget.TextView!
public val android.app.Activity.passwordCaption: android.widget.EditText!
public val android.app.Fragment.passwordCaption: android.widget.EditText!
public val android.app.Activity.loginButton: android.widget.Button!
public val android.app.Fragment.loginButton: android.widget.Button!
public val android.app.Activity.passwordCaption: android.widget.EditText!
public val android.app.Fragment.passwordCaption: android.widget.EditText!
public val android.app.Activity.passwordField: android.widget.TextView!
public val android.app.Fragment.passwordField: android.widget.TextView!
kotlinx.android.synthetic.main.test1.view
public val android.view.View.frameLayout: android.widget.FrameLayout!
public val android.view.View.passwordField: android.widget.TextView!
public val android.view.View.passwordCaption: android.widget.EditText!
public val android.view.View.loginButton: android.widget.Button!
public val android.view.View.passwordCaption: android.widget.EditText!
public val android.view.View.passwordField: android.widget.TextView!
kotlinx.android.synthetic.test
public val android.app.Activity.item_detail_container: android.widget.FrameLayout!
public val android.app.Fragment.item_detail_container: android.widget.FrameLayout!
public val android.app.Activity.textView1: android.widget.TextView!
public val android.app.Fragment.textView1: android.widget.TextView!
public val android.app.Activity.password: android.widget.EditText!
public val android.app.Fragment.password: android.widget.EditText!
public val android.app.Activity.login: android.widget.Button!
public val android.app.Fragment.login: android.widget.Button!
public val android.app.Activity.password: android.widget.EditText!
public val android.app.Fragment.password: android.widget.EditText!
public val android.app.Activity.textView1: android.widget.TextView!
public val android.app.Fragment.textView1: android.widget.TextView!
kotlinx.android.synthetic.test.view
public val android.view.View.item_detail_container: android.widget.FrameLayout!
public val android.view.View.textView1: android.widget.TextView!
public val android.view.View.password: android.widget.EditText!
public val android.view.View.login: android.widget.Button!
public val android.view.View.password: android.widget.EditText!
public val android.view.View.textView1: android.widget.TextView!
kotlinx.android.synthetic.test1
public val android.app.Activity.frameLayout: android.widget.FrameLayout!
public val android.app.Fragment.frameLayout: android.widget.FrameLayout!
public val android.app.Activity.passwordField: android.widget.TextView!
public val android.app.Fragment.passwordField: android.widget.TextView!
public val android.app.Activity.passwordCaption: android.widget.EditText!
public val android.app.Fragment.passwordCaption: android.widget.EditText!
public val android.app.Activity.loginButton: android.widget.Button!
public val android.app.Fragment.loginButton: android.widget.Button!
public val android.app.Activity.passwordCaption: android.widget.EditText!
public val android.app.Fragment.passwordCaption: android.widget.EditText!
public val android.app.Activity.passwordField: android.widget.TextView!
public val android.app.Fragment.passwordField: android.widget.TextView!
kotlinx.android.synthetic.test1.view
public val android.view.View.frameLayout: android.widget.FrameLayout!
public val android.view.View.passwordField: android.widget.TextView!
public val android.view.View.loginButton: android.widget.Button!
public val android.view.View.passwordCaption: android.widget.EditText!
public val android.view.View.loginButton: android.widget.Button!
public val android.view.View.passwordField: android.widget.TextView!
plugins/android-compiler-plugin/testData/descriptors/singleFile/result.txt
Vendored
+12 -12
View File
@@ -17,37 +17,37 @@ kotlinx.android.synthetic.main.test
public val android.app.Activity.item_detail_container: android.widget.FrameLayout!
public val android.app.Fragment.item_detail_container: android.widget.FrameLayout!
public val android.app.Activity.textView1: android.widget.TextView!
public val android.app.Fragment.textView1: android.widget.TextView!
public val android.app.Activity.password: android.widget.EditText!
public val android.app.Fragment.password: android.widget.EditText!
public val android.app.Activity.login: android.widget.Button!
public val android.app.Fragment.login: android.widget.Button!
public val android.app.Activity.password: android.widget.EditText!
public val android.app.Fragment.password: android.widget.EditText!
public val android.app.Activity.textView1: android.widget.TextView!
public val android.app.Fragment.textView1: android.widget.TextView!
kotlinx.android.synthetic.main.test.view
public val android.view.View.item_detail_container: android.widget.FrameLayout!
public val android.view.View.textView1: android.widget.TextView!
public val android.view.View.password: android.widget.EditText!
public val android.view.View.login: android.widget.Button!
public val android.view.View.password: android.widget.EditText!
public val android.view.View.textView1: android.widget.TextView!
kotlinx.android.synthetic.test
public val android.app.Activity.item_detail_container: android.widget.FrameLayout!
public val android.app.Fragment.item_detail_container: android.widget.FrameLayout!
public val android.app.Activity.textView1: android.widget.TextView!
public val android.app.Fragment.textView1: android.widget.TextView!
public val android.app.Activity.password: android.widget.EditText!
public val android.app.Fragment.password: android.widget.EditText!
public val android.app.Activity.login: android.widget.Button!
public val android.app.Fragment.login: android.widget.Button!
public val android.app.Activity.password: android.widget.EditText!
public val android.app.Fragment.password: android.widget.EditText!
public val android.app.Activity.textView1: android.widget.TextView!
public val android.app.Fragment.textView1: android.widget.TextView!
kotlinx.android.synthetic.test.view
public val android.view.View.item_detail_container: android.widget.FrameLayout!
public val android.view.View.textView1: android.widget.TextView!
public val android.view.View.login: android.widget.Button!
public val android.view.View.password: android.widget.EditText!
public val android.view.View.login: android.widget.Button!
public val android.view.View.textView1: android.widget.TextView!
plugins/android-compiler-plugin/testData/descriptors/specialTags/result.txt
Vendored
+6 -6
View File
@@ -15,37 +15,37 @@ kotlinx.android.synthetic.main
kotlinx.android.synthetic.main.test
public val android.app.Activity.includeTag: android.view.View!
public val android.app.Fragment.includeTag: android.view.View!
public val android.app.Activity.fragmentTag: android.app.Fragment!
public val android.app.Fragment.fragmentTag: android.app.Fragment!
public val android.app.Activity.`fun`: android.widget.TextView!
public val android.app.Fragment.`fun`: android.widget.TextView!
public val android.app.Activity.includeTag: android.view.View!
public val android.app.Fragment.includeTag: android.view.View!
public val android.app.Activity.set: android.widget.Button!
public val android.app.Fragment.set: android.widget.Button!
kotlinx.android.synthetic.main.test.view
public val android.view.View.includeTag: android.view.View!
public val android.view.View.`fun`: android.widget.TextView!
public val android.view.View.includeTag: android.view.View!
public val android.view.View.set: android.widget.Button!
kotlinx.android.synthetic.test
public val android.app.Activity.includeTag: android.view.View!
public val android.app.Fragment.includeTag: android.view.View!
public val android.app.Activity.fragmentTag: android.app.Fragment!
public val android.app.Fragment.fragmentTag: android.app.Fragment!
public val android.app.Activity.`fun`: android.widget.TextView!
public val android.app.Fragment.`fun`: android.widget.TextView!
public val android.app.Activity.includeTag: android.view.View!
public val android.app.Fragment.includeTag: android.view.View!
public val android.app.Activity.set: android.widget.Button!
public val android.app.Fragment.set: android.widget.Button!
kotlinx.android.synthetic.test.view
public val android.view.View.includeTag: android.view.View!
public val android.view.View.`fun`: android.widget.TextView!
public val android.view.View.includeTag: android.view.View!
public val android.view.View.set: android.widget.Button!
plugins/android-compiler-plugin/testData/descriptors/supportSingleFile/result.txt
Vendored
+12 -12
View File
@@ -17,37 +17,37 @@ kotlinx.android.synthetic.main.test
public val android.app.Activity.item_detail_container: android.widget.FrameLayout!
public val android.app.Fragment.item_detail_container: android.widget.FrameLayout!
public val android.app.Activity.textView1: android.widget.TextView!
public val android.app.Fragment.textView1: android.widget.TextView!
public val android.app.Activity.password: android.widget.EditText!
public val android.app.Fragment.password: android.widget.EditText!
public val android.app.Activity.login: android.widget.Button!
public val android.app.Fragment.login: android.widget.Button!
public val android.app.Activity.password: android.widget.EditText!
public val android.app.Fragment.password: android.widget.EditText!
public val android.app.Activity.textView1: android.widget.TextView!
public val android.app.Fragment.textView1: android.widget.TextView!
kotlinx.android.synthetic.main.test.view
public val android.view.View.item_detail_container: android.widget.FrameLayout!
public val android.view.View.textView1: android.widget.TextView!
public val android.view.View.password: android.widget.EditText!
public val android.view.View.login: android.widget.Button!
public val android.view.View.password: android.widget.EditText!
public val android.view.View.textView1: android.widget.TextView!
kotlinx.android.synthetic.test
public val android.app.Activity.item_detail_container: android.widget.FrameLayout!
public val android.app.Fragment.item_detail_container: android.widget.FrameLayout!
public val android.app.Activity.textView1: android.widget.TextView!
public val android.app.Fragment.textView1: android.widget.TextView!
public val android.app.Activity.password: android.widget.EditText!
public val android.app.Fragment.password: android.widget.EditText!
public val android.app.Activity.login: android.widget.Button!
public val android.app.Fragment.login: android.widget.Button!
public val android.app.Activity.password: android.widget.EditText!
public val android.app.Fragment.password: android.widget.EditText!
public val android.app.Activity.textView1: android.widget.TextView!
public val android.app.Fragment.textView1: android.widget.TextView!
kotlinx.android.synthetic.test.view
public val android.view.View.item_detail_container: android.widget.FrameLayout!
public val android.view.View.textView1: android.widget.TextView!
public val android.view.View.login: android.widget.Button!
public val android.view.View.password: android.widget.EditText!
public val android.view.View.login: android.widget.Button!
public val android.view.View.textView1: android.widget.TextView!
plugins/android-compiler-plugin/testData/descriptors/supportSpecialTags/result.txt
Vendored
+6 -6
View File
@@ -15,37 +15,37 @@ kotlinx.android.synthetic.main
kotlinx.android.synthetic.main.test
public val android.app.Activity.includeTag: android.view.View!
public val android.app.Fragment.includeTag: android.view.View!
public val android.app.Activity.fragmentTag: android.app.Fragment!
public val android.app.Fragment.fragmentTag: android.app.Fragment!
public val android.app.Activity.`fun`: android.widget.TextView!
public val android.app.Fragment.`fun`: android.widget.TextView!
public val android.app.Activity.includeTag: android.view.View!
public val android.app.Fragment.includeTag: android.view.View!
public val android.app.Activity.set: android.widget.Button!
public val android.app.Fragment.set: android.widget.Button!
kotlinx.android.synthetic.main.test.view
public val android.view.View.includeTag: android.view.View!
public val android.view.View.`fun`: android.widget.TextView!
public val android.view.View.includeTag: android.view.View!
public val android.view.View.set: android.widget.Button!
kotlinx.android.synthetic.test
public val android.app.Activity.includeTag: android.view.View!
public val android.app.Fragment.includeTag: android.view.View!
public val android.app.Activity.fragmentTag: android.app.Fragment!
public val android.app.Fragment.fragmentTag: android.app.Fragment!
public val android.app.Activity.`fun`: android.widget.TextView!
public val android.app.Fragment.`fun`: android.widget.TextView!
public val android.app.Activity.includeTag: android.view.View!
public val android.app.Fragment.includeTag: android.view.View!
public val android.app.Activity.set: android.widget.Button!
public val android.app.Fragment.set: android.widget.Button!
kotlinx.android.synthetic.test.view
public val android.view.View.includeTag: android.view.View!
public val android.view.View.`fun`: android.widget.TextView!
public val android.view.View.includeTag: android.view.View!
public val android.view.View.set: android.widget.Button!
plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidSyntheticPropertyDescriptorTest.kt
+4 -1
View File
@@ -21,6 +21,7 @@ import org.jetbrains.kotlin.android.synthetic.res.AndroidPackageFragmentProvider
import org.jetbrains.kotlin.android.synthetic.res.AndroidSyntheticPackageFragmentProvider
import org.jetbrains.kotlin.cli.jvm.compiler.JvmPackagePartProvider
import org.jetbrains.kotlin.renderer.DescriptorRenderer
import org.jetbrains.kotlin.resolve.MemberComparator
import org.jetbrains.kotlin.resolve.jvm.extensions.PackageFragmentProviderExtension
import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil
import org.jetbrains.kotlin.storage.LockBasedStorageManager
@@ -45,7 +46,9 @@ public abstract class AbstractAndroidSyntheticPropertyDescriptorTest : UsefulTes
val renderer = DescriptorRenderer.COMPACT_WITH_MODIFIERS
val expected = fragmentProvider.packageFragments.sortedBy { it.fqName.asString() }.map {
val descriptors = it.getMemberScope().getContributedDescriptors().map { " " + renderer.render(it) }.joinToString("\n")
val descriptors = it.getMemberScope().getContributedDescriptors()
.sortedWith(MemberComparator.INSTANCE)
.map { " " + renderer.render(it) }.joinToString("\n")
it.fqName.asString() + (if (descriptors.isNotEmpty()) "\n\n" + descriptors else "")
}.joinToString("\n\n\n")