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

Commit 3530bc42 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix test breakage in settingslib"

parents 5d402175 af68d729
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@

package com.android.settingslib.graph;

import android.animation.ArgbEvaluator;
import android.annotation.Nullable;
import android.content.Context;
import android.content.res.Resources;
+3 −1
Original line number Diff line number Diff line
@@ -16,8 +16,10 @@

package com.android.settingslib;

import android.os.Build;

public class TestConfig {
    public static final int SDK_VERSION = 25;
    public static final int SDK_VERSION = Build.VERSION_CODES.O;
    public static final String MANIFEST_PATH =
            "frameworks/base/packages/SettingsLib/tests/robotests/AndroidManifest.xml";
}
+5 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.settingslib.graph;

import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;

import android.content.Context;
@@ -35,11 +36,13 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;

@RunWith(SettingsLibRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
        shadows = SettingsLibShadowResources.class)
public class BatteryMeterDrawableBaseTest {
    private static final int CRITICAL_LEVEL = 5;
    private static final int PADDING = 5;
    private static final int HEIGHT = 80;
    private static final int WIDTH = 40;
@@ -53,7 +56,8 @@ public class BatteryMeterDrawableBaseTest {
        MockitoAnnotations.initMocks(this);

        mContext = RuntimeEnvironment.application;
        mBatteryMeterDrawableBase = new BatteryMeterDrawableBase(mContext, 0 /* frameColor */);
        mBatteryMeterDrawableBase = spy(new BatteryMeterDrawableBase(mContext, 0 /* frameColor */));
        ReflectionHelpers.setField(mBatteryMeterDrawableBase, "mCriticalLevel", CRITICAL_LEVEL);
    }

    @Test