diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-15 10:48:28 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-15 10:48:28 -0700 |
commit | 3adf7678cdf8fa955627e096bb5c27b94adc3079 (patch) | |
tree | 7d9abf85019f81752710c57903e9051b834af043 | |
parent | e6881c6300193422af6b33edf4380ac933315504 (diff) | |
parent | 9faa04fd85efa0be5c883e3136f06fa85b525ad6 (diff) | |
download | frameworks_base-3adf7678cdf8fa955627e096bb5c27b94adc3079.zip frameworks_base-3adf7678cdf8fa955627e096bb5c27b94adc3079.tar.gz frameworks_base-3adf7678cdf8fa955627e096bb5c27b94adc3079.tar.bz2 |
Merge change 4184 into donut
* changes:
Add permission test structure for private framework permissions.
-rw-r--r-- | tests/permission/Android.mk | 14 | ||||
-rw-r--r-- | tests/permission/AndroidManifest.xml | 33 | ||||
-rw-r--r-- | tests/permission/src/com/android/framework/permission/tests/DummyPermissionTest.java | 13 |
3 files changed, 60 insertions, 0 deletions
diff --git a/tests/permission/Android.mk b/tests/permission/Android.mk new file mode 100644 index 0000000..a6df98e --- /dev/null +++ b/tests/permission/Android.mk @@ -0,0 +1,14 @@ +LOCAL_PATH:= $(call my-dir) +include $(CLEAR_VARS) + +# We only want this apk build for tests. +LOCAL_MODULE_TAGS := tests + +# Include all test java files. +LOCAL_SRC_FILES := $(call all-java-files-under, src) + +LOCAL_JAVA_LIBRARIES := android.test.runner +LOCAL_PACKAGE_NAME := FrameworkPermissionTests + +include $(BUILD_PACKAGE) + diff --git a/tests/permission/AndroidManifest.xml b/tests/permission/AndroidManifest.xml new file mode 100644 index 0000000..b19bf00 --- /dev/null +++ b/tests/permission/AndroidManifest.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + * Copyright (C) 2009 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. + --> + +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.framework.permission.tests"> + + <application> + <uses-library android:name="android.test.runner" /> + </application> + + <!-- + The test declared in this instrumentation can be run via this command + "adb shell am instrument -w com.android.framework.permission.tests/android.test.InstrumentationTestRunner" + --> + <instrumentation android:name="android.test.InstrumentationTestRunner" + android:targetPackage="com.android.framework.permission.tests" + android:label="Tests for private API framework permissions"/> + +</manifest> diff --git a/tests/permission/src/com/android/framework/permission/tests/DummyPermissionTest.java b/tests/permission/src/com/android/framework/permission/tests/DummyPermissionTest.java new file mode 100644 index 0000000..010601a --- /dev/null +++ b/tests/permission/src/com/android/framework/permission/tests/DummyPermissionTest.java @@ -0,0 +1,13 @@ +package com.android.framework.permission.tests; + +import junit.framework.TestCase; + +/** + * TODO: Remove this. This is only a placeholder, need to implement this. + */ +public class DummyPermissionTest extends TestCase { + + public void testMe() { + + } +} |