YACA: tests updated for int->void change in de-allocators 34/78234/2
authorLukasz Pawelczyk <l.pawelczyk@samsung.com>
Mon, 4 Jul 2016 16:25:35 +0000 (18:25 +0200)
committerLukasz Pawelczyk <l.pawelczyk@samsung.com>
Tue, 5 Jul 2016 08:53:26 +0000 (10:53 +0200)
Change-Id: Ie4eeae2788ebe69fd7b9f7366518b9f986592acd

src/yaca/yaca-test-common.h
src/yaca/yaca-test-crypto.cpp

index 20dac47..19208cb 100644 (file)
@@ -108,9 +108,9 @@ do {                                                                           \
 
 #define YACA_INVALID_PARAM(func) YACA_RESULT(YACA_ERROR_INVALID_PARAMETER, func);
 
-typedef std::unique_ptr<char, int (*)(void*)> ChrPtr;
-typedef std::unique_ptr<yaca_key_s, int (*)(yaca_key_h)> KeyPtr;
-typedef std::unique_ptr<yaca_context_s, int (*)(yaca_context_h)> CtxPtr;
+typedef std::unique_ptr<char, void (*)(void*)> ChrPtr;
+typedef std::unique_ptr<yaca_key_s, void (*)(yaca_key_h)> KeyPtr;
+typedef std::unique_ptr<yaca_context_s, void (*)(yaca_context_h)> CtxPtr;
 
 typedef std::vector<char> Buffer;
 
index fb0523a..77ccb18 100644 (file)
@@ -69,11 +69,12 @@ RUNNER_TEST(T1030_yaca_realloc_invalid_param, YacaTest)
 
 RUNNER_TEST(T1040_yaca_free, YacaTest)
 {
-    YACA_SUCCESS(yaca_free(nullptr));
+    yaca_free(nullptr);
 
     void* memory;
-    YACA_SUCCESS(yaca_malloc(42, &memory))
-    YACA_SUCCESS(yaca_free(memory));
+    YACA_SUCCESS(yaca_malloc(42, &memory));
+
+    yaca_free(memory);
 }
 
 RUNNER_TEST(T1050_yaca_randomize_bytes, YacaTest)
@@ -119,12 +120,12 @@ RUNNER_TEST(T1070_yaca_context_get_property_invalid_param, YacaTest)
 
 RUNNER_TEST(T1080_yaca_context_destroy, YacaTest)
 {
-    YACA_SUCCESS(yaca_context_destroy(YACA_CONTEXT_NULL));
+    yaca_context_destroy(YACA_CONTEXT_NULL);
 
     yaca_context_h ctx;
     YACA_SUCCESS(yaca_digest_initialize(&ctx, YACA_DIGEST_MD5));
-    YACA_SUCCESS(yaca_context_destroy(ctx));
 
+    yaca_context_destroy(ctx);
 }
 
 RUNNER_TEST(T1090_yaca_get_output_length_invalid_param)