Loading services/robotests/Android.mk +2 −1 Original line number Diff line number Diff line Loading @@ -44,7 +44,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ android-support-test \ mockito-robolectric-prebuilt \ platform-test-annotations \ truth-prebuilt truth-prebuilt \ testng LOCAL_JAVA_LIBRARIES := \ junit \ Loading services/robotests/src/com/android/server/backup/TransportManagerTest.java +2 −11 Original line number Diff line number Diff line Loading @@ -23,6 +23,7 @@ import static junit.framework.Assert.fail; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static org.robolectric.shadow.api.Shadow.extract; import static org.testng.Assert.expectThrows; import android.annotation.Nullable; import android.app.backup.BackupManager; Loading @@ -37,7 +38,6 @@ import android.os.RemoteException; import android.platform.test.annotations.Presubmit; import com.android.internal.backup.IBackupTransport; import com.android.internal.util.FunctionalUtils.ThrowingRunnable; import com.android.server.backup.testing.ShadowBackupTransportStub; import com.android.server.backup.testing.ShadowContextImplForBackup; import com.android.server.backup.testing.ShadowPackageManagerForBackup; Loading @@ -58,6 +58,7 @@ import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowLog; import org.robolectric.shadows.ShadowLooper; import org.robolectric.shadows.ShadowPackageManager; import org.testng.Assert.ThrowingRunnable; import java.util.ArrayList; import java.util.Arrays; Loading Loading @@ -710,16 +711,6 @@ public class TransportManagerTest { return transportManager; } private static <T extends Throwable> void expectThrows( Class<T> throwableClass, ThrowingRunnable runnable) { try { runnable.runOrThrow(); fail("Expected to throw " + throwableClass.getSimpleName()); } catch (Throwable t) { assertThat(t).isInstanceOf(throwableClass); } } private static class TransportInfo { public final String packageName; public final String name; Loading Loading
services/robotests/Android.mk +2 −1 Original line number Diff line number Diff line Loading @@ -44,7 +44,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ android-support-test \ mockito-robolectric-prebuilt \ platform-test-annotations \ truth-prebuilt truth-prebuilt \ testng LOCAL_JAVA_LIBRARIES := \ junit \ Loading
services/robotests/src/com/android/server/backup/TransportManagerTest.java +2 −11 Original line number Diff line number Diff line Loading @@ -23,6 +23,7 @@ import static junit.framework.Assert.fail; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static org.robolectric.shadow.api.Shadow.extract; import static org.testng.Assert.expectThrows; import android.annotation.Nullable; import android.app.backup.BackupManager; Loading @@ -37,7 +38,6 @@ import android.os.RemoteException; import android.platform.test.annotations.Presubmit; import com.android.internal.backup.IBackupTransport; import com.android.internal.util.FunctionalUtils.ThrowingRunnable; import com.android.server.backup.testing.ShadowBackupTransportStub; import com.android.server.backup.testing.ShadowContextImplForBackup; import com.android.server.backup.testing.ShadowPackageManagerForBackup; Loading @@ -58,6 +58,7 @@ import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowLog; import org.robolectric.shadows.ShadowLooper; import org.robolectric.shadows.ShadowPackageManager; import org.testng.Assert.ThrowingRunnable; import java.util.ArrayList; import java.util.Arrays; Loading Loading @@ -710,16 +711,6 @@ public class TransportManagerTest { return transportManager; } private static <T extends Throwable> void expectThrows( Class<T> throwableClass, ThrowingRunnable runnable) { try { runnable.runOrThrow(); fail("Expected to throw " + throwableClass.getSimpleName()); } catch (Throwable t) { assertThat(t).isInstanceOf(throwableClass); } } private static class TransportInfo { public final String packageName; public final String name; Loading