Locate test data more robustly

util/net/http_body_test.cc

 // Copyright 2014 The Crashpad Authors. All rights reserved.
 //
 // 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.
 
 #include "util/net/http_body.h"
 
 #include "gtest/gtest.h"
 #include "util/net/http_body_test_util.h"
+#include "util/test/paths.h"
 
 namespace crashpad {
 namespace test {
 namespace {
 
 void ExpectBufferSet(const uint8_t* actual,
                      uint8_t expected_byte,
                      size_t num_expected_bytes) {
   for (size_t i = 0; i < num_expected_bytes; ++i) {
     EXPECT_EQ(expected_byte, actual[i]) << i;
@@ skipping 57 matching lines @@
     EXPECT_EQ(1, stream.GetBytesBuffer(buf, sizeof(buf)));
     EXPECT_EQ('c', buf[0]);
     EXPECT_EQ('b', buf[1]);  // Unmodified from last read.
     EXPECT_EQ(0, stream.GetBytesBuffer(buf, sizeof(buf)));
     EXPECT_EQ('c', buf[0]);
     EXPECT_EQ('b', buf[1]);
   }
 }
 
 TEST(FileHTTPBodyStream, ReadASCIIFile) {
-  // TODO(rsesek): Use a more robust mechanism to locate testdata
-  // <https://code.google.com/p/crashpad/issues/detail?id=4>.
-  base::FilePath path = base::FilePath(
+  base::FilePath path = Paths::TestDataRoot().Append(
       FILE_PATH_LITERAL("util/net/testdata/ascii_http_body.txt"));
   FileHTTPBodyStream stream(path);
   std::string contents = ReadStreamToString(&stream, 32);
   EXPECT_EQ("This is a test.\n", contents);
 
   // Make sure that the file is not read again after it has been read to
   // completion.
   uint8_t buf[8];
   memset(buf, '!', sizeof(buf));
   EXPECT_EQ(0, stream.GetBytesBuffer(buf, sizeof(buf)));
   ExpectBufferSet(buf, '!', sizeof(buf));
   EXPECT_EQ(0, stream.GetBytesBuffer(buf, sizeof(buf)));
   ExpectBufferSet(buf, '!', sizeof(buf));
 }
 
 TEST(FileHTTPBodyStream, ReadBinaryFile) {
   // HEX contents of file: |FEEDFACE A11A15|.
-  // TODO(rsesek): Use a more robust mechanism to locate testdata
-  // <https://code.google.com/p/crashpad/issues/detail?id=4>.
-  base::FilePath path = base::FilePath(
+  base::FilePath path = Paths::TestDataRoot().Append(
       FILE_PATH_LITERAL("util/net/testdata/binary_http_body.dat"));
   // This buffer size was chosen so that reading the file takes multiple reads.
   uint8_t buf[4];
 
   FileHTTPBodyStream stream(path);
 
   memset(buf, '!', sizeof(buf));
   EXPECT_EQ(4, stream.GetBytesBuffer(buf, sizeof(buf)));
   EXPECT_EQ(0xfe, buf[0]);
   EXPECT_EQ(0xed, buf[1]);
@@ skipping 63 matching lines @@
 
   ExpectBufferSet(reinterpret_cast<uint8_t*>(&buf[all_strings_length]), '!', 3);
 }
 
 TEST_P(CompositeHTTPBodyStreamBufferSize, StringsAndFile) {
   std::string string1("Hello! ");
   std::string string2(" Goodbye :)");
 
   std::vector<HTTPBodyStream*> parts;
   parts.push_back(new StringHTTPBodyStream(string1));
-  parts.push_back(new FileHTTPBodyStream(base::FilePath(
-      FILE_PATH_LITERAL("util/net/testdata/ascii_http_body.txt"))));
+  base::FilePath path = Paths::TestDataRoot().Append(
+      FILE_PATH_LITERAL("util/net/testdata/ascii_http_body.txt"));
+  parts.push_back(new FileHTTPBodyStream(path));
   parts.push_back(new StringHTTPBodyStream(string2));
 
   CompositeHTTPBodyStream stream(parts);
 
   std::string expected_string = string1 + "This is a test.\n" + string2;
   std::string actual_string = ReadStreamToString(&stream, GetParam());
   EXPECT_EQ(expected_string, actual_string);
 }
 
 INSTANTIATE_TEST_CASE_P(VariableBufferSize,
                         CompositeHTTPBodyStreamBufferSize,
                         testing::Values(1, 2, 9, 16, 31, 128, 1024));
 
 }  // namespace
 }  // namespace test
 }  // namespace crashpad