Fix building errors in the tests

ellysh · Feb 5, 2013 · 0191ac3 · 0191ac3
1 parent ac42350
commit 0191ac3
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 31 deletions.
diff --git a/test/cross_test.cpp b/test/cross_test.cpp
@@ -15,18 +15,17 @@ void* WriteOperation(void* args)
     char* key = static_cast<char*>(args);
     RegistrarClient client("write.log", "ipc:///var/run/zero-cache/0", kDealer);
 
-    client.WriteData(key, key, sizeof(key));
+    client.WriteData(key, Package(key, sizeof(key)));
 }
 
 void* ReadOperation(void* args)
 {
     const char* key = static_cast<char*>(args);
     RegistrarClient client("read.log", "ipc:///var/run/zero-cache/0", kDealer);
 
-    char* result;
-    result = static_cast<char*>(client.ReadData(key));
-    assert( ! memcmp(result, key, sizeof(key)) );
-    free(result);
+    Package result = client.ReadData(key);
+    assert( ! memcmp(result.GetData(), key, sizeof(key)) );
+    free(result.GetData());
 
     usleep(2 * 1000 * 1000);
     exit(0);

diff --git a/test/get_test.cpp b/test/get_test.cpp
@@ -19,23 +19,22 @@ static const string kKey3 = "key3";
 
 void InitData(RegistrarClient& client)
 {
-    client.WriteData(kKey1, kData1.c_str(), kData1.size());
-    client.WriteData(kKey2, &kData2, sizeof(kData2));
+    client.WriteData(kKey1, Package(kData1.c_str(), kData1.size()));
+    client.WriteData(kKey2, Package(&kData2, sizeof(kData2)));
 }
 
 void CheckData(RegistrarClient& client)
 {
-    char* result;
-    result = static_cast<char*>(client.ReadData(kKey1));
-    assert( ! memcmp(result, kData1.c_str(), kData1.size()) );
-    free(result);
+    Package result = client.ReadData(kKey1);
+    assert( ! memcmp(result.GetData(), kData1.c_str(), kData1.size()) );
+    free(result.GetData());
 
-    result = static_cast<char*>(client.ReadData(kKey2));
-    assert( ! memcmp(result, kData2, sizeof(kData2)) );
-    free(result);
+    result = client.ReadData(kKey2);
+    assert( ! memcmp(result.GetData(), kData2, sizeof(kData2)) );
+    free(result.GetData());
 
-    result = static_cast<char*>(client.ReadData(kKey3));
-    assert( result == NULL );
+    result = client.ReadData(kKey3);
+    assert( result.GetData() == NULL );
 }
 
 int main()

diff --git a/test/key_test.cpp b/test/key_test.cpp
@@ -16,8 +16,8 @@ static const string kData = "test data 1";
 
 void InitData(RegistrarClient& client)
 {
-    client.WriteData(kKey1, kData.c_str(), kData.size());
-    client.WriteData(kKey2, kData.c_str(), kData.size());
+    client.WriteData(kKey1, Package(kData.c_str(), kData.size()));
+    client.WriteData(kKey2, Package(kData.c_str(), kData.size()));
 }
 
 vector<string> ParseKeys(KeyArray& keys)

diff --git a/test/memory_leak_test.cpp b/test/memory_leak_test.cpp
@@ -15,7 +15,7 @@ void* WriteLoop(void* args)
 
     while (true)
     {
-        client.WriteData(key, &kData, sizeof(kData));
+        client.WriteData(key, Package(&kData, sizeof(kData)));
         usleep(100);
     }
 }

diff --git a/test/read_test.cpp b/test/read_test.cpp
@@ -15,16 +15,14 @@ void* WriteLoop(void* args)
     const char* key = static_cast<char*>(args);
     RegistrarClient client(key, "ipc:///var/run/zero-cache/0", kDealer);
 
-    char* result;
-
     while (true)
     {
-        client.WriteData(key, args, sizeof(args));
+        client.WriteData(key, Package(args, sizeof(args)));
         usleep(1000);
 
-        result = static_cast<char*>(client.ReadData(key));
-        assert( ! memcmp(result, key, sizeof(result)) );
-        free(result);
+        Package result = client.ReadData(key);
+        assert( ! memcmp(result.GetData(), key, sizeof(result)) );
+        free(result.GetData());
         usleep(1000);
     }
 }

diff --git a/test/tcp_test.cpp b/test/tcp_test.cpp
@@ -14,15 +14,14 @@ static char kData[10] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
 
 void InitData(RegistrarClient& client)
 {
-    client.WriteData(kKey, &kData, sizeof(kData));
+    client.WriteData(kKey, Package(&kData, sizeof(kData)));
 }
 
 void CheckData(RegistrarClient& client)
 {
-    char* result;
-    result = static_cast<char*>(client.ReadData(kKey));
-    assert( ! memcmp(result, kData, sizeof(kData)) );
-    free(result);
+    Package result = client.ReadData(kKey);
+    assert( ! memcmp(result.GetData(), kData, sizeof(kData)) );
+    free(result.GetData());
 }
 
 int main()

diff --git a/test/write_test.cpp b/test/write_test.cpp
@@ -13,7 +13,7 @@ void* WriteLoop(void* args)
 
     while (true)
     {
-        client.WriteData(key, args, 1);
+        client.WriteData(key, Package(args, 1));
         usleep(500);
     }
 }