1 files changed, 0 insertions, 157 deletions

diff --git a/src/libdisfluid/disfluid-tests.h b/src/libdisfluid/disfluid-tests.h
index 9ebbeb9..bcc50b4 100644
--- a/src/libdisfluid/disfluid-tests.h
+++ b/src/libdisfluid/disfluid-tests.h
@@ -12,12 +12,10 @@ static inline int test_append_count (const char *filename, size_t *n);
 
 # include <check.h>
 
-# include "disfluid-trie-node.h"
 # include "disfluid-init.h"
 # include "disfluid-version.h"
 # include "disfluid-cache-entry.h"
 # include "disfluid-cache-entry-key.h"
-# include "disfluid-db.h"
 # include "string-desc.h"
 # include "disfluid-append-only-file.h"
 # include "disfluid-trie.h"
@@ -35,47 +33,6 @@ static inline int test_append_count (const char *filename, size_t *n);
 
 # define BILLION THOUSAND MILLION
 
-static void
-prepare_database (char **filename)
-{
-  if (ALLOC_N (*filename, strlen ("/tmp/check-disfluid-db-XXXXXX") + 1) < 0)
-    {
-      abort ();
-    }
-  strcpy (*filename, "/tmp/check-disfluid-db-XXXXXX");
-  if (mkdtemp (*filename) == NULL)
-    {
-      abort ();
-    }
-}
-
-static int
-cleanup_database (char **filename)
-{
-  int error = 0;
-  ck_assert_int_eq (db_unmark (*filename), 0);
-  ck_assert_int_eq (db_collect (*filename), 0);
-  for (size_t i = 0; i < 256; i++)
-    {
-      char *group_name = NULL;
-      ck_assert_int_ge (ALLOC_N
-			(group_name,
-			 strlen (*filename) + strlen ("/") + 2 + 1), 0);
-      strcpy (group_name, *filename);
-      strcat (group_name, "/");
-      static const char *alpha[] = {
-	"0", "1", "2", "3", "4", "5", "6", "7",
-	"8", "9", "a", "b", "c", "d", "e", "f"
-      };
-      strcat (group_name, alpha[i / 16]);
-      strcat (group_name, alpha[i % 16]);
-      rmdir (group_name);
-      FREE (group_name);
-    }
-  rmdir (*filename);
-  FREE (*filename);
-}
-
 /* *INDENT-OFF* */
 START_TEST (test_check_version)
 /* *INDENT-ON* */
@@ -877,115 +834,6 @@ END_TEST
 /* *INDENT-ON* */
 
 /* *INDENT-OFF* */
