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

Commit c92eb465 authored by Artem Iglikov's avatar Artem Iglikov
Browse files

Fix and enable test for Trampoline.requestBackup(). 

This was disabled because of NPE.

Test: manual

Bug: 37535747

Change-Id: I30dfeadcddb8003fde7fa92c28fa1f06164201dc
parent 65090c6b

services/tests/servicestests/src/com/android/server/backup/TrampolineTest.java

+3 −4
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; 
import static org.mockito.Mockito.when;



import android.app.Instrumentation;

import android.app.backup.BackupManager;

import android.app.backup.IBackupManagerMonitor;

import android.app.backup.IBackupObserver;

import android.app.backup.IFullBackupRestoreObserver;
@@ -567,12 +568,10 @@ public class TrampolineTest { 
        verify(mBackupManagerServiceMock).isAppEligibleForBackup(PACKAGE_NAME);

    }



    // Test is ignored until Trampoline.requestBackup() is fixed not to throw NPE.

    @Ignore

    @Test

    public void requestBackup_calledBeforeInitialize_ignored() throws RemoteException {

        assertEquals(0, mTrampoline.requestBackup(PACKAGE_NAMES, mBackupObserverMock,

                mBackupManagerMonitorMock, 123));

        assertEquals(BackupManager.ERROR_BACKUP_NOT_ALLOWED, mTrampoline.requestBackup(

                PACKAGE_NAMES, mBackupObserverMock, mBackupManagerMonitorMock, 123));

        verifyNoMoreInteractions(mBackupManagerServiceMock);

    }