Auto convert content shell tests to JUnit4

Auto convert content shell tests to JUnit4

This uses auto convert script to convert content instrumentation tests to JUnit4,
assisted with some manual clean up. For more on JUnit4 migration, check
src/testing/android/docs/junit4.md 

BUG=640116
Review-Url: https://codereview.chromium.org/2708243004
Cr-Commit-Position: refs/heads/master@{#456227}
Committed: https://chromium.googlesource.com/chromium/src/+/2c657c64afced7163d245119597842025d4975cc

[the real yoland, 2017-02-22 16:15:48]

Description was changed from

==========
[Example] Convert all content shell tests

BUG=640116
==========

to

==========
[Example] Convert all content shell tests

This is not intended to be committed (not formatted or import organized yet). I
will break down to smaller CL as well

BUG=640116
==========

[the real yoland, 2017-02-22 16:15:49]

yolandyan@chromium.org changed reviewers:
+ jbudorick@chromium.org, mikecase@chromium.org

[the real yoland, 2017-03-01 22:40:05]

Description was changed from

==========
[Example] Convert all content shell tests

This is not intended to be committed (not formatted or import organized yet). I
will break down to smaller CL as well

BUG=640116
==========

to

==========
Auto convert 40 content shell tests to JUnit4

This uses auto convert script to convert 40 content java instrumentation tests
(out of 57) in JUnit. It does require some
manual clean up at the end and 

BUG=640116
==========

[the real yoland, 2017-03-01 22:41:21]

Description was changed from

==========
Auto convert 40 content shell tests to JUnit4

This uses auto convert script to convert 40 content java instrumentation tests
(out of 57) in JUnit. It does require some
manual clean up at the end and 

BUG=640116
==========

to

==========
Auto convert 40 content shell tests to JUnit4

This uses auto convert script to convert 39 content java instrumentation tests
(out of 50) in JUnit. It does require some
manual clean up at the end and 

BUG=640116
==========

[the real yoland, 2017-03-01 22:41:36]

yolandyan@chromium.org changed reviewers:
+ boliu@chromium.org

[boliu, 2017-03-01 23:02:46]

did this pass cq?

[jbudorick, 2017-03-01 23:10:19]

partial

https://codereview.chromium.org/2708243004/diff/80001/content/public/android/...
File
content/public/android/javatests/src/org/chromium/content/browser/BrowserStartupControllerTest.java
(right):

https://codereview.chromium.org/2708243004/diff/80001/content/public/android/...
content/public/android/javatests/src/org/chromium/content/browser/BrowserStartupControllerTest.java:13:
import org.junit.Test;
import order?

I'm surprised this wasn't flagged either during the build or on upload.

https://codereview.chromium.org/2708243004/diff/80001/content/public/android/...
content/public/android/javatests/src/org/chromium/content/browser/BrowserStartupControllerTest.java:94:

There shouldn't be a blank line here.

https://codereview.chromium.org/2708243004/diff/80001/content/public/android/...
File
content/public/android/javatests/src/org/chromium/content/browser/ContentDetectionActivityTestRule.java
(right):

https://codereview.chromium.org/2708243004/diff/80001/content/public/android/...
content/public/android/javatests/src/org/chromium/content/browser/ContentDetectionActivityTestRule.java:64:
Log.d("#YOLAND", "called onIntentUrlReceived");
:)

I'm assuming that your intention was to remove these.

https://codereview.chromium.org/2708243004/diff/80001/content/public/android/...
File
content/public/android/javatests/src/org/chromium/content/browser/ContentViewLocationTest.java
(right):

https://codereview.chromium.org/2708243004/diff/80001/content/public/android/...
content/public/android/javatests/src/org/chromium/content/browser/ContentViewLocationTest.java:117:

No bonus line here.

[the real yoland, 2017-03-08 23:10:51]

Description was changed from

==========
Auto convert 40 content shell tests to JUnit4

This uses auto convert script to convert 39 content java instrumentation tests
(out of 50) in JUnit. It does require some
manual clean up at the end and 

BUG=640116
==========

to

==========
Auto convert content shell tests to JUnit4

This uses auto convert script to convert content instrumentation tests to
JUnit4,
assisted with some manual clean up. For more on JUnit4 migration, check
src/testing/android/docs/junit4.md 

BUG=640116
==========

[the real yoland, 2017-03-08 23:24:44]

Patchset #6 (id:100001) has been deleted

[the real yoland, 2017-03-08 23:30:16]

Patchset #6 (id:120001) has been deleted

[the real yoland, 2017-03-08 23:30:56]

The CQ bit was checked by yolandyan@chromium.org to run a CQ dry run

[the real yoland, 2017-03-08 23:31:21]

On 2017/03/01 at 23:02:46, boliu wrote:
> did this pass cq?

