Menu
▾
▴
[Opensync-commits] r1001 - trunk/tests
|
From: <svn...@op...> - 2009-03-18 17:41:49
|
Author: bellmich Date: Wed Mar 18 18:41:45 2009 New Revision: 1001 URL: http://libsyncml.opensync.org/changeset/1001 Log: replaced deprecated functions Modified: trunk/tests/check_devinf.c trunk/tests/check_sync.c Modified: trunk/tests/check_devinf.c ============================================================================== --- trunk/tests/check_devinf.c Wed Mar 18 18:41:03 2009 (r1000) +++ trunk/tests/check_devinf.c Wed Mar 18 18:41:45 2009 (r1001) @@ -161,7 +161,7 @@ usleep(100); } - SmlDevInf *devinf2 = smlDevInfAgentGetDevInf(agent); + SmlDevInf *devinf2 = smlDevInfAgentGetSessionDevInf(agent, servertracker->session); sml_fail_unless(devinf2 != NULL, NULL); sml_fail_unless(transport_errors == 0, NULL); @@ -303,26 +303,26 @@ sml_fail_unless(smlSessionFlush(clienttracker->session, TRUE, &error), NULL); sml_fail_unless(error == NULL, NULL); - while (num_sessions != 2 || !smlDevInfAgentGetDevInf(serveragent)) { + while (num_sessions != 2 || !smlDevInfAgentGetSessionDevInf(serveragent, servertracker->session)) { smlManagerDispatch(servermanager); smlManagerDispatch(clientmanager); usleep(100); } - SmlDevInf *recvClientDevInf = smlDevInfAgentGetDevInf(serveragent); + SmlDevInf *recvClientDevInf = smlDevInfAgentGetSessionDevInf(serveragent, servertracker->session); sml_fail_unless(recvClientDevInf != NULL, NULL); sml_fail_unless(smlDevInfNumDataStores(recvClientDevInf) == 1, NULL); sml_fail_unless(servertracker->session != NULL, NULL); sml_fail_unless(smlSessionFlush(servertracker->session, TRUE, &error), NULL); - while (!smlDevInfAgentGetDevInf(clientagent)) { + while (!smlDevInfAgentGetSessionDevInf(clientagent, clienttracker->session)) { smlManagerDispatch(servermanager); smlManagerDispatch(clientmanager); usleep(100); } - SmlDevInf *recvServerDevInf = smlDevInfAgentGetDevInf(clientagent); + SmlDevInf *recvServerDevInf = smlDevInfAgentGetSessionDevInf(clientagent, clienttracker->session); sml_fail_unless(recvServerDevInf != NULL, NULL); sml_fail_unless(smlDevInfNumDataStores(recvServerDevInf) == 1, NULL); Modified: trunk/tests/check_sync.c ============================================================================== --- trunk/tests/check_sync.c Wed Mar 18 18:41:03 2009 (r1000) +++ trunk/tests/check_sync.c Wed Mar 18 18:41:45 2009 (r1001) @@ -273,7 +273,7 @@ smlTrace(TRACE_EXIT, "%s", __func__); } -static SmlErrorType _recv_san(SmlDsServer *server, SmlAlertType type, void *userdata) +static SmlErrorType _recv_san(SmlDsServer *server, SmlSession *session, SmlAlertType type, void *userdata) { smlTrace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, server, type, userdata); sml_fail_unless(GPOINTER_TO_INT(userdata) == 1, NULL); @@ -1264,7 +1264,7 @@ smlDsSessionGetAlert(servertracker->dssessions[1], _recv_alert, GINT_TO_POINTER(1)); smlDsSessionGetAlert(servertracker->dssessions[2], _recv_alert, GINT_TO_POINTER(1)); - while (alerts_received < 3 || !smlDevInfAgentGetDevInf(serveragent)) { + while (alerts_received < 3 || !smlDevInfAgentGetSessionDevInf(serveragent, servertracker->session)) { smlDsSessionDispatch(servertracker->dssessions[0]); smlDsSessionDispatch(servertracker->dssessions[1]); smlDsSessionDispatch(servertracker->dssessions[2]); @@ -1272,7 +1272,7 @@ sml_fail_unless(eventError == NULL, "%s", smlErrorPrint(&eventError)); } - SmlDevInf *recvClientDevInf = smlDevInfAgentGetDevInf(serveragent); + SmlDevInf *recvClientDevInf = smlDevInfAgentGetSessionDevInf(serveragent, servertracker->session); sml_fail_unless(recvClientDevInf != NULL, NULL); sml_fail_unless(smlDevInfNumDataStores(recvClientDevInf) == 3, NULL); sml_fail_unless(smlDevInfSupportsNumberOfChanges(recvClientDevInf) == TRUE, NULL); @@ -1311,7 +1311,7 @@ sml_fail_unless(smlSessionGetRemoteMaxMsgSize(clienttracker->session) == TEST_DEFAULT_MAX_MSG_SIZE, NULL); sml_fail_unless(smlSessionGetRemoteMaxObjSize(servertracker->session) == TEST_DEFAULT_MAX_OBJ_SIZE, NULL); - SmlDevInf *recvServerDevInf = smlDevInfAgentGetDevInf(clientagent); + SmlDevInf *recvServerDevInf = smlDevInfAgentGetSessionDevInf(clientagent, clienttracker->session); sml_fail_unless(recvServerDevInf != NULL, NULL); sml_fail_unless(smlDevInfNumDataStores(recvServerDevInf) == 3, NULL); sml_fail_unless(smlDevInfSupportsNumberOfChanges(recvServerDevInf) == TRUE, NULL); @@ -1572,9 +1572,9 @@ clienttracker->ds[0] = smlDsClientNew(SML_ELEMENT_TEXT_VCARD, loc1, loc1, &error); clienttracker->ds[1] = smlDsClientNew(SML_ELEMENT_TEXT_VCAL, loc2, loc2, &error); clienttracker->ds[2] = smlDsClientNew(SML_ELEMENT_TEXT_PLAIN, loc3, loc3, &error); - smlDsServerSetSanCallback(clienttracker->ds[0], _recv_san, GINT_TO_POINTER(1)); - smlDsServerSetSanCallback(clienttracker->ds[1], _recv_san, GINT_TO_POINTER(1)); - smlDsServerSetSanCallback(clienttracker->ds[2], _recv_san, GINT_TO_POINTER(1)); + smlDsServerSetSanSessionCallback(clienttracker->ds[0], _recv_san, GINT_TO_POINTER(1)); + smlDsServerSetSanSessionCallback(clienttracker->ds[1], _recv_san, GINT_TO_POINTER(1)); + smlDsServerSetSanSessionCallback(clienttracker->ds[2], _recv_san, GINT_TO_POINTER(1)); smlDsServerRegister(clienttracker->ds[0], clientmanager, &error); smlDsServerRegister(clienttracker->ds[1], clientmanager, &error); smlDsServerRegister(clienttracker->ds[2], clientmanager, &error); @@ -1851,9 +1851,9 @@ clienttracker->ds[0] = smlDsClientNew(SML_ELEMENT_TEXT_VCARD, loc1, loc1, &error); clienttracker->ds[1] = smlDsClientNew(SML_ELEMENT_TEXT_VCAL, loc2, loc2, &error); clienttracker->ds[2] = smlDsClientNew(SML_ELEMENT_TEXT_PLAIN, loc3, loc3, &error); - smlDsServerSetSanCallback(clienttracker->ds[0], _recv_san, GINT_TO_POINTER(1)); - smlDsServerSetSanCallback(clienttracker->ds[1], _recv_san, GINT_TO_POINTER(1)); - smlDsServerSetSanCallback(clienttracker->ds[2], _recv_san, GINT_TO_POINTER(1)); + smlDsServerSetSanSessionCallback(clienttracker->ds[0], _recv_san, GINT_TO_POINTER(1)); + smlDsServerSetSanSessionCallback(clienttracker->ds[1], _recv_san, GINT_TO_POINTER(1)); + smlDsServerSetSanSessionCallback(clienttracker->ds[2], _recv_san, GINT_TO_POINTER(1)); smlDsServerRegister(clienttracker->ds[0], clientmanager, &error); smlDsServerRegister(clienttracker->ds[1], clientmanager, &error); smlDsServerRegister(clienttracker->ds[2], clientmanager, &error); |
