X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flibsystemd-bus%2Ftest-bus-signature.c;h=c4304697f036864f716df1249188028b597d3738;hp=cab0daa77e1a4d3fcb1568afb1ad8b400cfa243c;hb=29ddb38fea134c6132e4f2dd608e9da3871eaebe;hpb=8d1a28020409ee4afea6ef8c1c4d3522a209284e

diff --git a/src/libsystemd-bus/test-bus-signature.c b/src/libsystemd-bus/test-bus-signature.c
index cab0daa77..c4304697f 100644
--- a/src/libsystemd-bus/test-bus-signature.c
+++ b/src/libsystemd-bus/test-bus-signature.c
@@ -28,29 +28,30 @@
 
 int main(int argc, char *argv[]) {
 
-        assert_se(signature_is_single("y"));
-        assert_se(signature_is_single("u"));
-        assert_se(signature_is_single("v"));
-        assert_se(signature_is_single("as"));
-        assert_se(signature_is_single("(ss)"));
-        assert_se(signature_is_single("()"));
-        assert_se(signature_is_single("(()()()()())"));
-        assert_se(signature_is_single("(((())))"));
-        assert_se(signature_is_single("((((s))))"));
-        assert_se(signature_is_single("{ss}"));
-        assert_se(signature_is_single("a{ss}"));
-        assert_se(!signature_is_single("uu"));
-        assert_se(!signature_is_single(""));
-        assert_se(!signature_is_single("("));
-        assert_se(!signature_is_single(")"));
-        assert_se(!signature_is_single("())"));
-        assert_se(!signature_is_single("((())"));
-        assert_se(!signature_is_single("{)"));
-        assert_se(!signature_is_single("{}"));
-        assert_se(!signature_is_single("{sss}"));
-        assert_se(!signature_is_single("{s}"));
-        assert_se(!signature_is_single("{ass}"));
-        assert_se(!signature_is_single("a}"));
+        assert_se(signature_is_single("y", false));
+        assert_se(signature_is_single("u", false));
+        assert_se(signature_is_single("v", false));
+        assert_se(signature_is_single("as", false));
+        assert_se(signature_is_single("(ss)", false));
+        assert_se(signature_is_single("()", false));
+        assert_se(signature_is_single("(()()()()())", false));
+        assert_se(signature_is_single("(((())))", false));
+        assert_se(signature_is_single("((((s))))", false));
+        assert_se(signature_is_single("{ss}", true));
+        assert_se(signature_is_single("a{ss}", false));
+        assert_se(!signature_is_single("uu", false));
+        assert_se(!signature_is_single("", false));
+        assert_se(!signature_is_single("(", false));
+        assert_se(!signature_is_single(")", false));
+        assert_se(!signature_is_single("())", false));
+        assert_se(!signature_is_single("((())", false));
+        assert_se(!signature_is_single("{)", false));
+        assert_se(!signature_is_single("{}", true));
+        assert_se(!signature_is_single("{sss}", true));
+        assert_se(!signature_is_single("{s}", true));
+        assert_se(!signature_is_single("{ss}", false));
+        assert_se(!signature_is_single("{ass}", true));
+        assert_se(!signature_is_single("a}", true));
 
         assert_se(signature_is_pair("yy"));
         assert_se(signature_is_pair("ss"));
@@ -112,5 +113,25 @@ int main(int argc, char *argv[]) {
         assert_se(!namespace_simple_pattern("", "foo"));
         assert_se(!namespace_simple_pattern("foo", ""));
 
+        assert_se(streq(object_path_startswith("/foo/bar", "/foo"), "bar"));
+        assert_se(streq(object_path_startswith("/foo", "/foo"), ""));
+        assert_se(streq(object_path_startswith("/foo", "/"), "foo"));
+        assert_se(streq(object_path_startswith("/", "/"), ""));
+        assert_se(!object_path_startswith("/foo", "/bar"));
+        assert_se(!object_path_startswith("/", "/bar"));
+        assert_se(!object_path_startswith("/foo", ""));
+
+        assert_se(object_path_is_valid("/foo/bar"));
+        assert_se(object_path_is_valid("/foo"));
+        assert_se(object_path_is_valid("/"));
+        assert_se(object_path_is_valid("/foo5"));
+        assert_se(object_path_is_valid("/foo_5"));
+        assert_se(!object_path_is_valid(""));
+        assert_se(!object_path_is_valid("/foo/"));
+        assert_se(!object_path_is_valid("//"));
+        assert_se(!object_path_is_valid("//foo"));
+        assert_se(!object_path_is_valid("/foo//bar"));
+        assert_se(!object_path_is_valid("/foo/aaaäöä"));
+
         return 0;
 }