diff options
author | Nathan S. Evans <evans@in.tum.de> | 2010-08-04 12:51:41 +0000 |
---|---|---|
committer | Nathan S. Evans <evans@in.tum.de> | 2010-08-04 12:51:41 +0000 |
commit | 6b4149fb0535be361e5345eccf5a488582f14842 (patch) | |
tree | 433e139f790d3b6f031f778dee325df149445184 /src/dht/test_dhtlog.c | |
parent | 65d153a8d31b17d92663d6c4bc098c62ec3295f1 (diff) | |
download | gnunet-6b4149fb0535be361e5345eccf5a488582f14842.tar.gz gnunet-6b4149fb0535be361e5345eccf5a488582f14842.zip |
add topology table creation, insert, update, get, etc. to the mysql dhtlog plugin, also added to test case
Diffstat (limited to 'src/dht/test_dhtlog.c')
-rw-r--r-- | src/dht/test_dhtlog.c | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/src/dht/test_dhtlog.c b/src/dht/test_dhtlog.c index 39404983c..26332bf5b 100644 --- a/src/dht/test_dhtlog.c +++ b/src/dht/test_dhtlog.c | |||
@@ -32,6 +32,7 @@ | |||
32 | 32 | ||
33 | static int ok; | 33 | static int ok; |
34 | 34 | ||
35 | #define CHECK(a) if (a != GNUNET_OK) return a | ||
35 | /** | 36 | /** |
36 | * Actual test of the service operations | 37 | * Actual test of the service operations |
37 | */ | 38 | */ |
@@ -67,11 +68,11 @@ test (struct GNUNET_DHTLOG_Handle * api) | |||
67 | .75, .25, .5, 42, 14, | 68 | .75, .25, .5, 42, 14, |
68 | 5, 1, 12, 0, 0, 0, | 69 | 5, 1, 12, 0, 0, 0, |
69 | "TEST INSERT TRIAL"); | 70 | "TEST INSERT TRIAL"); |
71 | CHECK(ret); | ||
70 | 72 | ||
71 | if (ret != GNUNET_OK) | 73 | ret = api->insert_topology(500); |
72 | { | 74 | |
73 | return ret; | 75 | CHECK(ret); |
74 | } | ||
75 | 76 | ||
76 | fprintf (stderr, "Trial uid is %llu\n", trialuid); | 77 | fprintf (stderr, "Trial uid is %llu\n", trialuid); |
77 | 78 | ||
@@ -80,20 +81,17 @@ test (struct GNUNET_DHTLOG_Handle * api) | |||
80 | ret = api->insert_node (&nodeuid, &p3); | 81 | ret = api->insert_node (&nodeuid, &p3); |
81 | ret = api->insert_node (&nodeuid, &p4); | 82 | ret = api->insert_node (&nodeuid, &p4); |
82 | 83 | ||
83 | if (ret != GNUNET_OK) | 84 | CHECK(ret); |
84 | { | ||
85 | fprintf (stderr, "received ret value of %d\n", ret); | ||
86 | return ret; | ||
87 | } | ||
88 | 85 | ||
86 | ret = api->insert_topology(0); | ||
87 | ret = api->insert_extended_topology(&p1, &p2); | ||
88 | ret = api->insert_extended_topology(&p3, &p4); | ||
89 | ret = api->update_topology(101); | ||
90 | CHECK(ret); | ||
89 | ret = api->insert_dhtkey (&dhtkeyuid, &k1); | 91 | ret = api->insert_dhtkey (&dhtkeyuid, &k1); |
90 | ret = api->insert_dhtkey (&dhtkeyuid, &k2); | 92 | ret = api->insert_dhtkey (&dhtkeyuid, &k2); |
91 | 93 | ||
92 | if (ret != GNUNET_OK) | 94 | CHECK(ret); |
93 | { | ||
94 | fprintf (stderr, "received ret value of %d\n", ret); | ||
95 | return ret; | ||
96 | } | ||
97 | 95 | ||
98 | ret = api->insert_query (&sqlqueryuid, internaluid, 2, 4, 0, &p2, &k1); | 96 | ret = api->insert_query (&sqlqueryuid, internaluid, 2, 4, 0, &p2, &k1); |
99 | 97 | ||
@@ -119,10 +117,7 @@ test (struct GNUNET_DHTLOG_Handle * api) | |||
119 | fprintf (stderr, "Updating trial %llu with endtime of now\n", trialuid); | 117 | fprintf (stderr, "Updating trial %llu with endtime of now\n", trialuid); |
120 | ret = api->update_trial (trialuid, 0, 0, 0); | 118 | ret = api->update_trial (trialuid, 0, 0, 0); |
121 | 119 | ||
122 | if (ret != GNUNET_OK) | 120 | CHECK(ret); |
123 | { | ||
124 | return ret; | ||
125 | } | ||
126 | 121 | ||
127 | return 0; | 122 | return 0; |
128 | } | 123 | } |