0

JNI Zero: JniMocker -> setInstanceForTesting() (replace uses)

Mostly a scripted change:
data = re.sub(r'^import .*\.JniMocker;\n', '', data, flags=re.MULTILINE)
data = re.sub(r'^.*@Rule\s+.*JniMocker (\w+) =\s*new JniMocker\(\);\n', '', data, flags=re.MULTILINE)
data = re.sub(r'\w+\.mock\(\s*(.+)\.TEST_HOOKS,\s*([^)]+)\)', r'\1.setInstanceForTesting(\2)', data)
data = re.sub(r'(\w+Jni)\.TEST_HOOKS\.setInstanceForTesting', r'\1.setInstanceForTesting', data)

Bug: 329069277
Change-Id: I5382f07d641f0f211f03b2f3d9cc219990226a33
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6020725
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Owners-Override: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1383714}
This commit is contained in:
Andrew Grieve
2024-11-15 18:30:42 +00:00
committed by Chromium LUCI CQ
parent 6b0c9b491a
commit b35b169c63
396 changed files with 583 additions and 1727 deletions
android_webview/junit/src/org/chromium/android_webview/robolectric/nonembedded
base/android/junit/src/org/chromium/base
chrome
android
features
java
javatests
src
org
chromium
chrome
browser
app
autofill
bookmarks
browserservices
browsing_data
contextmenu
contextualsearch
customtabs
device_dialog
download
firstrun
media
metrics
ntp
omnibox
page_info
privacy
read_later
search_engines
searchwidget
settings
signin
site_settings
sync
tab
tabbed_mode
toolbar
usage_stats
webauth
junit
src
org
chromium
chrome
browser
about_settings
app
autofill
background_sync
background_task_scheduler
backup
bookmarks
browserservices
compositor
contextmenu
contextualsearch
customtabs
desktop_site
dom_distiller
download
feed
history
media
metrics
multiwindow
notifications
ntp
offlinepages
partnerbookmarks
password_manager
payments
privacy
privacy_sandbox
search_engines
searchwidget
share
signin
suggestions
supervised_user
survey
tab
tabbed_mode
tabmodel
tasks
toolbar
ui
webapps
webauthn
browser
android
browserservices
verification
java
src
org
chromium
chrome
browser
browserservices
cookies
java
src
org
chromium
chrome
customtabs
branding
java
src
org
chromium
chrome
browser
httpclient
java
src
org
chromium
chrome
browser
autofill
android
javatest
src
org
chromium
chrome
browser
junit
src
org
chromium
chrome
auxiliary_search
commerce
creator
data_sharing
android
java
src
org
chromium
chrome
download
android
java
src
org
chromium
internal
android
java
src
educational_tip
junit
src
org
chromium
chrome
enterprise
util
android
java
src
org
chromium
chrome
browser
feed
image_descriptions
android
java
incognito
android
java
src
org
chromium
chrome
language
android
mandatory_reauth
android
internal
java
src
org
chromium
optimization_guide
android
java
javatests
src
org
chromium
chrome
page_image_service
android
junit
src
org
chromium
chrome
browser
password_check
android
javatests
src
org
chromium
chrome
password_manager
android
account_storage_notice
javatests
src
org
chromium
chrome
browser
password_manager
add_username_dialog
java
src
org
chromium
chrome
browser
grouped_affiliations
java
src
org
chromium
chrome
java
junit
pwd_check_wrapper
java
src
org
chromium
chrome
pwd_migration
payments
android
java
src
org
chromium
privacy_guide
privacy_sandbox
quick_delete
android
javatests
src
org
chromium
chrome
readaloud
recent_tabs
safety_check
android
javatests
safety_hub
search_resumption
share
signin
services
android
java
src
org
chromium
chrome
browser
junit
src
org
single_tab
android
junit
src
org
chromium
supervised_user
android
javatests
src
org
chromium
chrome
browser
tab_group_sync
android
tab_resumption
junit
src
org
chromium
chrome
tab_ui
android
junit
src
org
chromium
tabmodel
touch_to_fill
password_manager
android
junit
src
org
chromium
chrome
browser
no_passkeys
internal
android
java
src
org
chromium
chrome
browser
touch_to_fill
password_generation
android
internal
java
src
org
chromium
chrome
browser
touch_to_fill
translate
ui
android
autofill
edge_to_edge
internal
junit
src
org
chromium
chrome
hats
internal
logo
java
management
java
src
org
chromium
chrome
browser
night_mode
omnibox
plus_addresses
junit
src
org
chromium
chrome
signin
toolbar
wallet
android
javatests
src
org
chromium
test
android
javatests
src
org
chromium
chrome
components
android_autofill
browser
junit
src
org
chromium
components
browser_ui
accessibility
android
java
site_settings
android
javatests
src
org
chromium
junit
src
org
data_sharing
internal
android
java
src
org
chromium
download
network
android
junit
src
org
chromium
facilitated_payments
android
junit
src
org
chromium
image_fetcher
android
junit
src
org
chromium
components
installedapp
android
java
src
org
chromium
components
messages
android
java
src
org
chromium
components
payments
content
policy
android
prefs
android
java
src
org
chromium
components
privacy_sandbox
android
javatests
src
org
chromium
components
segmentation_platform
public
android
java
src
org
chromium
signin
public
android
java
src
org
chromium
components
subresource_filter
android
java
src
org
chromium
components
subresource_filter
translate
content
android
ukm
android
javatests
src
org
chromium
webapps
webauthn
content/public/android/junit/src/org/chromium/content/browser
net/android/junit/src/org/chromium/net
ui/android
url/android
java
src
org
chromium
javatests
src
org

@ -12,7 +12,6 @@ import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.verify;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@ -20,7 +19,6 @@ import org.mockito.MockitoAnnotations;
import org.robolectric.annotation.Config;
import org.chromium.base.test.BaseRobolectricTestRunner;
import org.chromium.base.test.util.JniMocker;
/** Unit tests for {@link PrefService}. */
@RunWith(BaseRobolectricTestRunner.class)
@ -28,8 +26,6 @@ import org.chromium.base.test.util.JniMocker;
public class PrefServiceTest {
private static final String PREF = "42";
private static final long NATIVE_HANDLE = 117;
@Rule public JniMocker mocker = new JniMocker();
@Mock private PrefService.Natives mNativeMock;
PrefService mPrefService;
@ -37,7 +33,7 @@ public class PrefServiceTest {
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mocker.mock(PrefServiceJni.TEST_HOOKS, mNativeMock);
PrefServiceJni.setInstanceForTesting(mNativeMock);
mPrefService = new PrefService(NATIVE_HANDLE);
}