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

Commit 30a74c01 authored by James Lemieux's avatar James Lemieux Committed by Android (Google) Code Review
Browse files

Merge "Use tip-of-tree robolectric"

parents 277ff273 38d86c2d

services/robotests/Android.mk

+30 −61
Original line number Diff line number Diff line
@@ -12,10 +12,9 @@ 
# See the License for the specific language governing permissions and

# limitations under the License.





##############################################################

###################################################################

# FrameworksServicesLib app just for Robolectric test target      #

##############################################################

###################################################################

LOCAL_PATH := $(call my-dir)



include $(CLEAR_VARS)
@@ -32,81 +31,51 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 


include $(BUILD_PACKAGE)



##############################################

# FrameworksServices Robolectric test target #

##############################################

###################################################################

# FrameworksServicesLib Robolectric test target.                  #

###################################################################

include $(CLEAR_VARS)



# Dependency platform-robolectric-android-all-stubs below contains a bunch of Android classes as

# stubs that throw RuntimeExceptions when we use them. The goal is to include hidden APIs that

# weren't included in Robolectric's Android jar files. However, we are testing the framework itself

# here, so if we write stuff that is being used in the tests and exist in

# platform-robolectric-android-all-stubs, the class loader is going to pick up the latter, and thus

# we are going to test what we don't want. To solve this:

#

#   1. If the class being used should be visible to bundled apps:

#      => Bypass the stubs target by including them in LOCAL_SRC_FILES and LOCAL_AIDL_INCLUDES

#         (if aidl).

#

#   2. If it's not visible:

#      => Remove the class from the stubs jar (common/robolectric/android-all/android-all-stubs.jar)

#         and add the class path to

#         common/robolectric/android-all/android-all-stubs_removed_classes.txt.

#

LOCAL_MODULE := FrameworksServicesRoboTests



INTERNAL_BACKUP := ../../core/java/com/android/internal/backup



LOCAL_SRC_FILES := \

    $(call all-java-files-under, src) \

    $(call all-Iaidl-files-under, $(INTERNAL_BACKUP)) \

    $(call all-java-files-under, ../../core/java/android/app/backup) \

    $(call all-Iaidl-files-under, ../../core/java/android/app/backup) \

    $(call all-java-files-under, ../../core/java/android/util/proto) \

    ../../core/java/android/content/pm/PackageInfo.java \

    ../../core/java/android/app/IBackupAgent.aidl \

    ../../core/java/android/util/KeyValueSettingObserver.java \

    ../../core/java/android/content/pm/PackageParser.java \

    ../../core/java/android/content/pm/SigningInfo.java



LOCAL_AIDL_INCLUDES := \

    $(call all-Iaidl-files-under, $(INTERNAL_BACKUP)) \

    $(call all-Iaidl-files-under, ../../core/java/android/app/backup) \

    ../../core/java/android/app/IBackupAgent.aidl

LOCAL_SRC_FILES := $(call all-java-files-under, src)



LOCAL_STATIC_JAVA_LIBRARIES := \

    platform-robolectric-android-all-stubs \

    android-support-test \

    guava \

    mockito-robolectric-prebuilt \

LOCAL_RESOURCE_DIR := \

    $(LOCAL_PATH)/res



LOCAL_JAVA_RESOURCE_DIRS := config



# Include the testing libraries

LOCAL_JAVA_LIBRARIES := \

    platform-test-annotations \

    robolectric_android-all-stub \

    Robolectric_all-target \

    mockito-robolectric-prebuilt \

    truth-prebuilt \

    testng



LOCAL_JAVA_LIBRARIES := \

    junit \

    platform-robolectric-3.6.2-prebuilt



LOCAL_INSTRUMENTATION_FOR := FrameworksServicesLib

LOCAL_MODULE := FrameworksServicesRoboTests



LOCAL_MODULE_TAGS := optional



