Add some more tests.

diff --git a/Makefile b/Makefile
index f5d9d2d798de257885faca1b2f71881686821a54..e2a0e871f40d8e203f95c0b8d8324582700aa290 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,8 +5,8 @@ TARGETS = $(TARGET_BINS) $(TARGET_LIBS)
 
 all: $(TARGETS)
 
-tests/check: tests/check.o tests/ptb.o tests/gp.o
-       $(CC) $(FLAGS) $^ -o $@ $(CHECK_LIBS)
+tests/check: tests/check.o tests/ptb.o tests/gp.o ptb.o
+       $(CC) $(FLAGS) $^ -o $@ $(CHECK_LIBS) 
 
 ptb2xml.o: ptb2xml.c
        $(CC) $(CFLAGS) -c $< $(LIBXSLT_CFLAGS) $(LIBXML_CFLAGS) $(XSLT_DEFINE)

diff --git a/tests/ptb.c b/tests/ptb.c
index d4bd27ee7d5736ce892ca14a257142cf0b8aec8f..4c55163d1f174010e68dff6db2072c2e8b4a83a2 100644 (file)
--- a/tests/ptb.c
+++ b/tests/ptb.c
@@ -20,15 +20,50 @@
 #include <check.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
+#include "ptb.h"
 
 START_TEST(test_get_step)
 END_TEST
 
+START_TEST(test_get_tone)
+       fail_unless(strcmp(ptb_get_tone(18), "D") == 0, "got %s", ptb_get_tone(18));
+       fail_unless(strcmp(ptb_get_tone(17), "C#") == 0, "got %s", ptb_get_tone(17));
+END_TEST
+
+START_TEST(test_get_tone_empty)
+       fail_unless(strcmp(ptb_get_tone(1), "") == 0, "got %s", ptb_get_tone(1));
+END_TEST
+
+START_TEST(test_get_tone_invalid)
+       fail_unless(strcmp(ptb_get_tone(30), "_UNKNOWN_CHORD_") == 0, "got %s", ptb_get_tone(30));
+END_TEST
+
+
+START_TEST(test_get_tone_full)
+       fail_unless(strcmp(ptb_get_tone_full(18), "d") == 0, "got %s", ptb_get_tone_full(18));
+       fail_unless(strcmp(ptb_get_tone_full(17), "cis") == 0, "got %s", ptb_get_tone_full(17));
+END_TEST
+
+START_TEST(test_get_tone_full_empty)
+       fail_unless(strcmp(ptb_get_tone_full(1), "_UNKNOWN_CHORD_") == 0, "got %s", ptb_get_tone_full(1));
+END_TEST
+
+START_TEST(test_get_tone_full_invalid)
+       fail_unless(strcmp(ptb_get_tone_full(15), "_UNKNOWN_CHORD_") == 0, "got %s", ptb_get_tone_full(15));
+END_TEST
+
 Suite *ptb_suite()
 {
        Suite *s = suite_create("ptb");
        TCase *tc_core = tcase_create("core");
        suite_add_tcase(s, tc_core);
        tcase_add_test(tc_core, test_get_step);
+       tcase_add_test(tc_core, test_get_tone);
+       tcase_add_test(tc_core, test_get_tone_empty);
+       tcase_add_test(tc_core, test_get_tone_invalid);
+       tcase_add_test(tc_core, test_get_tone_full);
+       tcase_add_test(tc_core, test_get_tone_full_empty);
+       tcase_add_test(tc_core, test_get_tone_full_invalid);
        return s;
 }