- added tests

diff --git a/testsuite/.gitignore b/testsuite/.gitignore
index f8b39a5f352c74bf95376ee2872786fcb2e04e8d..82532a6a22ac7502948f14fd500a5c9829680aa7 100644 (file)
--- a/testsuite/.gitignore
+++ b/testsuite/.gitignore
@@ -1,2 +1,4 @@
 *.o
+dirname1
+basename1
 sysconfig-get1

diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 7fa68791312e1913a56b4922286526ef3eb4e3a6..af160052e8694cea72c4f6f5499b6cec9c855eed 100644 (file)
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -10,10 +10,13 @@ LDADD = ../snapper/libsnapper.la
 
 noinst_SCRIPTS = run-all
 
-noinst_PROGRAMS = sysconfig-get1
+noinst_PROGRAMS = sysconfig-get1 dirname1 basename1
 
 sysconfig_get1_SOURCES = sysconfig-get1.cc common.h
 
+dirname1_SOURCES = dirname1.cc common.h
+basename1_SOURCES = basename1.cc common.h
+
 EXTRA_DIST = $(noinst_SCRIPTS) sysconfig-get1.txt
 
 check:

diff --git a/testsuite/basename1.cc b/testsuite/basename1.cc
new file mode 100644 (file)
index 0000000..baf30f3
--- /dev/null
+++ b/testsuite/basename1.cc
@@ -0,0 +1,21 @@
+
+#include "common.h"
+
+#include <snapper/AppUtil.h>
+
+using namespace snapper;
+
+
+int
+main()
+{
+    check_equal(basename("/hello/world"), string("world"));
+    check_equal(basename("hello/world"), string("world"));
+    check_equal(basename("/hello"), string("hello"));
+    check_equal(basename("hello"), string("hello"));
+    check_equal(basename("/"), string(""));
+    check_equal(basename(""), string(""));
+    check_equal(basename("."), string("."));
+    check_equal(basename(".."), string(".."));
+    check_equal(basename("../.."), string(".."));
+}

diff --git a/testsuite/common.h b/testsuite/common.h
index fc553a137bc461e4c923b75bd66937e97731dfc5..8f39cac9274ac11bde38ff7b5288eacc40501806 100644 (file)
--- a/testsuite/common.h
+++ b/testsuite/common.h
@@ -1,5 +1,6 @@
 
-#include <string>
+#include <stdlib.h>
+#include <iostream>
 
 using namespace std;
 

diff --git a/testsuite/dirname1.cc b/testsuite/dirname1.cc
new file mode 100644 (file)
index 0000000..8ba0062
--- /dev/null
+++ b/testsuite/dirname1.cc
@@ -0,0 +1,21 @@
+
+#include "common.h"
+
+#include <snapper/AppUtil.h>
+
+using namespace snapper;
+
+
+int
+main()
+{
+    check_equal(dirname("/hello/world"), string("/hello"));
+    check_equal(dirname("hello/world"), string("hello"));
+    check_equal(dirname("/hello"), string("/"));
+    check_equal(dirname("hello"), string("."));
+    check_equal(dirname("/"), string("/"));
+    check_equal(dirname(""), string("."));
+    check_equal(dirname("."), string("."));
+    check_equal(dirname(".."), string("."));
+    check_equal(dirname("../.."), string(".."));
+}

diff --git a/testsuite/run-all b/testsuite/run-all
index 2c74e140eaf9f156015698b52493ec68269eeabb..1726df7614f35dbd0c012e4abbb0000f18bcb07a 100755 (executable)
--- a/testsuite/run-all
+++ b/testsuite/run-all
@@ -18,5 +18,8 @@ function run()
 }
 
 
+run dirname1
+run basename1
+
 run sysconfig-get1
 

diff --git a/testsuite/sysconfig-get1.cc b/testsuite/sysconfig-get1.cc
index ce321e3c35b8d0e1d11e995f55fdf0bbf9565ec0..3e29cd44112385d02e6d18ced07f1eb83dc21bbf 100644 (file)
--- a/testsuite/sysconfig-get1.cc
+++ b/testsuite/sysconfig-get1.cc
@@ -1,6 +1,4 @@
 
-#include <stdlib.h>
-#include <iostream>
 #include <boost/algorithm/string.hpp>
 
 #include "common.h"