diff options
Diffstat (limited to 'tests/unit')
| -rw-r--r-- | tests/unit/unit1304.c | 51 |
1 files changed, 38 insertions, 13 deletions
diff --git a/tests/unit/unit1304.c b/tests/unit/unit1304.c index 83375f55d..6d8334c98 100644 --- a/tests/unit/unit1304.c +++ b/tests/unit/unit1304.c @@ -47,6 +47,8 @@ static void unit_stop(void) UNITTEST_START int result; + bool login_changed; + bool password_changed; static const char * const filename1 = "log/netrc1304"; memcpy(filename, filename1, strlen(filename1)); @@ -54,7 +56,8 @@ UNITTEST_START /* * Test a non existent host in our netrc file. */ - result = Curl_parsenetrc("test.example.com", &login, &password, filename); + result = Curl_parsenetrc("test.example.com", &login, &password, + &login_changed, &password_changed, filename); fail_unless(result == 1, "Host not found should return 1"); abort_unless(password != NULL, "returned NULL!"); fail_unless(password[0] == 0, "password should not have been changed"); @@ -67,13 +70,16 @@ UNITTEST_START free(login); login = strdup("me"); abort_unless(login != NULL, "returned NULL!"); - result = Curl_parsenetrc("example.com", &login, &password, filename); - fail_unless(result == 0, "Host should be found"); + result = Curl_parsenetrc("example.com", &login, &password, + &login_changed, &password_changed, filename); + fail_unless(result == 0, "Host should have been found"); abort_unless(password != NULL, "returned NULL!"); fail_unless(password[0] == 0, "password should not have been changed"); + fail_unless(!password_changed, "password should not have been changed"); abort_unless(login != NULL, "returned NULL!"); fail_unless(strncmp(login, "me", 2) == 0, "login should not have been changed"); + fail_unless(!login_changed, "login should not have been changed"); /* * Test a non existent login and host in our netrc file. @@ -81,8 +87,9 @@ UNITTEST_START free(login); login = strdup("me"); abort_unless(login != NULL, "returned NULL!"); - result = Curl_parsenetrc("test.example.com", &login, &password, filename); - fail_unless(result == 1, "Host should be found"); + result = Curl_parsenetrc("test.example.com", &login, &password, + &login_changed, &password_changed, filename); + fail_unless(result == 1, "Host not found should return 1"); abort_unless(password != NULL, "returned NULL!"); fail_unless(password[0] == 0, "password should not have been changed"); abort_unless(login != NULL, "returned NULL!"); @@ -96,13 +103,16 @@ UNITTEST_START free(login); login = strdup("admi"); abort_unless(login != NULL, "returned NULL!"); - result = Curl_parsenetrc("example.com", &login, &password, filename); - fail_unless(result == 0, "Host should be found"); + result = Curl_parsenetrc("example.com", &login, &password, + &login_changed, &password_changed, filename); + fail_unless(result == 0, "Host should have been found"); abort_unless(password != NULL, "returned NULL!"); fail_unless(password[0] == 0, "password should not have been changed"); + fail_unless(!password_changed, "password should not have been changed"); abort_unless(login != NULL, "returned NULL!"); fail_unless(strncmp(login, "admi", 4) == 0, "login should not have been changed"); + fail_unless(!login_changed, "login should not have been changed"); /* * Test a non existent login (superstring of an existing one) @@ -111,13 +121,16 @@ UNITTEST_START free(login); login = strdup("adminn"); abort_unless(login != NULL, "returned NULL!"); - result = Curl_parsenetrc("example.com", &login, &password, filename); - fail_unless(result == 0, "Host should be found"); + result = Curl_parsenetrc("example.com", &login, &password, + &login_changed, &password_changed, filename); + fail_unless(result == 0, "Host should have been found"); abort_unless(password != NULL, "returned NULL!"); fail_unless(password[0] == 0, "password should not have been changed"); + fail_unless(!password_changed, "password should not have been changed"); abort_unless(login != NULL, "returned NULL!"); fail_unless(strncmp(login, "adminn", 6) == 0, "login should not have been changed"); + fail_unless(!login_changed, "login should not have been changed"); /* * Test for the first existing host in our netrc file @@ -126,13 +139,16 @@ UNITTEST_START free(login); login = strdup(""); abort_unless(login != NULL, "returned NULL!"); - result = Curl_parsenetrc("example.com", &login, &password, filename); + result = Curl_parsenetrc("example.com", &login, &password, + &login_changed, &password_changed, filename); fail_unless(result == 0, "Host should have been found"); abort_unless(password != NULL, "returned NULL!"); fail_unless(strncmp(password, "passwd", 6) == 0, "password should be 'passwd'"); + fail_unless(password_changed, "password should have been changed"); abort_unless(login != NULL, "returned NULL!"); fail_unless(strncmp(login, "admin", 5) == 0, "login should be 'admin'"); + fail_unless(login_changed, "login should have been changed"); /* * Test for the first existing host in our netrc file @@ -141,13 +157,16 @@ UNITTEST_START free(password); password = strdup(""); abort_unless(password != NULL, "returned NULL!"); - result = Curl_parsenetrc("example.com", &login, &password, filename); + result = Curl_parsenetrc("example.com", &login, &password, + &login_changed, &password_changed, filename); fail_unless(result == 0, "Host should have been found"); abort_unless(password != NULL, "returned NULL!"); fail_unless(strncmp(password, "passwd", 6) == 0, "password should be 'passwd'"); + fail_unless(password_changed, "password should have been changed"); abort_unless(login != NULL, "returned NULL!"); fail_unless(strncmp(login, "admin", 5) == 0, "login should be 'admin'"); + fail_unless(!login_changed, "login should not have been changed"); /* * Test for the second existing host in our netrc file @@ -159,13 +178,16 @@ UNITTEST_START free(login); login = strdup(""); abort_unless(login != NULL, "returned NULL!"); - result = Curl_parsenetrc("curl.example.com", &login, &password, filename); + result = Curl_parsenetrc("curl.example.com", &login, &password, + &login_changed, &password_changed, filename); fail_unless(result == 0, "Host should have been found"); abort_unless(password != NULL, "returned NULL!"); fail_unless(strncmp(password, "none", 4) == 0, "password should be 'none'"); + fail_unless(password_changed, "password should have been changed"); abort_unless(login != NULL, "returned NULL!"); fail_unless(strncmp(login, "none", 4) == 0, "login should be 'none'"); + fail_unless(login_changed, "login should have been changed"); /* * Test for the second existing host in our netrc file @@ -174,13 +196,16 @@ UNITTEST_START free(password); password = strdup(""); abort_unless(password != NULL, "returned NULL!"); - result = Curl_parsenetrc("curl.example.com", &login, &password, filename); + result = Curl_parsenetrc("curl.example.com", &login, &password, + &login_changed, &password_changed, filename); fail_unless(result == 0, "Host should have been found"); abort_unless(password != NULL, "returned NULL!"); fail_unless(strncmp(password, "none", 4) == 0, "password should be 'none'"); + fail_unless(password_changed, "password should have been changed"); abort_unless(login != NULL, "returned NULL!"); fail_unless(strncmp(login, "none", 4) == 0, "login should be 'none'"); + fail_unless(!login_changed, "login should not have been changed"); /* TODO: * Test over the size limit password / login! |