passes locally, dry running now

[commit-bot: I haz the power, 2017-03-08 23:31:35]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[the real yoland, 2017-03-08 23:35:31]

if the reviewers prefer to have smaller CLs, I can break this down by
directories.

Current patch of tests: I did not convert tests that are failing or contains
features that are still in landing(ReRunWithUpdatedContentView, CommandLine), I
also did not include any Ime test (autoscript can't handle non-ascii chars :/)

https://codereview.chromium.org/2708243004/diff/80001/content/public/android/...
File
content/public/android/javatests/src/org/chromium/content/browser/BrowserStartupControllerTest.java
(right):

https://codereview.chromium.org/2708243004/diff/80001/content/public/android/...
content/public/android/javatests/src/org/chromium/content/browser/BrowserStartupControllerTest.java:13:
import org.junit.Test;
On 2017/03/01 at 23:10:19, jbudorick wrote:
> import order?
> 
> I'm surprised this wasn't flagged either during the build or on upload.

Oops, my bad, I bypassed this one.
Fixed now

https://codereview.chromium.org/2708243004/diff/80001/content/public/android/...
content/public/android/javatests/src/org/chromium/content/browser/BrowserStartupControllerTest.java:94:

On 2017/03/01 at 23:10:19, jbudorick wrote:
> There shouldn't be a blank line here.

Done, fixed for all tests

https://codereview.chromium.org/2708243004/diff/80001/content/public/android/...
File
content/public/android/javatests/src/org/chromium/content/browser/ContentDetectionActivityTestRule.java
(right):

https://codereview.chromium.org/2708243004/diff/80001/content/public/android/...
content/public/android/javatests/src/org/chromium/content/browser/ContentDetectionActivityTestRule.java:64:
Log.d("#YOLAND", "called onIntentUrlReceived");
On 2017/03/01 at 23:10:19, jbudorick wrote:
> :)
> 
> I'm assuming that your intention was to remove these.

lol, just did
Done

https://codereview.chromium.org/2708243004/diff/80001/content/public/android/...
File
content/public/android/javatests/src/org/chromium/content/browser/ContentViewLocationTest.java
(right):

https://codereview.chromium.org/2708243004/diff/80001/content/public/android/...
content/public/android/javatests/src/org/chromium/content/browser/ContentViewLocationTest.java:117:

On 2017/03/01 at 23:10:19, jbudorick wrote:
> No bonus line here.

Done

[the real yoland, 2017-03-08 23:39:03]

https://codereview.chromium.org/2708243004/diff/140001/content/public/android...
File
content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeArrayCoercionTest.java
(right):

https://codereview.chromium.org/2708243004/diff/140001/content/public/android...
content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeArrayCoercionTest.java:33:
private static final double ASSERTION_DELTA = 0.00000001;
Set ASSERTION_DELTA to be 0.00000001 for no particular reason.

https://codereview.chromium.org/2708243004/diff/140001/content/public/android...
File
content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeCoercionTest.java
(right):

https://codereview.chromium.org/2708243004/diff/140001/content/public/android...
content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeCoercionTest.java:39:
private static final double ASSERTION_DELTA = 0.00000001;
Set ASSERTION_DELTA to be 0.00000001 for no particular reason.

https://codereview.chromium.org/2708243004/diff/140001/content/public/android...
File
content/public/android/javatests/src/org/chromium/content/browser/input/CursorAnchorInfoControllerTest.java
(right):

https://codereview.chromium.org/2708243004/diff/140001/content/public/android...
content/public/android/javatests/src/org/chromium/content/browser/input/CursorAnchorInfoControllerTest.java:33:
private static final double ASSERTION_DELTA = 0.00000001;
Set ASSERTION_DELTA to be 0.00000001 for no particular reason.

https://codereview.chromium.org/2708243004/diff/140001/content/public/android...
File
content/public/android/javatests/src/org/chromium/content/browser/input/InputDialogContainerTest.java
(right):

https://codereview.chromium.org/2708243004/diff/140001/content/public/android...
content/public/android/javatests/src/org/chromium/content/browser/input/InputDialogContainerTest.java:38:
private static final double ASSERTION_DELTA = 0.00000001;
Set ASSERTION_DELTA to be 0.00000001 for no particular reason.

[the real yoland, 2017-03-09 00:12:38]

The CQ bit was checked by yolandyan@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-03-09 00:13:30]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-03-09 01:57:36]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-03-09 01:57:37]

Dry run: Try jobs failed on following builders:
  linux_android_rel_ng on master.tryserver.chromium.android (JOB_FAILED,
https://build.chromium.org/p/tryserver.chromium.android/builders/linux_androi...)

[the real yoland, 2017-03-09 15:53:53]

Patchset #7 (id:160001) has been deleted

[the real yoland, 2017-03-09 15:54:00]

The CQ bit was checked by yolandyan@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-03-09 15:54:24]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-03-09 15:57:19]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-03-09 15:57:20]

