Pass template files explicitly to Robolectric template processor.

Pass template files explicitly to Robolectric template processor.

Previously, the template processor searched through a directory you
passed to it and looked for all .vm files. Changing it so you have
to explicitly pass the lits of .vm files to the template processor
script. Verified this will fix a problem with the WebRTC bots not
being able to find the template files.

Committed: https://crrev.com/c46e862757edc04c06b1bd88724d15a5807b84d1
Cr-Commit-Position: refs/heads/master@{#409687}

[mikecase (-- gone --), 2016-08-03 19:20:38]

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

[mikecase (-- gone --), 2016-08-03 19:20:39]

Think this should fix the issue on the WebRTC bot.

[mikecase (-- gone --), 2016-08-03 20:04:28]

https://codereview.chromium.org/2200413004/diff/20001/third_party/robolectric...
File
third_party/robolectric/template_processor/src/org/chromium/testing/robolectric/template/ProcessRobolectricTemplate.java
(left):

https://codereview.chromium.org/2200413004/diff/20001/third_party/robolectric...
third_party/robolectric/template_processor/src/org/chromium/testing/robolectric/template/ProcessRobolectricTemplate.java:58:
Files.walkFileTree(parser.getBaseTemplateDir(), new SimpleFileVisitor<Path>() {
This walkFileTree line isnt working on the WebRTC bot. It only ever visits the
file third_party/robolectric/ and nothing inside that. I have no idea why.

Anyway, this change is an improvement, because before the names of the input
template files and output files existed both in this file and in the BUILD.gn.
Now the BUILD.gn file just explicitly lists what the template files and output
files are through some arguments.

[mikecase (-- gone --), 2016-08-03 22:20:26]

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

[mikecase (-- gone --), 2016-08-03 22:20:26]

Verified that this fix works.

Yoland, if you have time to take a look at this, Im the owner for this code.

[jbudorick, 2016-08-03 22:24:03]

https://codereview.chromium.org/2200413004/diff/20001/third_party/robolectric...
File
third_party/robolectric/template_processor/src/org/chromium/testing/robolectric/template/ProcessRobolectricTemplate.java
(left):

https://codereview.chromium.org/2200413004/diff/20001/third_party/robolectric...
third_party/robolectric/template_processor/src/org/chromium/testing/robolectric/template/ProcessRobolectricTemplate.java:58:
Files.walkFileTree(parser.getBaseTemplateDir(), new SimpleFileVisitor<Path>() {
On 2016/08/03 20:04:27, mikecase wrote:
> This walkFileTree line isnt working on the WebRTC bot. It only ever visits the
> file third_party/robolectric/ and nothing inside that. I have no idea why.

Java version?

> 
> Anyway, this change is an improvement, because before the names of the input
> template files and output files existed both in this file and in the BUILD.gn.
> Now the BUILD.gn file just explicitly lists what the template files and output
> files are through some arguments.

https://codereview.chromium.org/2200413004/diff/20001/third_party/robolectric...
File
third_party/robolectric/template_processor/src/org/chromium/testing/robolectric/template/ProcessRobolectricTemplate.java
(right):

https://codereview.chromium.org/2200413004/diff/20001/third_party/robolectric...
third_party/robolectric/template_processor/src/org/chromium/testing/robolectric/template/ProcessRobolectricTemplate.java:65:
private static void processTemplate(VelocityContext context, Path templateFile,
Path outputFile, int api_level) throws IOException {
line length

https://codereview.chromium.org/2200413004/diff/20001/third_party/robolectric...
File
third_party/robolectric/template_processor/src/org/chromium/testing/robolectric/template/TemplateFileInfo.java
(right):

https://codereview.chromium.org/2200413004/diff/20001/third_party/robolectric...
third_party/robolectric/template_processor/src/org/chromium/testing/robolectric/template/TemplateFileInfo.java:14:
Path mOutputFile;
private

https://codereview.chromium.org/2200413004/diff/20001/third_party/robolectric...
third_party/robolectric/template_processor/src/org/chromium/testing/robolectric/template/TemplateFileInfo.java:15:
Path mTemplateFile;
private

[mikecase (-- gone --), 2016-08-03 22:29:29]

Description was changed from

==========
Pass template files explicitly to Robolectric template processor.

Previously, the template processor searched through a directory you
passed to it and looked for all .vm files. Changing it so you have
to explicitly pass the lits of .vm files to the template processor
script. Hopefully this will fix a problem with the WebRTC bots not
being able to find the template files.
==========

to

==========
Pass template files explicitly to Robolectric template processor.

Previously, the template processor searched through a directory you
passed to it and looked for all .vm files. Changing it so you have
to explicitly pass the lits of .vm files to the template processor
script. Verified this will fix a problem with the WebRTC bots not
being able to find the template files.
==========

[mikecase (-- gone --), 2016-08-03 22:29:55]

https://codereview.chromium.org/2200413004/diff/20001/third_party/robolectric...
File
third_party/robolectric/template_processor/src/org/chromium/testing/robolectric/template/ProcessRobolectricTemplate.java
(left):

https://codereview.chromium.org/2200413004/diff/20001/third_party/robolectric...
third_party/robolectric/template_processor/src/org/chromium/testing/robolectric/template/ProcessRobolectricTemplate.java:58:
Files.walkFileTree(parser.getBaseTemplateDir(), new SimpleFileVisitor<Path>() {
On 2016/08/03 at 22:24:03, jbudorick wrote:
> On 2016/08/03 20:04:27, mikecase wrote:
> > This walkFileTree line isnt working on the WebRTC bot. It only ever visits
the
> > file third_party/robolectric/ and nothing inside that. I have no idea why.
> 
> Java version?
> 
> > 
> > Anyway, this change is an improvement, because before the names of the input
> > template files and output files existed both in this file and in the
BUILD.gn.
> > Now the BUILD.gn file just explicitly lists what the template files and
output
> > files are through some arguments.

Maybe. Also, they mentioned they set up some symlinks in their build
0 lrwxrwxrwx 39 Aug  3 15:14 robolectric ->
../chromium/src/third_party/robolectric

Could also be a reason.

https://codereview.chromium.org/2200413004/diff/20001/third_party/robolectric...
File
third_party/robolectric/template_processor/src/org/chromium/testing/robolectric/template/ProcessRobolectricTemplate.java
(right):

https://codereview.chromium.org/2200413004/diff/20001/third_party/robolectric...
third_party/robolectric/template_processor/src/org/chromium/testing/robolectric/template/ProcessRobolectricTemplate.java:65:
private static void processTemplate(VelocityContext context, Path templateFile,
Path outputFile, int api_level) throws IOException {
On 2016/08/03 at 22:24:03, jbudorick wrote:
> line length

Done

https://codereview.chromium.org/2200413004/diff/20001/third_party/robolectric...
File
third_party/robolectric/template_processor/src/org/chromium/testing/robolectric/template/TemplateFileInfo.java
(right):

https://codereview.chromium.org/2200413004/diff/20001/third_party/robolectric...
third_party/robolectric/template_processor/src/org/chromium/testing/robolectric/template/TemplateFileInfo.java:15:
Path mTemplateFile;
made private

[the real yoland, 2016-08-03 23:12:01]

lgtm

[mikecase (-- gone --), 2016-08-03 23:17:09]

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

[commit-bot: I haz the power, 2016-08-03 23:17:37]

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, 2016-08-04 00:46:17]

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

[commit-bot: I haz the power, 2016-08-04 00:46:18]

Dry run: This issue passed the CQ dry run.

[mikecase (-- gone --), 2016-08-04 00:49:52]

The CQ bit was checked by mikecase@chromium.org

[commit-bot: I haz the power, 2016-08-04 00:50:31]

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, 2016-08-04 00:56:36]

Committed patchset #4 (id:60001)

[commit-bot: I haz the power, 2016-08-04 00:58:19]

Description was changed from

==========
Pass template files explicitly to Robolectric template processor.

Previously, the template processor searched through a directory you
passed to it and looked for all .vm files. Changing it so you have
to explicitly pass the lits of .vm files to the template processor
script. Verified this will fix a problem with the WebRTC bots not
being able to find the template files.
==========

to

==========
Pass template files explicitly to Robolectric template processor.

Previously, the template processor searched through a directory you
passed to it and looked for all .vm files. Changing it so you have
to explicitly pass the lits of .vm files to the template processor
script. Verified this will fix a problem with the WebRTC bots not
being able to find the template files.

Committed: https://crrev.com/c46e862757edc04c06b1bd88724d15a5807b84d1
Cr-Commit-Position: refs/heads/master@{#409687}
==========

[commit-bot: I haz the power, 2016-08-04 00:58:20]

Patchset 4 (id:??) landed as
https://crrev.com/c46e862757edc04c06b1bd88724d15a5807b84d1
Cr-Commit-Position: refs/heads/master@{#409687}