Encoder test updates

- Rename AvcEncoderTest as AvcEncTest
- Enable AvcEncTest in cmake builds
- Rename AvcEncoderTestEnvironment.h as TestArgs.h

Change-Id: Iceba9c33e060bcb1138f03833da67c0ff6e84b2b

.github/workflows/cmake.yml

@@ -17,7 +17,7 @@ jobs:
     - uses: actions/checkout@v3
 
     - name: Configure CMake
-      run: cmake -B ${{github.workspace}}/out -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DENABLE_MVC=1 -DENABLE_SVC=1
+      run: cmake -B ${{github.workspace}}/out -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DENABLE_MVC=1 -DENABLE_SVC=1 -DENABLE_TESTS=1
 
     - name: Build
       run: cmake --build ${{github.workspace}}/out --config ${{env.BUILD_TYPE}}

.gitignore

@@ -0,0 +1 @@
+third_party

CMakeLists.txt

@@ -6,6 +6,7 @@ set(AVC_ROOT "${CMAKE_CURRENT_SOURCE_DIR}")
 set(AVC_CONFIG_DIR "${CMAKE_CURRENT_BINARY_DIR}")
 option(ENABLE_MVC "Enables svcenc and svcdec builds" OFF)
 option(ENABLE_SVC "Enables svcenc and svcdec builds" OFF)
+option(ENABLE_TESTS "Enables gtest based unit tests" OFF)
 
 if("${AVC_ROOT}" STREQUAL "${AVC_CONFIG_DIR}")
   message(
@@ -67,3 +68,7 @@ if (${ENABLE_SVC})
   include("${AVC_ROOT}/fuzzer/svc_enc_fuzzer.cmake")
   include("${AVC_ROOT}/fuzzer/svc_dec_fuzzer.cmake")
 endif()
+
+if (${ENABLE_TESTS})
+    include("${AVC_ROOT}/tests/AvcEncTest.cmake")
+endif()

tests/Android.bp

@@ -24,10 +24,10 @@ package {
 }
 
 cc_test {
-    name: "AvcEncoderTest",
+    name: "AvcEncTest",
     gtest: true,
 
-    srcs : [ "AvcEncoderTest.cpp" ],
+    srcs : [ "AvcEncTest.cpp" ],
 
     shared_libs: [
         "libutils",

tests/AndroidTest.xml

@@ -14,18 +14,18 @@
      limitations under the License.
 -->
 <configuration description="Test module config for AVC encoder unit tests">
-    <option name="test-suite-tag" value="AvcEncoderTest" />
+    <option name="test-suite-tag" value="AvcEncTest" />
     <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
         <option name="cleanup" value="true" />
-        <option name="push" value="AvcEncoderTest->/data/local/tmp/AvcEncoderTest/" />
+        <option name="push" value="AvcEncTest->/data/local/tmp/AvcEncTest/" />
         <option name="push-file"
             key="https://storage.googleapis.com/android_media/external/libavc/tests/AvcEncoder.zip?unzip=true"
-            value="/data/local/tmp/AvcEncoderTestRes/" />
+            value="/data/local/tmp/AvcEncTestRes/" />
     </target_preparer>
 
     <test class="com.android.tradefed.testtype.GTest" >
         <option name="native-test-device-path" value="/data/local/tmp" />
-        <option name="module-name" value="AvcEncoderTest" />
-        <option name="native-test-flag" value="-P /data/local/tmp/AvcEncoderTestRes/" />
+        <option name="module-name" value="AvcEncTest" />
+        <option name="native-test-flag" value="-P /data/local/tmp/AvcEncTestRes/" />
     </test>
 </configuration>

tests/AvcEncTest.cmake

@@ -0,0 +1,21 @@
+include(ExternalProject)
+ExternalProject_Add(googletest
+    GIT_REPOSITORY https://android.googlesource.com/platform/external/googletest
+    GIT_TAG main
+    PREFIX ${AVC_ROOT}/third_party/build/googletest
+    SOURCE_DIR ${AVC_ROOT}/third_party/googletest
+    TMP_DIR ${AVC_ROOT}/third_party/build/googletest/tmp
+    INSTALL_COMMAND ""
+)
+
+list(
+  APPEND
+  AVCENCTEST_SRCS
+  "${AVC_ROOT}/tests/AvcEncTest.cpp")
+
+libavc_add_executable(AvcEncTest libavcenc
+    SOURCES ${AVCENCTEST_SRCS}
+    INCLUDES "${AVC_ROOT}/third_party/googletest/googletest/include")
+target_link_libraries(AvcEncTest
+    ${AVC_ROOT}/third_party/build/googletest/src/googletest-build/lib/libgtest.a
+    ${AVC_ROOT}/third_party/build/googletest/src/googletest-build/lib/libgtest_main.a)