From 422e11ea9ad593c1c14e8c8ae83b0191361fd408 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Fri, 6 Nov 2015 18:36:12 +0300 Subject: [PATCH] Fix Android Extensions tests (descriptors) --- .../kotlin/generators/tests/GenerateTests.kt | 11 +- .../noManifest/res/layout/layout.xml | 29 ---- .../converter/simple/AndroidManifest.xml | 3 - .../simple/escapedLayoutName/get_LAYOUT.kt | 36 ----- .../simple/escapedLayoutName/get_VIEW.kt | 20 --- .../escapedLayoutName/main_get_LAYOUT.kt | 28 ---- .../simple/escapedLayoutName/main_get_VIEW.kt | 16 -- .../simple/fqNameInAttr/main_test_LAYOUT.kt | 10 -- .../simple/fqNameInAttr/main_test_VIEW.kt | 7 - .../simple/fqNameInAttr/test_LAYOUT.kt | 12 -- .../simple/fqNameInAttr/test_VIEW.kt | 8 - .../simple/fqNameInTag/main_test_LAYOUT.kt | 10 -- .../simple/fqNameInTag/main_test_VIEW.kt | 7 - .../simple/fqNameInTag/test_LAYOUT.kt | 12 -- .../converter/simple/fqNameInTag/test_VIEW.kt | 8 - .../simple/layoutVariants/main_test_LAYOUT.kt | 10 -- .../simple/layoutVariants/main_test_VIEW.kt | 7 - .../simple/layoutVariants/test_LAYOUT.kt | 12 -- .../simple/layoutVariants/test_VIEW.kt | 8 - .../simple/multiFile/main_test1_LAYOUT.kt | 28 ---- .../simple/multiFile/main_test1_VIEW.kt | 16 -- .../simple/multiFile/main_test_LAYOUT.kt | 28 ---- .../simple/multiFile/main_test_VIEW.kt | 16 -- .../simple/multiFile/test1_LAYOUT.kt | 36 ----- .../converter/simple/multiFile/test1_VIEW.kt | 20 --- .../converter/simple/multiFile/test_LAYOUT.kt | 36 ----- .../converter/simple/multiFile/test_VIEW.kt | 20 --- .../simple/noIds/main_test_LAYOUT.kt | 4 - .../converter/simple/noIds/main_test_VIEW.kt | 4 - .../converter/simple/noIds/test_LAYOUT.kt | 4 - .../converter/simple/noIds/test_VIEW.kt | 4 - .../simple/sameIds/main_test_LAYOUT.kt | 16 -- .../simple/sameIds/main_test_VIEW.kt | 10 -- .../converter/simple/sameIds/test_LAYOUT.kt | 20 --- .../converter/simple/sameIds/test_VIEW.kt | 12 -- .../simple/severalResDirs/main_test_LAYOUT.kt | 22 --- .../simple/severalResDirs/main_test_VIEW.kt | 13 -- .../simple/severalResDirs/test_LAYOUT.kt | 28 ---- .../simple/severalResDirs/test_VIEW.kt | 16 -- .../simple/singleFile/main_test_LAYOUT.kt | 28 ---- .../simple/singleFile/main_test_VIEW.kt | 16 -- .../simple/singleFile/test_LAYOUT.kt | 36 ----- .../converter/simple/singleFile/test_VIEW.kt | 20 --- .../simple/specialTags/main_test_LAYOUT.kt | 28 ---- .../simple/specialTags/main_test_VIEW.kt | 13 -- .../simple/specialTags/test_LAYOUT.kt | 36 ----- .../converter/simple/specialTags/test_VIEW.kt | 16 -- .../supportSingleFile/main_test_LAYOUT.kt | 40 ----- .../supportSingleFile/main_test_VIEW.kt | 16 -- .../simple/supportSingleFile/test_LAYOUT.kt | 52 ------- .../simple/supportSingleFile/test_VIEW.kt | 20 --- .../supportSpecialTags/main_test_LAYOUT.kt | 43 ------ .../supportSpecialTags/main_test_VIEW.kt | 13 -- .../simple/supportSpecialTags/test_LAYOUT.kt | 56 ------- .../simple/supportSpecialTags/test_VIEW.kt | 16 -- .../unresolvedFqName/main_test_LAYOUT.kt | 12 -- .../simple/unresolvedFqName/main_test_VIEW.kt | 8 - .../simple/unresolvedFqName/test_LAYOUT.kt | 14 -- .../simple/unresolvedFqName/test_VIEW.kt | 9 -- .../unresolvedWidget/main_test_LAYOUT.kt | 12 -- .../simple/unresolvedWidget/main_test_VIEW.kt | 8 - .../simple/unresolvedWidget/test_LAYOUT.kt | 14 -- .../simple/unresolvedWidget/test_VIEW.kt | 9 -- .../codegen/android/fqNameInAttr/0.kt | 2 +- .../codegen/android/fqNameInAttr/1.kt | 2 +- .../android/fqNameInAttr/AndroidManifest.xml | 2 +- .../testData/codegen/android/fqNameInTag/0.kt | 2 +- .../testData/codegen/android/fqNameInTag/1.kt | 2 +- .../android/fqNameInTag/AndroidManifest.xml | 2 +- .../testData/codegen/android/fragment/0.kt | 2 +- .../testData/codegen/android/fragment/1.kt | 2 +- .../android/fragment/AndroidManifest.xml | 2 +- .../android/manyWidgets/AndroidManifest.xml | 2 +- .../testData/codegen/android/multiFile/0.kt | 2 +- .../testData/codegen/android/multiFile/1.kt | 2 +- .../android/multiFile/AndroidManifest.xml | 2 +- .../testData/codegen/android/singleFile/0.kt | 2 +- .../testData/codegen/android/singleFile/1.kt | 2 +- .../android/singleFile/AndroidManifest.xml | 2 +- .../testData/codegen/android/view/0.kt | 2 +- .../testData/codegen/android/view/1.kt | 2 +- .../codegen/android/view/AndroidManifest.xml | 2 +- .../codegen/bytecodeShape/AndroidManifest.xml | 7 - .../bytecodeShape/baseClass/baseClass.kt | 4 +- .../baseClassFragment/baseClassFragment.kt | 4 +- .../bytecodeShape/clearCache/clearCache.kt | 4 +- .../clearCacheBaseClass.kt | 2 +- .../extensionFunctions/extensionFunctions.kt | 6 +- .../extensionFunctionsFragment.kt | 8 +- .../extensionFunctionsView.kt | 4 +- .../fqNameInAttr/fqNameInAttr.kt | 6 +- .../fqNameInAttrFragment.kt | 8 +- .../bytecodeShape/fqNameInTag/fqNameInTag.kt | 6 +- .../fqNameInTagFragment.kt | 8 +- .../bytecodeShape/multiFile/multiFile.kt | 8 +- .../multiFileFragment/multiFileFragment.kt | 12 +- .../onDestroyFragment/onDestroyFragment.kt | 6 +- .../codegen/bytecodeShape/simple/simple.kt | 6 +- .../simpleFragment/simpleFragment.kt | 8 +- .../simpleFragmentProperty.kt | 4 +- .../bytecodeShape/simpleView/simpleView.kt | 8 +- .../supportExtensionFunctionsFragment.kt | 2 +- .../supportSimpleFragment.kt | 2 +- .../supportSimpleFragmentProperty.kt | 2 +- .../escapedLayoutName/res/layout/get.xml | 0 .../descriptors/escapedLayoutName/result.txt | 53 +++++++ .../fqNameInAttr/res/layout/test.xml | 0 .../descriptors/fqNameInAttr/result.txt | 35 +++++ .../fqNameInTag/res/layout/test.xml | 0 .../descriptors/fqNameInTag/result.txt | 35 +++++ .../layoutVariants/res/layout-hdpi/test.xml | 0 .../layoutVariants/res/layout/test.xml | 0 .../descriptors/layoutVariants/result.txt | 35 +++++ .../multiFile/res/layout/test.xml | 0 .../multiFile/res/layout/test1.xml | 0 .../testData/descriptors/multiFile/result.txt | 93 ++++++++++++ .../noIds/res/layout/test.xml | 0 .../testData/descriptors/noIds/result.txt | 25 ++++ .../sameIds/res/layout/test.xml | 0 .../testData/descriptors/sameIds/result.txt | 41 ++++++ .../severalResDirs/res/layout/test.xml | 0 .../severalResDirs/res2/layout/test.xml | 0 .../descriptors/severalResDirs/result.txt | 47 ++++++ .../singleFile/res/layout/test.xml | 0 .../descriptors/singleFile/result.txt | 53 +++++++ .../specialTags/res/layout/test.xml | 0 .../descriptors/specialTags/result.txt | 51 +++++++ .../supportSingleFile/res/layout/test.xml | 0 .../descriptors/supportSingleFile/result.txt | 53 +++++++ .../supportSpecialTags/res/layout/test.xml | 0 .../descriptors/supportSpecialTags/result.txt | 51 +++++++ .../unresolvedFqName/res/layout/test.xml | 0 .../descriptors/unresolvedFqName/result.txt | 35 +++++ .../unresolvedWidget/res/layout/test.xml | 0 .../descriptors/unresolvedWidget/result.txt | 35 +++++ .../android/test/AbstractAndroidBoxTest.kt | 4 +- .../test/AbstractAndroidBytecodeShapeTest.kt | 4 +- ...tAndroidSyntheticPropertyDescriptorTest.kt | 54 +++++++ .../AbstractAndroidXml2KConversionTest.kt | 75 ---------- ...theticPropertyDescriptorTestGenerated.java | 121 +++++++++++++++ .../AndroidXml2KConversionTestGenerated.java | 139 ------------------ .../resolve/android/test/CompilerTestUtils.kt | 54 ++----- .../findUsages/fqNameInAttr/fqNameInAttr.kt | 2 +- .../fqNameInAttrFragment.kt | 2 +- .../findUsages/fqNameInTag/fqNameInTag.kt | 2 +- .../fqNameInTagFragment.kt | 2 +- .../android/findUsages/multiFile/multiFile.kt | 2 +- .../multiFileFragment/multiFileFragment.kt | 2 +- .../android/findUsages/simple/simple.kt | 2 +- .../simpleFragment/simpleFragment.kt | 2 +- .../findUsages/simpleView/simpleView.kt | 2 +- .../findUsages/wrongIdFormat/wrongIdFormat.kt | 2 +- .../parserResultEquality/AndroidManifest.xml | 7 - .../fqNameInAttr/res/layout/layout.xml | 15 -- .../fqNameInTag/res/layout/layout.xml | 14 -- .../multiFile/res/layout/layout.xml | 29 ---- .../multiFile/res/layout/layout1.xml | 29 ---- .../noIds/res/layout/layout.xml | 25 ---- .../nolayout/res/nofiles.txt | 1 - .../singleFile/res/layout/layout.xml | 29 ---- .../rename/fqNameInAttr/fqNameInAttr.kt | 2 +- .../fqNameInAttrFragment.kt | 2 +- .../android/rename/fqNameInTag/fqNameInTag.kt | 2 +- .../fqNameInTagFragment.kt | 2 +- .../android/rename/multiFile/multiFile.kt | 2 +- .../multiFileFragment/multiFileFragment.kt | 2 +- .../testData/android/rename/simple/simple.kt | 2 +- .../rename/simpleFragment/simpleFragment.kt | 2 +- .../android/rename/simpleView/simpleView.kt | 2 +- .../android/AbstractAndroidFindUsagesTest.kt | 4 +- .../kotlin/android/AbstractAndroidGotoTest.kt | 21 ++- .../android/AbstractAndroidRenameTest.kt | 34 ++--- .../AbstractParserResultEqualityTest.kt | 47 ------ .../ParserResultEqualityTestGenerated.java | 73 --------- .../kotlin/android/SamePluginVersionsTest.kt | 64 -------- 175 files changed, 963 insertions(+), 1865 deletions(-) delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/exceptions/noManifest/res/layout/layout.xml delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/AndroidManifest.xml delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/escapedLayoutName/get_LAYOUT.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/escapedLayoutName/get_VIEW.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/escapedLayoutName/main_get_LAYOUT.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/escapedLayoutName/main_get_VIEW.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInAttr/main_test_LAYOUT.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInAttr/main_test_VIEW.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInAttr/test_LAYOUT.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInAttr/test_VIEW.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInTag/main_test_LAYOUT.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInTag/main_test_VIEW.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInTag/test_LAYOUT.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInTag/test_VIEW.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/layoutVariants/main_test_LAYOUT.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/layoutVariants/main_test_VIEW.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/layoutVariants/test_LAYOUT.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/layoutVariants/test_VIEW.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/main_test1_LAYOUT.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/main_test1_VIEW.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/main_test_LAYOUT.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/main_test_VIEW.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/test1_LAYOUT.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/test1_VIEW.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/test_LAYOUT.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/test_VIEW.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/noIds/main_test_LAYOUT.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/noIds/main_test_VIEW.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/noIds/test_LAYOUT.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/noIds/test_VIEW.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/sameIds/main_test_LAYOUT.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/sameIds/main_test_VIEW.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/sameIds/test_LAYOUT.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/sameIds/test_VIEW.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/severalResDirs/main_test_LAYOUT.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/severalResDirs/main_test_VIEW.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/severalResDirs/test_LAYOUT.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/severalResDirs/test_VIEW.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/singleFile/main_test_LAYOUT.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/singleFile/main_test_VIEW.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/singleFile/test_LAYOUT.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/singleFile/test_VIEW.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/specialTags/main_test_LAYOUT.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/specialTags/main_test_VIEW.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/specialTags/test_LAYOUT.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/specialTags/test_VIEW.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/supportSingleFile/main_test_LAYOUT.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/supportSingleFile/main_test_VIEW.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/supportSingleFile/test_LAYOUT.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/supportSingleFile/test_VIEW.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/supportSpecialTags/main_test_LAYOUT.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/supportSpecialTags/main_test_VIEW.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/supportSpecialTags/test_LAYOUT.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/supportSpecialTags/test_VIEW.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/unresolvedFqName/main_test_LAYOUT.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/unresolvedFqName/main_test_VIEW.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/unresolvedFqName/test_LAYOUT.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/unresolvedFqName/test_VIEW.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/unresolvedWidget/main_test_LAYOUT.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/unresolvedWidget/main_test_VIEW.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/unresolvedWidget/test_LAYOUT.kt delete mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/unresolvedWidget/test_VIEW.kt delete mode 100644 plugins/android-compiler-plugin/testData/codegen/bytecodeShape/AndroidManifest.xml rename plugins/android-compiler-plugin/testData/{android/converter/simple => descriptors}/escapedLayoutName/res/layout/get.xml (100%) create mode 100644 plugins/android-compiler-plugin/testData/descriptors/escapedLayoutName/result.txt rename plugins/android-compiler-plugin/testData/{android/converter/simple => descriptors}/fqNameInAttr/res/layout/test.xml (100%) create mode 100644 plugins/android-compiler-plugin/testData/descriptors/fqNameInAttr/result.txt rename plugins/android-compiler-plugin/testData/{android/converter/simple => descriptors}/fqNameInTag/res/layout/test.xml (100%) create mode 100644 plugins/android-compiler-plugin/testData/descriptors/fqNameInTag/result.txt rename plugins/android-compiler-plugin/testData/{android/converter/simple => descriptors}/layoutVariants/res/layout-hdpi/test.xml (100%) rename plugins/android-compiler-plugin/testData/{android/converter/simple => descriptors}/layoutVariants/res/layout/test.xml (100%) create mode 100644 plugins/android-compiler-plugin/testData/descriptors/layoutVariants/result.txt rename plugins/android-compiler-plugin/testData/{android/converter/simple => descriptors}/multiFile/res/layout/test.xml (100%) rename plugins/android-compiler-plugin/testData/{android/converter/simple => descriptors}/multiFile/res/layout/test1.xml (100%) create mode 100644 plugins/android-compiler-plugin/testData/descriptors/multiFile/result.txt rename plugins/android-compiler-plugin/testData/{android/converter/simple => descriptors}/noIds/res/layout/test.xml (100%) create mode 100644 plugins/android-compiler-plugin/testData/descriptors/noIds/result.txt rename plugins/android-compiler-plugin/testData/{android/converter/simple => descriptors}/sameIds/res/layout/test.xml (100%) create mode 100644 plugins/android-compiler-plugin/testData/descriptors/sameIds/result.txt rename plugins/android-compiler-plugin/testData/{android/converter/simple => descriptors}/severalResDirs/res/layout/test.xml (100%) rename plugins/android-compiler-plugin/testData/{android/converter/simple => descriptors}/severalResDirs/res2/layout/test.xml (100%) create mode 100644 plugins/android-compiler-plugin/testData/descriptors/severalResDirs/result.txt rename plugins/android-compiler-plugin/testData/{android/converter/simple => descriptors}/singleFile/res/layout/test.xml (100%) create mode 100644 plugins/android-compiler-plugin/testData/descriptors/singleFile/result.txt rename plugins/android-compiler-plugin/testData/{android/converter/simple => descriptors}/specialTags/res/layout/test.xml (100%) create mode 100644 plugins/android-compiler-plugin/testData/descriptors/specialTags/result.txt rename plugins/android-compiler-plugin/testData/{android/converter/simple => descriptors}/supportSingleFile/res/layout/test.xml (100%) create mode 100644 plugins/android-compiler-plugin/testData/descriptors/supportSingleFile/result.txt rename plugins/android-compiler-plugin/testData/{android/converter/simple => descriptors}/supportSpecialTags/res/layout/test.xml (100%) create mode 100644 plugins/android-compiler-plugin/testData/descriptors/supportSpecialTags/result.txt rename plugins/android-compiler-plugin/testData/{android/converter/simple => descriptors}/unresolvedFqName/res/layout/test.xml (100%) create mode 100644 plugins/android-compiler-plugin/testData/descriptors/unresolvedFqName/result.txt rename plugins/android-compiler-plugin/testData/{android/converter/simple => descriptors}/unresolvedWidget/res/layout/test.xml (100%) create mode 100644 plugins/android-compiler-plugin/testData/descriptors/unresolvedWidget/result.txt create mode 100644 plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidSyntheticPropertyDescriptorTest.kt delete mode 100644 plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidXml2KConversionTest.kt create mode 100644 plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidSyntheticPropertyDescriptorTestGenerated.java delete mode 100644 plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidXml2KConversionTestGenerated.java delete mode 100644 plugins/android-idea-plugin/testData/android/parserResultEquality/AndroidManifest.xml delete mode 100644 plugins/android-idea-plugin/testData/android/parserResultEquality/fqNameInAttr/res/layout/layout.xml delete mode 100644 plugins/android-idea-plugin/testData/android/parserResultEquality/fqNameInTag/res/layout/layout.xml delete mode 100644 plugins/android-idea-plugin/testData/android/parserResultEquality/multiFile/res/layout/layout.xml delete mode 100644 plugins/android-idea-plugin/testData/android/parserResultEquality/multiFile/res/layout/layout1.xml delete mode 100644 plugins/android-idea-plugin/testData/android/parserResultEquality/noIds/res/layout/layout.xml delete mode 100644 plugins/android-idea-plugin/testData/android/parserResultEquality/nolayout/res/nofiles.txt delete mode 100644 plugins/android-idea-plugin/testData/android/parserResultEquality/singleFile/res/layout/layout.xml delete mode 100644 plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractParserResultEqualityTest.kt delete mode 100644 plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/ParserResultEqualityTestGenerated.java delete mode 100644 plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/SamePluginVersionsTest.kt diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index 36a2579010e..6a14075fd30 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -112,7 +112,7 @@ import org.jetbrains.kotlin.jvm.compiler.* import org.jetbrains.kotlin.jvm.runtime.AbstractJvmRuntimeDescriptorLoaderTest import org.jetbrains.kotlin.lang.resolve.android.test.AbstractAndroidBoxTest import org.jetbrains.kotlin.lang.resolve.android.test.AbstractAndroidBytecodeShapeTest -import org.jetbrains.kotlin.lang.resolve.android.test.AbstractAndroidXml2KConversionTest +import org.jetbrains.kotlin.lang.resolve.android.test.AbstractAndroidSyntheticPropertyDescriptorTest import org.jetbrains.kotlin.load.java.AbstractJavaTypeSubstitutorTest import org.jetbrains.kotlin.modules.xml.AbstractModuleXmlParserTest import org.jetbrains.kotlin.parsing.AbstractParsingTest @@ -926,9 +926,8 @@ fun main(args: Array) { } testGroup("plugins/android-compiler-plugin/tests", "plugins/android-compiler-plugin/testData") { - testClass() { - model("android/converter/simple", recursive = false, extension = null) - model("android/converter/exceptions", recursive = false, extension = null, testMethod = "doNoManifestTest") + testClass() { + model("descriptors", recursive = false, extension = null) } testClass() { @@ -948,10 +947,6 @@ fun main(args: Array) { } testGroup("plugins/android-idea-plugin/tests", "plugins/android-idea-plugin/testData") { - testClass() { - model("android/parserResultEquality", recursive = false, extension = null) - } - testClass() { model("android/completion", recursive = false, extension = null) } diff --git a/plugins/android-compiler-plugin/testData/android/converter/exceptions/noManifest/res/layout/layout.xml b/plugins/android-compiler-plugin/testData/android/converter/exceptions/noManifest/res/layout/layout.xml deleted file mode 100644 index f4736f6937b..00000000000 --- a/plugins/android-compiler-plugin/testData/android/converter/exceptions/noManifest/res/layout/layout.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - -