afb-session: remove initial token

[src/app-framework-binder.git] / src / tests / session / test-session.c

diff --git a/src/tests/session/test-session.c b/src/tests/session/test-session.c
index 637b0a1..c630cb6 100644 (file)
--- a/src/tests/session/test-session.c
+++ b/src/tests/session/test-session.c
@@ -16,12 +16,8 @@
 /* check the initialisation */
 START_TEST (check_initialisation)
 {
-       ck_assert_int_eq(0, afb_session_init(0, 0, NULL));
-       ck_assert_int_eq(0, afb_session_init(200, 0, NULL));
-       ck_assert_int_eq(0, afb_session_init(10, 0, GOOD_UUID));
-       ck_assert_str_eq(GOOD_UUID, afb_session_initial_token());
-       ck_assert_int_eq(-1, afb_session_init(10, 0, BAD_UUID));
-       ck_assert_int_eq(errno, EINVAL);
+       ck_assert_int_eq(0, afb_session_init(0, 0));
+       ck_assert_int_eq(0, afb_session_init(200, 0));
 }
 END_TEST
 
@@ -45,7 +41,7 @@ START_TEST (check_creation)
        struct afb_session *s, *x;
 
        /* init */
-       ck_assert_int_eq(0, afb_session_init(10, 3600, GOOD_UUID));
+       ck_assert_int_eq(0, afb_session_init(10, 3600));
 
        /* create a session */
        s = afb_session_create(AFB_SESSION_TIMEOUT_DEFAULT);
@@ -53,20 +49,8 @@ START_TEST (check_creation)
 
        /* the session is valid */
        ck_assert(afb_session_uuid(s) != NULL);
-       ck_assert(afb_session_token(s) != NULL);
        ck_assert(!afb_session_is_closed(s));
 
-       /* token is the initial one */
-       ck_assert_str_eq(afb_session_token(s), GOOD_UUID);
-       ck_assert(afb_session_check_token(s, GOOD_UUID));
-       ck_assert(afb_session_check_token(s, afb_session_token(s)));
-
-       /* token can be renewed */
-       afb_session_new_token(s);
-       ck_assert(strcmp(afb_session_token(s), GOOD_UUID));
-       ck_assert(!afb_session_check_token(s, GOOD_UUID));
-       ck_assert(afb_session_check_token(s, afb_session_token(s)));
-
        /* query the session */
        uuid = strdup(afb_session_uuid(s));
        x = afb_session_search(uuid);
@@ -95,7 +79,7 @@ END_TEST
 START_TEST (check_capacity)
 {
        struct afb_session *s[3];
-       ck_assert_int_eq(0, afb_session_init(2, 3600, GOOD_UUID));
+       ck_assert_int_eq(0, afb_session_init(2, 3600));
        s[0] = afb_session_create(AFB_SESSION_TIMEOUT_DEFAULT);
        ck_assert(s[0]);
        s[1] = afb_session_create(AFB_SESSION_TIMEOUT_DEFAULT);
@@ -136,7 +120,7 @@ START_TEST (check_cookies)
        int i, j;
 
        /* init */
-       ck_assert_int_eq(0, afb_session_init(10, 3600, GOOD_UUID));
+       ck_assert_int_eq(0, afb_session_init(10, 3600));
 
        /* create a session */
        s = afb_session_create(AFB_SESSION_TIMEOUT_DEFAULT);
@@ -187,6 +171,7 @@ END_TEST
 /*********************************************************************/
 /* check hooking */
 
+#if WITH_AFB_HOOK
 int hookflag;
 
 void on_create(void *closure, const struct afb_hookid *hookid, struct afb_session *session)
@@ -246,7 +231,7 @@ START_TEST (check_hooking)
        struct afb_session *s;
 
        /* init */
-       ck_assert_int_eq(0, afb_session_init(10, 3600, GOOD_UUID));
+       ck_assert_int_eq(0, afb_session_init(10, 3600));
 
        /* create the hooking */
        hs = afb_hook_create_session(NULL, afb_hook_flags_session_all, &hookitf, NULL);
@@ -299,6 +284,8 @@ START_TEST (check_hooking)
 }
 END_TEST
 
+#endif
+
 /*********************************************************************/
 
 
@@ -327,6 +314,8 @@ int main(int ac, char **av)
                        addtest(check_creation);
                        addtest(check_capacity);
                        addtest(check_cookies);
+#if WITH_AFB_HOOK
                        addtest(check_hooking);
+#endif
        return !!srun();
 }