summaryrefslogtreecommitdiff
path: root/android/testSrc
diff options
context:
space:
mode:
authorFisher Jomo <jomof@google.com>2022-03-01 12:28:36 -0800
committerJomo Fisher <jomof@google.com>2022-03-02 00:05:27 +0000
commit3cb5e13083b449f48bc924308f9d3778b040000c (patch)
treeb954921f717650f3395fab8323bd5f05b0d519bb /android/testSrc
parent7aeb27151e5bcc5b1bcc6f615c8d08007bd5242f (diff)
downloadidea-3cb5e13083b449f48bc924308f9d3778b040000c.tar.gz
Unfix NDK version in FixNdkVersionProcessorTest
...to make it easier to update NDK version. Bug: NA Test: NA Change-Id: Ib385ba84f76fc088386909fbe0e8902380ec08be
Diffstat (limited to 'android/testSrc')
-rw-r--r--android/testSrc/com/android/tools/idea/gradle/project/sync/issues/processor/FixNdkVersionProcessorTest.kt11
1 files changed, 7 insertions, 4 deletions
diff --git a/android/testSrc/com/android/tools/idea/gradle/project/sync/issues/processor/FixNdkVersionProcessorTest.kt b/android/testSrc/com/android/tools/idea/gradle/project/sync/issues/processor/FixNdkVersionProcessorTest.kt
index 32995524cf8..ab3139355fa 100644
--- a/android/testSrc/com/android/tools/idea/gradle/project/sync/issues/processor/FixNdkVersionProcessorTest.kt
+++ b/android/testSrc/com/android/tools/idea/gradle/project/sync/issues/processor/FixNdkVersionProcessorTest.kt
@@ -15,6 +15,7 @@
*/
package com.android.tools.idea.gradle.project.sync.issues.processor
+import com.android.SdkConstants
import com.android.tools.idea.gradle.project.sync.GradleSyncListener
import com.android.tools.idea.gradle.project.sync.GradleSyncState
import com.android.tools.idea.gradle.util.GradleUtil
@@ -23,9 +24,11 @@ import com.android.tools.idea.testing.TestProjectPaths.HELLO_JNI
import com.google.common.collect.ImmutableList
import com.intellij.openapi.command.WriteCommandAction
import com.intellij.openapi.project.Project
+import com.intellij.openapi.util.io.FileUtil
import com.intellij.usageView.UsageInfo
import com.intellij.usageView.UsageViewBundle
import org.junit.Test
+import java.io.File
class FixNdkVersionProcessorTest : AndroidGradleTestCase() {
@@ -49,7 +52,7 @@ class FixNdkVersionProcessorTest : AndroidGradleTestCase() {
@Test
fun testFindUsages() {
- loadProject(HELLO_JNI)
+ loadProject(HELLO_JNI, null, null, null, null, SdkConstants.NDK_DEFAULT_VERSION)
val module = getModule("app")
val file = GradleUtil.getGradleBuildFile(module)!!
@@ -61,7 +64,7 @@ class FixNdkVersionProcessorTest : AndroidGradleTestCase() {
@Test
fun testPerformRefactoring() {
- loadProject(HELLO_JNI)
+ loadProject(HELLO_JNI, null, null, null, null, SdkConstants.NDK_DEFAULT_VERSION)
val module = getModule("app")
val file = GradleUtil.getGradleBuildFile(module)!!
@@ -78,8 +81,8 @@ class FixNdkVersionProcessorTest : AndroidGradleTestCase() {
WriteCommandAction.runWriteCommandAction(project) {
processor.performRefactoring(usages)
}
-
- assertTrue(String(file.contentsToByteArray()).contains("ndkVersion '77.7.7'"))
+ assertTrue(String(file.contentsToByteArray()).contains("ndkVersion"))
+ assertTrue(String(file.contentsToByteArray()).contains("77.7.7"))
assertTrue(synced)
}