components/invalidation/impl/android/javatests/src/org/chromium/components/invalidation/InvalidationClientServiceTest.java - Issue 1674283003: Fix broken tests on M.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: components/invalidation/impl/android/javatests/src/org/chromium/components/invalidation/InvalidationClientServiceTest.java

Issue 1674283003: Fix broken tests on M. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java ('K') | « chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabsConnectionTest.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/invalidation/impl/android/javatests/src/org/chromium/components/invalidation/InvalidationClientServiceTest.java

diff --git a/components/invalidation/impl/android/javatests/src/org/chromium/components/invalidation/InvalidationClientServiceTest.java b/components/invalidation/impl/android/javatests/src/org/chromium/components/invalidation/InvalidationClientServiceTest.java

index bf5d075bac1976e1ff9fc50a800b8f088d7d9bef..c33b60472adf6979eb28d2d1efc872cca81f0065 100644

--- a/components/invalidation/impl/android/javatests/src/org/chromium/components/invalidation/InvalidationClientServiceTest.java

+++ b/components/invalidation/impl/android/javatests/src/org/chromium/components/invalidation/InvalidationClientServiceTest.java

@@ -17,6 +17,7 @@ import com.google.ipc.invalidation.external.client.types.Invalidation;

import com.google.ipc.invalidation.external.client.types.ObjectId;

import org.chromium.base.CollectionUtil;

+import org.chromium.base.PathUtils;

import org.chromium.base.library_loader.LibraryLoader;

import org.chromium.base.library_loader.LibraryProcessType;

import org.chromium.base.test.util.AdvancedMockContext;

@@ -43,6 +44,7 @@ public class InvalidationClientServiceTest extends

ServiceTestCase<TestableInvalidationClientService> {

/** Id used when creating clients. */

private static final byte[] CLIENT_ID = new byte[]{0, 4, 7};

+ private static final String PRIVATE_DATA_DIRECTORY_SUFFIX = "content";

/** Intents provided to {@link #startService}. */

private List<Intent> mStartServiceIntents;

@@ -54,6 +56,8 @@ public class InvalidationClientServiceTest extends

@Override

public void setUp() throws Exception {

super.setUp();

+ PathUtils.setPrivateDataDirectorySuffix(PRIVATE_DATA_DIRECTORY_SUFFIX,

+ getContext());

mStartServiceIntents = new ArrayList<Intent>();

setContext(new AdvancedMockContext(getContext()) {

@Override