summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Norbye <tnorbye@google.com>2014-10-16 09:39:39 -0700
committerTor Norbye <tnorbye@google.com>2014-10-16 09:39:39 -0700
commit5cde5a213c359be1e9662068b2d98684260f5acd (patch)
treecf521ca77dd2f42d72de23ae2f2814b763d27782
parent2a10d8df742d05ff17259ed10120a8fb72138267 (diff)
downloadbase-5cde5a213c359be1e9662068b2d98684260f5acd.tar.gz
Update test golden files for lint
Change-Id: I9e5a6a386740456233eb62e56db14bd1c8493a29
-rw-r--r--lint/cli/src/test/java/com/android/tools/lint/MainTest.java2
-rw-r--r--lint/cli/src/test/java/com/android/tools/lint/checks/GradleDetectorTest.java3
2 files changed, 3 insertions, 2 deletions
diff --git a/lint/cli/src/test/java/com/android/tools/lint/MainTest.java b/lint/cli/src/test/java/com/android/tools/lint/MainTest.java
index 7a2d11fad1..9190edd29c 100644
--- a/lint/cli/src/test/java/com/android/tools/lint/MainTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/MainTest.java
@@ -151,7 +151,7 @@ public class MainTest extends AbstractCheckTest {
"file's minimum SDK as the required API level.\n" +
"\n" +
"If you are deliberately setting android: attributes in style definitions, make\n" +
- "sure you place this in a values-v11 folder in order to avoid running into\n" +
+ "sure you place this in a values-vNN folder in order to avoid running into\n" +
"runtime conflicts on certain devices where manufacturers have added custom\n" +
"attributes whose ids conflict with the new ones on later platforms.\n" +
"\n" +
diff --git a/lint/cli/src/test/java/com/android/tools/lint/checks/GradleDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/GradleDetectorTest.java
index 78b699d647..8d373a6b11 100644
--- a/lint/cli/src/test/java/com/android/tools/lint/checks/GradleDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/GradleDetectorTest.java
@@ -16,6 +16,7 @@
package com.android.tools.lint.checks;
+import static com.android.SdkConstants.GRADLE_PLUGIN_MINIMUM_VERSION;
import static com.android.SdkConstants.GRADLE_PLUGIN_RECOMMENDED_VERSION;
import static com.android.tools.lint.checks.GradleDetector.ACCIDENTAL_OCTAL;
import static com.android.tools.lint.checks.GradleDetector.COMPATIBILITY;
@@ -165,7 +166,7 @@ public class GradleDetectorTest extends AbstractCheckTest {
public void testIncompatiblePlugin() throws Exception {
mEnabled = Collections.singleton(GRADLE_PLUGIN_COMPATIBILITY);
assertEquals(""
- + "build.gradle:6: Error: You must use a newer version of the Android Gradle plugin. The minimum supported version is 0.12.0 and the recommended version is " + GRADLE_PLUGIN_RECOMMENDED_VERSION + " [AndroidGradlePluginVersion]\n"
+ + "build.gradle:6: Error: You must use a newer version of the Android Gradle plugin. The minimum supported version is " + GRADLE_PLUGIN_MINIMUM_VERSION + " and the recommended version is " + GRADLE_PLUGIN_RECOMMENDED_VERSION + " [AndroidGradlePluginVersion]\n"
+ " classpath 'com.android.tools.build:gradle:0.1.0'\n"
+ " ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+ "1 errors, 0 warnings\n",