Align handling of ParameterizedTest annotations in Java and Python code

build/android/pylib/instrumentation/instrumentation_test_instance.py

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import collections
 import copy
 import logging
 import os
 import pickle
 import re
@@ skipping 145 matching lines @@
     "--flag-to-add" added to command-line, the second time with
     "--flag-to-remove" to be removed from command-line, and the third time
     with default command-line args. If the same flag is listed both for adding
     and for removing, it is left unchanged.
 
     If the test is not parametrized, returns None.
 
   """
   ParamsTuple = collections.namedtuple('ParamsTuple', ['add', 'remove'])
   parameterized_tests = []
-  if _PARAMETERIZED_TEST_ANNOTATION in annotations:
-    parameterized_tests = [annotations[_PARAMETERIZED_TEST_ANNOTATION]]
-  elif _PARAMETERIZED_TEST_SET_ANNOTATION in annotations:
+  if _PARAMETERIZED_TEST_SET_ANNOTATION in annotations:
     if annotations[_PARAMETERIZED_TEST_SET_ANNOTATION]:
       parameterized_tests = annotations[
         _PARAMETERIZED_TEST_SET_ANNOTATION].get('tests', [])
+  elif _PARAMETERIZED_TEST_ANNOTATION in annotations:
+    parameterized_tests = [annotations[_PARAMETERIZED_TEST_ANNOTATION]]
   else:
     return None
 
   result = []
   for pt in parameterized_tests:
     if not pt:
       continue
     for p in pt['parameters']:
       if p['tag'] == _COMMAND_LINE_PARAMETER:
         to_add = []
@@ skipping 433 matching lines @@
   def GenerateTestResults(
       result_code, result_bundle, statuses, start_ms, duration_ms):
     return GenerateTestResults(result_code, result_bundle, statuses,
                                start_ms, duration_ms)
 
   #override
   def TearDown(self):
     if self._isolate_delegate:
       self._isolate_delegate.Clear()