commit 4500147d14161f91d3f39f1ad4ae878ea729e5c1
author yolandyan <yolandyan@chromium.org> Wed Dec 21 21:12:42 2016
committer Commit bot <commit-bot@chromium.org> Wed Dec 21 21:16:27 2016
tree fe99ef15cc84ca07f1d7f8733221cfa42c147cd8
parent 606e53489b319ad2354e496da7ffd0dee732d6e4

Replace deprecated Android java test annotations

Previous SmallTest, MediumTest, and LargeTest annotations have been
deprecated since level 24, since our test runner only uses these
annotations' names, instead of package names, to identify tests,
We can first replace these annotations

BUG=673824, 640116
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.android:android_cronet_tester
TBR=bengr@chromium.org,boliu@chromium.org,joedow@chromium.org, mariakhomenko@chromium.org,maxbogue@chromium.org, mikecase@chromium.org, msarda@chromium.org,nyquist@chromium.org,sgurun@chromium.org,tedchoc@chromium.org, xunjieli@chromium.org,yzshen@chromium.org,phajdan.jr@chromium.org,timvolodine@chromium.org

Review-Url: https://codereview.chromium.org/2583933003
Cr-Commit-Position: refs/heads/master@{#440211}

PRESUBMIT_test.py

diff --git a/PRESUBMIT_test.py b/PRESUBMIT_test.py
index 34da837..1b5fd31 100755
--- a/PRESUBMIT_test.py
+++ b/PRESUBMIT_test.py
@@ -959,6 +959,53 @@
     self.assertTrue('File is stale' in str(results[1]))
 
 
+class AndroidDeprecatedTestAnnotationTest(unittest.TestCase):
+  def testCheckAndroidTestAnnotationUsage(self):
+    mock_input_api = MockInputApi()
+    mock_output_api = MockOutputApi()
+
+    mock_input_api.files = [
+        MockAffectedFile('LalaLand.java', [
+          'random stuff'
+        ]),
+        MockAffectedFile('CorrectUsage.java', [
+          'import android.support.test.filters.LargeTest;',
+          'import android.support.test.filters.MediumTest;',
+          'import android.support.test.filters.SmallTest;',
+        ]),
+        MockAffectedFile('UsedDeprecatedLargeTestAnnotation.java', [
+          'import android.test.suitebuilder.annotation.LargeTest;',
+        ]),
+        MockAffectedFile('UsedDeprecatedMediumTestAnnotation.java', [
+          'import android.test.suitebuilder.annotation.MediumTest;',
+        ]),
+        MockAffectedFile('UsedDeprecatedSmallTestAnnotation.java', [
+          'import android.test.suitebuilder.annotation.SmallTest;',
+        ]),
+        MockAffectedFile('UsedDeprecatedSmokeAnnotation.java', [
+          'import android.test.suitebuilder.annotation.Smoke;',
+        ])
+    ]
+    msgs = PRESUBMIT._CheckAndroidTestAnnotationUsage(
+        mock_input_api, mock_output_api)
+    self.assertEqual(1, len(msgs),
+                     'Expected %d items, found %d: %s'
+                     % (1, len(msgs), msgs))
+    self.assertEqual(4, len(msgs[0].items),
+                     'Expected %d items, found %d: %s'
+                     % (4, len(msgs[0].items), msgs[0].items))
+    self.assertTrue('UsedDeprecatedLargeTestAnnotation.java:1' in msgs[0].items,
+                    'UsedDeprecatedLargeTestAnnotation not found in errors')
+    self.assertTrue('UsedDeprecatedMediumTestAnnotation.java:1'
+                    in msgs[0].items,
+                    'UsedDeprecatedMediumTestAnnotation not found in errors')
+    self.assertTrue('UsedDeprecatedSmallTestAnnotation.java:1' in msgs[0].items,
+                    'UsedDeprecatedSmallTestAnnotation not found in errors')
+    self.assertTrue('UsedDeprecatedSmokeAnnotation.java:1' in msgs[0].items,
+                    'UsedDeprecatedSmokeAnnotation not found in errors')
+
+
+
 class LogUsageTest(unittest.TestCase):
 
   def testCheckAndroidCrLogUsage(self):