From b14198a2c5e38987a6c7ac2d6c77b4949ee81615 Mon Sep 17 00:00:00 2001 From: Tor Norbye Date: Thu, 24 Aug 2017 12:02:15 -0700 Subject: [PATCH] Update to Gradle 3.0, and update tests to new DSL --- build.gradle | 22 +-- gradle/wrapper/gradle-wrapper.jar | Bin 52266 -> 53636 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- .../google/lint/MainActivityDetectorTest.java | 156 ++++++++---------- 4 files changed, 81 insertions(+), 101 deletions(-) diff --git a/build.gradle b/build.gradle index d9fc51a6..277037f6 100644 --- a/build.gradle +++ b/build.gradle @@ -17,24 +17,26 @@ apply plugin: 'java' repositories { + google() jcenter() - maven { - url "http://dl.bintray.com/android/android-tools" - } +} + +ext { + lintVersion = '26.0.0-beta2' } dependencies { - compile 'com.android.tools.lint:lint-api:25.3.0' - compile 'com.android.tools.lint:lint-checks:25.3.0' - testCompile 'junit:junit:4.11' - testCompile 'com.android.tools.lint:lint:25.3.0' - testCompile 'com.android.tools.lint:lint-tests:25.3.0' - testCompile 'com.android.tools:testutils:25.3.0' + compile "com.android.tools.lint:lint-api:$lintVersion" + compile "com.android.tools.lint:lint-checks:$lintVersion" + testCompile "junit:junit:4.11" + testCompile "com.android.tools.lint:lint:$lintVersion" + testCompile "com.android.tools.lint:lint-tests:$lintVersion" + testCompile "com.android.tools:testutils:$lintVersion" } jar { manifest { - attributes("Lint-Registry": "com.example.google.lint.MyIssueRegistry") + attributes("Lint-Registry-v2": "com.example.google.lint.MyIssueRegistry") } } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index b5166dad4d90021f6a0b45268c0755719f1d5cd4..13372aef5e24af05341d49695ee84e5f9b594659 100644 GIT binary patch delta 12526 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 Kpmo}R_xwNY%LGpV delta 11161 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 HALai6b5uB& diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 274cf712..9375478b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Aug 21 14:39:26 PDT 2015 +#Wed Aug 09 14:33:29 PDT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-rc-1-all.zip diff --git a/src/test/java/com/example/google/lint/MainActivityDetectorTest.java b/src/test/java/com/example/google/lint/MainActivityDetectorTest.java index f98d30a5..6df66364 100644 --- a/src/test/java/com/example/google/lint/MainActivityDetectorTest.java +++ b/src/test/java/com/example/google/lint/MainActivityDetectorTest.java @@ -16,17 +16,12 @@ package com.example.google.lint; -import com.android.annotations.NonNull; import com.android.tools.lint.checks.infrastructure.LintDetectorTest; -import com.android.tools.lint.client.api.LintClient; import com.android.tools.lint.detector.api.Detector; import com.android.tools.lint.detector.api.Issue; -import com.android.tools.lint.detector.api.Project; import java.util.Collections; -import java.util.HashSet; import java.util.List; -import java.util.Set; import static com.android.SdkConstants.FN_ANDROID_MANIFEST_XML; @@ -35,11 +30,6 @@ * to adjust your code for the next tools release. */ public class MainActivityDetectorTest extends LintDetectorTest { - /** - * The set of enabled issues for a given test. - */ - private Set mEnabled = new HashSet(); - @Override protected Detector getDetector() { return new MainActivityDetector(); @@ -50,103 +40,91 @@ protected List getIssues() { return Collections.singletonList(MainActivityDetector.ISSUE); } - /** - * Gets the configuration for the test. - * Each test can have a set of enabled issues by assigning the member field {@link #mEnabled}. - */ - @Override - protected TestConfiguration getConfiguration(LintClient client, Project project) { - return new TestConfiguration(client, project, null) { - @Override - public boolean isEnabled(@NonNull Issue issue) { - return super.isEnabled(issue) && mEnabled.contains(issue); - } - }; - } - /** * Test that a manifest with an activity with a launcher intent has no warnings. */ - public void testHasMainActivity() throws Exception { - mEnabled = Collections.singleton(MainActivityDetector.ISSUE); - String expected = "No warnings."; - String result = lintProject(xml(FN_ANDROID_MANIFEST_XML, "" + - "\n" + - "\n" + - " \n" + - " \n" + - " \n" + - "\n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - "")); - assertEquals(expected, result); + public void testHasMainActivity() { + lint().files( + xml(FN_ANDROID_MANIFEST_XML, "" + + "\n" + + "\n" + + " \n" + + " \n" + + " \n" + + "\n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + "")) + .run() + .expectClean(); } /** * Test that a manifest without an activity with a launcher intent reports an error. */ - public void testMissingMainActivity() throws Exception { - mEnabled = Collections.singleton(MainActivityDetector.ISSUE); + public void testMissingMainActivity() { String expected = "AndroidManifest.xml: Error: Expecting AndroidManifest.xml to have an " + "activity with a launcher intent. [MainActivityDetector]\n" + "1 errors, 0 warnings\n"; - String result = lintProject(xml(FN_ANDROID_MANIFEST_XML, "" + - "\n" + - "\n" + - " \n" + - " \n" + - " \n" + - " \n" + - "\n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - "\n" + - " \n" + - " \n" + - "\n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - "")); - assertEquals(expected, result); + lint().files( + xml(FN_ANDROID_MANIFEST_XML, "" + + "\n" + + "\n" + + " \n" + + " \n" + + " \n" + + " \n" + + "\n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + "\n" + + " \n" + + " \n" + + "\n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + "")) + .run() + .expect(expected); } /** * Test that a manifest without an <application> tag reports an error. */ - public void testMissingApplication() throws Exception { - mEnabled = Collections.singleton(MainActivityDetector.ISSUE); + public void testMissingApplication() { String expected = "AndroidManifest.xml: Error: Expecting AndroidManifest.xml to have an " + " tag. [MainActivityDetector]\n" + "1 errors, 0 warnings\n"; - String result = lintProject(xml(FN_ANDROID_MANIFEST_XML, "" + - "\n" + - "\n" + - "")); - assertEquals(expected, result); + lint().files( + xml(FN_ANDROID_MANIFEST_XML, "" + + "\n" + + "\n" + + "")) + .run() + .expect(expected); } }