[Android log] Fix presubmit check reports in base package

The presubmit check stop warning about Log calls from classes in the
org.chromium.base package.

Also does some refactoring to simplify logging related checks

BUG=498171

Review URL: https://codereview.chromium.org/1183493002

Cr-Commit-Position: refs/heads/master@{#334135}

1 files changed, 20 insertions, 27 deletions

diff --git a/PRESUBMIT_test.py b/PRESUBMIT_test.py
index 613fd41..e0de967 100755
--- a/PRESUBMIT_test.py
+++ b/PRESUBMIT_test.py
@@ -821,7 +821,7 @@ class UserMetricsActionTest(unittest.TestCase):
 
 class LogUsageTest(unittest.TestCase):
 
-  def testCheckNoNewUtilLogUsage(self):
+  def testCheckAndroidCrLogUsage(self):
     mock_input_api = MockInputApi()
     mock_output_api = MockOutputApi()
 
@@ -829,44 +829,33 @@ class LogUsageTest(unittest.TestCase):
       MockAffectedFile('RandomStuff.java', [
         'random stuff'
       ]),
-      MockAffectedFile('HasCrLog.java', [
-        'import org.chromium.base.Log;',
-        'some random stuff',
-        'Log.d("TAG", "foo");',
-      ]),
       MockAffectedFile('HasAndroidLog.java', [
         'import android.util.Log;',
         'some random stuff',
         'Log.d("TAG", "foo");',
       ]),
-      MockAffectedFile('HasExplicitLog.java', [
+      MockAffectedFile('HasExplicitUtilLog.java', [
         'some random stuff',
         'android.util.Log.d("TAG", "foo");',
       ]),
+      MockAffectedFile('IsInBasePackage.java', [
+        'package org.chromium.base;',
+        'private static final String TAG = "cr.Foo";',
+        'Log.d(TAG, "foo");',
+      ]),
+      MockAffectedFile('IsInBasePackageButImportsLog.java', [
+        'package org.chromium.base;',
+        'import android.util.Log;',
+        'private static final String TAG = "cr.Foo";',
+        'Log.d(TAG, "foo");',
+      ]),
       MockAffectedFile('HasBothLog.java', [
         'import org.chromium.base.Log;',
         'some random stuff',
-        'Log.d("TAG", "foo");',
+        'private static final String TAG = "cr.Foo";',
+        'Log.d(TAG, "foo");',
         'android.util.Log.d("TAG", "foo");',
       ]),
-    ]
-
-    warnings = PRESUBMIT._CheckNoNewUtilLogUsage(
-        mock_input_api, mock_output_api)
-
-    self.assertEqual(1, len(warnings))
-    self.assertEqual(2, len(warnings[0].items))
-    self.assertTrue('HasAndroidLog.java' in warnings[0].items[0])
-    self.assertTrue('HasExplicitLog.java' in warnings[0].items[1])
-
-  def testCheckAndroidCrLogUsage(self):
-    mock_input_api = MockInputApi()
-    mock_output_api = MockOutputApi()
-
-    mock_input_api.files = [
-      MockAffectedFile('RandomStuff.java', [
-        'random stuff'
-      ]),
       MockAffectedFile('HasCorrectTag.java', [
         'import org.chromium.base.Log;',
         'some random stuff',
@@ -913,7 +902,7 @@ class LogUsageTest(unittest.TestCase):
     msgs = PRESUBMIT._CheckAndroidCrLogUsage(
         mock_input_api, mock_output_api)
 
-    self.assertEqual(3, len(msgs))
+    self.assertEqual(4, len(msgs))
 
     # Declaration format
     self.assertEqual(3, len(msgs[0].items))
@@ -929,6 +918,10 @@ class LogUsageTest(unittest.TestCase):
     self.assertEqual(1, len(msgs[2].items))
     self.assertTrue('HasInlineTag.java:4' in msgs[2].items)
 
+    # Util Log usage
+    self.assertEqual(2, len(msgs[3].items))
+    self.assertTrue('HasAndroidLog.java:3' in msgs[3].items)
+    self.assertTrue('IsInBasePackageButImportsLog.java:4' in msgs[3].items)
 
 
 if __name__ == '__main__':