work in progress

[nbds] / test / txn_test.c

diff --git a/test/txn_test.c b/test/txn_test.c
index 74d5cee2494a641995254cc35c1fee412da05d04..4728ef971ec3553584efad4fd0e62d550ed64c19 100644 (file)
--- a/test/txn_test.c
+++ b/test/txn_test.c
@@ -10,24 +10,23 @@
 #define ASSERT_EQUAL(x, y) CuAssertIntEquals(tc, x, y)
 
 void test1 (CuTest* tc) {
-    map_t *map = map_alloc(&ht_map_impl, NULL);
-    txn_t *t1 = txn_begin(TXN_REPEATABLE_READ, map);
-    txn_t *t2 = txn_begin(TXN_REPEATABLE_READ, map);
-    void *k1 = (void *)1;
-    tm_set(t1, k1, 2);
-    tm_set(t1, k1, 3);
-    ASSERT_EQUAL( DOES_NOT_EXIST, tm_get(t2, k1) );
-    tm_set(t2, k1, 4);
-    ASSERT_EQUAL( 3, tm_get(t1, k1) );
-    ASSERT_EQUAL( 4, tm_get(t2, k1) );
+    map_t *map = map_alloc(&MAP_IMPL_HT, NULL);
+    txn_t *t1 = txn_begin(map);
+    txn_t *t2 = txn_begin(map);
+    map_key_t k1 = (map_key_t)1;
+    txn_map_set(t1, k1, 2);
+    txn_map_set(t1, k1, 3);
+    ASSERT_EQUAL( DOES_NOT_EXIST, txn_map_get(t2, k1) );
+    txn_map_set(t2, k1, 4);
+    ASSERT_EQUAL( 3, txn_map_get(t1, k1) );
+    ASSERT_EQUAL( 4, txn_map_get(t2, k1) );
     ASSERT_EQUAL( TXN_VALIDATED, txn_commit(t2));
-    ASSERT_EQUAL( TXN_ABORTED, txn_commit(t1));
+    ASSERT_EQUAL( TXN_ABORTED,   txn_commit(t1));
 }
 
 int main (void) {
-
-    nbd_init();
-    txn_init();
+    nbd_thread_init();
+    lwt_set_trace_level("x3h3");
 
     CuString *output = CuStringNew();
     CuSuite* suite = CuSuiteNew();