commit 4dc37605e8e1ec83b0f963832dff7601c0ded203
author Devin Moore <devinmoore@google.com> Wed Jan 10 18:56:09 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 10 18:56:09 2024 +0000
tree a28da87e6a437ba15bd91bf527ff6300acd34096
parent fe02df8ce644a8af704dbebec7775630a429bcc4
parent 4b4ce0314a5e30a0d8dc5fe1a0ce85aa072e4388

Merge "Rename AImageReaderWindowHandleTest to AImageReaderWindowTest" into main

media/ndk/Android.bp

diff --git a/media/ndk/Android.bp b/media/ndk/Android.bp
index 7196d79..9ec7700 100644
--- a/media/ndk/Android.bp
+++ b/media/ndk/Android.bp
@@ -208,9 +208,9 @@
 }
 
 cc_test {
-    name: "AImageReaderWindowHandleTest",
+    name: "AImageReaderWindowTest",
     test_suites: ["device-tests"],
-    srcs: ["tests/AImageReaderWindowHandleTest.cpp"],
+    srcs: ["tests/AImageReaderWindowTest.cpp"],
     shared_libs: [
         "libbinder",
         "libmediandk",

media/ndk/TEST_MAPPING

diff --git a/media/ndk/TEST_MAPPING b/media/ndk/TEST_MAPPING
index e420812..1a15728 100644
--- a/media/ndk/TEST_MAPPING
+++ b/media/ndk/TEST_MAPPING
@@ -1,7 +1,7 @@
 // mappings for frameworks/av/media/ndk
 {
   "presubmit": [
-    { "name": "AImageReaderWindowHandleTest" },
+    { "name": "AImageReaderWindowTest" },
     { "name": "libmediandk_test" }
   ]
 }

media/ndk/tests/AImageReaderWindowTest.cpp

diff --git a/media/ndk/tests/AImageReaderWindowHandleTest.cpp b/media/ndk/tests/AImageReaderWindowTest.cpp
similarity index 96%
rename from media/ndk/tests/AImageReaderWindowHandleTest.cpp
rename to media/ndk/tests/AImageReaderWindowTest.cpp
index a32b51f..650b990 100644
--- a/media/ndk/tests/AImageReaderWindowHandleTest.cpp
+++ b/media/ndk/tests/AImageReaderWindowTest.cpp
@@ -58,7 +58,7 @@
 
 static constexpr int kOnImageAvailableWaitUs = 100 * 1000;
 
-class AImageReaderWindowHandleTest : public ::testing::Test {
+class AImageReaderWindowTest : public ::testing::Test {
    public:
     void SetUp() override {
         AImageReader_newWithUsage(kImageWidth, kImageHeight, kImageFormat,
@@ -105,8 +105,8 @@
 
     static void onImageAvailable(void *context, AImageReader *reader) {
         (void)reader;
-        AImageReaderWindowHandleTest *thisContext =
-            reinterpret_cast<AImageReaderWindowHandleTest *>(context);
+        AImageReaderWindowTest *thisContext =
+            reinterpret_cast<AImageReaderWindowTest *>(context);
         thisContext->HandleImageAvailable();
     }
 
@@ -178,7 +178,7 @@
 };
 
 
-TEST_F(AImageReaderWindowHandleTest, CreateWindowNativeHandle) {
+TEST_F(AImageReaderWindowTest, CreateWindowNativeHandle) {
     // Check that we can create a native_handle_t corresponding to the
     // AImageReader.
     native_handle_t *nh = nullptr;
@@ -205,7 +205,7 @@
     validateIGBP(igbp);
 }
 
-TEST_F(AImageReaderWindowHandleTest, CreateWindow) {
+TEST_F(AImageReaderWindowTest, CreateWindow) {
     ANativeWindow* window = nullptr;
     media_status_t status = AImageReader_getWindow(imageReader_, &window);