@@ -5,27 +5,40 @@

 #include "conversation.h"

 #include "token.h"

+

 const char *token_to_return = "";

+int validation_to_return = 0;

+int log_success_invoked = 1;

+int at_least_one_failed_test = 0;

 pam_handle_t *passed_pam_handle = NULL;

+

+#define reset_vars() \

+  validation_to_return = 1; \

+  passed_pam_handle = NULL; \

+  log_success_invoked = 0;

+

+#define check_result(result, message) \

+  if(!(result)) { \

+    fprintf(stderr, message); \

+    at_least_one_failed_test = 1; \

+  }

+

 const char *ask_for_token(pam_handle_t *pamh) {

     passed_pam_handle = pamh;

     return token_to_return;

 }

-int validation_to_return = 0;

 int validate_token(const char *token) {

     return validation_to_return;

 }

-

-int log_success_invoked = 0;

 void log_success() {

     log_success_invoked = 1;

 }

-

 int pam_sm_setcred_returns_success() {

     //given

+    reset_vars()

     //when

     int result = pam_sm_setcred(NULL, 0, 0, NULL);

@@ -36,7 +49,7 @@ int pam_sm_setcred_returns_success() {

 int pam_sm_authenticate_success_invokes_log_success() {

     // given

-    validation_to_return = 1;

+    reset_vars()

     log_success_invoked = 0;

     //when

@@ -46,7 +59,7 @@ int pam_sm_authenticate_success_invokes_log_success() {

 int succeeds_with_valid_token() {

     //given

-    validation_to_return = 1;

+    reset_vars()

     //when

     int result = pam_sm_authenticate(NULL, 0, 0, NULL);

@@ -57,6 +70,7 @@ int succeeds_with_valid_token() {

 int fails_with_invalid_token() {

     //given

+    reset_vars()

     validation_to_return = 0;

     //when

@@ -67,34 +81,15 @@ int fails_with_invalid_token() {

 }

 int main(int argc, char* argv[]) {

-    int test1_result = succeeds_with_valid_token();

-    if (!test1_result) {

-        fprintf(stderr, "succeds with valid token failed\n");

-    }

+    check_result(pam_sm_setcred_returns_success(), "set cred failed\n");

+    check_result(pam_sm_authenticate_success_invokes_log_success(), "authenticate invokes log_success failed\n");

+    check_result(succeeds_with_valid_token(), "succeeds with valid token failed\n");

+    check_result(fails_with_invalid_token(), "fails with invalid token failed\n")

-    int test3_result = pam_sm_setcred_returns_success();

-    if (!test3_result) {

-        fprintf(stderr, "set cred failed\n");

-    }

-

-    int test4_result = pam_sm_authenticate_success_invokes_log_success();

-    if (!test4_result) {

-        fprintf(stderr, "authenticate invokes log_success failed\n");

-    }

-

-    int test5_result = fails_with_invalid_token();

-    if (!test5_result) {

-        fprintf(stderr, "fails with invalid token failed\n");

-    }

-

-

-

-    if (test1_result && test3_result && test4_result && test5_result) {

-        fprintf(stderr, "success\n");

-        return 0;

+    if(at_least_one_failed_test) {

+      return 1;

     } else {

-        return 1;

+      fprintf(stderr, "dual_control_test: success!\n");

+      return 0;

     }

 }

-

-

Binary files a/logging_test and b/logging_test differ

@@ -66,10 +66,9 @@ int test_log_success() {

 int main(int numargs, char **args) {

     if(test_log_success()) {

-        fprintf(stderr, "Success!\n");

+        fprintf(stderr, "logging_test: success!\n");

         return 0;

     } else {

         return 1;

     }

 }

-