[brlcad-commits] SF.net SVN: brlcad:[51607] brlcad/trunk/src/libbu/test

[<sta...@us...>]

Revision: 51607
          http://brlcad.svn.sourceforge.net/brlcad/?rev=51607&view=rev
Author:   starseeker
Date:     2012-07-19 21:30:00 +0000 (Thu, 19 Jul 2012)
Log Message:
-----------
Add basename tests to ctest

Modified Paths:
--------------
    brlcad/trunk/src/libbu/test/CMakeLists.txt
    brlcad/trunk/src/libbu/test/basename.c

Modified: brlcad/trunk/src/libbu/test/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libbu/test/CMakeLists.txt	2012-07-19 20:53:52 UTC (rev 51606)
+++ brlcad/trunk/src/libbu/test/CMakeLists.txt	2012-07-19 21:30:00 UTC (rev 51607)
@@ -10,10 +10,35 @@
 BRLCAD_ADDEXEC(tester_timer timer.c libbu NO_INSTALL LOCAL)
 BRLCAD_ADDEXEC(tester_vls_vprintf vls_vprintf.c libbu NO_INSTALL LOCAL)
 
+############################
+#     basename testing     #
+############################
+add_test(bu_basename_empty                                      tester_basename) # tests NULL and ""
+add_test(bu_basename_sl_usr_sl_dir_sl_file                      tester_basename "/usr/dir/file")
+add_test(bu_basename_sl_usr_sl_dir_sl_                          tester_basename "/usr/dir/")
+add_test(bu_basename_sl_usr_bsl__bsl__sl_dir                    tester_basename "/usr\\/dir")
+add_test(bu_basename_sl_usr_sl__p_                              tester_basename "/usr/.")
+add_test(bu_basename_sl_usr_sl_                                 tester_basename "/usr/")
+add_test(bu_basename_sl_usr                                     tester_basename "/usr")
+add_test(bu_basename_usr                                        tester_basename "usr")
+add_test(bu_basename_sl_usr_sl_some_sp_long_sl_file             tester_basename "/usr/some long/file")
+add_test(bu_basename_sl_usr_sl_some_sp_file                     tester_basename "/usr/some file")
+add_test(bu_basename_C_c__sl_usr_sl_some_bsl__bsl__sp_drivepath tester_basename "C:/usr/some\\ drivepath")
+add_test(bu_basename_sl_a_sp_test_sp_file                       tester_basename "/a test file")
+add_test(bu_basename_another_sp_file                            tester_basename "another file")
+add_test(bu_basename_C_c__bsl__bsl_Temp                         tester_basename "C:\\Temp")
+add_test(bu_basename_C_c__sl_Temp                               tester_basename "C:/Temp")
+add_test(bu_basename_sl_                                        tester_basename "/")
+add_test(bu_basename_sl__sl__sl__sl__sl_                        tester_basename "/////")
+add_test(bu_basename_p_                                         tester_basename ".")
+add_test(bu_basename_p__p_                                      tester_basename "..")
+add_test(bu_basename_p__p__p_                                   tester_basename "...")
+add_test(bu_basename_sp__sp__sp_                                tester_basename "   ")
 
+
 # Local Variables:
 # tab-width: 8
 # mode: cmake
 # indent-tabs-mode: t
 # End:
-# ex: shiftwidth=2 tabstop=8
+# ex: shiftwidth=2 tabstop=8 textwidth=0 wrapmargin=0

Modified: brlcad/trunk/src/libbu/test/basename.c
===================================================================
--- brlcad/trunk/src/libbu/test/basename.c	2012-07-19 20:53:52 UTC (rev 51606)
+++ brlcad/trunk/src/libbu/test/basename.c	2012-07-19 21:30:00 UTC (rev 51607)
@@ -58,52 +58,27 @@
     if (BU_STR_EQUAL(res, ans))
 	printf("%24s -> %24s [PASSED]\n", input, res);
     else
-	printf("%24s -> %24s (should be: %s) [FAIL]\n", input, res, ans);
+	bu_exit(EXIT_FAILURE, "%24s -> %24s (should be: %s) [FAIL]\n", input, res, ans);
 
     bu_free(res, NULL);
 }
 
 
 int
-main(int ac, char *av[])
+main(int argc, char *argv[])
 {
-    char input[1000] = {0};
+    /* If we don't have any args at all, test NULL and "" */
+    if (argc == 1) {
+	automatic_test("");
+	automatic_test(NULL);
+    }
 
-    /* pre-define tests */
-    printf("Performing pre-defined tests:\n");
-    automatic_test("/usr/dir/file");
-    automatic_test("/usr/dir/");
-    automatic_test("/usr\\/dir");
-    automatic_test("/usr/.");
-    automatic_test("/usr/");
-    automatic_test("/usr");
-    automatic_test("usr");
-    automatic_test("/usr/some long/file");
-    automatic_test("/usr/some file");
-    automatic_test("C:/usr/some\\ drivepath");
-    automatic_test("/a test file");
-    automatic_test("another file");
-    automatic_test("C:\\Temp");
-    automatic_test("C:/Temp");
-    automatic_test("/");
-    automatic_test("/////");
-    automatic_test(".");
-    automatic_test("..");
-    automatic_test("...");
-    automatic_test("   ");
-    automatic_test("");
-    automatic_test(NULL);
-
-    /* user tests */
-    if (ac > 1) {
-	printf("Enter a string:\n");
-	bu_fgets(input, 1000, stdin);
-	if (strlen(input) > 0)
-	    input[strlen(input)-1] = '\0';
-	automatic_test(input);
+    /* If we have something, print it and test it */
+    if (argc > 1) {
+       printf("Testing string %s\n", argv[1]);
+       automatic_test(argv[1]);
     }
 
-    printf("%s: testing complete\n", av[0]);
     return 0;
 }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.