Add a basic backwards compatibility unittest.

courgette/image_info_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "courgette/base_test_unittest.h"
 #include "courgette/image_info.h"
 
-#include <string>
-
-#include "base/path_service.h"
-#include "base/file_util.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/string_util.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-class ImageInfoTest : public testing::Test {
+class ImageInfoTest : public BaseTest {
  public:
 
   void TestExe() const;
   void TestResourceDll() const;
 
- private:
-  void SetUp() {
-    PathService::Get(base::DIR_SOURCE_ROOT, &test_dir_);
-    test_dir_ = test_dir_.AppendASCII("courgette");
-    test_dir_ = test_dir_.AppendASCII("testdata");
-  }
-
-  void TearDown() {
-  }
-
+ protected:

[Michael Krebs, 2011/10/17 21:22:14]

Did you intend to change ExpectExecutable() to be protected instead of private?

[dgarrett, 2011/10/17 21:50:59]

No, but don't really care either way. I can switch it back.

   void ExpectExecutable(courgette::PEInfo* info) const;
 
-  std::string FileContents(const char* file_name) const;
-
-  FilePath test_dir_;
 };
 
-//  Reads a test file into a string.
-std::string ImageInfoTest::FileContents(const char* file_name) const {
-  FilePath file_path = test_dir_;
-  file_path = file_path.AppendASCII(file_name);
-  std::string file_bytes;
-  if (!file_util::ReadFileToString(file_path, &file_bytes)) {
-    EXPECT_TRUE(!"Could not read test data");
-  }
-  return file_bytes;
-}
-
 void ImageInfoTest::ExpectExecutable(courgette::PEInfo* info) const {
   EXPECT_TRUE(info->ok());
   EXPECT_TRUE(info->has_text_section());
 }
 
 void ImageInfoTest::TestExe() const {
   std::string file1 = FileContents("setup1.exe");
 
   scoped_ptr<courgette::PEInfo> info(new courgette::PEInfo());
   info->Init(reinterpret_cast<const uint8*>(file1.c_str()), file1.length());
@@ skipping 38 matching lines @@
 
   EXPECT_TRUE(info->ok());
   EXPECT_FALSE(info->has_text_section());
   EXPECT_EQ(0U, info->size_of_code());
 }
 
 TEST_F(ImageInfoTest, All) {
   TestExe();
   TestResourceDll();
 }