From 57c3a3c8a250f2396909482f34bcc89bf8dd4b6e Mon Sep 17 00:00:00 2001
From: Keiji Ariyama <keiji_ariyama@c-lis.co.jp>
Date: Sun, 20 Jan 2013 12:28:09 +0900
Subject: Add new lint Checks for manifest typos.

Check <use-sdk> instead of <uses-sdk>
Check <user-permission> instead of <uses-permission>
Check <use-feature> instead of <uses-feature>
Check <user-library> instead of <uses-library>

Change-Id: I60ea44d7d6d8860b8987998a03c128523e8ba082
---
 .../lint/checks/ManifestTypoDetectorTest.java      | 184 +++++++++++++++++++++
 .../tools/lint/checks/data/typo_not_found.xml      |  28 ++++
 .../tools/lint/checks/data/typo_uses_feature.xml   |  28 ++++
 .../tools/lint/checks/data/typo_uses_feature2.xml  |  28 ++++
 .../tools/lint/checks/data/typo_uses_library.xml   |  28 ++++
 .../tools/lint/checks/data/typo_uses_library2.xml  |  28 ++++
 .../lint/checks/data/typo_uses_permission.xml      |  28 ++++
 .../lint/checks/data/typo_uses_permission2.xml     |  28 ++++
 .../tools/lint/checks/data/typo_uses_sdk.xml       |  28 ++++
 .../tools/lint/checks/data/typo_uses_sdk2.xml      |  28 ++++
 10 files changed, 436 insertions(+)
 create mode 100644 lint/cli/src/test/java/com/android/tools/lint/checks/ManifestTypoDetectorTest.java
 create mode 100644 lint/cli/src/test/java/com/android/tools/lint/checks/data/typo_not_found.xml
 create mode 100644 lint/cli/src/test/java/com/android/tools/lint/checks/data/typo_uses_feature.xml
 create mode 100644 lint/cli/src/test/java/com/android/tools/lint/checks/data/typo_uses_feature2.xml
 create mode 100644 lint/cli/src/test/java/com/android/tools/lint/checks/data/typo_uses_library.xml
 create mode 100644 lint/cli/src/test/java/com/android/tools/lint/checks/data/typo_uses_library2.xml
 create mode 100644 lint/cli/src/test/java/com/android/tools/lint/checks/data/typo_uses_permission.xml
 create mode 100644 lint/cli/src/test/java/com/android/tools/lint/checks/data/typo_uses_permission2.xml
 create mode 100644 lint/cli/src/test/java/com/android/tools/lint/checks/data/typo_uses_sdk.xml
 create mode 100644 lint/cli/src/test/java/com/android/tools/lint/checks/data/typo_uses_sdk2.xml

(limited to 'lint/cli')

