Skip to content

Commit 5f2e02c

Browse files
[quick_actions]: Bump mockito-core from 3.2.4 to 4.6.1 in /packages/quick_actions/quick_actions_android/android (#5899)
1 parent 9c9784e commit 5f2e02c

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

packages/quick_actions/quick_actions_android/CHANGELOG.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
1+
## NEXT
2+
3+
* Updates mockito-core to 4.6.1.
4+
* Removes deprecated FieldSetter from QuickActionsTest.
5+
16
## 0.6.2
27

3-
* Update gradle version to 7.2.1 on Android.
8+
* Updates gradle version to 7.2.1.
49

510
## 0.6.1
611

packages/quick_actions/quick_actions_android/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ android {
3535

3636
dependencies {
3737
testImplementation 'junit:junit:4.13.2'
38-
testImplementation 'org.mockito:mockito-core:3.2.4'
38+
testImplementation 'org.mockito:mockito-core:4.6.1'
3939
}
4040

4141
compileOptions {

packages/quick_actions/quick_actions_android/android/src/test/java/io/flutter/plugins/quickactions/QuickActionsTest.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import java.nio.ByteBuffer;
3030
import org.junit.After;
3131
import org.junit.Test;
32-
import org.mockito.internal.util.reflection.FieldSetter;
3332

3433
public class QuickActionsTest {
3534
private static class TestBinaryMessenger implements BinaryMessenger {
@@ -79,10 +78,9 @@ public void onAttachedToActivity_buildVersionSupported_invokesLaunchMethod()
7978
final QuickActionsPlugin plugin = new QuickActionsPlugin();
8079
setUpMessengerAndFlutterPluginBinding(testBinaryMessenger, plugin);
8180
setBuildVersion(SUPPORTED_BUILD);
82-
FieldSetter.setField(
83-
plugin,
84-
QuickActionsPlugin.class.getDeclaredField("handler"),
85-
mock(MethodCallHandlerImpl.class));
81+
Field handler = plugin.getClass().getDeclaredField("handler");
82+
handler.setAccessible(true);
83+
handler.set(plugin, mock(MethodCallHandlerImpl.class));
8684
final Intent mockIntent = createMockIntentWithQuickActionExtra();
8785
final Activity mockMainActivity = mock(Activity.class);
8886
when(mockMainActivity.getIntent()).thenReturn(mockIntent);

0 commit comments

Comments
 (0)