diff options
| -rw-r--r-- | packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/instrumentation/SharedPreferenceLoggerTest.java | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/instrumentation/SharedPreferenceLoggerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/instrumentation/SharedPreferenceLoggerTest.java index ebafc594c122..017d37388340 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/instrumentation/SharedPreferenceLoggerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/instrumentation/SharedPreferenceLoggerTest.java @@ -31,7 +31,6 @@ import android.content.SharedPreferences; import android.util.Pair; import com.android.settingslib.SettingsLibRobolectricTestRunner; -import com.google.common.truth.Platform; import org.junit.Before; import org.junit.Test; @@ -160,18 +159,23 @@ public class SharedPreferenceLoggerTest { } private ArgumentMatcher<Pair<Integer, Object>> pairMatches(int tag, Class clazz) { - return pair -> pair.first == tag && Platform.isInstanceOfType(pair.second, clazz); + return pair -> pair.first == tag && isInstanceOfType(pair.second, clazz); } private ArgumentMatcher<Pair<Integer, Object>> pairMatches(int tag, boolean bool) { return pair -> pair.first == tag - && Platform.isInstanceOfType(pair.second, Integer.class) + && isInstanceOfType(pair.second, Integer.class) && pair.second.equals((bool ? 1 : 0)); } private ArgumentMatcher<Pair<Integer, Object>> pairMatches(int tag, int val) { return pair -> pair.first == tag - && Platform.isInstanceOfType(pair.second, Integer.class) + && isInstanceOfType(pair.second, Integer.class) && pair.second.equals(val); } + + /** Returns true if the instance is assignable to the type Clazz. */ + private static boolean isInstanceOfType(Object instance, Class<?> clazz) { + return clazz.isInstance(instance); + } } |