journal: add one more level on top with AND

[elogind.git] / src / journal / test-journal-match.c

diff --git a/src/journal/test-journal-match.c b/src/journal/test-journal-match.c
index 2ca2337c44a3f9fd480439967e3bf68737521738..7b14568fd2944ebd082f8745ee31d68a20d5c10f 100644 (file)
--- a/src/journal/test-journal-match.c
+++ b/src/journal/test-journal-match.c
@@ -54,11 +54,23 @@ int main(int argc, char *argv[]) {
         assert_se(sd_journal_add_match(j, "ONE=two", 0) >= 0);
         assert_se(sd_journal_add_match(j, "TWO=two", 0) >= 0);
 
-        assert_se(t = journal_make_match_string(j));
+        assert_se(sd_journal_add_conjunction(j) >= 0);
+
+        assert_se(sd_journal_add_match(j, "L4_1=yes", 0) >= 0);
+        assert_se(sd_journal_add_match(j, "L4_1=ok", 0) >= 0);
+        assert_se(sd_journal_add_match(j, "L4_2=yes", 0) >= 0);
+        assert_se(sd_journal_add_match(j, "L4_2=ok", 0) >= 0);
+
+        assert_se(sd_journal_add_disjunction(j) >= 0);
 
-        assert_se(streq(t, "((TWO=two AND (ONE=two OR ONE=one)) OR (PIFF=paff AND (QUUX=yyyyy OR QUUX=xxxxx OR QUUX=mmmm) AND (HALLO= OR HALLO=WALDO)))"));
+        assert_se(sd_journal_add_match(j, "L3=yes", 0) >= 0);
+        assert_se(sd_journal_add_match(j, "L3=ok", 0) >= 0);
+
+        assert_se(t = journal_make_match_string(j));
 
         printf("resulting match expression is: %s\n", t);
 
+        assert_se(streq(t, "(((L3=ok OR L3=yes) OR ((L4_2=ok OR L4_2=yes) AND (L4_1=ok OR L4_1=yes))) AND ((TWO=two AND (ONE=two OR ONE=one)) OR (PIFF=paff AND (QUUX=yyyyy OR QUUX=xxxxx OR QUUX=mmmm) AND (HALLO= OR HALLO=WALDO))))"));
+
         return 0;
 }