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

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

Merge "Rename test class to match code."

parents f8627502 8d3b7a4d

services/core/java/com/android/server/pm/dex/TEST_MAPPING

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
      ]

    },

    {

      "name": "DexLoggerIntegrationTests"

      "name": "DynamicCodeLoggerIntegrationTests"

    }

  ]

}

tests/DexLoggerIntegrationTests/Android.mk→tests/DynamicCodeLoggerIntegrationTests/Android.mk

+10 −10
Original line number Diff line number Diff line
@@ -21,12 +21,12 @@ LOCAL_PATH:= $(call my-dir) 
include $(CLEAR_VARS)



LOCAL_MODULE_TAGS := tests

LOCAL_MODULE := DexLoggerTestLibrary

LOCAL_MODULE := DynamicCodeLoggerTestLibrary

LOCAL_SRC_FILES := $(call all-java-files-under, src/com/android/dcl)



include $(BUILD_JAVA_LIBRARY)



dexloggertest_jar := $(LOCAL_BUILT_MODULE)

dynamiccodeloggertest_jar := $(LOCAL_BUILT_MODULE)





# Also build a native library that the test app can dynamically load
@@ -34,7 +34,7 @@ dexloggertest_jar := $(LOCAL_BUILT_MODULE) 
include $(CLEAR_VARS)



LOCAL_MODULE_TAGS := tests

LOCAL_MODULE := DexLoggerNativeTestLibrary

LOCAL_MODULE := DynamicCodeLoggerNativeTestLibrary

LOCAL_SRC_FILES := src/cpp/com_android_dcl_Jni.cpp

LOCAL_C_INCLUDES += \

    $(JNI_H_INCLUDE)
@@ -48,19 +48,19 @@ include $(BUILD_SHARED_LIBRARY) 
include $(CLEAR_VARS)



LOCAL_MODULE_TAGS := tests

LOCAL_MODULE := DexLoggerNativeExecutable

LOCAL_MODULE := DynamicCodeLoggerNativeExecutable

LOCAL_SRC_FILES := src/cpp/test_executable.cpp



include $(BUILD_EXECUTABLE)



dexloggertest_executable := $(LOCAL_BUILT_MODULE)

dynamiccodeloggertest_executable := $(LOCAL_BUILT_MODULE)



# Build the test app itself



include $(CLEAR_VARS)



LOCAL_MODULE_TAGS := tests

LOCAL_PACKAGE_NAME := DexLoggerIntegrationTests

LOCAL_PACKAGE_NAME := DynamicCodeLoggerIntegrationTests

LOCAL_SDK_VERSION := current

LOCAL_COMPATIBILITY_SUITE := device-tests

LOCAL_CERTIFICATE := shared
@@ -73,12 +73,12 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 
# Include both versions of the .so if we have 2 arch

LOCAL_MULTILIB := both

LOCAL_JNI_SHARED_LIBRARIES := \

    DexLoggerNativeTestLibrary \

    DynamicCodeLoggerNativeTestLibrary \



# This gets us the javalib.jar built by DexLoggerTestLibrary above as well as the various

# This gets us the javalib.jar built by DynamicCodeLoggerTestLibrary above as well as the various

# native binaries.

LOCAL_JAVA_RESOURCE_FILES := \

    $(dexloggertest_jar) \

    $(dexloggertest_executable) \

    $(dynamiccodeloggertest_jar) \

    $(dynamiccodeloggertest_executable) \



include $(BUILD_PACKAGE)

tests/DexLoggerIntegrationTests/AndroidManifest.xml→tests/DynamicCodeLoggerIntegrationTests/AndroidManifest.xml

+3 −3
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
-->



<manifest xmlns:android="http://schemas.android.com/apk/res/android"

        package="com.android.frameworks.dexloggertest">

        package="com.android.frameworks.dynamiccodeloggertest">



    <!-- Tests feature introduced in P (28) -->

    <uses-sdk
@@ -30,6 +30,6 @@ 


    <instrumentation

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

        android:targetPackage="com.android.frameworks.dexloggertest"

        android:label="Integration test for DexLogger" />

        android:targetPackage="com.android.frameworks.dynamiccodeloggertest"

        android:label="Integration test for DynamicCodeLogger" />

</manifest>

tests/DexLoggerIntegrationTests/AndroidTest.xml→tests/DynamicCodeLoggerIntegrationTests/AndroidTest.xml

+4 −4
Original line number Diff line number Diff line
@@ -13,17 +13,17 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<configuration description="Runs DexLogger Integration Tests">

<configuration description="Runs DynamicLogger Integration Tests">

    <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">

        <option name="test-file-name" value="DexLoggerIntegrationTests.apk"/>

        <option name="test-file-name" value="DynamicCodeLoggerIntegrationTests.apk"/>

        <option name="cleanup-apks" value="true"/>

    </target_preparer>



    <option name="test-suite-tag" value="apct"/>

    <option name="test-tag" value="DexLoggerIntegrationTests"/>

    <option name="test-tag" value="DynamicCodeLoggerIntegrationTests"/>



    <test class="com.android.tradefed.testtype.AndroidJUnitTest">

        <option name="package" value="com.android.frameworks.dexloggertest"/>

        <option name="package" value="com.android.frameworks.dynamiccodeloggertest"/>

        <option name="runner" value="android.support.test.runner.AndroidJUnitRunner"/>

        <option name="hidden-api-checks" value="false"/>

    </test>