-START_TEST (test_db)
-/* *INDENT-ON* */
-
-{
-  ck_assert_int_eq (db_check (), 0);
-}
-/* *INDENT-OFF* */
-END_TEST
-/* *INDENT-ON* */
-
-/* *INDENT-OFF* */
-START_TEST (test_db_trie_inner)
-/* *INDENT-ON* */
-
-{
-  char *database;
-  prepare_database (&database);
-  static const char *hello = "hello";
-  string_desc_t common_part = {
-    ._nbytes = 5,
-    ._data = (char *) hello
-  };
-  static const char series[32] = { 1, 2, 3, 4, 5 };
-  string_desc_t interesting_branch = {
-    ._nbytes = 32,
-    ._data = (char *) series
-  };
-  ck_assert_int_eq (common_part._nbytes, strlen (hello));
-  ck_assert_int_eq (interesting_branch._nbytes, sizeof (series));
-  const struct trie_node node = {
-    .common_part = common_part,
-    .branches = {{0}, interesting_branch, {0}},
-    .is_leaf = false
-  };
-  string_desc_t node_id = { 0 };
-  ck_assert_int_eq (db_write_trie_node (database, &node_id, &node), 0);
-  struct trie_node *actual_node = NULL;
-  ck_assert_int_eq (db_read_trie_node (database, node_id, &actual_node), 0);
-  ck_assert (!trie_node_is_leaf (actual_node));
-  const string_desc_t actual_common_part =
-    trie_node_common_part (actual_node);
-  const string_desc_t actual_branches[2] = {
-    trie_node_branch (actual_node, 0),
-    trie_node_branch (actual_node, 1)
-  };
-  ck_assert_int_eq (actual_common_part._nbytes, common_part._nbytes);
-  ck_assert_int_eq (memcmp
-		    (actual_common_part._data, common_part._data,
-		     common_part._nbytes), 0);
-  ck_assert_int_eq (actual_branches[0]._nbytes, 0);
-  ck_assert_ptr_null (actual_branches[0]._data);
-  ck_assert_int_eq (actual_branches[1]._nbytes, 32);
-  ck_assert_int_eq (memcmp (actual_branches[1]._data, series, 32), 0);
-  trie_node_free (&actual_node);
-  FREE (node_id._data);
-  cleanup_database (&database);
-}
-/* *INDENT-OFF* */
-END_TEST
-/* *INDENT-ON* */
-
-/* *INDENT-OFF* */
-START_TEST (test_db_trie_leaf)
-/* *INDENT-ON* */
-
-{
-  char *database;
-  prepare_database (&database);
-  static const char *hello = "hello";
-  const string_desc_t common_part = {
-    ._nbytes = 5,
-    ._data = (char *) hello
-  };
-  static const char series[32] = { 1, 2, 3, 4, 5 };
-  const string_desc_t leaf_id = {
-    ._nbytes = 32,
-    ._data = (char *) series
-  };
-  ck_assert_int_eq (common_part._nbytes, strlen (hello));
-  ck_assert_int_eq (leaf_id._nbytes, sizeof (series));
-  const struct trie_node node = {
-    .common_part = common_part,
-    .branches = {leaf_id, {0}},
-    .is_leaf = true
-  };
-  string_desc_t node_id = { 0 };
-  ck_assert_int_eq (db_write_trie_node (database, &node_id, &node), 0);
-  struct trie_node *actual_node = NULL;
-  ck_assert_int_eq (db_read_trie_node (database, node_id, &actual_node), 0);
-  const string_desc_t actual_common_part =
-    trie_node_common_part (actual_node);
-  ck_assert (trie_node_is_leaf (actual_node));
-  const string_desc_t actual_leaf_id = trie_node_leaf_id (actual_node);
-  ck_assert_int_eq (actual_common_part._nbytes, common_part._nbytes);
-  ck_assert_int_eq (memcmp
-		    (actual_common_part._data, common_part._data,
-		     common_part._nbytes), 0);
-  ck_assert_int_eq (memcmp
-		    (actual_leaf_id._data, leaf_id._data, leaf_id._nbytes),
-		    0);
-  trie_node_free (&actual_node);
-  FREE (node_id._data);
-  cleanup_database (&database);
-}
-/* *INDENT-OFF* */
-END_TEST
-/* *INDENT-ON* */
-
-/* *INDENT-OFF* */
 START_TEST (test_aof_recover)
 /* *INDENT-ON* */
 
@@ -1428,11 +1276,6 @@ run_tests (size_t *n_tests, size_t *n_errors)
   TCase *cache_hash = tcase_create (_("disfluid cache hash key"));
   tcase_add_test (cache_hash, test_cache_hash);
   suite_add_tcase (suite, cache_hash);
-  TCase *db = tcase_create (_("disfluid database"));
-  tcase_add_test (db, test_db);
-  tcase_add_test (db, test_db_trie_inner);
-  tcase_add_test (db, test_db_trie_leaf);
-  suite_add_tcase (suite, db);
   TCase *aof = tcase_create (_("append-only file"));
   tcase_add_test (aof, test_aof_recover);
   tcase_add_test (aof, test_aof_can_read_locked_file);