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

Commit cc021c9a authored by Philip P. Moltmann's avatar Philip P. Moltmann
Browse files

Move print workflow tests to own apk 

Test: Ran new tests
parent 83827705

core/tests/coretests/AndroidManifest.xml

+0 −11
Original line number Diff line number Diff line
@@ -1323,17 +1323,6 @@ 
            </meta-data>

        </service>



        <activity

            android:name="android.print.mockservice.SettingsActivity"

            android:permission="android.permission.START_PRINT_SERVICE_CONFIG_ACTIVITY"

            android:exported="true">

        </activity>



        <activity

                android:name="android.print.mockservice.AddPrintersActivity"

                android:exported="true">

        </activity>



    </application>



    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"

core/tests/coretests/res/xml/printservice.xml

+1 −3
Original line number Diff line number Diff line
@@ -16,6 +16,4 @@ 
    limitations under the License.

-->



<print-service  xmlns:android="http://schemas.android.com/apk/res/android"

     android:settingsActivity="android.print.mockservice.SettingsActivity"

     android:addPrintersActivity="android.print.mockservice.AddPrintersActivity" />
 
<print-service  xmlns:android="http://schemas.android.com/apk/res/android" />

core/tests/coretests/src/android/print/mockservice/SettingsActivity.java

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 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 android.print.mockservice;



import android.app.Activity;

import android.os.Bundle;



public class SettingsActivity extends Activity {



    @Override

    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

    }

}

packages/PrintSpooler/tests/Android.mk

0 → 100644
+19 −0
Original line number Diff line number Diff line 
# Copyright (C) 2016 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.



LOCAL_PATH:= $(call my-dir)



include $(CLEAR_VARS)



include $(call all-makefiles-under, $(LOCAL_PATH))

packages/PrintSpooler/tests/outofprocess/Android.mk

0 → 100644
+28 −0
Original line number Diff line number Diff line 
# Copyright (C) 2016 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.



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

LOCAL_STATIC_JAVA_LIBRARIES := android-support-test ub-uiautomator mockito-target-minus-junit4



LOCAL_PACKAGE_NAME := PrintSpoolerOutOfProcessTests



include $(BUILD_PACKAGE)