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

Commit abbc6196 authored by Fan Zhang's avatar Fan Zhang
Browse files

Remove SettingsRobolectricTestRunner 

Test: rerun robotests
Change-Id: I7054d8d5cfc4756beb8d3032bc92361534229494
parent 887fa5c6

tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java

+0 −2
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ import static com.google.common.truth.Truth.assertThat; 
import android.content.Intent;

import android.os.SystemProperties;



import com.android.settings.testutils.SettingsRobolectricTestRunner;



import com.google.android.setupcompat.util.WizardManagerHelper;

import com.google.android.setupdesign.util.ThemeHelper;

tests/robotests/src/com/android/settings/applications/defaultapps/RolesPreferenceControllerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ import android.provider.Settings; 
import androidx.preference.Preference;



import com.android.settings.core.BasePreferenceController;

import com.android.settings.testutils.SettingsRobolectricTestRunner;



import org.junit.Before;

import org.junit.Test;
@@ -40,8 +39,9 @@ import org.junit.runner.RunWith; 
import org.mockito.ArgumentCaptor;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.robolectric.RobolectricTestRunner;



@RunWith(SettingsRobolectricTestRunner.class)

@RunWith(RobolectricTestRunner.class)

public class RolesPreferenceControllerTest {



    private static final String PREFERENCE_KEY = "roles";

tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java

deleted100644 → 0
+0 −27
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;



import org.junit.runners.model.InitializationError;

import org.robolectric.RobolectricTestRunner;



public class SettingsRobolectricTestRunner extends RobolectricTestRunner {



    public SettingsRobolectricTestRunner(Class<?> testClass) throws InitializationError {

        super(testClass);

    }

}

tests/robotests/src/com/android/settings/wifi/ButtonPreferenceTest.java

+4 −4
Original line number Diff line number Diff line
@@ -22,18 +22,18 @@ import android.content.Context; 
import android.view.View;

import android.widget.ImageButton;



import com.android.settings.R;

import com.android.settings.testutils.SettingsRobolectricTestRunner;



import androidx.preference.PreferenceViewHolder;



import com.android.settings.R;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.MockitoAnnotations;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;



@RunWith(SettingsRobolectricTestRunner.class)

@RunWith(RobolectricTestRunner.class)

public class ButtonPreferenceTest {



    private Context mContext;