1 files changed, 54 insertions, 0 deletions
diff --git a/libs/canvas/test/types.cc b/libs/canvas/test/types.cc
new file mode 100644
index 0000000000..69667466de
--- /dev/null
+++ b/libs/canvas/test/types.cc
@@ -0,0 +1,54 @@
+#include "canvas/types.h"
+#include "types.h"
+
+using namespace std;
+using namespace ArdourCanvas;
+
+CPPUNIT_TEST_SUITE_REGISTRATION (TypesTest);
+
+void
+TypesTest::intersect ()
+{
+	{
+		Rect a (0, 0, 1024, 1024);
+		Rect b (0, 0, 512, 512);
+		boost::optional<Rect> c = a.intersection (b);
+
+		CPPUNIT_ASSERT (c.is_initialized ());
+		CPPUNIT_ASSERT (c->x0 == 0);
+		CPPUNIT_ASSERT (c->x1 == 512);
+		CPPUNIT_ASSERT (c->y0 == 0);
+		CPPUNIT_ASSERT (c->y1 == 512);
+	}
+
+	{
+		Rect a (0, 0, 512, 512);
+		Rect b (513, 513, 1024, 1024);
+		boost::optional<Rect> c = a.intersection (b);
+
+		CPPUNIT_ASSERT (!c.is_initialized ());
+	}
+}
+
+void
+TypesTest::extend ()
+{
+	{
+		Rect a (50, 60, 70, 80);
+		Rect b (100, 110, 120, 130);
+		Rect c = a.extend (b);
+
+		CPPUNIT_ASSERT (c.x0 == 50);
+		CPPUNIT_ASSERT (c.y0 == 60);
+		CPPUNIT_ASSERT (c.x1 == 120);
+		CPPUNIT_ASSERT (c.y1 == 130);
+	}
+}
+		
+void
+TypesTest::test_safe_add ()
+{
+	CPPUNIT_ASSERT (safe_add (4, 9) == 13);
+	CPPUNIT_ASSERT (safe_add (4, COORD_MAX) == COORD_MAX);
+	CPPUNIT_ASSERT (safe_add (COORD_MAX, 4) == COORD_MAX);
+}