PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use external/robolectric-shadows/run_robotests.mk

Browse Source 
This allows Settings to test against the latest framework changes.

Also replaced TestConfig with traditional robolectric.properties.

Bug: 73173204
Bug: 73892008
Test: make -j56 RunSettingsRoboTests
Change-Id: I3135b4fa5f095ba79b282a76f45dd9baa2584bc7
This commit is contained in:
James Lemieux
2018-02-26 00:51:42 -08:00
parent 229a6a2bc4
commit 22a39c2b93
752 changed files with 5096 additions and 9182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/robotests/src/com/android/settings/fuelgauge/PowerUsageBaseTest.java
View File

@@ -15,7 +15,6 @@
*/
package com.android.settings.fuelgauge;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.doReturn;
@@ -28,7 +27,6 @@ import android.content.Context;
import android.os.Bundle;
import com.android.internal.os.BatteryStatsHelper;
import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowDashboardFragment;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -42,13 +40,10 @@ import org.robolectric.annotation.Config;
import java.util.List;
/**
* Unit tests for {@link PowerUsageBase}.
*/
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
shadows = ShadowDashboardFragment.class)
@Config(shadows = ShadowDashboardFragment.class)
public class PowerUsageBaseTest {
@Mock
private BatteryStatsHelper mBatteryStatsHelper;
@Mock
@@ -98,7 +93,7 @@ public class PowerUsageBaseTest {
return null;
}
public void setBatteryStatsHelper(BatteryStatsHelper batteryStatsHelper) {
private void setBatteryStatsHelper(BatteryStatsHelper batteryStatsHelper) {
mStatsHelper = batteryStatsHelper;
}
}