More <iostream> includes for Arch.

[dcpomatic.git] / test / colour_conversion_test.cc

diff --git a/test/colour_conversion_test.cc b/test/colour_conversion_test.cc
index f8c764975ad774a852235fb56c22f551d06fdcc8..2f01dd0fdf20c13be61f1b84da7e46dc14b26ee6 100644 (file)
--- a/test/colour_conversion_test.cc
+++ b/test/colour_conversion_test.cc
@@ -22,10 +22,13 @@
  */
 
 #include "lib/colour_conversion.h"
+#include "lib/film.h"
 #include <dcp/colour_matrix.h>
 #include <dcp/gamma_transfer_function.h>
 #include <libxml++/libxml++.h>
 #include <boost/test/unit_test.hpp>
+#include <boost/foreach.hpp>
+#include <iostream>
 
 using std::cout;
 using boost::shared_ptr;
@@ -36,7 +39,7 @@ BOOST_AUTO_TEST_CASE (colour_conversion_test1)
        ColourConversion B (dcp::ColourConversion::rec709_to_xyz ());
 
        BOOST_CHECK_EQUAL (A.identifier(), "9840c601d2775bf1b3847254bbaa36a9");
-       BOOST_CHECK_EQUAL (B.identifier(), "0778fbc5c87470f58820604a66992579");
+       BOOST_CHECK_EQUAL (B.identifier(), "58151ac92fdf333663a62c9a8ba5c5f4");
 }
 
 BOOST_AUTO_TEST_CASE (colour_conversion_test2)
@@ -81,11 +84,8 @@ BOOST_AUTO_TEST_CASE (colour_conversion_test3)
                "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
                "<Test>\n"
                "  <InputTransferFunction>\n"
-               "    <Type>ModifiedGamma</Type>\n"
-               "    <Power>2.222222222222222</Power>\n"
-               "    <Threshold>0.081</Threshold>\n"
-               "    <A>0.099</A>\n"
-               "    <B>4.5</B>\n"
+               "    <Type>Gamma</Type>\n"
+               "    <Gamma>2.2</Gamma>\n"
                "  </InputTransferFunction>\n"
                "  <YUVToRGB>1</YUVToRGB>\n"
                "  <RedX>0.64</RedX>\n"
@@ -100,3 +100,16 @@ BOOST_AUTO_TEST_CASE (colour_conversion_test3)
                "</Test>\n"
                );
 }
+
+/** Test a round trip via the XML representation */
+BOOST_AUTO_TEST_CASE (colour_conversion_test4)
+{
+       BOOST_FOREACH (PresetColourConversion const & i, PresetColourConversion::all ()) {
+               xmlpp::Document out;
+               xmlpp::Element* out_root = out.create_root_node ("Test");
+               i.conversion.as_xml (out_root);
+               shared_ptr<cxml::Document> in (new cxml::Document ("Test"));
+               in->read_string (out.write_to_string ("UTF-8"));
+               BOOST_CHECK (ColourConversion::from_xml (in, Film::current_state_version).get () == i.conversion);
+       }
+}