Changeset 2309 for libcacaTweet

Timestamp:

Apr 21, 2008, 12:10:42 PM (15 years ago)

Author:

Sam Hocevar

Message:

• Started libcaca unit tests.

Location:

libcaca/trunk/tests

Files:

• .gitignore (modified) (1 diff)
• Makefile.am (modified) (2 diffs)
• caca-test.cpp (added)
• canvas.cpp (modified) (2 diffs)
• driver.cpp (added)

libcaca/trunk/tests/.gitignore

@@ -1 +1 @@
 simple
 cucul-test
+caca-test

libcaca/trunk/tests/Makefile.am

@@ -1 +1 @@
 # $Id$
 
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/cucul -I../cucul
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/cucul -I../cucul \
+              -I$(top_srcdir)/caca
 
 if USE_CPPUNIT
-cppunit_tests = cucul-test
+cppunit_tests = cucul-test caca-test
 endif
 
@@ -15 +16 @@
 
 cucul_test_SOURCES = cucul-test.cpp canvas.cpp
-cucul_test_CPPFLAGS = $(CPPUNIT_CFLAGS)
+cucul_test_CXXFLAGS = $(CPPUNIT_CFLAGS)
 cucul_test_LDADD = ../cucul/libcucul.la $(CPPUNIT_LIBS)
 
+caca_test_SOURCES = caca-test.cpp driver.cpp
+caca_test_CXXFLAGS = $(CPPUNIT_CFLAGS)
+caca_test_LDADD = ../caca/libcaca.la $(CPPUNIT_LIBS)
+

libcaca/trunk/tests/canvas.cpp

@@ -1 +1 @@
 /*
  *  cucul-test    testsuite program for libcucul
- *  Copyright (c) 2008 Sam Hocevar <sam@zoy.org>
  *  Copyright (c) 2008 Sam Hocevar <sam@zoy.org>
  *                All Rights Reserved
@@ -53 +52 @@
 
         cv = cucul_create_canvas(0, 0);
-        CPPUNIT_ASSERT_EQUAL(cucul_get_canvas_width(cv), 0U);
-        CPPUNIT_ASSERT_EQUAL(cucul_get_canvas_height(cv), 0U);
+        CPPUNIT_ASSERT_EQUAL(cucul_get_canvas_width(cv), 0);
+        CPPUNIT_ASSERT_EQUAL(cucul_get_canvas_height(cv), 0);
 
         cucul_set_canvas_size(cv, 1, 1);
-        CPPUNIT_ASSERT_EQUAL(cucul_get_canvas_width(cv), 1U);
-        CPPUNIT_ASSERT_EQUAL(cucul_get_canvas_height(cv), 1U);
+        CPPUNIT_ASSERT_EQUAL(cucul_get_canvas_width(cv), 1);
+        CPPUNIT_ASSERT_EQUAL(cucul_get_canvas_height(cv), 1);
 
         cucul_set_canvas_size(cv, 1234, 1001);
-        CPPUNIT_ASSERT_EQUAL(cucul_get_canvas_width(cv), 1234U);
-        CPPUNIT_ASSERT_EQUAL(cucul_get_canvas_height(cv), 1001U);
+        CPPUNIT_ASSERT_EQUAL(cucul_get_canvas_width(cv), 1234);
+        CPPUNIT_ASSERT_EQUAL(cucul_get_canvas_height(cv), 1001);
 
         cucul_set_canvas_size(cv, 0, 0);
-        CPPUNIT_ASSERT_EQUAL(cucul_get_canvas_width(cv), 0U);
-        CPPUNIT_ASSERT_EQUAL(cucul_get_canvas_height(cv), 0U);
+        CPPUNIT_ASSERT_EQUAL(cucul_get_canvas_width(cv), 0);
+        CPPUNIT_ASSERT_EQUAL(cucul_get_canvas_height(cv), 0);
 
         cucul_free_canvas(cv);