Align handling of ParameterizedTest annotations in Java and Python code

Align handling of ParameterizedTest annotations in Java and Python code

The following rules are applied:

  -- all annotations are merged down starting from the topmost superclass and
     finally updated with method annotations (thus, method annotations override
     class annotations);

  -- if the test method ends up having both @ParameterizedTest.Set and
     @ParameterizedTest annotations, the set "wins" (but that also means, if the
     method has defined @ParameterizedTest on itself, but there is
     @ParameterizedTest.Set coming from the class, the latter "wins", as the
     method receives both annotations due to the first rule).

BUG=526885
Committed: https://crrev.com/ee07229c554d9e028c60df336cc6792a426eee64
Cr-Commit-Position: refs/heads/master@{#360158}

[mnaganov (inactive), 2015-11-11 17:41:48]

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

[mnaganov (inactive), 2015-11-11 17:41:49]

Hi John,

Please take a look whether the proposed set of rules makes sense to you.

[jbudorick, 2015-11-16 14:40:34]

lgtm w/ nit

https://codereview.chromium.org/1422433007/diff/1/base/test/android/javatests...
File
base/test/android/javatests/src/org/chromium/base/test/util/parameter/Parameter.java
(right):

https://codereview.chromium.org/1422433007/diff/1/base/test/android/javatests...
base/test/android/javatests/src/org/chromium/base/test/util/parameter/Parameter.java:91:
} else if (mAnnotatedTestMethod.isAnnotationPresent(ParameterizedTest.class)) {
nit: this looks a bit more consistent if it's not structured as an else if.
you'd instead have

if (method is annotated) {}
findClassWithAnnotation()
if (class is annotated) {}

for both ParameterizedTest.Set and ParameterizedTest.

[mnaganov (inactive), 2015-11-16 16:53:47]

https://codereview.chromium.org/1422433007/diff/1/base/test/android/javatests...
File
base/test/android/javatests/src/org/chromium/base/test/util/parameter/Parameter.java
(right):

https://codereview.chromium.org/1422433007/diff/1/base/test/android/javatests...
base/test/android/javatests/src/org/chromium/base/test/util/parameter/Parameter.java:91:
} else if (mAnnotatedTestMethod.isAnnotationPresent(ParameterizedTest.class)) {
On 2015/11/16 14:40:34, jbudorick wrote:
> nit: this looks a bit more consistent if it's not structured as an else if.
> you'd instead have
> 
> if (method is annotated) {}
> findClassWithAnnotation()
> if (class is annotated) {}
> 
> for both ParameterizedTest.Set and ParameterizedTest.

Done.

[mnaganov (inactive), 2015-11-16 16:54:18]

mnaganov@chromium.org changed reviewers:
+ nyquist@chromium.org

[mnaganov (inactive), 2015-11-16 16:54:18]

Hi Tommy,

Can you please take a look at the changes?

[nyquist, 2015-11-17 19:30:38]

lgtm

[mnaganov (inactive), 2015-11-17 19:31:09]

The CQ bit was checked by mnaganov@chromium.org

[mnaganov (inactive), 2015-11-17 19:31:09]

The patchset sent to the CQ was uploaded after l-g-t-m from
jbudorick@chromium.org
Link to the patchset: https://codereview.chromium.org/1422433007/#ps20001
(title: "Comments addressed")

[commit-bot: I haz the power, 2015-11-17 19:32:51]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1422433007/20001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1422433007/20001

[commit-bot: I haz the power, 2015-11-17 20:57:32]

Committed patchset #2 (id:20001)

[commit-bot: I haz the power, 2015-11-17 20:58:27]

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