Dry run: Try jobs failed on following builders:
  ios-device on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-device/builds...)
  ios-device-xcode-clang on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-device-xcode-...)
  mac_chromium_compile_dbg_ng on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_comp...)

[the real yoland, 2017-03-09 16:17:58]

The CQ bit was checked by yolandyan@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-03-09 16:18:40]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-03-09 16:30:04]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-03-09 16:30:05]

Dry run: Try jobs failed on following builders:
  android_arm64_dbg_recipe on master.tryserver.chromium.android (JOB_FAILED,
https://build.chromium.org/p/tryserver.chromium.android/builders/android_arm6...)
  android_compile_dbg on master.tryserver.chromium.android (JOB_FAILED,
https://build.chromium.org/p/tryserver.chromium.android/builders/android_comp...)
  android_n5x_swarming_rel on master.tryserver.chromium.android (JOB_FAILED,
https://build.chromium.org/p/tryserver.chromium.android/builders/android_n5x_...)

[the real yoland, 2017-03-09 17:40:06]

Patchset #8 (id:200001) has been deleted

[the real yoland, 2017-03-09 17:40:13]

The CQ bit was checked by yolandyan@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-03-09 17:40:36]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-03-09 17:57:49]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-03-09 17:57:54]

Dry run: This issue passed the CQ dry run.

[the real yoland, 2017-03-09 18:26:38]

