A few more libpbd test tweaks.

[ardour.git] / libs / pbd / test / scalar_properties.cc

diff --git a/libs/pbd/test/scalar_properties.cc b/libs/pbd/test/scalar_properties.cc
index 05d97a7ad10ebd09f393b01fc2a82db57276f7e6..eff640c6d1e3b6e8feaf01de1c560cb798a22a84 100644 (file)
--- a/libs/pbd/test/scalar_properties.cc
+++ b/libs/pbd/test/scalar_properties.cc
@@ -1,26 +1,37 @@
 #include "scalar_properties.h"
 
+CPPUNIT_TEST_SUITE_REGISTRATION (ScalarPropertiesTest);
+
+using namespace std;
 using namespace PBD;
 
 namespace Properties {
        PBD::PropertyDescriptor<int> fred;
 };
 
+void
+ScalarPropertiesTest::make_property_quarks ()
+{
+       Properties::fred.property_id = g_quark_from_static_string ("fred");
+}
+
 ScalarPropertiesTest::ScalarPropertiesTest ()
        : _fred (Properties::fred, 0)
 {
-
 }
 
 void
 ScalarPropertiesTest::testBasic ()
 {
        CPPUNIT_ASSERT (_fred.changed() == false);
-       
+
        _fred = 4;
        CPPUNIT_ASSERT (_fred == 4);
        CPPUNIT_ASSERT (_fred.changed() == true);
 
+       _fred.clear_history ();
+       CPPUNIT_ASSERT (_fred.changed() == false);
+       
        _fred = 5;
        CPPUNIT_ASSERT (_fred == 5);
        CPPUNIT_ASSERT (_fred.changed() == true);
@@ -28,4 +39,15 @@ ScalarPropertiesTest::testBasic ()
        PropertyList undo;
        PropertyList redo;
        _fred.diff (undo, redo);
+
+       CPPUNIT_ASSERT (undo.size() == 1);
+       CPPUNIT_ASSERT (redo.size() == 1);
+
+       PropertyTemplate<int>* t = dynamic_cast<Property<int>*> (undo.begin()->second);
+       CPPUNIT_ASSERT (t);
+       CPPUNIT_ASSERT (t->val() == 4);
+
+       t = dynamic_cast<Property<int>*> (redo.begin()->second);
+       CPPUNIT_ASSERT (t);
+       CPPUNIT_ASSERT (t->val() == 5);
 }