commit 72d105f876312a6a7a0886963c461a56c16d6383
author hkuang <hkuang@google.com> Thu May 21 10:48:55 2020 -0700
committer hkuang <hkuang@google.com> Tue May 26 16:05:35 2020 -0700
tree 90b7e8670ce9815df8f2b2b2b31c9f5388c79abc
parent 63b7e570a5ee9d48b886c4c18306bb26d5f2a107

Transcoding: Change to use string path instead of fd.

Bug: 145628554
Test: unit test

Change-Id: I321ecf75e770b4500fc3015a5d161e3b48ea5678

media/libmediatranscoding/tests/TranscodingClientManager_tests.cpp

diff --git a/media/libmediatranscoding/tests/TranscodingClientManager_tests.cpp b/media/libmediatranscoding/tests/TranscodingClientManager_tests.cpp
index d9504ca..0ae8035 100644
--- a/media/libmediatranscoding/tests/TranscodingClientManager_tests.cpp
+++ b/media/libmediatranscoding/tests/TranscodingClientManager_tests.cpp
@@ -133,7 +133,7 @@
 
         // This is the secret name we'll check, to test error propagation from
         // the scheduler back to client.
-        if (request.fileName == "bad_file") {
+        if (request.sourceFilePath == "bad_source_file") {
             return false;
         }
 
@@ -346,33 +346,37 @@
 
     // Test jobId assignment.
     TranscodingRequestParcel request;
-    request.fileName = "test_file_0";
+    request.sourceFilePath = "test_source_file_0";
+    request.destinationFilePath = "test_desintaion_file_0";
     TranscodingJobParcel job;
     bool result;
     EXPECT_TRUE(mClient1->submitRequest(request, &job, &result).isOk());
     EXPECT_TRUE(result);
     EXPECT_EQ(job.jobId, JOB(0));
 
-    request.fileName = "test_file_1";
+    request.sourceFilePath = "test_source_file_1";
+    request.destinationFilePath = "test_desintaion_file_1";
     EXPECT_TRUE(mClient1->submitRequest(request, &job, &result).isOk());
     EXPECT_TRUE(result);
     EXPECT_EQ(job.jobId, JOB(1));
 
-    request.fileName = "test_file_2";
+    request.sourceFilePath = "test_source_file_2";
+    request.destinationFilePath = "test_desintaion_file_2";
     EXPECT_TRUE(mClient1->submitRequest(request, &job, &result).isOk());
     EXPECT_TRUE(result);
     EXPECT_EQ(job.jobId, JOB(2));
 
-    // Test submit bad request (no valid fileName) fails.
+    // Test submit bad request (no valid sourceFilePath) fails.
     TranscodingRequestParcel badRequest;
-    badRequest.fileName = "bad_file";
+    badRequest.sourceFilePath = "bad_source_file";
+    badRequest.destinationFilePath = "bad_destination_file";
     EXPECT_TRUE(mClient1->submitRequest(badRequest, &job, &result).isOk());
     EXPECT_FALSE(result);
 
     // Test get jobs by id.
     EXPECT_TRUE(mClient1->getJobWithId(JOB(2), &job, &result).isOk());
     EXPECT_EQ(job.jobId, JOB(2));
-    EXPECT_EQ(job.request.fileName, "test_file_2");
+    EXPECT_EQ(job.request.sourceFilePath, "test_source_file_2");
     EXPECT_TRUE(result);
 
     // Test get jobs by invalid id fails.
@@ -417,7 +421,8 @@
     addMultipleClients();
 
     TranscodingRequestParcel request;
-    request.fileName = "test_file_name";
+    request.sourceFilePath = "test_source_file_name";
+    request.destinationFilePath = "test_destination_file_name";
     TranscodingJobParcel job;
     bool result;
     EXPECT_TRUE(mClient1->submitRequest(request, &job, &result).isOk());
@@ -461,12 +466,14 @@
     TranscodingJobParcel job;
     bool result;
 
-    request.fileName = "test_file_0";
+    request.sourceFilePath = "test_source_file_0";
+    request.destinationFilePath = "test_destination_file_0";
     request.priority = TranscodingJobPriority::kUnspecified;
     EXPECT_TRUE(client->submitRequest(request, &job, &result).isOk() && result);
     EXPECT_EQ(job.jobId, JOB(0));
 
-    request.fileName = "test_file_1";
+    request.sourceFilePath = "test_source_file_1";
+    request.destinationFilePath = "test_destination_file_1";
     request.priority = TranscodingJobPriority::kNormal;
     EXPECT_TRUE(client->submitRequest(request, &job, &result).isOk() && result);
     EXPECT_EQ(job.jobId, JOB(1));
@@ -476,7 +483,8 @@
     EXPECT_TRUE(status.isOk());
 
     // Test submit new request after unregister, should fail with ERROR_DISCONNECTED.
-    request.fileName = "test_file_2";
+    request.sourceFilePath = "test_source_file_2";
+    request.destinationFilePath = "test_destination_file_2";
     request.priority = TranscodingJobPriority::kNormal;
     status = client->submitRequest(request, &job, &result);
     EXPECT_FALSE(status.isOk());