Move Editor class to test.{cc,h}

diff --git a/test/subtitle_font_id_change_test.cc b/test/subtitle_font_id_change_test.cc
index f325419800b67233a5e92eb43a7abf6edda3d1ee..878dc650668bd30d152aaea709fcb1b1f873b477 100644 (file)
--- a/test/subtitle_font_id_change_test.cc
+++ b/test/subtitle_font_id_change_test.cc
@@ -38,37 +38,6 @@
 using std::string;
 
 
-class Editor
-{
-public:
-       Editor (boost::filesystem::path path)
-               : _path(path)
-               , _content(dcp::file_to_string(path))
-       {
-
-       }
-
-       ~Editor ()
-       {
-               auto f = fopen(_path.string().c_str(), "w");
-               BOOST_REQUIRE(f);
-               fwrite(_content.c_str(), _content.length(), 1, f);
-               fclose(f);
-       }
-
-       void replace (string a, string b)
-       {
-               auto old_content = _content;
-               boost::algorithm::replace_all (_content, a, b);
-               BOOST_REQUIRE (_content != old_content);
-       }
-
-private:
-       boost::filesystem::path _path;
-       std::string _content;
-};
-
-
 BOOST_AUTO_TEST_CASE(subtitle_font_id_change_test1)
 {
        auto film = new_test_film2("subtitle_font_id_change_test1");

diff --git a/test/test.cc b/test/test.cc
index f1fd40fb791597c4bf5da7e960a05b523b5878cb..02b567237b01dd20f9d4251686172872689af442 100644 (file)
--- a/test/test.cc
+++ b/test/test.cc
@@ -980,3 +980,27 @@ find_file (boost::filesystem::path dir, string filename_part)
        BOOST_REQUIRE (found);
        return *found;
 }
+
+
+Editor::Editor(boost::filesystem::path path)
+       : _path(path)
+       , _content(dcp::file_to_string(path))
+{
+
+}
+
+Editor::~Editor()
+{
+       auto f = fopen(_path.string().c_str(), "w");
+       BOOST_REQUIRE(f);
+       fwrite(_content.c_str(), _content.length(), 1, f);
+       fclose(f);
+}
+
+void
+Editor::replace(string a, string b)
+{
+       auto old_content = _content;
+       boost::algorithm::replace_all(_content, a, b);
+       BOOST_REQUIRE(_content != old_content);
+}

diff --git a/test/test.h b/test/test.h
index 10113b66276afae11a42af1a2cb442bfe05aba0c..8bcef0604c9b3a080a839735b4e034dc0bc45900 100644 (file)
--- a/test/test.h
+++ b/test/test.h
@@ -97,6 +97,20 @@ public:
 };
 
 
+class Editor
+{
+public:
+       Editor(boost::filesystem::path path);
+       ~Editor();
+
+       void replace(std::string a, std::string b);
+
+private:
+       boost::filesystem::path _path;
+       std::string _content;
+};
+
+
 namespace dcp {
 
 std::ostream& operator<< (std::ostream& s, dcp::Size i);