refactor

move TestPubKeyFromHex from lib/cgo/tests/check_cipher.crypto.c to lib/cgo/tests/check_cipher.crypto.common.c ref #34
fibercrypto · May 16, 2019 · f1f8671 · f1f8671
1 parent 6dc0acc
commit f1f8671
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 40 deletions.
diff --git a/lib/cgo/tests/check_cipher.crypto.c b/lib/cgo/tests/check_cipher.crypto.c
@@ -13,45 +13,6 @@
 
 
 
-START_TEST(TestPubKeyFromHex)
-{
-    cipher__PubKey p, p1;
-    cipher__SecKey sk;
-    GoString s;
-    unsigned char buff[51];
-    char sbuff[101];
-    GoSlice slice = {(void*)buff, 0, 51};
-    unsigned int errorcode;
-
-    // Invalid hex
-    s.n = 0;
-    errorcode = SKY_cipher_PubKeyFromHex(s, &p1);
-    ck_assert_msg(errorcode == SKY_ErrInvalidLengthPubKey, "TestPubKeyFromHex: Invalid hex. Empty string");
-
-    s.p = "cascs";
-    s.n = strlen(s.p);
-    errorcode = SKY_cipher_PubKeyFromHex(s, &p1);
-    ck_assert_msg(errorcode == SKY_ErrInvalidPubKey, "TestPubKeyFromHex: Invalid hex. Bad chars");
-
-    // Invalid hex length
-    SKY_cipher_GenerateKeyPair(&p, &sk);
-    memcpy(slice.data, (void*)p, sizeof(p));
-    slice.len = sizeof(p);
-    bytesnhex(&p[0], sbuff, slice.len >> 1);
-    s.p = sbuff;
-    s.n = strlen(s.p);
-    errorcode = SKY_cipher_PubKeyFromHex(s, &p1);
-    ck_assert_msg(errorcode == SKY_ErrInvalidLengthPubKey, "TestPubKeyFromHex: Invalid hex length");
-
-    // Valid
-    bytesnhex(p, sbuff, sizeof(p));
-    s.p = sbuff;
-    s.n = sizeof(p) << 1;
-    errorcode = SKY_cipher_PubKeyFromHex(s, &p1);
-    ck_assert_msg(errorcode == SKY_OK, "TestPubKeyFromHex: Valid. No panic.");
-    ck_assert(isPubKeyEq(&p, &p1));
-}
-END_TEST
 
 START_TEST(TestPubKeyHex)
 {
@@ -818,7 +779,6 @@ Suite* cipher_crypto(void)
 
     tc = tcase_create("cipher.crypto");
     tcase_add_checked_fixture(tc, setup, teardown);
-    tcase_add_test(tc, TestPubKeyFromHex);
     tcase_add_test(tc, TestPubKeyHex);
     tcase_add_test(tc, TestPubKeyVerify);
     tcase_add_test(tc, TestPubKeyVerifyNil);

diff --git a/lib/cgo/tests/check_cipher.crypto.common.c b/lib/cgo/tests/check_cipher.crypto.common.c
@@ -52,6 +52,46 @@ START_TEST(TestNewPubKey)
 }
 END_TEST
 
+START_TEST(TestPubKeyFromHex)
+{
+    cipher__PubKey p, p1;
+    cipher__SecKey sk;
+    GoString s;
+    unsigned char buff[51];
+    char sbuff[101];
+    GoSlice slice = {(void*)buff, 0, 51};
+    unsigned int errorcode;
+
+    // Invalid hex
+    s.n = 0;
+    errorcode = SKY_cipher_PubKeyFromHex(s, &p1);
+    ck_assert_msg(errorcode == SKY_ErrInvalidLengthPubKey, "TestPubKeyFromHex: Invalid hex. Empty string");
+
+    s.p = "cascs";
+    s.n = strlen(s.p);
+    errorcode = SKY_cipher_PubKeyFromHex(s, &p1);
+    ck_assert_msg(errorcode == SKY_ErrInvalidPubKey, "TestPubKeyFromHex: Invalid hex. Bad chars");
+
+    // Invalid hex length
+    SKY_cipher_GenerateKeyPair(&p, &sk);
+    memcpy(slice.data, (void*)p, sizeof(p));
+    slice.len = sizeof(p);
+    bytesnhex(&p[0], sbuff, slice.len >> 1);
+    s.p = sbuff;
+    s.n = strlen(s.p);
+    errorcode = SKY_cipher_PubKeyFromHex(s, &p1);
+    ck_assert_msg(errorcode == SKY_ErrInvalidLengthPubKey, "TestPubKeyFromHex: Invalid hex length");
+
+    // Valid
+    bytesnhex(p, sbuff, sizeof(p));
+    s.p = sbuff;
+    s.n = sizeof(p) << 1;
+    errorcode = SKY_cipher_PubKeyFromHex(s, &p1);
+    ck_assert_msg(errorcode == SKY_OK, "TestPubKeyFromHex: Valid. No panic.");
+    ck_assert(isPubKeyEq(&p, &p1));
+}
+END_TEST
+
 // define test suite and cases
 Suite *common_check_cipher_crypto(void)
 {
@@ -60,6 +100,7 @@ Suite *common_check_cipher_crypto(void)
 
   tc = tcase_create("check_cipher.crypto");
   tcase_add_test(tc, TestNewPubKey);
+  tcase_add_test(tc, TestPubKeyFromHex);
   suite_add_tcase(s, tc);
   tcase_set_timeout(tc, 150);