Migrate settings robolectric tests to mockito 2
- Migrated ArgumentMatcher subclasses to lambdas - Replaced any() with nullable() where tests were failing Test: cd tests/robotests && mma Bug: 38456058 Change-Id: Ice8c39b435c45b87f82dbbd9860e68f235314cf8
This commit is contained in:
@@ -16,6 +16,11 @@
|
||||
|
||||
package com.android.settings.datetime;
|
||||
|
||||
import static org.mockito.ArgumentMatchers.nullable;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.verify;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.os.Bundle;
|
||||
import android.view.LayoutInflater;
|
||||
@@ -33,11 +38,6 @@ import org.robolectric.Robolectric;
|
||||
import org.robolectric.annotation.Config;
|
||||
import org.robolectric.util.ReflectionHelpers;
|
||||
|
||||
import static org.mockito.Matchers.any;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.verify;
|
||||
|
||||
@RunWith(SettingsRobolectricTestRunner.class)
|
||||
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
|
||||
public class ZonePickerTest {
|
||||
@@ -64,8 +64,8 @@ public class ZonePickerTest {
|
||||
|
||||
// Should render
|
||||
verify(mZonePicker).onCreateView(
|
||||
any(LayoutInflater.class),
|
||||
any(ViewGroup.class),
|
||||
any(Bundle.class));
|
||||
nullable(LayoutInflater.class),
|
||||
nullable(ViewGroup.class),
|
||||
nullable(Bundle.class));
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user