refactor

move TestAddressNull from lib/cgo/tests/check_cipher.address.c to lib/cgo/tests/check_cipher.address.common.c ref skycoin#34
simelo · May 15, 2019 · c308812 · c308812
1 parent e6596ab
commit c308812
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 25 deletions.
diff --git a/lib/cgo/tests/check_cipher.address.c b/lib/cgo/tests/check_cipher.address.c
@@ -140,30 +140,6 @@ START_TEST(TestAddressFromBytes)
 }
 END_TEST
 
-START_TEST(TestAddressNull)
-{
-    cipher__Address a;
-    memset(&a, 0, sizeof(cipher__Address));
-    GoUint32 result;
-    GoUint8 isNull;
-    result = SKY_cipher_Address_Null(&a, &isNull);
-    ck_assert_msg(result == SKY_OK, "SKY_cipher_Address_Null");
-    ck_assert(isNull == 1);
-
-    cipher__PubKey p;
-    cipher__SecKey s;
-
-    result = SKY_cipher_GenerateKeyPair(&p, &s);
-    ck_assert_msg(result == SKY_OK, "SKY_cipher_GenerateKeyPair failed");
-
-    result = SKY_cipher_AddressFromPubKey(&p, &a);
-    ck_assert_msg(result == SKY_OK, "SKY_cipher_AddressFromPubKey failed");
-    result = SKY_cipher_Address_Null(&a, &isNull);
-    ck_assert_msg(result == SKY_OK, "SKY_cipher_Address_Null");
-    ck_assert(isNull == 0);
-}
-END_TEST
-
 // define test suite and cases
 Suite* cipher_address(void)
 {
@@ -174,7 +150,6 @@ Suite* cipher_address(void)
     tcase_add_checked_fixture(tc, setup, teardown);
     tcase_add_test(tc, TestDecodeBase58Address);
     tcase_add_test(tc, TestAddressFromBytes);
-    tcase_add_test(tc, TestAddressNull);
     suite_add_tcase(s, tc);
     tcase_set_timeout(tc, 150);
 

diff --git a/lib/cgo/tests/check_cipher.address.common.c b/lib/cgo/tests/check_cipher.address.common.c
@@ -99,6 +99,30 @@ START_TEST(TestAddressBulk)
 }
 END_TEST
 
+START_TEST(TestAddressNull)
+{
+    cipher__Address a;
+    memset(&a, 0, sizeof(cipher__Address));
+    GoUint32 result;
+    GoUint8 isNull;
+    result = SKY_cipher_Address_Null(&a, &isNull);
+    ck_assert_msg(result == SKY_OK, "SKY_cipher_Address_Null");
+    ck_assert(isNull == 1);
+
+    cipher__PubKey p;
+    cipher__SecKey s;
+
+    result = SKY_cipher_GenerateKeyPair(&p, &s);
+    ck_assert_msg(result == SKY_OK, "SKY_cipher_GenerateKeyPair failed");
+
+    result = SKY_cipher_AddressFromPubKey(&p, &a);
+    ck_assert_msg(result == SKY_OK, "SKY_cipher_AddressFromPubKey failed");
+    result = SKY_cipher_Address_Null(&a, &isNull);
+    ck_assert_msg(result == SKY_OK, "SKY_cipher_Address_Null");
+    ck_assert(isNull == 0);
+}
+END_TEST
+
 // define test suite and cases
 Suite *common_check_cipher_address(void)
 {
@@ -109,6 +133,7 @@ Suite *common_check_cipher_address(void)
   tcase_add_test(tc, TestAddressVerify);
   tcase_add_test(tc, TestAddressString);
   tcase_add_test(tc, TestAddressBulk);
+  tcase_add_test(tc, TestAddressNull);
   suite_add_tcase(s, tc);
   tcase_set_timeout(tc, 150);