journal: unify code for up and for down traversal

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

diff --git a/src/journal/test-journal.c b/src/journal/test-journal.c
index 92bef5f3ef9239773a3d2d9c50b6f0d2e884fcaf..93e2b4dab4039b6fb1484eb33670da8b2bfa0b64 100644 (file)
--- a/src/journal/test-journal.c
+++ b/src/journal/test-journal.c
@@ -20,8 +20,9 @@
 ***/
 
 #include <fcntl.h>
+#include <unistd.h>
 
-#include "journal-private.h"
+#include "journal-file.h"
 #include "log.h"
 
 int main(int argc, char *argv[]) {
@@ -33,48 +34,50 @@ int main(int argc, char *argv[]) {
 
         log_set_max_level(LOG_DEBUG);
 
-        assert_se(journal_file_open(NULL, "test", O_RDWR|O_CREAT, 0666, &f) == 0);
+        unlink("test.journal");
+
+        assert_se(journal_file_open("test.journal", O_RDWR|O_CREAT, 0666, NULL, &f) == 0);
 
         dual_timestamp_get(&ts);
 
         iovec.iov_base = (void*) test;
         iovec.iov_len = strlen(test);
-        assert_se(journal_file_append_entry(f, &ts, &iovec, 1, NULL, NULL) == 0);
+        assert_se(journal_file_append_entry(f, &ts, &iovec, 1, NULL, NULL, NULL) == 0);
 
         iovec.iov_base = (void*) test2;
         iovec.iov_len = strlen(test2);
-        assert_se(journal_file_append_entry(f, &ts, &iovec, 1, NULL, NULL) == 0);
+        assert_se(journal_file_append_entry(f, &ts, &iovec, 1, NULL, NULL, NULL) == 0);
 
         iovec.iov_base = (void*) test;
         iovec.iov_len = strlen(test);
-        assert_se(journal_file_append_entry(f, &ts, &iovec, 1, NULL, NULL) == 0);
+        assert_se(journal_file_append_entry(f, &ts, &iovec, 1, NULL, NULL, NULL) == 0);
 
         journal_file_dump(f);
 
-        assert(journal_file_next_entry(f, NULL, &o, NULL) == 1);
+        assert(journal_file_next_entry(f, NULL, DIRECTION_DOWN, &o, NULL) == 1);
         assert(le64toh(o->entry.seqnum) == 1);
 
-        assert(journal_file_next_entry(f, o, &o, NULL) == 1);
+        assert(journal_file_next_entry(f, o, DIRECTION_DOWN, &o, NULL) == 1);
         assert(le64toh(o->entry.seqnum) == 2);
 
-        assert(journal_file_next_entry(f, o, &o, NULL) == 1);
+        assert(journal_file_next_entry(f, o, DIRECTION_DOWN, &o, NULL) == 1);
         assert(le64toh(o->entry.seqnum) == 3);
 
-        assert(journal_file_next_entry(f, o, &o, NULL) == 0);
+        assert(journal_file_next_entry(f, o, DIRECTION_DOWN, &o, NULL) == 0);
 
-        assert(journal_file_find_first_entry(f, test, strlen(test), &o, NULL) == 1);
+        assert(journal_file_find_first_entry(f, test, strlen(test), DIRECTION_DOWN, &o, NULL) == 1);
         assert(le64toh(o->entry.seqnum) == 1);
 
-        assert(journal_file_find_last_entry(f, test, strlen(test), &o, NULL) == 1);
+        assert(journal_file_find_first_entry(f, test, strlen(test), DIRECTION_UP, &o, NULL) == 1);
         assert(le64toh(o->entry.seqnum) == 3);
 
-        assert(journal_file_find_last_entry(f, test2, strlen(test2), &o, NULL) == 1);
+        assert(journal_file_find_first_entry(f, test2, strlen(test2), DIRECTION_UP, &o, NULL) == 1);
         assert(le64toh(o->entry.seqnum) == 2);
 
-        assert(journal_file_find_first_entry(f, test2, strlen(test2), &o, NULL) == 1);
+        assert(journal_file_find_first_entry(f, test2, strlen(test2), DIRECTION_DOWN, &o, NULL) == 1);
         assert(le64toh(o->entry.seqnum) == 2);
 
-        assert(journal_file_find_first_entry(f, "quux", 4, &o, NULL) == 0);
+        assert(journal_file_find_first_entry(f, "quux", 4, DIRECTION_DOWN, &o, NULL) == 0);
 
         assert(journal_file_move_to_entry(f, 1, &o, NULL) == 1);
         assert(le64toh(o->entry.seqnum) == 1);
@@ -87,7 +90,12 @@ int main(int argc, char *argv[]) {
 
         assert(journal_file_move_to_entry(f, 10, &o, NULL) == 0);
 
+        journal_file_rotate(&f);
+        journal_file_rotate(&f);
+
         journal_file_close(f);
 
+        journal_directory_vacuum(".", 3000000, 0);
+
         return 0;
 }