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

Commit d12a3646 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix test failures in deviceinfo" into main

parents 76129cbe e24c5f37

tests/robotests/src/com/android/settings/deviceinfo/batteryinfo/BatteryFirstUseDatePreferenceControllerTest.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -31,10 +31,10 @@ import android.os.BatteryManager; 




import androidx.test.core.app.ApplicationProvider;

import androidx.test.core.app.ApplicationProvider;





import com.android.settings.fuelgauge.BatteryUtils;

import com.android.settings.testutils.FakeFeatureFactory;

import com.android.settings.testutils.FakeFeatureFactory;





import org.junit.Before;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.junit.runner.RunWith;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RobolectricTestRunner;
@@ -76,17 +76,17 @@ public class BatteryFirstUseDatePreferenceControllerTest { 
        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);

        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);

    }

    }





    @Ignore("b/315267179")

    @Test

    @Test

    public void getSummary_available_returnExpectedDate() {

    public void getSummary_available_returnExpectedDate() {

        when(mFactory.batterySettingsFeatureProvider.isFirstUseDateAvailable(eq(mContext),

        when(mFactory.batterySettingsFeatureProvider.isFirstUseDateAvailable(eq(mContext),

                anyLong())).thenReturn(true);

                anyLong())).thenReturn(true);

        mShadowBatteryManager.setLongProperty(BatteryManager.BATTERY_PROPERTY_FIRST_USAGE_DATE,

        mShadowBatteryManager.setLongProperty(BatteryManager.BATTERY_PROPERTY_FIRST_USAGE_DATE,

                1669680000L);

                1669680000L);

        final CharSequence expectedDate = BatteryUtils.getBatteryInfoFormattedDate(1669680000000L);





        final CharSequence result = mController.getSummary();

        final CharSequence result = mController.getSummary();





        assertThat(result.toString()).isEqualTo("November 29, 2022");

        assertThat(result).isEqualTo(expectedDate);

    }

    }





    @Test

    @Test

tests/robotests/src/com/android/settings/deviceinfo/batteryinfo/BatteryManufactureDatePreferenceControllerTest.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -31,10 +31,10 @@ import android.os.BatteryManager; 




import androidx.test.core.app.ApplicationProvider;

import androidx.test.core.app.ApplicationProvider;





import com.android.settings.fuelgauge.BatteryUtils;

import com.android.settings.testutils.FakeFeatureFactory;

import com.android.settings.testutils.FakeFeatureFactory;





import org.junit.Before;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.junit.runner.RunWith;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RobolectricTestRunner;
@@ -77,17 +77,17 @@ public class BatteryManufactureDatePreferenceControllerTest { 
        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);

        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);

    }

    }





    @Ignore("b/315267179")

    @Test

    @Test

    public void getSummary_available_returnExpectedDate() {

    public void getSummary_available_returnExpectedDate() {

        when(mFactory.batterySettingsFeatureProvider.isManufactureDateAvailable(eq(mContext),

        when(mFactory.batterySettingsFeatureProvider.isManufactureDateAvailable(eq(mContext),

                anyLong())).thenReturn(true);

                anyLong())).thenReturn(true);

        mShadowBatteryManager.setLongProperty(BatteryManager.BATTERY_PROPERTY_MANUFACTURING_DATE,

        mShadowBatteryManager.setLongProperty(BatteryManager.BATTERY_PROPERTY_MANUFACTURING_DATE,

                1669680000L);

                1669680000L);

        final CharSequence expectedDate = BatteryUtils.getBatteryInfoFormattedDate(1669680000000L);





        final CharSequence result = mController.getSummary();

        final CharSequence result = mController.getSummary();





        assertThat(result.toString()).isEqualTo("November 29, 2022");

        assertThat(result).isEqualTo(expectedDate);

    }

    }





    @Test

    @Test