commit b8a66a00b10aa9e6fef8e10924effea6e36a3586
author Sam Maier <smaier@chromium.org> Tue Oct 10 13:50:55 2023
committer Chromium LUCI CQ <chromium-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Oct 10 13:50:55 2023
tree 89dde54a83f7228e33a80d75c709c878fe0e1941
parent 97613a30b623fab8da9c7ac9f72f867e692b35c0

Fixing @Mock Presubmit with new Java formatting

Bug: 1490300
Change-Id: I823ea1cecb4e0da0b92c07ff896453f970f229c0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4918411
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Auto-Submit: Sam Maier <smaier@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1207619}

PRESUBMIT_test.py

diff --git a/PRESUBMIT_test.py b/PRESUBMIT_test.py
index 010e8da..6db23638 100755
--- a/PRESUBMIT_test.py
+++ b/PRESUBMIT_test.py
@@ -4914,8 +4914,7 @@
             MockFile('path/OneTest.java', [
                 'import a.b.c.Bar;',
                 'import a.b.c.Foo;',
-                '@Mock',
-                'public static Foo f = new Foo();',
+                '@Mock public static Foo f = new Foo();',
                 'Mockito.mock(new Bar(a, b, c))'
             ]),
             MockFile('path/TwoTest.java', [
@@ -4964,7 +4963,8 @@
                 'package a.b.c;',
                 '@Mock',
                 'public static Baz<abc> b;',
-                'Mockito.mock(Baz.class)']),
+                'Mockito.mock(Baz.class)'
+            ]),
             MockFile('path/SixTest.java', [
                 'package a.b.c;',
                 'import android.view.View;',
@@ -4972,6 +4972,16 @@
                 'Mockito.spy(new View())',
                 'Mockito.mock(ArrayList.class)'
             ]),
+            MockFile('path/SevenTest.java', [
+                'package a.b.c;',
+                '@Mock private static Seven s;',
+                'Mockito.mock(Seven.class)'
+            ]),
+            MockFile('path/EightTest.java', [
+                'package a.b.c;',
+                '@Spy Eight e = new Eight2();',
+                'Mockito.py(new Eight())'
+            ]),
         ]
         errors = PRESUBMIT.CheckMockAnnotation(mock_input, MockOutputApi())
         self.assertEqual(0, len(errors))