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

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

Merge "Migrate frameworks/base/core/tests/privacytests to androidx.test"

parents 1c53b010 a6a9d0f9

core/tests/privacytests/Android.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -8,7 +8,7 @@ LOCAL_MODULE_TAGS := tests 
LOCAL_SRC_FILES := \

LOCAL_SRC_FILES := \

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

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





LOCAL_STATIC_JAVA_LIBRARIES := junit rappor-tests android-support-test truth-prebuilt

LOCAL_STATIC_JAVA_LIBRARIES := junit rappor-tests androidx.test.rules truth-prebuilt





LOCAL_JAVA_LIBRARIES := android.test.runner

LOCAL_JAVA_LIBRARIES := android.test.runner

LOCAL_PACKAGE_NAME := FrameworksPrivacyLibraryTests

LOCAL_PACKAGE_NAME := FrameworksPrivacyLibraryTests

core/tests/privacytests/AndroidManifest.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -22,7 +22,7 @@ 
    </application>

    </application>





    <instrumentation

    <instrumentation

            android:name="android.support.test.runner.AndroidJUnitRunner"

            android:name="androidx.test.runner.AndroidJUnitRunner"

            android:targetPackage="com.android.frameworks.coretests.privacy"

            android:targetPackage="com.android.frameworks.coretests.privacy"

            android:label="Frameworks Privacy Library Tests" />

            android:label="Frameworks Privacy Library Tests" />

core/tests/privacytests/src/android/privacy/LongitudinalReportingEncoderTest.java

+3 −4
Original line number Original line Diff line number Diff line
@@ -17,21 +17,20 @@ 
package android.privacy;

package android.privacy;





import static com.google.common.truth.Truth.assertThat;

import static com.google.common.truth.Truth.assertThat;



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertTrue;

import static org.junit.Assert.assertTrue;





import android.privacy.internal.longitudinalreporting.LongitudinalReportingConfig;

import android.privacy.internal.longitudinalreporting.LongitudinalReportingConfig;

import android.privacy.internal.longitudinalreporting.LongitudinalReportingEncoder;

import android.privacy.internal.longitudinalreporting.LongitudinalReportingEncoder;





import android.support.test.filters.SmallTest;

import androidx.test.filters.SmallTest;

import android.support.test.runner.AndroidJUnit4;

import androidx.test.runner.AndroidJUnit4;





import org.junit.Test;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.junit.runner.RunWith;





import java.nio.ByteBuffer;

import java.nio.ByteBuffer;

import java.nio.ByteOrder;

import java.nio.charset.StandardCharsets;

import java.nio.charset.StandardCharsets;

import java.security.MessageDigest;

import java.security.MessageDigest;

core/tests/privacytests/src/android/privacy/RapporEncoderTest.java

+3 −2
Original line number Original line Diff line number Diff line
@@ -22,8 +22,9 @@ import static org.junit.Assert.assertTrue; 




import android.privacy.internal.rappor.RapporConfig;

import android.privacy.internal.rappor.RapporConfig;

import android.privacy.internal.rappor.RapporEncoder;

import android.privacy.internal.rappor.RapporEncoder;

import android.support.test.filters.SmallTest;



import android.support.test.runner.AndroidJUnit4;

import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;





import org.junit.Test;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.junit.runner.RunWith;