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

Commit 921e0948 authored by Ray Essick's avatar Ray Essick
Browse files

Convert Media unit tests from push-file to MediaPreparer

Note this was to fix how we accessed the data; some of these unit tests
do not pass. That will be addressed in subsequent work.

Bug: 274674920
Test: atest of all of the unit tests
Change-Id: I0473bdcef2958bd0a28528702e98a2f23c3915dd
parent f25dd316
Loading
Loading
Loading
Loading
+12 −4
Original line number Diff line number Diff line
@@ -18,14 +18,22 @@
    <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
        <option name="cleanup" value="false" />
        <option name="push" value="HEVCUtilsUnitTest->/data/local/tmp/HEVCUtilsUnitTest" />
        <option name="push-file"
            key="https://storage.googleapis.com/android_media/frameworks/av/media/libstagefright/foundation/tests/HEVCUtils/HEVCUtilsUnitTest.zip?unzip=true"
            value="/data/local/tmp/HEVCUtilsUnitTest/" />
    </target_preparer>

    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.DynamicConfigPusher">
        <option name="target" value="host" />
        <option name="config-filename" value="HEVCUtilsUnitTest" />
        <option name="version" value="1.0"/>
    </target_preparer>
    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.MediaPreparer">
        <option name="push-all" value="true" />
        <option name="media-folder-name" value="HEVCUtilsUnitTest-1.0" />
        <option name="dynamic-config-module" value="HEVCUtilsUnitTest" />
    </target_preparer>

    <test class="com.android.tradefed.testtype.GTest" >
        <option name="native-test-device-path" value="/data/local/tmp" />
        <option name="module-name" value="HEVCUtilsUnitTest" />
        <option name="native-test-flag" value="-P /data/local/tmp/HEVCUtilsUnitTest/" />
        <option name="native-test-flag" value="-P /sdcard/tests/HEVCUtilsUnitTest-1.0/" />
    </test>
</configuration>
+20 −0
Original line number Diff line number Diff line
<!-- Copyright (C) 2021 The Android Open Source Project

     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at

          http://www.apache.org/licenses/LICENSE-2.0

     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-->

<dynamicConfig>
    <entry key="media_files_url">
            <value>https://storage.googleapis.com/android_media/frameworks/av/media/libstagefright/foundation/tests/HEVCUtils/HEVCUtilsUnitTest-1.0.zip</value>
    </entry>
</dynamicConfig>
+11 −4
Original line number Diff line number Diff line
@@ -18,14 +18,21 @@
    <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
        <option name="cleanup" value="true" />
        <option name="push" value="ExtractorFactoryTest->/data/local/tmp/ExtractorFactoryTest" />
        <option name="push-file"
            key="https://storage.googleapis.com/android_media/frameworks/av/media/extractors/tests/extractor.zip?unzip=true"
            value="/data/local/tmp/ExtractorFactoryTestRes/" />
    </target_preparer>
    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.DynamicConfigPusher">
        <option name="target" value="host" />
        <option name="config-filename" value="ExtractorFactoryTest" />
        <option name="version" value="1.0"/>
    </target_preparer>
    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.MediaPreparer">
        <option name="push-all" value="true" />
        <option name="media-folder-name" value="extractor-1.5" />
        <option name="dynamic-config-module" value="ExtractorFactoryTest" />
    </target_preparer>

    <test class="com.android.tradefed.testtype.GTest" >
        <option name="native-test-device-path" value="/data/local/tmp" />
        <option name="module-name" value="ExtractorFactoryTest" />
        <option name="native-test-flag" value="-P /data/local/tmp/ExtractorFactoryTestRes/" />
        <option name="native-test-flag" value="-P /sdcard/test/extractor-1.5/" />
    </test>
</configuration>
+20 −0
Original line number Diff line number Diff line
<!-- Copyright (C) 2021 The Android Open Source Project

     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at

          http://www.apache.org/licenses/LICENSE-2.0

     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-->

<dynamicConfig>
    <entry key="media_files_url">
            <value>https://storage.googleapis.com/android_media/frameworks/av/media/extractors/tests/extractor-1.5.zip</value>
    </entry>
</dynamicConfig>
+12 −4
Original line number Diff line number Diff line
@@ -18,14 +18,22 @@
    <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
        <option name="cleanup" value="true" />
        <option name="push" value="writerTest->/data/local/tmp/writerTest" />
        <option name="push-file"
            key="https://storage.googleapis.com/android_media/frameworks/av/media/libstagefright/tests/writer/WriterTestRes-1.1.zip?unzip=true"
            value="/data/local/tmp/WriterTestRes/" />
    </target_preparer>
    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.DynamicConfigPusher">
        <option name="target" value="host" />
        <option name="config-filename" value="writerTest" />
        <option name="version" value="1.0"/>
    </target_preparer>
    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.MediaPreparer">
        <option name="push-all" value="true" />
        <option name="media-folder-name" value="WriterTestRes-1.2" />
        <option name="dynamic-config-module" value="writerTest" />
    </target_preparer>

    <test class="com.android.tradefed.testtype.GTest" >
        <option name="native-test-device-path" value="/data/local/tmp" />
        <option name="module-name" value="writerTest" />
        <option name="native-test-flag" value="-P /data/local/tmp/WriterTestRes/" />
        <option name="native-test-flag" value="-P /sdcard/test/WriterTestRes-1.2/" />
        <option name="native-test-flag" value="-C true" />
    </test>
</configuration>
Loading