include $(BUILD_STATIC_JAVA_LIBRARY)



###############################################################

# FrameworksServices runner target to run the previous target #

###############################################################

###################################################################

# FrameworksServicesLib runner target to run the previous target. #

###################################################################

include $(CLEAR_VARS)



LOCAL_MODULE := RunFrameworksServicesRoboTests



LOCAL_SDK_VERSION := current



LOCAL_STATIC_JAVA_LIBRARIES := \

    FrameworksServicesRoboTests

LOCAL_JAVA_LIBRARIES := \

    FrameworksServicesRoboTests \

    platform-test-annotations \

    robolectric_android-all-stub \

    Robolectric_all-target \

    mockito-robolectric-prebuilt \

    truth-prebuilt \

    testng



LOCAL_TEST_PACKAGE := FrameworksServicesLib



LOCAL_INSTRUMENT_SOURCE_DIRS := $(dir $(LOCAL_PATH))backup/java



include prebuilts/misc/common/robolectric/3.6.2/run_robotests.mk
 
include external/robolectric-shadows/run_robotests.mk
 
 No newline at end of file

services/robotests/config/robolectric.properties

0 → 100644
+1 −0
Original line number Diff line number Diff line 
sdk=NEWEST_SDK
 
 No newline at end of file

services/robotests/src/android/app/backup/BackupUtilsTest.java

+2 −7
Original line number Diff line number Diff line
@@ -22,14 +22,11 @@ import android.app.backup.FullBackup.BackupScheme.PathWithRequiredFlags; 
import android.content.Context;

import android.platform.test.annotations.Presubmit;



import com.android.server.testing.FrameworkRobolectricTestRunner;

import com.android.server.testing.SystemLoaderPackages;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;

import org.robolectric.annotation.Config;

import org.robolectric.annotation.internal.DoNotInstrument;



import java.io.File;
@@ -38,9 +35,7 @@ import java.util.Collection; 
import java.util.stream.Collectors;

import java.util.stream.Stream;



@RunWith(FrameworkRobolectricTestRunner.class)

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

@SystemLoaderPackages({"android.app.backup"})

@RunWith(RobolectricTestRunner.class)

@Presubmit

@DoNotInstrument

public class BackupUtilsTest {

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

+3 −9
Original line number Diff line number Diff line
@@ -25,22 +25,16 @@ import android.content.Context; 
import android.os.Handler;

import android.platform.test.annotations.Presubmit;

import android.provider.Settings;

import android.util.KeyValueSettingObserver;

import com.android.server.testing.FrameworkRobolectricTestRunner;

import com.android.server.testing.SystemLoaderClasses;

import com.android.server.testing.SystemLoaderPackages;



import org.junit.After;

import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;

import org.robolectric.annotation.Config;



/** Tests for {@link BackupAgentTimeoutParameters}. */

@RunWith(FrameworkRobolectricTestRunner.class)

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

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

@SystemLoaderClasses({KeyValueSettingObserver.class})

@RunWith(RobolectricTestRunner.class)

@Presubmit

public class BackupAgentTimeoutParametersTest {

    private ContentResolver mContentResolver;

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

+3 −9
Original line number Diff line number Diff line
@@ -23,21 +23,15 @@ import android.content.Context; 
import android.os.Handler;

import android.platform.test.annotations.Presubmit;

import android.provider.Settings;

import android.util.KeyValueSettingObserver;

import com.android.server.testing.FrameworkRobolectricTestRunner;

import com.android.server.testing.SystemLoaderClasses;

import com.android.server.testing.SystemLoaderPackages;



import org.junit.After;

import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;

import org.robolectric.annotation.Config;



@RunWith(FrameworkRobolectricTestRunner.class)

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

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

@SystemLoaderClasses({KeyValueSettingObserver.class})

@RunWith(RobolectricTestRunner.class)

@Presubmit

public class BackupManagerConstantsTest {

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