Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 076e098b authored by Felipe Leme's avatar Felipe Leme Committed by Android (Google) Code Review
Browse files

Merge "Initial integration test for BugReportReceiver."

parents a600d5c8 e53e85f6

packages/Shell/Android.mk

+3 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ include $(CLEAR_VARS) 


LOCAL_MODULE_TAGS := optional



LOCAL_SRC_FILES := $(call all-subdir-java-files)

LOCAL_SRC_FILES := $(call all-java-files-under, src)



LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4
@@ -12,3 +12,5 @@ LOCAL_CERTIFICATE := platform 
LOCAL_PRIVILEGED_MODULE := true



include $(BUILD_PACKAGE)



include $(LOCAL_PATH)/tests/Android.mk

packages/Shell/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

 * Copyright (c) 2014 Google Inc.

 * Copyright (C) 2015 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.

packages/Shell/src/com/android/shell/BugreportReceiver.java

+2 −2
Original line number Diff line number Diff line
@@ -61,8 +61,8 @@ public class BugreportReceiver extends BroadcastReceiver { 


    private static final String AUTHORITY = "com.android.shell";



    private static final String EXTRA_BUGREPORT = "android.intent.extra.BUGREPORT";

    private static final String EXTRA_SCREENSHOT = "android.intent.extra.SCREENSHOT";

    static final String EXTRA_BUGREPORT = "android.intent.extra.BUGREPORT";

    static final String EXTRA_SCREENSHOT = "android.intent.extra.SCREENSHOT";



    /**

     * Always keep the newest 8 bugreport files; 4 reports and 4 screenshots are

packages/Shell/tests/Android.mk

0 → 100644
+20 −0
Original line number Diff line number Diff line 


LOCAL_PATH := $(call my-dir)

include $(CLEAR_VARS)



LOCAL_MODULE_TAGS := tests



LOCAL_SRC_FILES := $(call all-java-files-under, src)



LOCAL_JAVA_LIBRARIES := android.test.runner



# TODO: update and/or remove

LOCAL_STATIC_JAVA_LIBRARIES := ub-uiautomator

#LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 mockito-target ub-uiautomator



LOCAL_PACKAGE_NAME := ShellTests

LOCAL_INSTRUMENTATION_FOR := Shell



LOCAL_CERTIFICATE := platform



include $(BUILD_PACKAGE)

packages/Shell/tests/AndroidManifest.xml

0 → 100644
+43 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

 * Copyright (C) 2015 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.

 */

-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.android.shell.tests">



    <application>

        <uses-library android:name="android.test.runner" />



        <activity

            android:name="com.android.shell.ActionSendMultipleConsumerActivity"

            android:label="ActionSendMultipleConsumer"

            android:theme="@android:style/Theme.NoDisplay"

            android:noHistory="true"

            android:excludeFromRecents="true">

            <intent-filter>

                <action android:name="android.intent.action.SEND_MULTIPLE" />

                <category android:name="android.intent.category.DEFAULT" />

                <data android:mimeType="*/*" />

            </intent-filter>

        </activity>

    </application>



    <instrumentation android:name="android.test.InstrumentationTestRunner"

        android:targetPackage="com.android.shell"

        android:label="Tests for Shell" />



</manifest>