Android: split golden content from jni_generator_tests.

Android: split golden content from jni_generator_tests.

Rather than intermix the generated golden files with the test script,
extract in separate files.
Also, if "REBASELINE" environment variable is set, it'll re-generate the
golden scripts, to it's much simpler to do changes in the generator itself.
Note: there are NO functional changes in the generator itself, only in the tests.

BUG=

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=237947

[bulach, 2013-11-29 12:26:03]

ptal

[Sami, 2013-11-29 13:24:41]

Thanks, this makes the tests a lot more maintainable.

https://codereview.chromium.org/96523004/diff/1/base/android/jni_generator/jn...
File base/android/jni_generator/jni_generator_tests.py (right):

https://codereview.chromium.org/96523004/diff/1/base/android/jni_generator/jn...
base/android/jni_generator/jni_generator_tests.py:68: if
os.environ.get('REBASELINE'):
Instead of reading the environment all over the place could we just check if
golden_file is truthy and then write to it? Alternatively this could be in a
catch block in assertGoldenTextEquals.

https://codereview.chromium.org/96523004/diff/1/base/android/jni_generator/jn...
base/android/jni_generator/jni_generator_tests.py:72: print 'Run with: '
nit: no space before closing quote.

https://codereview.chromium.org/96523004/diff/1/base/android/jni_generator/jn...
base/android/jni_generator/jni_generator_tests.py:73: print 'REBASELINE=1 ',
sys.argv[0]
ditto

https://codereview.chromium.org/96523004/diff/1/base/android/jni_generator/jn...
base/android/jni_generator/jni_generator_tests.py:79: caller =
inspect.stack()[1][3]
Clever :)

[bulach, 2013-11-29 13:58:23]

thanks sami! another look please?

https://codereview.chromium.org/96523004/diff/1/base/android/jni_generator/jn...
File base/android/jni_generator/jni_generator_tests.py (right):

https://codereview.chromium.org/96523004/diff/1/base/android/jni_generator/jn...
base/android/jni_generator/jni_generator_tests.py:68: if
os.environ.get('REBASELINE'):
On 2013/11/29 13:24:41, Sami wrote:
> Instead of reading the environment all over the place could we just check if
> golden_file is truthy and then write to it? Alternatively this could be in a
> catch block in assertGoldenTextEquals.

I'm not sure I fully understood, but.. :)
yeah, simplified it a bit so it's reading the environment in one place and
writing to the golden file if needed..
I don't want to do this unconditionally as it'd mess up with bots and people's
checkout, so it really requires an "extra effort" to rebaseline..

https://codereview.chromium.org/96523004/diff/1/base/android/jni_generator/jn...
base/android/jni_generator/jni_generator_tests.py:72: print 'Run with: '
On 2013/11/29 13:24:41, Sami wrote:
> nit: no space before closing quote.

Done.

https://codereview.chromium.org/96523004/diff/1/base/android/jni_generator/jn...
base/android/jni_generator/jni_generator_tests.py:73: print 'REBASELINE=1 ',
sys.argv[0]
On 2013/11/29 13:24:41, Sami wrote:
> ditto

Done.

https://codereview.chromium.org/96523004/diff/1/base/android/jni_generator/jn...
base/android/jni_generator/jni_generator_tests.py:79: caller =
inspect.stack()[1][3]
On 2013/11/29 13:24:41, Sami wrote:
> Clever :)

:)

[Sami, 2013-11-29 14:22:15]

Yes, this is exactly what I was after even if I failed to explain it :) lgtm!

[commit-bot: I haz the power, 2013-11-29 14:29:34]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/bulach@chromium.org/96523004/40001

[commit-bot: I haz the power, 2013-11-29 20:11:26]

Change committed as 237947