Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b85b8389 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use testng for utilities in tests"

parents 795c173d 24476873
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -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 \
+2 −11
Original line number Diff line number Diff line
@@ -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;
@@ -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;
@@ -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;
@@ -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;