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

Commit 6fc7ebd7 authored by Fan Zhang's avatar Fan Zhang
Browse files

Use settingslib shadows in Settings robotest 

Change-Id: Ieae5d65bb5efdbc4c91455d1f722e84fe9e60116
Fixes: 80428049
Test: robotest
parent 50437769

tests/robotests/Android.mk

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


LOCAL_MODULE := SettingsRoboTests



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

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

    $(call all-java-files-under, ../../../../../frameworks/base/packages/SettingsLib/tests/robotests/src/com/android/settingslib/testutils)



LOCAL_JAVA_RESOURCE_DIRS := config

tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java

+2 −2
Original line number Diff line number Diff line
@@ -35,8 +35,8 @@ import android.os.UserManager; 


import com.android.settings.testutils.ApplicationTestUtils;

import com.android.settings.testutils.SettingsRobolectricTestRunner;

import com.android.settings.testutils.shadow.ShadowDefaultDialerManager;

import com.android.settings.testutils.shadow.ShadowSmsApplication;

import com.android.settingslib.testutils.shadow.ShadowDefaultDialerManager;

import com.android.settingslib.testutils.shadow.ShadowSmsApplication;



import org.junit.Before;

import org.junit.Test;

tests/robotests/src/com/android/settings/testutils/shadow/ShadowDefaultDialerManager.java

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

 * Copyright (C) 2018 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.settings.testutils.shadow;



import android.content.Context;

import android.telecom.DefaultDialerManager;



import org.robolectric.annotation.Implementation;

import org.robolectric.annotation.Implements;

import org.robolectric.annotation.Resetter;



@Implements(DefaultDialerManager.class)

public class ShadowDefaultDialerManager {



    private static String sDefaultDailer;



    @Resetter

    public void reset() {

        sDefaultDailer = null;

    }



    @Implementation

    public static String getDefaultDialerApplication(Context context) {

        return sDefaultDailer;

    }



    public static void setDefaultDialerApplication(String dialer) {

        sDefaultDailer = dialer;

    }

}

tests/robotests/src/com/android/settings/testutils/shadow/ShadowSmsApplication.java

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

 * Copyright (C) 2018 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.settings.testutils.shadow;



import android.content.ComponentName;

import android.content.Context;



import com.android.internal.telephony.SmsApplication;



import org.robolectric.annotation.Implementation;

import org.robolectric.annotation.Implements;

import org.robolectric.annotation.Resetter;



@Implements(SmsApplication.class)

public class ShadowSmsApplication {



    private static ComponentName sDefaultSmsApplication;



    @Resetter

    public void reset() {

        sDefaultSmsApplication = null;

    }



    @Implementation

    public static ComponentName getDefaultSmsApplication(Context context, boolean updateIfNeeded) {

        return sDefaultSmsApplication;

    }



    public static void setDefaultSmsApplication(ComponentName cn) {

        sDefaultSmsApplication = cn;

    }

}