Upstream GestureDetectorProxyTest

Upstream Android GestureDetectorProxyTest

Include the GestureDetectorProxyTest as part of the
ContentShellTests.apk.

Produce a jar (ContentShellTests-debug.jar) so that
run_instrumentation_tests.py can use Proguard to enumerate the tests
by annotation.

BUG=136687
TEST=GestureDetectorProxyTest

[bulach, 2012-07-16 13:22:43]

great stuff! a few nits below.. ted: would you mind taking a look at my comment
for content_shell.gypi? is it possible to reference the jars directly in the xml
rather than copying them via gyp?

http://codereview.chromium.org/10690190/diff/1/base/android/javatests/src/org...
File base/android/javatests/src/org/chromium/base/test/ScalableTimeout.java
(right):

http://codereview.chromium.org/10690190/diff/1/base/android/javatests/src/org...
base/android/javatests/src/org/chromium/base/test/ScalableTimeout.java:18: *  
adb shell "echo 20.0 > /data/local/chrome_timeout_scale"
nit: I think this is /data/local/tmp/ now..

http://codereview.chromium.org/10690190/diff/1/content/content_shell.gypi
File content/content_shell.gypi (right):

http://codereview.chromium.org/10690190/diff/1/content/content_shell.gypi#new...
content/content_shell.gypi:646: 'action_name': 'copy_content_javatests_jar',
nit: are these copies necessary? would it be possible to just add these jars to
content_shell_test_apk.xml?

http://codereview.chromium.org/10690190/diff/1/content/public/android/java/sr...
File
content/public/android/java/src/org/chromium/content/browser/GestureDetectorProxy.java
(right):

http://codereview.chromium.org/10690190/diff/1/content/public/android/java/sr...
content/public/android/java/src/org/chromium/content/browser/GestureDetectorProxy.java:1:
// Copyright (c) 2010 The Chromium Authors. All rights reserved.
nit: 2012

[Ted C, 2012-07-17 00:48:03]

http://codereview.chromium.org/10690190/diff/1/content/content_shell.gypi
File content/content_shell.gypi (right):

http://codereview.chromium.org/10690190/diff/1/content/content_shell.gypi#new...
content/content_shell.gypi:646: 'action_name': 'copy_content_javatests_jar',
On 2012/07/16 13:22:44, bulach wrote:
> nit: are these copies necessary? would it be possible to just add these jars
to
> content_shell_test_apk.xml?

I think it was done this way for historical reasons.  There might be ways to
specify it in the xml, but I'm not aware of any ant files where we do that.  It
is nice only having to change the gyp file if new dependencies are required, but
all the copy declarations are quite annoying.

I think the native test apk generator allows you to specify the java lib paths,
which might be a nice way to keep it all in the gyp file but avoid this cruft.

Again...no strong reason to keep it this way though.

[brettw, 2012-07-17 19:45:03]

https://chromiumcodereview.appspot.com/10690190/diff/1/base/android/javatests...
File base/android/javatests/src/org/chromium/base/test/Feature.java (right):

https://chromiumcodereview.appspot.com/10690190/diff/1/base/android/javatests...
base/android/javatests/src/org/chromium/base/test/Feature.java:13: * This
annotation can be used to mark a test is related to some feature(s).
I don't understand this class.

https://chromiumcodereview.appspot.com/10690190/diff/1/base/android/javatests...
File base/android/javatests/src/org/chromium/base/test/ScalableTimeout.java
(right):

https://chromiumcodereview.appspot.com/10690190/diff/1/base/android/javatests...
base/android/javatests/src/org/chromium/base/test/ScalableTimeout.java:44:
private static char[] readUtf8FileFully(String fileName, int sizeLimit) throws
In C++ we have ReadFileToString. I wonder if we should split this out into a
TestFileUtil.java file (and call it ReadUtf8File or something to more match the
C++ code). This is something we ended up doing a bunch in Chrome test code.

[bulach, 2012-07-18 17:15:14]

thanks brett! John is holidays this week, so I'll be taking over this patch soon
(there has been some other changes downstream as well, which will require to be
reconciled here..). I just wanted to leave a question and a note below:

http://codereview.chromium.org/10690190/diff/1/base/android/javatests/src/org...
File base/android/javatests/src/org/chromium/base/test/Feature.java (right):

http://codereview.chromium.org/10690190/diff/1/base/android/javatests/src/org...
base/android/javatests/src/org/chromium/base/test/Feature.java:13: * This
annotation can be used to mark a test is related to some feature(s).
On 2012/07/17 19:45:03, brettw wrote:
> I don't understand this class.

the java tests are instrumentation tests and normally much larger than
unit-tests. we use this annotation to indicate which feature (area) it's
exercising, so we can then apply filters when running the tests.. so then each
test is annotated with something like:

@Feature({"FooBar"})

to indicate it's exercising an area related to FooBar.

I'm happy to improve the comments if you think that would help!

http://codereview.chromium.org/10690190/diff/1/base/android/javatests/src/org...
File base/android/javatests/src/org/chromium/base/test/ScalableTimeout.java
(right):

http://codereview.chromium.org/10690190/diff/1/base/android/javatests/src/org...
base/android/javatests/src/org/chromium/base/test/ScalableTimeout.java:44:
private static char[] readUtf8FileFully(String fileName, int sizeLimit) throws
On 2012/07/17 19:45:03, brettw wrote:
> In C++ we have ReadFileToString. I wonder if we should split this out into a
> TestFileUtil.java file (and call it ReadUtf8File or something to more match
the
> C++ code). This is something we ended up doing a bunch in Chrome test code.

that's a good idea, we can certainly do both (move to a TestFileUtil and rename
the method)

[brettw, 2012-07-18 18:13:16]

http://codereview.chromium.org/10690190/diff/1/base/android/javatests/src/org...
File base/android/javatests/src/org/chromium/base/test/Feature.java (right):

http://codereview.chromium.org/10690190/diff/1/base/android/javatests/src/org...
base/android/javatests/src/org/chromium/base/test/Feature.java:13: * This
annotation can be used to mark a test is related to some feature(s).
Yeah, the purpose of me asking wasn't that I need it explained to me in the code
review, but that it should be obvious to anybody what it's for and how to use
it.

[bulach, 2012-07-18 18:17:46]

On 2012/07/18 18:13:16, brettw wrote:
>
http://codereview.chromium.org/10690190/diff/1/base/android/javatests/src/org...
> File base/android/javatests/src/org/chromium/base/test/Feature.java (right):
> 
>
http://codereview.chromium.org/10690190/diff/1/base/android/javatests/src/org...
> base/android/javatests/src/org/chromium/base/test/Feature.java:13: * This
> annotation can be used to mark a test is related to some feature(s).
> Yeah, the purpose of me asking wasn't that I need it explained to me in the
code
> review, but that it should be obvious to anybody what it's for and how to use
> it.

absolutely, I fully agree! :) thanks for reviewing it downstream, I'll land
tomorrow my morning and update this patch with the latest changes from there.