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:

committed by
Chromium LUCI CQ

parent
6b0c9b491a
commit
b35b169c63
android_webview/junit/src/org/chromium/android_webview/robolectric/nonembedded
base/android/junit/src/org/chromium/base
chrome
android
features
keyboard_accessory
junit
src
org
chromium
chrome
browser
keyboard_accessory
ManualFillingControllerTest.java
all_passwords_bottom_sheet
tab_ui
java
src
javatests
src
org
chromium
chrome
browser
tasks
tab_management
junit
java
src
org
chromium
chrome
browser
javatests
src
org
chromium
chrome
browser
app
appmenu
bookmarks
metrics
autofill
bookmarks
browserservices
browsing_data
contextmenu
contextualsearch
customtabs
device_dialog
download
firstrun
media
metrics
ntp
omnibox
suggestions
page_info
privacy
settings
read_later
search_engines
searchwidget
settings
signin
site_settings
sync
AccountManagementFragmentTest.javaGoogleServicesSettingsTest.javaIdentityErrorCardPreferenceTest.javaManageSyncSettingsTest.javaManageSyncSettingsWithFakeSyncServiceImplTest.javaSyncErrorCardPreferenceTest.java
ui
tab
state
tabbed_mode
toolbar
usage_stats
webauth
junit
src
org
chromium
chrome
browser
about_settings
app
autofill
background_sync
background_task_scheduler
backup
bookmarks
BookmarkFolderPickerMediatorUnitTest.javaBookmarkManagerCoordinatorTest.javaBookmarkManagerMediatorTest.javaBookmarkSaveFlowMediatorUnitTest.javaBookmarkUtilsTest.javaFakeBookmarkModel.javaImprovedBookmarkQueryHandlerTest.javaImprovedBookmarkRowCoordinatorTest.javaShoppingAccessoryCoordinatorTest.java
browserservices
permissiondelegation
trustedwebactivityui
ui
controller
trustedwebactivity
compositor
contextmenu
contextualsearch
customtabs
BaseCustomTabRootUiCoordinatorUnitTest.javaClientManagerTest.javaCustomTabCookiesFetcherUnitTest.javaCustomTabsOpenTimeRecorderTest.javaTrustedCdnTest.java
content
features
desktop_site
dom_distiller
download
feed
history
media
metrics
multiwindow
notifications
ntp
offlinepages
partnerbookmarks
password_manager
payments
privacy
privacy_sandbox
search_engines
settings
searchwidget
share
signin
suggestions
supervised_user
survey
tab
RequestDesktopUtilsUnitTest.javaTabBrowserControlsConstraintsHelperTest.javaTabStateBrowserControlsVisibilityDelegateTest.javaTabStateExtractorTest.javaTabUnitTest.javaTabUtilsUnitTest.java
tab_restore
tabbed_mode
tabmodel
tasks
toolbar
ui
webapps
webauthn
browser
android
browserservices
verification
java
src
org
chromium
chrome
browser
browserservices
verification
cookies
java
src
org
chromium
chrome
browser
cookies
customtabs
branding
java
src
org
chromium
chrome
browser
customtabs
features
httpclient
java
src
org
chromium
chrome
browser
android
httpclient
autofill
android
javatest
src
org
chromium
chrome
browser
autofill
editors
junit
src
org
chromium
chrome
browser
autofill
auxiliary_search
junit
src
org
chromium
commerce
merchant_viewer
android
javatests
src
org
price_change
android
junit
src
org
chromium
chrome
browser
price_tracking
android
javatests
subscriptions
test
android
java
src
org
chromium
chrome
creator
android
java
src
org
chromium
data_sharing
android
java
src
org
chromium
chrome
browser
data_sharing
download
android
java
src
org
chromium
chrome
browser
internal
android
java
src
org
chromium
chrome
browser
download
educational_tip
junit
src
org
chromium
chrome
browser
educational_tip
enterprise
util
android
java
src
org
chromium
chrome
browser
enterprise
feed
android
java
src
org
chromium
chrome
browser
feed
FeedReliabilityLoggingBridge.javaFeedServiceBridge.javaFeedStreamTest.javaSingleWebFeedStreamTest.java
feedmanagement
followmanagement
sections
sort_ui
webfeed
image_descriptions
android
java
src
org
chromium
chrome
browser
image_descriptions
incognito
android
java
src
org
chromium
chrome
browser
incognito
language
android
java
src
org
chromium
chrome
browser
mandatory_reauth
android
internal
java
src
org
chromium
chrome
browser
mandatory_reauth
optimization_guide
android
java
src
org
chromium
chrome
browser
javatests
src
org
chromium
chrome
browser
optimization_guide
page_image_service
android
junit
src
org
chromium
chrome
browser
page_image_service
password_check
android
javatests
src
org
chromium
chrome
browser
password_check
password_manager
android
account_storage_notice
javatests
src
org
chromium
chrome
browser
password_manager
account_storage_notice
add_username_dialog
java
src
org
chromium
chrome
browser
add_username_dialog
grouped_affiliations
java
src
org
chromium
chrome
browser
grouped_affiliations
java
src
org
chromium
chrome
junit
src
pwd_check_wrapper
java
src
org
chromium
chrome
browser
pwd_check_wrapper
pwd_migration
java
src
org
chromium
chrome
payments
android
java
src
org
chromium
chrome
browser
privacy_guide
android
javatests
src
org
chromium
chrome
browser
privacy_guide
junit
privacy_sandbox
android
javatests
src
org
chromium
chrome
quick_delete
android
javatests
src
org
chromium
chrome
browser
quick_delete
readaloud
android
java
src
org
recent_tabs
android
java
src
org
chromium
chrome
browser
recent_tabs
internal
android
java
src
org
safety_check
android
javatests
src
org
chromium
chrome
browser
safety_hub
android
javatests
src
org
chromium
chrome
browser
junit
src
org
chromium
search_resumption
junit
src
org
chromium
chrome
browser
share
android
javatests
src
org
chromium
chrome
browser
share
android_share_sheet
link_to_text
long_screenshots
bitmap_generation
page_info_sheet
scroll_capture
send_tab_to_self
share_sheet
signin
services
android
java
src
org
chromium
chrome
browser
signin
services
junit
src
org
chromium
chrome
browser
signin
single_tab
android
junit
src
org
chromium
chrome
browser
supervised_user
android
javatests
src
org
chromium
chrome
browser
supervised_user
tab_group_sync
android
java
src
org
chromium
chrome
browser
tab_resumption
junit
src
org
chromium
chrome
browser
tab_resumption
tab_ui
android
junit
src
org
chromium
chrome
browser
tabmodel
android
java
src
org
chromium
touch_to_fill
password_manager
android
junit
src
org
chromium
chrome
browser
touch_to_fill
no_passkeys
internal
android
java
src
org
chromium
chrome
browser
touch_to_fill
no_passkeys
password_generation
android
internal
java
src
org
chromium
chrome
browser
touch_to_fill
password_generation
translate
android
java
src
org
chromium
chrome
ui
android
autofill
internal
java
src
org
chromium
edge_to_edge
internal
junit
src
org
chromium
chrome
browser
ui
edge_to_edge
hats
internal
java
src
org
chromium
chrome
logo
java
src
org
chromium
chrome
management
java
src
org
chromium
chrome
browser
management
night_mode
java
src
org
chromium
chrome
omnibox
java
src
org
chromium
chrome
browser
omnibox
LocationBarMediatorTest.javaSearchEngineUtilsUnitTest.java
geo
status
styles
suggestions
voice
plus_addresses
junit
src
org
chromium
chrome
browser
ui
plus_addresses
signin
java
src
org
chromium
junit
src
org
chromium
chrome
browser
toolbar
java
src
org
chromium
chrome
browser
wallet
android
javatests
src
org
chromium
chrome
browser
test
android
javatests
src
org
chromium
chrome
browser
components
android_autofill
browser
junit
src
org
chromium
components
autofill
browser_ui
accessibility
android
java
src
org
chromium
components
browser_ui
site_settings
android
javatests
src
org
chromium
components
browser_ui
site_settings
junit
src
org
chromium
components
browser_ui
data_sharing
internal
android
java
src
org
chromium
components
data_sharing
download
network
android
junit
src
org
chromium
components
facilitated_payments
android
junit
src
org
chromium
components
facilitated_payments
image_fetcher
android
junit
src
org
chromium
components
image_fetcher
installedapp
android
java
src
org
chromium
components
installedapp
messages
android
java
src
org
chromium
components
messages
payments
content
android
junit
src
org
chromium
components
payments
policy
android
junit
src
org
chromium
components
prefs
android
java
src
org
chromium
components
prefs
privacy_sandbox
android
javatests
src
org
chromium
components
privacy_sandbox
segmentation_platform
public
android
java
src
org
chromium
components
segmentation_platform
signin
public
android
java
src
org
chromium
components
signin
identitymanager
subresource_filter
android
java
src
org
chromium
components
subresource_filter
translate
content
android
java
src
org
chromium
components
ukm
android
javatests
src
org
chromium
components
webapps
browser
android
java
src
org
chromium
components
webauthn
android
java
src
org
chromium
components
webauthn
junit
src
org
chromium
content/public/android/junit/src/org/chromium/content/browser
net/android/junit/src/org/chromium/net
ui/android
javatests
src
org
chromium
junit
src
org
chromium
url/android
@ -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);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user