Move Android WebView Test WebServer to net

Move Android WebView Test WebServer to net.

Move Android WebView Test WebServer to net so that other test code can
make use of it.

BUG=159601
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=166493

[joth, 2012-11-06 15:28:55]

wouldn't src/net  make more sense?



On 6 November 2012 15:16, <jknotten@chromium.org> wrote:

> Reviewers: Martin Kosiba, joth,
>
> Description:
> Move Android WebView Test WebServer to base.
>
> Move Android WebView Test WebServer to base so that other test code can
> make use of it.
>
> BUG=159601
>
>
> Please review this at
https://codereview.chromium.**org/11366108/<https://codereview.chromium.org/1...
>
> SVN Base:
svn://svn.chromium.org/chrome/**trunk/src<http://svn.chromium.org/chrome/trunk/src>
>
> Affected files:
>   android_webview/javatests/src/**org/chromium/android_webview/**test/**
> AndroidWebViewLoadUrlTest.java
>   android_webview/javatests/src/**org/chromium/android_webview/**test/**
> AwContentsClientOnFormResubmis**sionTest.java
>   android_webview/javatests/src/**org/chromium/android_webview/**test/**
> AwContentsClientShouldIgnoreNa**vigationTest.java
>   android_webview/javatests/src/**org/chromium/android_webview/**test/**
> AwContentsClientShouldIntercep**tRequestTest.java
>   android_webview/javatests/src/**org/chromium/android_webview/**
> test/AwContentsTest.java
>   android_webview/javatests/src/**org/chromium/android_webview/**
> test/AwSettingsTest.java
>   android_webview/javatests/src/**org/chromium/android_webview/**
> test/ClientOnPageFinishedTest.**java
>   android_webview/javatests/src/**org/chromium/android_webview/**
> test/CookieManagerTest.java
>   android_webview/javatests/src/**org/chromium/android_webview/**
> test/GetTitleTest.java
>   android_webview/javatests/src/**org/chromium/android_webview/**
> test/LoadDataWithBaseUrlTest.**java
>   android_webview/javatests/src/**org/chromium/android_webview/**
> test/NavigationHistoryTest.**java
>   android_webview/javatests/src/**org/chromium/android_webview/**
> test/util/TestWebServer.java
>   base/test/android/javatests/**src/org/chromium/base/test/**
> util/TestWebServer.java
>   build/android/findbugs_filter/**findbugs_known_bugs.txt
>
>
>

[John Knottenbelt, 2012-11-06 18:30:40]

Also updating OWNERS to include myself and Phillipe.

[Yaron, 2012-11-06 20:39:14]

lgtm but you'll need a net OWNER. +rsleevi

https://codereview.chromium.org/11366108/diff/3001/build/android/findbugs_fil...
File build/android/findbugs_filter/findbugs_known_bugs.txt (right):

https://codereview.chromium.org/11366108/diff/3001/build/android/findbugs_fil...
build/android/findbugs_filter/findbugs_known_bugs.txt:5: H D ST: Write to static
field org.chromium.base.test.util.TestWebServer.sInstance from instance method
org.chromium.base.test.util.TestWebServer.shutdown()  At TestWebServer.java
Update

[joth, 2012-11-07 09:36:32]

lgtm

https://codereview.chromium.org/11366108/diff/3001/net/android/OWNERS
File net/android/OWNERS (right):

https://codereview.chromium.org/11366108/diff/3001/net/android/OWNERS#newcode3
net/android/OWNERS:3: jknotten@chromium.org
nit: alpha (ascending) order.

https://codereview.chromium.org/11366108/diff/3001/net/test/android/OWNERS
File net/test/android/OWNERS (right):

https://codereview.chromium.org/11366108/diff/3001/net/test/android/OWNERS#ne...
net/test/android/OWNERS:2: pliard@chromium.org
ditto

https://codereview.chromium.org/11366108/diff/3001/net/test/android/javatests...
File net/test/android/javatests/org/chromium/net/test/util/TestWebServer.java
(right):

https://codereview.chromium.org/11366108/diff/3001/net/test/android/javatests...
net/test/android/javatests/org/chromium/net/test/util/TestWebServer.java:55: *
Simple http test server for testing.
maybe add: the server runs in a thread in the current process, so is convenient
for loopback testing without the need to setup tcp forwarding and so forth.

https://codereview.chromium.org/11366108/diff/3001/net/test/android/javatests...
net/test/android/javatests/org/chromium/net/test/util/TestWebServer.java:145:
sInstance = null;
apparently if you change this to TestWebServer.sInstance = null that will quell
the find bugs warning.

[Philippe, 2012-11-07 09:49:55]

On 2012/11/07 09:36:32, joth wrote:
> lgtm
> 
> https://codereview.chromium.org/11366108/diff/3001/net/android/OWNERS
> File net/android/OWNERS (right):
> 
> https://codereview.chromium.org/11366108/diff/3001/net/android/OWNERS#newcode3
> net/android/OWNERS:3: mailto:jknotten@chromium.org
> nit: alpha (ascending) order.
> 
> https://codereview.chromium.org/11366108/diff/3001/net/test/android/OWNERS
> File net/test/android/OWNERS (right):
> 
>
https://codereview.chromium.org/11366108/diff/3001/net/test/android/OWNERS#ne...
> net/test/android/OWNERS:2: mailto:pliard@chromium.org
> ditto
> 
>
https://codereview.chromium.org/11366108/diff/3001/net/test/android/javatests...
> File net/test/android/javatests/org/chromium/net/test/util/TestWebServer.java
> (right):
> 
>
https://codereview.chromium.org/11366108/diff/3001/net/test/android/javatests...
> net/test/android/javatests/org/chromium/net/test/util/TestWebServer.java:55: *
> Simple http test server for testing.
> maybe add: the server runs in a thread in the current process, so is
convenient
> for loopback testing without the need to setup tcp forwarding and so forth.
> 
>
https://codereview.chromium.org/11366108/diff/3001/net/test/android/javatests...
> net/test/android/javatests/org/chromium/net/test/util/TestWebServer.java:145:
> sInstance = null;
> apparently if you change this to TestWebServer.sInstance = null that will
quell
> the find bugs warning.

lgtm, thanks John! As we discussed too I think it would be good to add digit@ to
the OWNERS.

[John Knottenbelt, 2012-11-07 10:35:15]

http://codereview.chromium.org/11366108/diff/3001/net/android/OWNERS
File net/android/OWNERS (right):

http://codereview.chromium.org/11366108/diff/3001/net/android/OWNERS#newcode3
net/android/OWNERS:3: jknotten@chromium.org
On 2012/11/07 09:36:32, joth wrote:
> nit: alpha (ascending) order.

Done.

http://codereview.chromium.org/11366108/diff/3001/net/test/android/OWNERS
File net/test/android/OWNERS (right):

http://codereview.chromium.org/11366108/diff/3001/net/test/android/OWNERS#new...
net/test/android/OWNERS:2: pliard@chromium.org
On 2012/11/07 09:36:32, joth wrote:
> ditto

Done.

http://codereview.chromium.org/11366108/diff/3001/net/test/android/javatests/...
File net/test/android/javatests/org/chromium/net/test/util/TestWebServer.java
(right):

http://codereview.chromium.org/11366108/diff/3001/net/test/android/javatests/...
net/test/android/javatests/org/chromium/net/test/util/TestWebServer.java:55: *
Simple http test server for testing.
On 2012/11/07 09:36:32, joth wrote:
> maybe add: the server runs in a thread in the current process, so is
convenient
> for loopback testing without the need to setup tcp forwarding and so forth.

Done.

http://codereview.chromium.org/11366108/diff/3001/net/test/android/javatests/...
net/test/android/javatests/org/chromium/net/test/util/TestWebServer.java:145:
sInstance = null;
On 2012/11/07 09:36:32, joth wrote:
> apparently if you change this to TestWebServer.sInstance = null that will
quell
> the find bugs warning.

Done.

[Ryan Sleevi, 2012-11-07 14:46:18]

lgtm

[commit-bot: I haz the power, 2012-11-07 15:10:40]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/jknotten@chromium.org/11366108/2002

[commit-bot: I haz the power, 2012-11-07 15:42:50]

Sorry for I got bad news for ya.
Compile failed with a clobber build on android_dbg.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=android_db...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[John Knottenbelt, 2012-11-07 16:00:16]

I needed to introduce a net_java_test_support target that android webview can
depend upon to get the web server (when it was in base, this worked fine because
there is already a base_java_test_support target that android webview is already
depending on).

[Yaron, 2012-11-07 16:37:49]

lgtm

[commit-bot: I haz the power, 2012-11-07 17:34:35]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/jknotten@chromium.org/11366108/2003

[commit-bot: I haz the power, 2012-11-07 19:40:42]

Change committed as 166493