ughh, please ignore the win10 bot, it's broken
(https://build.chromium.org/p/tryserver.chromium.win/builders/win10_chromium_x...)

[boliu, 2017-03-10 18:32:33]

https://codereview.chromium.org/2708243004/diff/210001/content/public/android...
File
content/public/android/javatests/src/org/chromium/content/browser/BrowserStartupControllerTest.java
(right):

https://codereview.chromium.org/2708243004/diff/210001/content/public/android...
content/public/android/javatests/src/org/chromium/content/browser/BrowserStartupControllerTest.java:1:
// Copyright 2017 The Chromium Authors. All rights reserved.
don't modify date

https://codereview.chromium.org/2708243004/diff/210001/content/public/android...
File
content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeArrayCoercionTest.java
(right):

https://codereview.chromium.org/2708243004/diff/210001/content/public/android...
content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeArrayCoercionTest.java:33:
private static final double ASSERTION_DELTA = 0.00000001;
afaict, previous code effectively has the delta as 0, so should keep that unless
it actually cause a failure.

also avoid promoting float to double

https://codereview.chromium.org/2708243004/diff/210001/content/public/android...
File
content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeBasicsTest.java
(right):

https://codereview.chromium.org/2708243004/diff/210001/content/public/android...
content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeBasicsTest.java:184:

remove this empty line change

https://codereview.chromium.org/2708243004/diff/210001/content/public/android...
File
content/public/android/javatests/src/org/chromium/content/browser/webcontents/WebContentsTest.java
(right):

https://codereview.chromium.org/2708243004/diff/210001/content/public/android...
content/public/android/javatests/src/org/chromium/content/browser/webcontents/WebContentsTest.java:340:
public void testWebContentsMainFrame() throws InterruptedException {
this needs a rebase.. depending on timing of when
https://codereview.chromium.org/2681933002/ lands again

[the real yoland, 2017-03-10 19:31:59]

https://codereview.chromium.org/2708243004/diff/210001/content/public/android...
File
content/public/android/javatests/src/org/chromium/content/browser/BrowserStartupControllerTest.java
(right):

https://codereview.chromium.org/2708243004/diff/210001/content/public/android...
content/public/android/javatests/src/org/chromium/content/browser/BrowserStartupControllerTest.java:1:
// Copyright 2017 The Chromium Authors. All rights reserved.
On 2017/03/10 at 18:32:32, boliu wrote:
> don't modify date

Done

https://codereview.chromium.org/2708243004/diff/210001/content/public/android...
File
content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeArrayCoercionTest.java
(right):

https://codereview.chromium.org/2708243004/diff/210001/content/public/android...
content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeArrayCoercionTest.java:33:
private static final double ASSERTION_DELTA = 0.00000001;
On 2017/03/10 at 18:32:32, boliu wrote:
> afaict, previous code effectively has the delta as 0, so should keep that
unless it actually cause a failure.
> 
> also avoid promoting float to double

Changed to 0

float is always promoted to double in JUnit4 assertEquals
http://junit.sourceforge.net/javadoc/org/junit/Assert.html

https://codereview.chromium.org/2708243004/diff/210001/content/public/android...
File
content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeBasicsTest.java
(right):

https://codereview.chromium.org/2708243004/diff/210001/content/public/android...
content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeBasicsTest.java:184:

On 2017/03/10 at 18:32:32, boliu wrote:
> remove this empty line change

Done

https://codereview.chromium.org/2708243004/diff/210001/content/public/android...
File
content/public/android/javatests/src/org/chromium/content/browser/webcontents/WebContentsTest.java
(right):

https://codereview.chromium.org/2708243004/diff/210001/content/public/android...
content/public/android/javatests/src/org/chromium/content/browser/webcontents/WebContentsTest.java:340:
public void testWebContentsMainFrame() throws InterruptedException {
On 2017/03/10 at 18:32:32, boliu wrote:
> this needs a rebase.. depending on timing of when
https://codereview.chromium.org/2681933002/ lands again

Will do

[the real yoland, 2017-03-10 19:32:03]

The CQ bit was checked by yolandyan@chromium.org to run a CQ dry run

[the real yoland, 2017-03-10 19:32:39]

The CQ bit was unchecked by yolandyan@chromium.org

[boliu, 2017-03-10 19:36:11]

lgtm

https://codereview.chromium.org/2708243004/diff/210001/content/public/android...
File
content/public/android/javatests/src/org/chromium/content/browser/webcontents/WebContentsTest.java
(right):

https://codereview.chromium.org/2708243004/diff/210001/content/public/android...
content/public/android/javatests/src/org/chromium/content/browser/webcontents/WebContentsTest.java:340:
public void testWebContentsMainFrame() throws InterruptedException {
On 2017/03/10 19:31:58, the real yoland wrote:
> On 2017/03/10 at 18:32:32, boliu wrote:
> > this needs a rebase.. depending on timing of when
> https://codereview.chromium.org/2681933002/ lands again
> 
> Will do

That CL just got cq-ed again, so guess you have to wait a bit..

[the real yoland, 2017-03-10 23:25:50]

On 2017/03/10 at 19:36:11, boliu wrote:
> lgtm
> 
>
https://codereview.chromium.org/2708243004/diff/210001/content/public/android...
> File
content/public/android/javatests/src/org/chromium/content/browser/webcontents/WebContentsTest.java
(right):
> 
>
https://codereview.chromium.org/2708243004/diff/210001/content/public/android...
>
content/public/android/javatests/src/org/chromium/content/browser/webcontents/WebContentsTest.java:340:
public void testWebContentsMainFrame() throws InterruptedException {
> On 2017/03/10 19:31:58, the real yoland wrote:
> > On 2017/03/10 at 18:32:32, boliu wrote:
> > > this needs a rebase.. depending on timing of when
> > https://codereview.chromium.org/2681933002/ lands again
> > 
> > Will do
> 
> That CL just got cq-ed again, so guess you have to wait a bit..

Done

[the real yoland, 2017-03-10 23:25:57]

The CQ bit was checked by yolandyan@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-03-10 23:26:29]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-03-10 23:45:18]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-03-10 23:45:20]

Dry run: This issue passed the CQ dry run.

[the real yoland, 2017-03-11 00:16:32]

The CQ bit was checked by yolandyan@chromium.org

[the real yoland, 2017-03-11 00:16:33]

The patchset sent to the CQ was uploaded after l-g-t-m from boliu@chromium.org
Link to the patchset: https://codereview.chromium.org/2708243004/#ps250001
(title: "rebase")

[commit-bot: I haz the power, 2017-03-11 00:17:15]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-03-11 00:22:52]

CQ is committing da patch.

Bot data: {"patchset_id": 250001, "attempt_start_ts": 1489191392405830,
"parent_rev": "fead74a8e3d55044bc89fe96500275a0b5e3f24c", "commit_rev":
"2c657c64afced7163d245119597842025d4975cc"}

[commit-bot: I haz the power, 2017-03-11 00:23:28]

Description was changed from

==========
Auto convert content shell tests to JUnit4

This uses auto convert script to convert content instrumentation tests to
JUnit4,
assisted with some manual clean up. For more on JUnit4 migration, check
src/testing/android/docs/junit4.md 

BUG=640116
==========

to

==========
Auto convert content shell tests to JUnit4

This uses auto convert script to convert content instrumentation tests to
JUnit4,
assisted with some manual clean up. For more on JUnit4 migration, check
src/testing/android/docs/junit4.md 

BUG=640116

Review-Url: https://codereview.chromium.org/2708243004
Cr-Commit-Position: refs/heads/master@{#456227}
Committed:
https://chromium.googlesource.com/chromium/src/+/2c657c64afced7163d2451195978...
==========

[commit-bot: I haz the power, 2017-03-11 00:23:30]

Committed patchset #10 (id:250001) as
https://chromium.googlesource.com/chromium/src/+/2c657c64afced7163d2451195978...