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

Update Robolectric to 3.4.2

Browse Source 
Bug: 66693279
Test: m RunSettingsRoboTests
      m RunSettingsRoboTests-jacoco
Change-Id: I9df619c3d68f0af2ee2ae944a15998275129f7c2
This commit is contained in:
Maurice Lam
2017-09-20 22:20:22 -07:00
parent d0b1297e84
commit e18902ec67
66 changed files with 297 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java
View File

@@ -20,11 +20,11 @@ import android.content.Intent;
import org.junit.runners.model.InitializationError;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.android.controller.ActivityController;
import org.robolectric.annotation.Config;
import org.robolectric.manifest.AndroidManifest;
import org.robolectric.res.Fs;
import org.robolectric.res.ResourcePath;
import org.robolectric.util.ActivityController;
import org.robolectric.util.ReflectionHelpers;
import java.util.List;
@@ -79,35 +79,35 @@ public class SettingsRobolectricTestRunner extends RobolectricTestRunner {
public static void getIncludedResourcePaths(String packageName, List<ResourcePath> paths) {
paths.add(new ResourcePath(
packageName,
null,
Fs.fileFromPath("./packages/apps/Settings/res"),
null));
paths.add(new ResourcePath(
packageName,
null,
Fs.fileFromPath("./frameworks/base/packages/SettingsLib/res"),
null));
paths.add(new ResourcePath(
packageName,
null,
Fs.fileFromPath("./frameworks/base/core/res/res"),
null));
paths.add(new ResourcePath(
packageName,
null,
Fs.fileFromPath("./frameworks/opt/setupwizard/library/main/res"),
null));
paths.add(new ResourcePath(
packageName,
null,
Fs.fileFromPath("./frameworks/opt/setupwizard/library/gingerbread/res"),
null));
paths.add(new ResourcePath(
packageName,
null,
Fs.fileFromPath("./frameworks/opt/setupwizard/library/recyclerview/res"),
null));
paths.add(new ResourcePath(
packageName,
null,
Fs.fileFromPath("./frameworks/support/v7/appcompat/res"),
null));
paths.add(new ResourcePath(
packageName,
null,
Fs.fileFromPath("./frameworks/support/v7/cardview/res"),
null));
}