diff --git a/lint/cli/src/test/java/com/android/tools/lint/checks/ManifestTypoDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/ManifestTypoDetectorTest.java
new file mode 100644
index 0000000..f0ce60d
--- /dev/null
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/ManifestTypoDetectorTest.java
@@ -0,0 +1,184 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.tools.lint.checks;
+
+import com.android.annotations.NonNull;
+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.io.File;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+@SuppressWarnings("javadoc")
+public class ManifestTypoDetectorTest extends AbstractCheckTest {
+    @Override
+    protected Detector getDetector() {
+        return new ManifestTypoDetector();
+    }
+
+    private Set<Issue> mEnabled = new HashSet<Issue>();
+
+    @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);
+            }
+        };
+    }
+
+    public void testOk() throws Exception {
+        mEnabled = Collections.singleton(ManifestTypoDetector.ISSUE);
+        assertEquals(
+                "No warnings.",
+                lintProject(
+                        "typo_not_found.xml=>AndroidManifest.xml",
+                        "res/values/strings.xml"));
+    }
+
+    public void testTypoUsesSdk() throws Exception {
+        mEnabled = Collections.singleton(ManifestTypoDetector.ISSUE);
+        assertEquals(
+            "AndroidManifest.xml:7: " +
+            "Warning: <use-sdk> looks like a typo; did you mean <uses-sdk> ? [ManifestTypos]\n" +
+            "    <use-sdk android:minSdkVersion=\"14\" />\n" +
+            "    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" +
+            "0 errors, 1 warnings\n" +
+            "",
+
+            lintProject(
+                    "typo_uses_sdk.xml=>AndroidManifest.xml",
+                    "res/values/strings.xml"));
+    }
+
+    public void testTypoUsesSdk2() throws Exception {
+        mEnabled = Collections.singleton(ManifestTypoDetector.ISSUE);
+        assertEquals(
+            "AndroidManifest.xml:7: " +
+            "Warning: <user-sdk> looks like a typo; did you mean <uses-sdk> ? [ManifestTypos]\n" +
+            "    <user-sdk android:minSdkVersion=\"14\" />\n" +
+            "    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" +
+            "0 errors, 1 warnings\n" +
+            "",
+
+            lintProject(
+                    "typo_uses_sdk2.xml=>AndroidManifest.xml",
+                    "res/values/strings.xml"));
+    }
+
+    public void testTypoUsesPermission() throws Exception {
+        mEnabled = Collections.singleton(ManifestTypoDetector.ISSUE);
+        assertEquals(
+            "AndroidManifest.xml:9: " +
+            "Warning: <use-permission> looks like a typo; " +
+            "did you mean <uses-permission> ? [ManifestTypos]\n" +
+            "    <use-permission android:name=\"com.example.helloworld.permission\" />\n" +
+            "    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" +
+            "0 errors, 1 warnings\n" +
+            "",
+
+            lintProject(
+                    "typo_uses_permission.xml=>AndroidManifest.xml",
+                    "res/values/strings.xml"));
+    }
+
+    public void testTypoUsesPermission2() throws Exception {
+        mEnabled = Collections.singleton(ManifestTypoDetector.ISSUE);
+        assertEquals(
+            "AndroidManifest.xml:9: " +
+            "Warning: <user-permission> looks like a typo; " +
+            "did you mean <uses-permission> ? [ManifestTypos]\n" +
+            "    <user-permission android:name=\"com.example.helloworld.permission\" />\n" +
+            "    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" +
+            "0 errors, 1 warnings\n" +
+            "",
+
+            lintProject(
+                    "typo_uses_permission2.xml=>AndroidManifest.xml",
+                    "res/values/strings.xml"));
+    }
+
+    public void testTypoUsesFeature() throws Exception {
+        mEnabled = Collections.singleton(ManifestTypoDetector.ISSUE);
+        assertEquals(
+            "AndroidManifest.xml:11: " +
+            "Warning: <use-feature> looks like a typo; " +
+            "did you mean <uses-feature> ? [ManifestTypos]\n" +
+            "    <use-feature android:name=\"android.hardware.wifi\" />\n" +
+            "    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" +
+            "0 errors, 1 warnings\n" +
+            "",
+
+            lintProject(
+                    "typo_uses_feature.xml=>AndroidManifest.xml",
+                    "res/values/strings.xml"));
+    }
+
+    public void testTypoUsesFeature2() throws Exception {
+        mEnabled = Collections.singleton(ManifestTypoDetector.ISSUE);
+        assertEquals(
+            "AndroidManifest.xml:11: " +
+            "Warning: <user-feature> looks like a typo; " +
+            "did you mean <uses-feature> ? [ManifestTypos]\n" +
+            "    <user-feature android:name=\"android.hardware.wifi\" />\n" +
+            "    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" +
+            "0 errors, 1 warnings\n" +
+            "",
+
+            lintProject(
+                    "typo_uses_feature2.xml=>AndroidManifest.xml",
+                    "res/values/strings.xml"));
+    }
+
+    public void testTypoUsesLibrary() throws Exception {
+        mEnabled = Collections.singleton(ManifestTypoDetector.ISSUE);
+        assertEquals(
+            "AndroidManifest.xml:16: " +
+            "Warning: <use-library> looks like a typo; " +
+            "did you mean <uses-library> ? [ManifestTypos]\n" +
+            "    <use-library android:name=\"com.example.helloworld\" />\n" +
+            "    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" +
+            "0 errors, 1 warnings\n" +
+            "",
+
+            lintProject(
+                    "typo_uses_library.xml=>AndroidManifest.xml",
+                    "res/values/strings.xml"));
+    }
+
+    public void testTypoUsesLibrary2() throws Exception {
+        mEnabled = Collections.singleton(ManifestTypoDetector.ISSUE);
+        assertEquals(
+            "AndroidManifest.xml:16: " +
+            "Warning: <user-library> looks like a typo; " +
+            "did you mean <uses-library> ? [ManifestTypos]\n" +
+            "    <user-library android:name=\"com.example.helloworld\" />\n" +
+            "    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" +
+            "0 errors, 1 warnings\n" +
+            "",
+
+            lintProject(
+                    "typo_uses_library2.xml=>AndroidManifest.xml",
+                    "res/values/strings.xml"));
+    }
+}
diff --git a/lint/cli/src/test/java/com/android/tools/lint/checks/data/typo_not_found.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/typo_not_found.xml
new file mode 100644
index 0000000..9cd3640
--- /dev/null
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/typo_not_found.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="foo.bar2"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <uses-sdk android:minSdkVersion="14" />
+
+    <uses-permission android:name="com.example.helloworld.permission" />
+
+    <uses-feature android:name="android.hardware.wifi" />
+
+    <application
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name" >
+        <uses-library android:name="com.example.helloworld" />
+        <activity
+            android:label="@string/app_name"
+            android:name=".Foo2Activity" >
+            <intent-filter >
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/lint/cli/src/test/java/com/android/tools/lint/checks/data/typo_uses_feature.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/typo_uses_feature.xml
new file mode 100644
index 0000000..cff7f2e
--- /dev/null
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/typo_uses_feature.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="foo.bar2"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <uses-sdk android:minSdkVersion="14" />
+
+    <uses-permission android:name="com.example.helloworld.permission" />
+
+    <use-feature android:name="android.hardware.wifi" />
+
+    <application
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name" >
+        <uses-library android:name="com.example.helloworld" />
+        <activity
+            android:label="@string/app_name"
+            android:name=".Foo2Activity" >
+            <intent-filter >
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/lint/cli/src/test/java/com/android/tools/lint/checks/data/typo_uses_feature2.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/typo_uses_feature2.xml
new file mode 100644
index 0000000..d4d8f6e
--- /dev/null
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/typo_uses_feature2.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="foo.bar2"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <uses-sdk android:minSdkVersion="14" />
+
+    <uses-permission android:name="com.example.helloworld.permission" />
+
+    <user-feature android:name="android.hardware.wifi" />
+
+    <application
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name" >
+        <uses-library android:name="com.example.helloworld" />
+        <activity
+            android:label="@string/app_name"
+            android:name=".Foo2Activity" >
+            <intent-filter >
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/lint/cli/src/test/java/com/android/tools/lint/checks/data/typo_uses_library.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/typo_uses_library.xml
new file mode 100644
index 0000000..5273642
--- /dev/null
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/typo_uses_library.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="foo.bar2"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <uses-sdk android:minSdkVersion="14" />
+
+    <uses-permission android:name="com.example.helloworld.permission" />
+
+    <uses-feature android:name="android.hardware.wifi" />
+
+    <application
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name" >
+        <use-library android:name="com.example.helloworld" />
+        <activity
+            android:label="@string/app_name"
+            android:name=".Foo2Activity" >
+            <intent-filter >
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/lint/cli/src/test/java/com/android/tools/lint/checks/data/typo_uses_library2.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/typo_uses_library2.xml
new file mode 100644
index 0000000..966caf4
--- /dev/null
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/typo_uses_library2.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="foo.bar2"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <uses-sdk android:minSdkVersion="14" />
+
+    <uses-permission android:name="com.example.helloworld.permission" />
+
+    <uses-feature android:name="android.hardware.wifi" />
+
+    <application
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name" >
+        <user-library android:name="com.example.helloworld" />
+        <activity
+            android:label="@string/app_name"
+            android:name=".Foo2Activity" >
+            <intent-filter >
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/lint/cli/src/test/java/com/android/tools/lint/checks/data/typo_uses_permission.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/typo_uses_permission.xml
new file mode 100644
index 0000000..18a31ae
--- /dev/null
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/typo_uses_permission.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="foo.bar2"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <uses-sdk android:minSdkVersion="14" />
+
+    <use-permission android:name="com.example.helloworld.permission" />
+
+    <uses-feature android:name="android.hardware.wifi" />
+
+    <application
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name" >
+        <uses-library android:name="com.example.helloworld" />
+        <activity
+            android:label="@string/app_name"
+            android:name=".Foo2Activity" >
+            <intent-filter >
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/lint/cli/src/test/java/com/android/tools/lint/checks/data/typo_uses_permission2.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/typo_uses_permission2.xml
new file mode 100644
index 0000000..2f070c5
--- /dev/null
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/typo_uses_permission2.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="foo.bar2"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <uses-sdk android:minSdkVersion="14" />
+
+    <user-permission android:name="com.example.helloworld.permission" />
+
+    <uses-feature android:name="android.hardware.wifi" />
+
+    <application
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name" >
+        <uses-library android:name="com.example.helloworld" />
+        <activity
+            android:label="@string/app_name"
+            android:name=".Foo2Activity" >
+            <intent-filter >
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/lint/cli/src/test/java/com/android/tools/lint/checks/data/typo_uses_sdk.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/typo_uses_sdk.xml
new file mode 100644
index 0000000..c086515
--- /dev/null
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/typo_uses_sdk.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="foo.bar2"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <use-sdk android:minSdkVersion="14" />
+
+    <uses-permission android:name="com.example.helloworld.permission" />
+
+    <uses-feature android:name="android.hardware.wifi" />
+
+    <application
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name" >
+        <uses-library android:name="com.example.helloworld" />
+        <activity
+            android:label="@string/app_name"
+            android:name=".Foo2Activity" >
+            <intent-filter >
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/lint/cli/src/test/java/com/android/tools/lint/checks/data/typo_uses_sdk2.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/typo_uses_sdk2.xml
new file mode 100644
index 0000000..148a3fc
--- /dev/null
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/typo_uses_sdk2.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="foo.bar2"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <user-sdk android:minSdkVersion="14" />
+
+    <uses-permission android:name="com.example.helloworld.permission" />
+
+    <uses-feature android:name="android.hardware.wifi" />
+
+    <application
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name" >
+        <uses-library android:name="com.example.helloworld" />
+        <activity
+            android:label="@string/app_name"
+            android:name=".Foo2Activity" >
+            <intent-filter >
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
\ No newline at end of file
-- 
cgit v1.1