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

fix android cross parser tests

Browse Source 
- reorganize tests folder structure
- fix class attribute ignored in ide xml parser
This commit is contained in:
Mikhail Mutcianko
2014-09-07 17:44:17 +04:00
committed by Yan Zhulanow
parent 84d326ed47
commit bc9e1ee2d2
23 changed files with 29 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.android/src/org/jetbrains/jet/lang/resolve/android/AndroidXmlHandler.kt
+4 -4
View File
@@ -31,10 +31,10 @@ class AndroidXmlHandler(private val resourceManager: AndroidResourceManager, pri
} }
override fun startElement(uri: String, localName: String, qName: String, attributes: Attributes) { override fun startElement(uri: String, localName: String, qName: String, attributes: Attributes) {
val hashMap = attributes.toMap() val attributesMap = attributes.toMap()
val s = hashMap[resourceManager.idAttributeNoNamespace] val idAttr = attributesMap[resourceManager.idAttributeNoNamespace]
val className = hashMap[resourceManager.classAttributeNoNamespace] ?: localName val classNameAttr = attributesMap[resourceManager.classAttributeNoNamespace] ?: localName
if (resourceManager.isResourceDeclarationOrUsage(s)) elementCallback(resourceManager.idToName(s), className) if (resourceManager.isResourceDeclarationOrUsage(idAttr)) elementCallback(resourceManager.idToName(idAttr), classNameAttr)
} }
override fun endElement(uri: String?, localName: String, qName: String) { override fun endElement(uri: String?, localName: String, qName: String) {
idea/src/org/jetbrains/jet/plugin/android/AndroidXmlVisitor.kt
+2 -1
View File
@@ -36,7 +36,8 @@ class AndroidXmlVisitor(val resourceManager: AndroidResourceManager, val element
override fun visitXmlTag(tag: XmlTag?) { override fun visitXmlTag(tag: XmlTag?) {
val attribute = tag?.getAttribute(resourceManager.idAttribute) val attribute = tag?.getAttribute(resourceManager.idAttribute)
if (attribute != null && attribute.getValue() != null) { if (attribute != null && attribute.getValue() != null) {
elementCallback(resourceManager.idToName(attribute.getValue()), tag!!.getLocalName(), attribute) val classNameAttr = tag?.getAttribute(resourceManager.classAttributeNoNamespace)?.getValue() ?: tag?.getLocalName()
elementCallback(resourceManager.idToName(attribute.getValue()), classNameAttr!!, attribute)
} }
tag?.acceptChildren(this) tag?.acceptChildren(this)
} }
idea/testData/android/crossParser/AndroidManifest.xml
+7
View File
@@ -0,0 +1,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.myapp"
android:versionCode="1"
android:versionName="1.0" >
</manifest>
idea/testData/android/crossParser/fqNameInAttr/AndroidManifest.xml
-33
View File
@@ -1,33 +0,0 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.myapp"
android:versionCode="1"
android:versionName="1.0" >
<uses-permission android:name="android.permission.READ_CONTACTS"/>
<uses-sdk
android:minSdkVersion="18"
android:targetSdkVersion="18" />
<permission android:name="android"></permission>
<application
android:allowBackup="true"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@style/Theme.Sample" >
<activity
android:name="com.example.android.basiccontactables.MainActivity"
android:label="@string/app_name"
android:launchMode="singleTop">
<meta-data
android:name="android.app.searchable"
android:resource="@xml/searchable" />
<intent-filter>
<action android:name="android.intent.action.SEARCH" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>
</manifest>
idea/testData/android/crossParser/fqNameInAttr/layout.kt
-9
View File
@@ -1,9 +0,0 @@
package com.myapp
import android.app.Activity
import android.view.View
import android.widget.*
val Activity.MyButton: org.my.cool.Button
get() = findViewById(0) as org.my.cool.Button
idea/testData/android/crossParser/fqNameInAttr/layout/layout.xml → idea/testData/android/crossParser/fqNameInAttr/res/layout/layout.xml
View File
idea/testData/android/crossParser/fqNameInTag/AndroidManifest.xml
-33
View File
@@ -1,33 +0,0 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.myapp"
android:versionCode="1"
android:versionName="1.0" >
<uses-permission android:name="android.permission.READ_CONTACTS"/>
<uses-sdk
android:minSdkVersion="18"
android:targetSdkVersion="18" />
<permission android:name="android"></permission>
<application
android:allowBackup="true"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@style/Theme.Sample" >
<activity
android:name="com.example.android.basiccontactables.MainActivity"
android:label="@string/app_name"
android:launchMode="singleTop">
<meta-data
android:name="android.app.searchable"
android:resource="@xml/searchable" />
<intent-filter>
<action android:name="android.intent.action.SEARCH" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>
</manifest>
idea/testData/android/crossParser/fqNameInTag/layout.kt
-9
View File
@@ -1,9 +0,0 @@
package com.myapp
import android.app.Activity
import android.view.View
import android.widget.*
val Activity.MyButton: org.my.cool.Button
get() = findViewById(0) as org.my.cool.Button
idea/testData/android/crossParser/fqNameInTag/layout/layout.xml → idea/testData/android/crossParser/fqNameInTag/res/layout/layout.xml
View File
idea/testData/android/crossParser/multiFile/AndroidManifest.xml
-33
View File
@@ -1,33 +0,0 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.myapp"
android:versionCode="1"
android:versionName="1.0" >
<uses-permission android:name="android.permission.READ_CONTACTS"/>
<uses-sdk
android:minSdkVersion="18"
android:targetSdkVersion="18" />
<permission android:name="android"></permission>
<application
android:allowBackup="true"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@style/Theme.Sample" >
<activity
android:name="com.example.android.basiccontactables.MainActivity"
android:label="@string/app_name"
android:launchMode="singleTop">
<meta-data
android:name="android.app.searchable"
android:resource="@xml/searchable" />
<intent-filter>
<action android:name="android.intent.action.SEARCH" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>
</manifest>
idea/testData/android/crossParser/multiFile/layout.kt
-30
View File
@@ -1,30 +0,0 @@
package com.myapp
import android.app.Activity
import android.view.View
import android.widget.*
val Activity.item_detail_container: FrameLayout
get() = findViewById(0) as FrameLayout
val Activity.textView1: TextView
get() = findViewById(0) as TextView
val Activity.password: EditText
get() = findViewById(0) as EditText
val Activity.login: Button
get() = findViewById(0) as Button
val Activity.frameLayout: FrameLayout
get() = findViewById(0) as FrameLayout
val Activity.passwordField: TextView
get() = findViewById(0) as TextView
val Activity.passwordCaption: EditText
get() = findViewById(0) as EditText
val Activity.loginButton: Button
get() = findViewById(0) as Button
idea/testData/android/crossParser/multiFile/layout/layout.xml → idea/testData/android/crossParser/multiFile/res/layout/layout.xml
View File
idea/testData/android/crossParser/multiFile/layout/layout1.xml → idea/testData/android/crossParser/multiFile/res/layout/layout1.xml
View File
idea/testData/android/crossParser/noIds/AndroidManifest.xml
-33
View File
@@ -1,33 +0,0 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.myapp"
android:versionCode="1"
android:versionName="1.0" >
<uses-permission android:name="android.permission.READ_CONTACTS"/>
<uses-sdk
android:minSdkVersion="18"
android:targetSdkVersion="18" />
<permission android:name="android"></permission>
<application
android:allowBackup="true"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@style/Theme.Sample" >
<activity
android:name="com.example.android.basiccontactables.MainActivity"
android:label="@string/app_name"
android:launchMode="singleTop">
<meta-data
android:name="android.app.searchable"
android:resource="@xml/searchable" />
<intent-filter>
<action android:name="android.intent.action.SEARCH" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>
</manifest>
idea/testData/android/crossParser/noIds/layout.kt
-6
View File
@@ -1,6 +0,0 @@
package com.myapp
import android.app.Activity
import android.view.View
import android.widget.*
idea/testData/android/crossParser/noIds/layout/layout.xml → idea/testData/android/crossParser/noIds/res/layout/layout.xml
View File
idea/testData/android/crossParser/singleFile/AndroidManifest.xml
-33
View File
@@ -1,33 +0,0 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.myapp"
android:versionCode="1"
android:versionName="1.0" >
<uses-permission android:name="android.permission.READ_CONTACTS"/>
<uses-sdk
android:minSdkVersion="18"
android:targetSdkVersion="18" />
<permission android:name="android"></permission>
<application
android:allowBackup="true"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@style/Theme.Sample" >
<activity
android:name="com.example.android.basiccontactables.MainActivity"
android:label="@string/app_name"
android:launchMode="singleTop">
<meta-data
android:name="android.app.searchable"
android:resource="@xml/searchable" />
<intent-filter>
<action android:name="android.intent.action.SEARCH" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>
</manifest>
idea/testData/android/crossParser/singleFile/MyActivity.kt
-27
View File
@@ -1,27 +0,0 @@
package com.myapp
import android.app.Activity
import android.view.View
import android.widget.*
class MyActivity(): Activity() {
val textViewWidget = TextView()
val editTextWidget = EditText()
val buttonWidget = Button()
override fun findViewById(id: Int): View? {
return when (id) {
R.id.textView1 -> textViewWidget
R.id.password -> editTextWidget
R.id.login -> buttonWidget
else -> null
}
}
fun test(): String {
return if (password.toString() == "EditText" &&
textView1.toString() == "TextView" &&
login.toString() == "Button" )
"OK" else "NOTOK"
}
}
idea/testData/android/crossParser/singleFile/R.kt
-14
View File
@@ -1,14 +0,0 @@
package com.myapp
class R {
class id {
class object {
val item_detail_container = 0
val textView1 = 1
val password = 2
val textView2 = 3
val passwordConfirmation = 4
val login = 5
}
}
}
idea/testData/android/crossParser/singleFile/layout.kt
-18
View File
@@ -1,18 +0,0 @@
package com.myapp
import android.app.Activity
import android.view.View
import android.widget.*
val Activity.item_detail_container: FrameLayout
get() = findViewById(0) as FrameLayout
val Activity.textView1: TextView
get() = findViewById(0) as TextView
val Activity.password: EditText
get() = findViewById(0) as EditText
val Activity.login: Button
get() = findViewById(0) as Button
idea/testData/android/crossParser/singleFile/layout/layout.xml → idea/testData/android/crossParser/singleFile/res/layout/layout.xml
View File
idea/tests/org/jetbrains/jet/android/AbstractCrossParserTest.kt
+16 -8
View File
@@ -36,13 +36,15 @@ import com.intellij.ide.startup.impl.StartupManagerImpl
import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess
import org.jetbrains.jet.JetTestCaseBuilder import org.jetbrains.jet.JetTestCaseBuilder
import com.intellij.openapi.startup.StartupManager import com.intellij.openapi.startup.StartupManager
import com.android.SdkConstants
import com.intellij.openapi.application.PathManager
public abstract class AbstractCrossParserTest : LightCodeInsightFixtureTestCase() { public abstract class AbstractCrossParserTest : KotlinAndroidTestCase() {
public fun doTest(path: String) { public fun doTest(path: String) {
val project = myFixture.getProject() val project = myFixture!!.getProject()
project.putUserData(TestConst.TESTDATA_PATH, path) project.putUserData(TestConst.TESTDATA_PATH, path)
myFixture.copyDirectoryToProject(getTestName(true), "") myFixture!!.copyDirectoryToProject(getResDir()!!, "res")
val cliParser = CliAndroidUIXmlProcessor(project, path + "/layout", path + "AndroidManifest.xml") val cliParser = CliAndroidUIXmlProcessor(project, path + getResDir() + "/layout/", path + "../AndroidManifest.xml")
val ideParser = IDEAndroidUIXmlProcessor(project) val ideParser = IDEAndroidUIXmlProcessor(project)
val cliResult = cliParser.parseToPsi(project)!!.getText() val cliResult = cliParser.parseToPsi(project)!!.getText()
@@ -51,10 +53,9 @@ public abstract class AbstractCrossParserTest : LightCodeInsightFixtureTestCase(
assertEquals(cliResult, ideResult) assertEquals(cliResult, ideResult)
} }
override fun setUp() { override fun setUp() {
System.setProperty(KotlinAndroidTestCaseBase.SDK_PATH_PROPERTY, PathManager.getHomePath() + "/androidSDK/")
System.setProperty(KotlinAndroidTestCaseBase.PLATFORM_DIR_PROPERTY, "android-17")
super.setUp() super.setUp()
myFixture.setTestDataPath(PluginTestCaseBase.getTestDataPathBase() + "/android/crossParser")
(StartupManager.getInstance(getProject()) as StartupManagerImpl).runPostStartupActivities()
VfsRootAccess.allowRootAccess(JetTestCaseBuilder.getHomeDirectory())
} }
private fun getEnvironment(testPath: String): JetCoreEnvironment { private fun getEnvironment(testPath: String): JetCoreEnvironment {
@@ -63,7 +64,14 @@ public abstract class AbstractCrossParserTest : LightCodeInsightFixtureTestCase(
configuration.put<String>(JVMConfigurationKeys.ANDROID_MANIFEST, testPath + "/AndroidManifest.xml") configuration.put<String>(JVMConfigurationKeys.ANDROID_MANIFEST, testPath + "/AndroidManifest.xml")
return JetCoreEnvironment.createForTests(getTestRootDisposable()!!, configuration) return JetCoreEnvironment.createForTests(getTestRootDisposable()!!, configuration)
} }
override fun getTestDataPath(): String? { override fun getTestDataPath(): String? {
return PluginTestCaseBase.getTestDataPathBase() + "/android/crossParser/" return PluginTestCaseBase.getTestDataPathBase() + "/android/crossParser/" + getTestName(true) + "/"
} }
override fun createManifest() {
myFixture!!.copyFileToProject("idea/testData/android/AndroidManifest.xml", SdkConstants.FN_ANDROID_MANIFEST_XML)
}
override fun requireRecentSdk() = true
} }
idea/tests/org/jetbrains/jet/android/KotlinAndroidTestCase.java
-1
View File
@@ -114,7 +114,6 @@ public abstract class KotlinAndroidTestCase extends KotlinAndroidTestCaseBase {
createManifest(); createManifest();
myFacet = addAndroidFacet(myModule, sdkPath, getPlatformDir(), isToAddSdk()); myFacet = addAndroidFacet(myModule, sdkPath, getPlatformDir(), isToAddSdk());
myFixture.copyDirectoryToProject(getResDir(), "res");
myAdditionalModules = new ArrayList<Module>(); myAdditionalModules = new ArrayList<Module>();