lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-07-29 13:01:13 +03:00
Code Activity

tests: Prefer assert_non_null over assert_true

Browse Source 
This also replaces some occurrences of assert_true with assert_null.

Signed-off-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
This commit is contained in:
Anderson Toshiyuki Sasaki
2019-01-15 11:19:49 +01:00
committed by Andreas Schneider
parent 89f58decb6
commit 603b6d7222
14 changed files with 87 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
tests/unittests/torture_keyfiles.c
View File

@ -170,7 +170,7 @@ static void torture_pubkey_generate_from_privkey(void **state) {
rc = ssh_try_publickey_from_file(session, LIBSSH_RSA_TESTKEY, &pubkey_orig,
&type_orig);
assert_true(rc == 0);
assert_true(pubkey_orig != NULL);
assert_non_null(pubkey_orig);
rc = torture_read_one_line(LIBSSH_RSA_TESTKEY ".pub", pubkey_line_orig,
sizeof(pubkey_line_orig));
@ -180,17 +180,17 @@ static void torture_pubkey_generate_from_privkey(void **state) {
unlink(LIBSSH_RSA_TESTKEY ".pub");
privkey = privatekey_from_file(session, LIBSSH_RSA_TESTKEY, 0, NULL);
assert_true(privkey != NULL);
assert_non_null(privkey);
pubkey = publickey_from_privatekey(privkey);
assert_true(pubkey != NULL);
assert_non_null(pubkey);
type_new = privkey->type;
privatekey_free(privkey);
pubkey_new = publickey_to_string(pubkey);
publickey_free(pubkey);
assert_true(pubkey_new != NULL);
assert_non_null(pubkey_new);
assert_true(ssh_string_len(pubkey_orig) == ssh_string_len(pubkey_new));
assert_memory_equal(ssh_string_data(pubkey_orig),
@ -228,7 +228,7 @@ static void torture_privatekey_from_file(void **state) {
ssh_private_key key = NULL;
key = privatekey_from_file(session, LIBSSH_RSA_TESTKEY, SSH_KEYTYPE_RSA, NULL);
assert_true(key != NULL);
assert_non_null(key);
if (key != NULL) {
privatekey_free(key);
key = NULL;
@ -236,7 +236,7 @@ static void torture_privatekey_from_file(void **state) {
#ifdef HAVE_DSA
key = privatekey_from_file(session, LIBSSH_DSA_TESTKEY, SSH_KEYTYPE_DSS, NULL);
assert_true(key != NULL);
assert_non_null(key);
if (key != NULL) {
privatekey_free(key);
key = NULL;
@ -245,7 +245,7 @@ static void torture_privatekey_from_file(void **state) {
/* Test the automatic type discovery */
key = privatekey_from_file(session, LIBSSH_RSA_TESTKEY, 0, NULL);
assert_true(key != NULL);
assert_non_null(key);
if (key != NULL) {
privatekey_free(key);
key = NULL;
@ -253,7 +253,7 @@ static void torture_privatekey_from_file(void **state) {
#ifdef HAVE_DSA
key = privatekey_from_file(session, LIBSSH_DSA_TESTKEY, 0, NULL);
assert_true(key != NULL);
assert_non_null(key);
if (key != NULL) {
privatekey_free(key);
key = NULL;
@ -269,7 +269,7 @@ static void torture_privatekey_from_file_passphrase(void **state) {
ssh_private_key key = NULL;
key = privatekey_from_file(session, LIBSSH_RSA_TESTKEY, SSH_KEYTYPE_RSA, TORTURE_TESTKEY_PASSWORD);
assert_true(key != NULL);
assert_non_null(key);
if (key != NULL) {
privatekey_free(key);
key = NULL;
@ -277,7 +277,7 @@ static void torture_privatekey_from_file_passphrase(void **state) {
#ifdef HAVE_DSA
key = privatekey_from_file(session, LIBSSH_DSA_TESTKEY, SSH_KEYTYPE_DSS, TORTURE_TESTKEY_PASSWORD);
assert_true(key != NULL);
assert_non_null(key);
if (key != NULL) {
privatekey_free(key);
key = NULL;
@ -286,7 +286,7 @@ static void torture_privatekey_from_file_passphrase(void **state) {
/* Test the automatic type discovery */
key = privatekey_from_file(session, LIBSSH_RSA_TESTKEY, 0, TORTURE_TESTKEY_PASSWORD);
assert_true(key != NULL);
assert_non_null(key);
if (key != NULL) {
privatekey_free(key);
key = NULL;
@ -294,7 +294,7 @@ static void torture_privatekey_from_file_passphrase(void **state) {
#ifdef HAVE_DSA
key = privatekey_from_file(session, LIBSSH_DSA_TESTKEY, 0, TORTURE_TESTKEY_PASSWORD);
assert_true(key != NULL);
assert_non_null(key);
if (key != NULL) {
privatekey_free(key);
key = NULL;