components/cronet/android/sample/javatests/src/org/chromium/cronet_sample_apk/HttpUrlRequestFactoryTest.java - Issue 344793006: Generate Cronet Version.java based on VERSION and LASTCHANGE files.

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 344793006: Generate Cronet Version.java based on VERSION and LASTCHANGE files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address Matt's comments. Created 6 years, 6 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

« no previous file with comments | « components/cronet/android/org_chromium_net_UrlRequestContext.cc ('k') | components/cronet/android/url_request_context_peer.h » ('j') | no next file with comments »
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 c97ad521247088372d24853df53ebd6889f59b80..954038d0bc451aa699020c73aff3666623932b67 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

@@ -11,6 +11,8 @@ import org.chromium.base.test.util.Feature;

import org.chromium.net.HttpUrlRequestFactory;

import org.chromium.net.HttpUrlRequestFactoryConfig;

+import java.util.regex.Pattern;

/**

* Tests for {@link ChunkedWritableByteChannel}

@@ -22,8 +24,9 @@ public class HttpUrlRequestFactoryTest extends InstrumentationTestCase {

HttpUrlRequestFactory factory = HttpUrlRequestFactory.createFactory(

getInstrumentation().getContext(), config);

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

- assertTrue("Factory should not be legacy",

- "HttpUrlConnection" != factory.getName());

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

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

+ factory.getName()));

}

@SmallTest

@@ -35,6 +38,8 @@ public class HttpUrlRequestFactoryTest extends InstrumentationTestCase {

HttpUrlRequestFactory factory = HttpUrlRequestFactory.createFactory(

getInstrumentation().getContext(), config);

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

- assertEquals("HttpUrlConnection", factory.getName());

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

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

+ factory.getName()));

}