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

Commit 7b0c8cfb authored by tom hsu's avatar tom hsu Committed by Tom Hsu
Browse files

[Regional Preference] Remove unit tes tof systemproperty 

 - Unit test of System Property failed due to timing issue. Remove it to avoid to impact formal unit test tracker.

 - This system property is feature flag.

Bug: b/265410669
Test: atest passed.
Change-Id: I65b4a34e1a362428ccb18611c90702650a5cdf8f
parent 47fbf1d3

src/com/android/settings/regionalpreferences/RegionalPreferencesController.java

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ public class RegionalPreferencesController extends BasePreferenceController { 
     */

    @Override

    public int getAvailabilityStatus() {

        return SystemProperties.getBoolean(FEATURE_PROPERTY, false)

        return SystemProperties.getBoolean(FEATURE_PROPERTY, true)

                ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;

    }

}

tests/unit/src/com/android/settings/regionalpreferences/RegionalPreferencesControllerTest.java

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

 * Copyright (C) 2022 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.regionalpreferences;



import static com.android.settings.core.BasePreferenceController.AVAILABLE;

import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;



import static org.junit.Assert.assertEquals;



import android.app.UiAutomation;

import android.content.Context;

import android.os.SystemProperties;



import androidx.test.InstrumentationRegistry;

import androidx.test.core.app.ApplicationProvider;



import org.junit.After;

import org.junit.Before;

import org.junit.Test;



public class RegionalPreferencesControllerTest {

    private boolean mCacheProperty = false;

    private Context mApplicationContext;

    private RegionalPreferencesController mController;



    @Before

    public void setUp() throws Exception {

        mApplicationContext = ApplicationProvider.getApplicationContext();

        mCacheProperty =

                SystemProperties.getBoolean(RegionalPreferencesController.FEATURE_PROPERTY, false);

        mController = new RegionalPreferencesController(mApplicationContext, "key");

    }



    @After

    public void tearDown() throws Exception {

        setProp(mCacheProperty);

    }



    @Test

    public void getAvailabilityStatus_systemPropertyIstrue_available() throws Exception {

        setProp(true);



        int result = mController.getAvailabilityStatus();



        assertEquals(AVAILABLE, result);

    }



    @Test

    public void getAvailabilityStatus_systemPropertyIstrue_unavailable() throws Exception {

        setProp(false);



        int result = mController.getAvailabilityStatus();



        assertEquals(CONDITIONALLY_UNAVAILABLE, result);

    }



    private static void setProp(boolean isEnabled) throws Exception {

        UiAutomation uiAutomation = InstrumentationRegistry.getInstrumentation().getUiAutomation();

        uiAutomation.executeShellCommand(

                "setprop " + RegionalPreferencesController.FEATURE_PROPERTY + " " + isEnabled);



        for (int i = 0; i < 3; i++) {

            Thread.sleep(500);

            if (SystemProperties.getBoolean(

                    RegionalPreferencesController.FEATURE_PROPERTY, false) == isEnabled) {

                break;

            }

        }

    }

}