components/cronet/android/sample/javatests/src/org/chromium/cronet_sample_apk/HttpUrlRequestFactoryTest.java - Issue 500193002: Fix Cronet compilation and test errors.

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/cronet/android/sample/javatests/src/org/chromium/cronet_sample_apk/HttpUrlRequestFactoryTest.java

Issue 500193002: Fix Cronet compilation and test errors. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 4 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

« components/cronet/android/sample/javatests/src/org/chromium/cronet_sample_apk/CronetSampleUrlTest.java ('K') | « components/cronet/android/sample/javatests/src/org/chromium/cronet_sample_apk/CronetSampleUrlTest.java ('k') | components/cronet/android/url_request_adapter.h » ('j') | components/cronet/android/url_request_adapter.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/cronet/android/sample/javatests/src/org/chromium/cronet_sample_apk/HttpUrlRequestFactoryTest.java

diff --git a/components/cronet/android/sample/javatests/src/org/chromium/cronet_sample_apk/HttpUrlRequestFactoryTest.java b/components/cronet/android/sample/javatests/src/org/chromium/cronet_sample_apk/HttpUrlRequestFactoryTest.java

index 954038d0bc451aa699020c73aff3666623932b67..743a04990948b91a5329d0b7768042cd67611693 100644

--- a/components/cronet/android/sample/javatests/src/org/chromium/cronet_sample_apk/HttpUrlRequestFactoryTest.java

+++ b/components/cronet/android/sample/javatests/src/org/chromium/cronet_sample_apk/HttpUrlRequestFactoryTest.java

@@ -25,7 +25,7 @@ public class HttpUrlRequestFactoryTest extends InstrumentationTestCase {

getInstrumentation().getContext(), config);

assertNotNull("Factory should be created", factory);

assertTrue("Factory should be Chromium/n.n.n.n/r",

mmenke 2014/08/25 19:46:44 This line isn't quite correct

mef 2014/08/25 20:26:18 Acknowledged. Will fix.

- Pattern.matches("Chromium/\\d+\\.\\d+\\.\\d+\\.\\d+@\\d+",

+ Pattern.matches("Chromium/\\d+\\.\\d+\\.\\d+\\.\\d+@\\w+",

factory.getName()));

}

@@ -39,7 +39,8 @@ public class HttpUrlRequestFactoryTest extends InstrumentationTestCase {

getInstrumentation().getContext(), config);

assertNotNull("Factory should be created", factory);

assertTrue("Factory should be HttpUrlConnection/n.n.n.n@r",

- Pattern.matches("HttpUrlConnection/\\d+\\.\\d+\\.\\d+\\.\\d+@\\d+",

+ Pattern.matches(

+ "HttpUrlConnection/\\d+\\.\\d+\\.\\d+\\.\\d+@\\w+",

factory.getName()));

}