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

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

Merge "Annotation for package in FrameworkRobolectricTestRunner"

parents ab7d1848 03b76773

services/robotests/src/com/android/server/backup/BackupManagerConstantsTest.java

+2 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.provider.Settings; 


import com.android.server.testing.FrameworkRobolectricTestRunner;

import com.android.server.testing.SystemLoaderClasses;

import com.android.server.testing.SystemLoaderPackages;



import org.junit.Before;

import org.junit.Test;
@@ -36,7 +37,7 @@ import org.robolectric.annotation.Config; 


@RunWith(FrameworkRobolectricTestRunner.class)

@Config(manifest = Config.NONE, sdk = 26)

@SystemLoaderClasses({BackupManagerConstants.class})

@SystemLoaderPackages({"com.android.server.backup"})

@Presubmit

public class BackupManagerConstantsTest {

    private static final String PACKAGE_NAME = "some.package.name";

services/robotests/src/com/android/server/backup/BackupManagerServiceTest.java

+3 −6
Original line number Diff line number Diff line
@@ -48,7 +48,8 @@ import com.android.server.backup.testing.TransportData; 
import com.android.server.backup.testing.TransportTestUtils.TransportMock;

import com.android.server.backup.transport.TransportNotRegisteredException;

import com.android.server.testing.FrameworkRobolectricTestRunner;

import com.android.server.testing.SystemLoaderClasses;

import com.android.server.testing.SystemLoaderPackages;



import java.io.File;

import java.util.HashMap;

import java.util.List;
@@ -74,11 +75,7 @@ import org.robolectric.shadows.ShadowSystemClock; 
    sdk = 26,

    shadows = {ShadowAppBackupUtils.class, ShadowBackupPolicyEnforcer.class}

)

@SystemLoaderClasses({

    BackupManagerService.class,

    TransportManager.class,

    PackageManagerBackupAgent.class

})

@SystemLoaderPackages({"com.android.server.backup"})

@Presubmit

public class BackupManagerServiceTest {

    private static final String TAG = "BMSTest";

services/robotests/src/com/android/server/backup/PerformBackupTaskTest.java

+2 −3
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ import com.android.server.backup.testing.TransportTestUtils.TransportMock; 
import com.android.server.backup.transport.TransportClient;

import com.android.server.testing.FrameworkRobolectricTestRunner;

import com.android.server.testing.SystemLoaderClasses;

import com.android.server.testing.SystemLoaderPackages;

import com.android.server.testing.shadows.FrameworkShadowPackageManager;

import com.android.server.testing.shadows.ShadowBackupDataInput;

import com.android.server.testing.shadows.ShadowBackupDataOutput;
@@ -102,12 +103,10 @@ import java.util.stream.Stream; 
        ShadowQueuedWork.class

    }

)

@SystemLoaderPackages({"com.android.server.backup"})

@SystemLoaderClasses({

    BackupManagerService.class,

    PerformBackupTask.class,

    BackupDataOutput.class,

    FullBackupDataOutput.class,

    TransportManager.class,

    BackupAgent.class,

    IBackupTransport.class,

    IBackupAgent.class,

services/robotests/src/com/android/server/backup/TransportManagerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ import com.android.server.backup.transport.TransportClient; 
import com.android.server.backup.transport.TransportClientManager;

import com.android.server.backup.transport.TransportNotRegisteredException;

import com.android.server.testing.FrameworkRobolectricTestRunner;

import com.android.server.testing.SystemLoaderClasses;

import com.android.server.testing.SystemLoaderPackages;

import com.android.server.testing.shadows.FrameworkShadowContextImpl;

import com.android.server.testing.shadows.FrameworkShadowPackageManager;

import java.util.ArrayList;
@@ -75,7 +75,7 @@ import org.robolectric.shadows.ShadowPackageManager; 
    sdk = 26,

    shadows = {FrameworkShadowPackageManager.class, FrameworkShadowContextImpl.class}

)

@SystemLoaderClasses({TransportManager.class})

@SystemLoaderPackages({"com.android.server.backup"})

@Presubmit

public class TransportManagerTest {

    private static final String PACKAGE_A = "some.package.a";

services/robotests/src/com/android/server/backup/internal/PerformInitializeTaskTest.java

+2 −6
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ import com.android.server.backup.testing.TransportData; 
import com.android.server.backup.testing.TransportTestUtils.TransportMock;

import com.android.server.backup.transport.TransportClient;

import com.android.server.testing.FrameworkRobolectricTestRunner;

import com.android.server.testing.SystemLoaderClasses;

import com.android.server.testing.SystemLoaderPackages;



import org.junit.Before;

import org.junit.Test;
@@ -67,11 +67,7 @@ import java.util.stream.Stream; 


@RunWith(FrameworkRobolectricTestRunner.class)

@Config(manifest = Config.NONE, sdk = 26)

@SystemLoaderClasses({

    BackupManagerService.class,

    PerformInitializeTaskTest.class,

    TransportManager.class

})

@SystemLoaderPackages({"com.android.server.backup"})

@Presubmit

public class PerformInitializeTaskTest {

    @Mock private BackupManagerService mBackupManagerService;