add more tests

Signed-off-by: Somtochi Onyekwere <[email protected]>

Author: somtochiama

core/rs/integration_check/src/t/tableinfo.rs

@@ -6,7 +6,7 @@ use alloc::vec::Vec;
 use core::{ffi::c_char, mem};
 use crsql_bundle::test_exports;
 use crsql_bundle::test_exports::tableinfo::TableInfo;
-use sqlite::Connection;
+use sqlite::{Connection, ResultCode};
 use sqlite_nostd as sqlite;
 
 // Unfortunate circumstance that we still have some C code that requires this argument
@@ -360,11 +360,44 @@ fn test_leak_condition() {
         .expect("inserted into foo");
 }
 
+fn test_site_id_initialization() {
+    {
+        let db = crate::opendb().expect("Opened DB");
+        let raw_db = db.db.db;
+        let site_id = select_site_id(raw_db).expect("selected site id");
+        assert_eq!(site_id.len(), 16);
+        raw_db.exec_safe("DELETE FROM crsql_site_id;").expect("deleted site id");
+    }
+
+    {
+        let db = crate::opendb().expect("Opened DB");
+        let raw_db = db.db.db;
+        let site_id = select_site_id(raw_db).expect("selected site id");
+        assert_eq!(site_id.len(), 16);
+        raw_db.exec_safe("DROP TABLE crsql_site_id;").expect("dropped crsql_site_id");
+    }
+
+    {
+        let db = crate::opendb().expect("Opened DB");
+        let raw_db = db.db.db;
+        let site_id = select_site_id(raw_db).expect("selected site id");
+        assert_eq!(site_id.len(), 16);
+    }
+}
+
+fn select_site_id(db: *mut sqlite::sqlite3) -> Result<Vec<u8>, ResultCode> {
+    let site_id_stmt = db.prepare_v2("SELECT crsql_site_id()")?;
+    site_id_stmt.step()?;
+    let site_id = site_id_stmt.column_blob(0)?.to_vec();
+    Ok(site_id)
+}
+
 pub fn run_suite() {
     libc_print::libc_println!("Running tableinfo suite");
     test_ensure_table_infos_are_up_to_date();
     test_pull_table_info();
     test_is_table_compatible();
     test_create_clock_table_from_table_info();
     test_leak_condition();
+    test_site_id_initialization();
 }

core/src/ext-data.test.c

@@ -54,26 +54,6 @@ static void textNewExtData() {
   printf("\t\e[0;32mSuccess\e[0m\n");
 }
 
-static void testAllocateExtData() {
-  printf("AllocateExtData\n");
-  sqlite3 *db;
-  int rc = SQLITE_OK;
-  rc = sqlite3_open(":memory:", &db);
-  assert(rc == SQLITE_OK);
-  unsigned char *siteIdBuffer =
-      sqlite3_malloc(SITE_ID_LEN * sizeof *(siteIdBuffer));
-      
-  crsql_ExtData *pExtData = crsqlExtDataInit(db, siteIdBuffer);
-  // ordinal map allocated to an empty map
-  assert(pExtData->ordinalMap != 0);
-
-  // crsql_finalize(pExtData);
-  // crsql_freeExtData(pExtData);
-  crsql_close(db);
-  printf("\t\e[0;32mSuccess\e[0m\n");
-}
-
-
 // valgrind will let us know if we failed to free something
 // mainly testing that we can finalize + free without error
 static void testFreeExtData() {
@@ -244,5 +224,4 @@ void crsqlExtDataTestSuite() {
   testFinalize();
   testFetchPragmaSchemaVersion();
   testFetchPragmaDataVersion();
-  testAllocateExtData();
 }