Changeset 139

Timestamp:

04/21/06 00:02:28 (3 years ago)

Author:

abauer

Message:

Added a new regression for better testing deletes

Fixed some unit tests

Files:

• branches/6620-branch/tests/check_ds.c (modified) (57 diffs)
• branches/6620-branch/tests/check_sync.c (modified) (4 diffs)

branches/6620-branch/tests/check_ds.c

@@ -47 +47 @@
-
-gint data_received = 0;
-unsigned 
-unsigned 
-unsigned 
-unsigned 
-unsigned 
-unsigned 
-unsigned 
-unsigned 
-unsigned 
-unsigned 
-unsigned 
-unsigned 
-unsigned 
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-SmlTransportData *to_session = NULL;
@@ -225 +225 @@
-        
-        corr->dsession = dsession;
-init_alerts_received++
+g_atomic_int_add(&init_alerts_received, 1)
-        smlDsSessionRef(dsession);
-        
@@ -238 +238 @@
-        fail_unless(next != NULL, NULL);
-        
-alerts_received++
+g_atomic_int_add(&alerts_received, 1)
-        
-        smlTrace(TRACE_EXIT, "%s", __func__);
@@ -244 +244 @@
-}
-
-
+static 
-{
-        smlTrace(TRACE_ENTRY, "%s()", __func__);
-        
-syncs_received++
+g_atomic_int_add(&syncs_received, 1)
-                
-        smlTrace(TRACE_EXIT, "%s", __func__);
-}
-
-
+static 
-{
-        smlTrace(TRACE_ENTRY, "%s(%p, %i, %s, %s, %i, %i, %p, %p)", __func__, dsession, type, uid, data, size, contenttype, userdata, error);
-
-        if (type == SML_CHANGE_ADD) {
-adds_received++
-fail_unless(!strcmp(uid, "uid"), NULL
-fail_unless(!strcmp(data, "data"), NULL
-fail_unless(size == 5, NULL
+g_atomic_int_add(&adds_received, 1)
+g_assert(!strcmp(uid, "uid")
+g_assert(!strncmp(data, "data", size)
+g_assert(size == 4
-        } else if (type == SML_CHANGE_REPLACE) {
-modifies_received++
-fail_unless(!strcmp(uid, "uid"), NULL
-fail_unless(!strcmp(data, "newdata"), NULL
-fail_unless(size == 8, NULL
+g_atomic_int_add(&modifies_received, 1)
+g_assert(!strcmp(uid, "uid")
+g_assert(!strncmp(data, "newdata", size)
+g_assert(size == 7
-        } else if (type == SML_CHANGE_DELETE) {
-deletes_received++
-fail_unless(!strcmp(uid, "uid"), NULL
-fail_unless(!data, NULL
-fail_unless(size == 0, NULL
+g_atomic_int_add(&deletes_received, 1)
+g_assert(!strcmp(uid, "uid")
+g_assert(!data
+g_assert(size == 0
-        } else
-                fail(NULL);
@@ -278 +278 @@
-        return TRUE;
-}
-
-/*static void _map_reply(SmlSession *session, SmlStatus *status, void *userdata)
-{
-        smlTrace(TRACE_ENTRY, "%s()", __func__);
-        
-        fail_unless(status != NULL, NULL);
-        fail_unless(userdata == GINT_TO_POINTER(1), NULL);
-        fail_unless(smlStatusGetClass(status) == SML_ERRORCLASS_SUCCESS, NULL);
-        
-        smlTrace(TRACE_EXIT, "%s", __func__);
-}
-
-SmlBool _recv_client_changes(SmlDsServer *server, SmlChangeType type, const char *uid, char *data, unsigned int size, SmlContentType contenttype, void *userdata, SmlError **error)
-{
-        smlTrace(TRACE_ENTRY, "%s(%p, %i, %s, %s, %i, %i, %p, %p)", __func__, server, type, uid, data, size, contenttype, userdata, error);
-        
-        if (!type) {
-                fail_unless(!uid, NULL);
-                fail_unless(!data, NULL);
-                client_changes_end = TRUE;
-                
-                if (client_send_map) {
-                        fail_unless(smlDsServerCloseMap(server, _map_reply, GINT_TO_POINTER(1), error), NULL);
-                }
-        } else if (type == SML_CHANGE_ADD) {
-                clientrecvchanges++;
-                fail_unless(!strcmp(uid, "uid"), NULL);
-                fail_unless(!strcmp(data, "data"), NULL);
-                fail_unless(size == 5, NULL);
-                if (client_send_map) {
-                        fail_unless(smlDsServerQueueMap(server, uid, "newuid", error), NULL);
-                }
-        } else if (type == SML_CHANGE_REPLACE) {
-                clientrecvchanges++;
-                fail_unless(!strcmp(uid, "uid"), NULL);
-                fail_unless(!strcmp(data, "newdata"), NULL);
-                fail_unless(size == 8, NULL);
-        } else if (type == SML_CHANGE_DELETE) {
-                clientrecvchanges++;
-                fail_unless(!strcmp(uid, "uid"), NULL);
-                fail_unless(!data, NULL);
-                fail_unless(size == 0, NULL);
-        } else
-                fail(NULL);
-        
-        smlTrace(TRACE_EXIT, "%s", __func__);
-        return TRUE;
-}*/
-
-static void _alert_reply(SmlSession *dsession, SmlStatus *status, void *userdata)
@@ -339 +291 @@
-        }
-        
-replies_received++
+g_atomic_int_add(&replies_received, 1)
-        
-        smlTrace(TRACE_EXIT, "%s", __func__);
@@ -356 +308 @@
-        }
-        
-replies_received++
+g_atomic_int_add(&replies_received, 1)
-        
-        smlTrace(TRACE_EXIT, "%s", __func__);
@@ -374 +326 @@
-                fail_unless(newuid == NULL, NULL);
-        
-add_replies_received++
+g_atomic_int_add(&add_replies_received, 1)
-
-        smlTrace(TRACE_EXIT, "%s", __func__);
@@ -389 +341 @@
-        fail_unless(newuid == NULL, NULL);
-        
-modify_replies_received++
+g_atomic_int_add(&modify_replies_received, 1)
-
-        smlTrace(TRACE_EXIT, "%s", __func__);
@@ -404 +356 @@
-        fail_unless(newuid == NULL, NULL);
-        
-delete_replies_received++
-
+g_atomic_int_add(&delete_replies_received, 1)
+
-        smlTrace(TRACE_EXIT, "%s", __func__);
-}
@@ -416 +368 @@
-        fail_unless(smlStatusGetClass(status) == SML_ERRORCLASS_SUCCESS, NULL);
-        
-replies_received++
+g_atomic_int_add(&replies_received, 1)
-        
-        smlTrace(TRACE_EXIT, "%s", __func__);
-}
-
-/*static void _server_sent_change_add(SmlDsServer *server, SmlStatus *status, const char *newuid, void *userdata)
-{
-        smlTrace(TRACE_ENTRY, "%s(%p, %p, %s, %p)", __func__, server, status, newuid, userdata);
-        
-        fail_unless(status != NULL, NULL);
-        fail_unless(GPOINTER_TO_INT(userdata) == 1, NULL);
-        fail_unless(smlStatusGetClass(status) == SML_ERRORCLASS_SUCCESS, NULL);
-        fail_unless(!strcmp(newuid, "newuid"), NULL);
-
-        servercommitreplies++;
-
-        smlTrace(TRACE_EXIT, "%s", __func__);
-}
-
-static void _server_sent_change_repdel(SmlDsServer *server, SmlStatus *status, const char *newuid, void *userdata)
-{
-        smlTrace(TRACE_ENTRY, "%s(%p, %p, %s, %p)", __func__, server, status, newuid, userdata);
-        
-        fail_unless(status != NULL, NULL);
-        fail_unless(GPOINTER_TO_INT(userdata) == 1, NULL);
-        fail_unless(smlStatusGetClass(status) == SML_ERRORCLASS_SUCCESS, NULL);
-        fail_unless(newuid == NULL, NULL);
-
-        servercommitreplies++;
-
-        smlTrace(TRACE_EXIT, "%s", __func__);
-}
-
-void __client_final_handler_end(SmlSession *session, void *userdata)
-{
-        smlTrace(TRACE_ENTRY, "%s(%p, %p)", __func__, session, userdata);
-        SmlError *error = NULL;
-        clientfinals++;
-        
-        fail_unless(!smlSessionFlush(session, TRUE, &error), NULL);
-        fail_unless(error != NULL, NULL);
-        smlErrorDeref(&error);
-
-        smlTrace(TRACE_EXIT, "%s", __func__);
-}
-
-void __client_final_handler3(SmlSession *session, void *userdata)
-{
-        smlTrace(TRACE_ENTRY, "%s(%p, %p)", __func__, session, userdata);
-        SmlError *error = NULL;
-        clientfinals++;
-        
-        if (clientfinals == clientsessionend) {
-                smlSessionRegisterFinalHandler(session, __client_final_handler_end, userdata);
-        } else  {
-                fail(NULL);
-        }
-
-        fail_unless(smlSessionFlush(session, TRUE, &error), NULL);
-        fail_unless(error == NULL, NULL);
-        
-        smlTrace(TRACE_EXIT, "%s", __func__);
-}
-
-void __client_final_handler2(SmlSession *session, void *userdata)
-{
-        smlTrace(TRACE_ENTRY, "%s(%p, %p)", __func__, session, userdata);
-        SmlDsServer *server = (SmlDsServer *)userdata;
-        SmlError *error = NULL;
-        clientfinals++;
-        
-        if (client_request_changes) {
-                fail_unless(smlDsServerRequestChanges(server, _recv_client_changes, _recv_sync, userdata, &error), NULL);
-                fail_unless(error == NULL, NULL);
-        }
-        
-        if (clientfinals == clientsessionend) {
-                smlSessionRegisterFinalHandler(session, __client_final_handler_end, userdata);
-        } else  {
-                smlSessionRegisterFinalHandler(session, __client_final_handler3, userdata);
-        }
-
-        fail_unless(smlSessionFlush(session, TRUE, &error), NULL);
-        fail_unless(error == NULL, NULL);
-        
-        smlTrace(TRACE_EXIT, "%s", __func__);
-}
-
-void __client_final_handler(SmlSession *session, void *userdata)
-{
-        smlTrace(TRACE_ENTRY, "%s(%p, %p)", __func__, session, userdata);
-        SmlDsServer *server = (SmlDsServer *)userdata;
-        SmlError *error = NULL;
-        clientfinals++;
-        
-        if (client_request_alert) {
-                fail_unless(smlDsServerRequestAlert(server, _recv_alert, userdata, &error), NULL);
-                fail_unless(error == NULL, NULL);
-        }
-        
-        if (client_send_changes) {
-                fail_unless(smlDsServerSendSync(server, 0, _alert_reply, GINT_TO_POINTER(1), &error), NULL);
-                fail_unless(error == NULL, NULL);
-                
-                if (client_send_add) {
-                        fail_unless(smlDsServerQueueChange(server, SML_CHANGE_ADD, "uid", "data", 5, SML_CONTENT_TYPE_VCARD, _client_sent_change_add, GINT_TO_POINTER(1), &error), NULL);
-                        fail_unless(error == NULL, NULL);
-                }
-                
-                if (client_send_many_add) {
-                        int i = 0;
-                        for (i = 0; i < 30; i++) {
-                                char *uid = g_strdup_printf("uid%i", i);
-                                fail_unless(smlDsServerQueueChange(server, SML_CHANGE_ADD, uid, "data", 5, SML_CONTENT_TYPE_VCARD, _client_sent_change_add, GINT_TO_POINTER(1), &error), NULL);
-                                fail_unless(error == NULL, NULL);
-                                g_free(uid);
-                        }
-                }
-                
-                if (client_send_replace) {
-                        fail_unless(smlDsServerQueueChange(server, SML_CHANGE_REPLACE, "uid", "newdata", 8, SML_CONTENT_TYPE_VCARD, _client_sent_change_add, GINT_TO_POINTER(1), &error), NULL);
-                        fail_unless(error == NULL, NULL);
-                }
-                
-                if (client_send_delete) {
-                        fail_unless(smlDsServerQueueChange(server, SML_CHANGE_DELETE, "uid", NULL, 0, SML_CONTENT_TYPE_VCARD, _client_sent_change_add, GINT_TO_POINTER(1), &error), NULL);
-                        fail_unless(error == NULL, NULL);
-                }
-                
-                fail_unless(smlDsServerCloseSync(server, &error), NULL);
-                fail_unless(error == NULL, NULL);
-        }
-        
-        if (clientfinals == clientsessionend) {
-                smlSessionRegisterFinalHandler(session, __client_final_handler_end, userdata);
-        } else  {
-                smlSessionRegisterFinalHandler(session, __client_final_handler2, userdata);
-        }
-        
-        if (client_request_alert) {
-                fail_unless(smlSessionFlush(session, TRUE, &error), NULL);
-                fail_unless(error == NULL, NULL);
-        }
-        
-        smlTrace(TRACE_EXIT, "%s", __func__);
-}
-
-void __server_final_handler_end(SmlSession *session, void *userdata)
-{
-        smlTrace(TRACE_ENTRY, "%s(%p, %p)", __func__, session, userdata);
-        SmlError *error = NULL;
-        serverfinals++;
-
-        fail_unless(smlSessionFlush(session, TRUE, &error), NULL);
-        fail_unless(error == NULL, NULL);
-        
-        smlTrace(TRACE_EXIT, "%s", __func__);
-}
-
-void __server_final_handler2(SmlSession *session, void *userdata)
-{
-        smlTrace(TRACE_ENTRY, "%s(%p, %p)", __func__, session, userdata);
-        SmlDsServer *server = (SmlDsServer *)userdata;
-        SmlError *error = NULL;
-        serverfinals++;
-
-        if (server_request_changes) {
-                fail_unless(smlDsServerRequestChanges(server, _recv_server_changes, _recv_sync, userdata, &error), NULL);
-                fail_unless(error == NULL, NULL);
-        }
-        
-        if (server_send_changes) {
-                fail_unless(smlDsServerSendSync(server, 0, _alert_reply, GINT_TO_POINTER(1), &error), NULL);
-                fail_unless(error == NULL, NULL);
-                                
-                if (server_send_delete) {
-                        fail_unless(smlDsServerQueueChange(server, SML_CHANGE_DELETE, "uid", NULL, 0, SML_CONTENT_TYPE_VCARD, _server_sent_change_repdel, GINT_TO_POINTER(1), &error), NULL);
-                        fail_unless(error == NULL, NULL);
-                }
-                
-                if (server_send_many_add) {
-                        int i = 0;
-                        for (i = 0; i < 30; i++) {
-                                char *uid = g_strdup_printf("uid%i", i);
-                                fail_unless(smlDsServerQueueChange(server, SML_CHANGE_ADD, uid, "data", 5, SML_CONTENT_TYPE_VCARD, _client_sent_change_add, GINT_TO_POINTER(1), &error), NULL);
-                                fail_unless(error == NULL, NULL);
-                                g_free(uid);
-                        }
-                }
-                
-                if (server_send_add) {
-                        fail_unless(smlDsServerQueueChange(server, SML_CHANGE_ADD, "uid", "data", 5, SML_CONTENT_TYPE_VCARD, _server_sent_change_add, GINT_TO_POINTER(1), &error), NULL);
-                        fail_unless(error == NULL, NULL);
-                }
-                
-                if (server_send_replace) {
-                        fail_unless(smlDsServerQueueChange(server, SML_CHANGE_REPLACE, "uid", "newdata", 8, SML_CONTENT_TYPE_VCARD, _server_sent_change_repdel, GINT_TO_POINTER(1), &error), NULL);
-                        fail_unless(error == NULL, NULL);
-                }
-                
-                fail_unless(smlDsServerCloseSync(server, &error), NULL);
-                fail_unless(error == NULL, NULL);
-        }
-        
-        if (serverfinals == serversessionend)
-                smlSessionRegisterFinalHandler(session, __server_final_handler_end, userdata);
-        else
-                smlSessionRegisterFinalHandler(session, __server_final_handler2, userdata);
-                
-        fail_unless(smlSessionFlush(session, TRUE, &error), NULL);
-        fail_unless(error == NULL, NULL);
-        
-        smlTrace(TRACE_EXIT, "%s", __func__);
-}*/
-
-START_TEST (check_ds_server_new)
@@ -704 +446 @@
-                        break;
-                case SML_SESSION_EVENT_END:
-session_ends++
+g_atomic_int_add(&session_ends, 1)
-                        break;
-                default:
@@ -1040 +782 @@
-        while (syncs_received != 1) {
-                smlDsSessionDispatch(server_corr->dsession);
-000
+
-        }
-        
@@ -1184 +926 @@
-        while (syncs_received != 1) {
-                smlDsSessionDispatch(server_corr->dsession);
-000
+
-        }
-        
@@ -1201 +943 @@
-        while (syncs_received != 2) {
-                smlDsSessionDispatch(client_corr->dsession);
-000
+
-        }
-        
@@ -1335 +1077 @@
-        smlDsSessionSendSync(client_corr->dsession, 0, _sync_reply, GINT_TO_POINTER(1), &error);
-        
-5
+4
-        fail_unless(error == NULL, NULL);
-        
@@ -1352 +1094 @@
-        while (syncs_received != 1 || adds_received != 1) {
-                smlDsSessionDispatch(server_corr->dsession);
-000
+
-        }
-        
@@ -1369 +1111 @@
-        while (syncs_received != 2) {
-                smlDsSessionDispatch(client_corr->dsession);
-000
+
-        }
-        
@@ -1509 +1251 @@
-        smlDsSessionSendSync(client_corr->dsession, 0, _sync_reply, GINT_TO_POINTER(1), &error);
-        
-5
+4
-        fail_unless(error == NULL, NULL);
-        
@@ -1526 +1268 @@
-        while (syncs_received != 1 || adds_received != 1) {
-                smlDsSessionDispatch(server_corr->dsession);
-000
+
-        }
-        
-        smlDsSessionSendSync(server_corr->dsession, 0, _sync_reply, GINT_TO_POINTER(1), &error);
-        
-5
+4
-        fail_unless(error == NULL, NULL);
-        
@@ -1548 +1290 @@
-        while (syncs_received != 2 || adds_received != 2) {
-                smlDsSessionDispatch(client_corr->dsession);
-000
+
-        }
-        
@@ -1603 +1345 @@
-END_TEST
-
-
-
+
-/* C -- Put, Alert --> S
- * S -- Status, Put, Alert --> C
-Replace, Delete, Add
-Add, Replace, 
-, Map
+Delete
+
+
- * S -- Status --> C */
-map_full
+delete
-{
-        data_received = 0;
@@ -1699 +1440 @@
-        smlDsSessionSendSync(client_corr->dsession, 0, _sync_reply, GINT_TO_POINTER(1), &error);
-        
-        fail_unless(smlDsSessionQueueChange(client_corr->dsession, SML_CHANGE_REPLACE, "uid", "newdata", 8, SML_CONTENT_TYPE_VCARD, _modify_reply, GINT_TO_POINTER(1), &error), NULL);
-        fail_unless(error == NULL, NULL);
-        
-        fail_unless(smlDsSessionQueueChange(client_corr->dsession, SML_CHANGE_DELETE, "uid", NULL, 0, SML_CONTENT_TYPE_VCARD, _delete_reply, GINT_TO_POINTER(1), &error), NULL);
-        fail_unless(error == NULL, NULL);
-        
-        fail_unless(smlDsSessionQueueChange(client_corr->dsession, SML_CHANGE_ADD, "uid", "data", 5, SML_CONTENT_TYPE_VCARD, _add_reply, GINT_TO_POINTER(2), &error), NULL);
-        fail_unless(error == NULL, NULL);
-        
@@ -1720 +1455 @@
-        smlDsSessionGetChanges(server_corr->dsession, _recv_changes, GINT_TO_POINTER(1));
-        
-adds_received != 1 || deletes_received != 1 || modifi
+delet
-                smlDsSessionDispatch(server_corr->dsession);
-000
+
-        }
-        
-        smlDsSessionSendSync(server_corr->dsession, 0, _sync_reply, GINT_TO_POINTER(1), &error);
-        
-        fail_unless(smlDsSessionQueueChange(server_corr->dsession, SML_CHANGE_REPLACE, "uid", "newdata", 8, SML_CONTENT_TYPE_VCARD, _modify_reply, GINT_TO_POINTER(1), &error), NULL);
-        fail_unless(error == NULL, NULL);
-        
-        fail_unless(smlDsSessionQueueChange(server_corr->dsession, SML_CHANGE_ADD, "uid", "data", 5, SML_CONTENT_TYPE_VCARD, _add_reply, GINT_TO_POINTER(1), &error), NULL);
-        fail_unless(error == NULL, NULL);
-        
-        fail_unless(smlDsSessionQueueChange(server_corr->dsession, SML_CHANGE_DELETE, "uid", NULL, 0, SML_CONTENT_TYPE_VCARD, _delete_reply, GINT_TO_POINTER(1), &error), NULL);
@@ -1748 +1477 @@
-        smlDsSessionGetChanges(client_corr->dsession, _recv_changes, GINT_TO_POINTER(1));
-        
-adds_received != 2 || deletes_received != 2 || modifi
+delet
-                smlDsSessionDispatch(client_corr->dsession);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-                usleep(500);
-        }
@@ -1782 +1501 @@
-        fail_unless(syncs_received == 2, NULL);
-        fail_unless(changes_received == 0, NULL);
-5
+4
-        fail_unless(session_ends == 2, NULL);
-        
-2
-2
+0
+0
-        fail_unless(deletes_received == 2, NULL);
-        fail_unless(delete_replies_received == 2, NULL);
-2
-2
+0
+0
-        
-        g_free(client_corr);
@@ -1802 +1521 @@
-        smlDsServerFree(server);
-        smlDsServerFree(client);
-        
-}
-END_TEST
-
+/* send alerts, send sync from client, send from server with one add */
+/* Send map */
-/* C -- Put, Alert --> S
- * S -- Status, Put, Alert --> C
-500 *
-500 * Add
+Replace, Delete,
+Add, Replace, Delete
- * C -- Status, Map --> S
- * S -- Status --> C */
-add_large
+map_full
-{
-        data_received = 0;
@@ -1832 +1552 @@
-        to_session2 = NULL;
-        
-        int num = 50;
-        
-        /* General setup */
-        setup_testbed(NULL);
@@ -1901 +1619 @@
-        
-        smlDsSessionSendSync(client_corr->dsession, 0, _sync_reply, GINT_TO_POINTER(1), &error);
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-        
-        smlDsSessionCloseSync(client_corr->dsession, &error);
@@ -1920 +1641 @@
-        smlDsSessionGetChanges(server_corr->dsession, _recv_changes, GINT_TO_POINTER(1));
-        
-num
+1 || deletes_received != 1 || modifies_received != 1
-                smlDsSessionDispatch(server_corr->dsession);
-000
+
-        }
-        
-        smlDsSessionSendSync(server_corr->dsession, 0, _sync_reply, GINT_TO_POINTER(1), &error);
-        
-
-
-
-
+
+
+
+
+
+
+
+
-        
-        smlDsSessionCloseSync(server_corr->dsession, &error);
@@ -1944 +1669 @@
-        smlDsSessionGetChanges(client_corr->dsession, _recv_changes, GINT_TO_POINTER(1));
-        
-num *
+2 || deletes_received != 2 || modifies_received !=
-                smlDsSessionDispatch(client_corr->dsession);
-
-
-
-
-
-
+
+
+
+
-        smlDsSessionCloseMap(client_corr->dsession, _map_reply, GINT_TO_POINTER(1), &error);
-        
@@ -1957 +1680 @@
-        fail_unless(error == NULL, NULL);
-        
-num * 
+
-                usleep(500);
-        }
@@ -1983 +1706 @@
-        fail_unless(session_ends == 2, NULL);
-        
-num * 
-num * 
-0
-0
-0
-0
+
+
+2
+2
+2
+2
-        
-        g_free(client_corr);
@@ -2000 +1723 @@
-        smlDsServerFree(server);
-        smlDsServerFree(client);
+        
-}
-END_TEST
@@ -2009 +1733 @@
- * C -- Status, Map --> S
- * S -- Status --> C */
-
-
+
-{
-        data_received = 0;
@@ -2030 +1753 @@
-        to_session2 = NULL;
-        
-
-
+
-        
-        /* General setup */
@@ -2054 +1776 @@
-        SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error);
-        client_corr->thread = smlSessionRunAsync(session, &to_session);
-        smlSessionSetSendingLimit(session, limit);
-        SmlSession *session2 = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error);
-        server_corr->thread = smlSessionRunAsync(session2, &to_session2);
-        smlSessionSetSendingLimit(session2, limit);
-        
-        smlSessionSetEventCallback(session, _event_callback, client_corr);
@@ -2088 +1808 @@
-        fail_unless(error == NULL, NULL);
-        
+        while (data_received != 2) {
+                usleep(500);
+        }
+        
-        smlDsSessionGetAlert(client_corr->dsession, _recv_alert, GINT_TO_POINTER(1));
+        
-        
-        
@@ -2100 +1825 @@
-        int i = 0;
-        for (i = 0; i < num; i++) {
-5
+4
-                fail_unless(error == NULL, NULL);
-        }
@@ -2109 +1834 @@
-        fail_unless(error == NULL, NULL);
-        
+        while (data_received != 3) {
+                usleep(500);
+        }
-        
-        smlDsSessionGetSync(server_corr->dsession, _recv_sync, GINT_TO_POINTER(1));
@@ -2115 +1843 @@
-        while (syncs_received != 1 || adds_received != num) {
-                smlDsSessionDispatch(server_corr->dsession);
-0
+
-        }
-        
@@ -2121 +1849 @@
-        
-        for (i = 0; i < num; i++) {
-5
+4
-                fail_unless(error == NULL, NULL);
-        }
@@ -2130 +1858 @@
-        fail_unless(error == NULL, NULL);
-        
+        while (data_received != 4) {
+                usleep(500);
+        }
-        
-        smlDsSessionGetSync(client_corr->dsession, _recv_sync, GINT_TO_POINTER(1));
-        smlDsSessionGetChanges(client_corr->dsession, _recv_changes, GINT_TO_POINTER(1));
-        
-
+syncs_received != 2 || 
-                smlDsSessionDispatch(client_corr->dsession);
-0
+
-        }
-        
@@ -2147 +1878 @@
-        fail_unless(error == NULL, NULL);
-        
-
+data_received != 5 || 
-                usleep(500);
-        }
@@ -2157 +1888 @@
-                usleep(500);
-        }
-        
-        smlLocationUnref(loc);
-        
-        smlSessionStop(client_corr->thread);
@@ -2166 +1895 @@
-        smlDsSessionUnref(server_corr->dsession);
-        
-//
+
-        fail_unless(init_alerts_received == 1, NULL);
-        
@@ -2188 +1917 @@
-        smlSessionUnref(session2);
-                
+        smlLocationUnref(loc);
+                
-        smlDsServerFree(server);
-        smlDsServerFree(client);
@@ -2193 +1924 @@
-END_TEST
-
-#if 0
-/* C -- Put, Alert --> S
- * S -- Status, Put, Alert --> C
@@ -2201 +1931 @@
- * S -- Status --> C */
-/* Limit the sending size of both sides */
-multi_server
+limit
-{
-        data_received = 0;
@@ -2221 +1951 @@
-        to_session2 = NULL;
-        
+        int num = 5;
+        unsigned int limit = 1300;
+        
+        /* General setup */
+        setup_testbed(NULL);
+        
+        SmlError *error = NULL;
+        SmlLocation *loc = smlLocationNew("/vcards", NULL, &error);
+        
+        
+        SmlDsServer *client = smlDsClientNew(SML_CONTENT_TYPE_VCARD, loc, loc, &error);
+        _server_corr *client_corr = g_malloc0(sizeof(_server_corr));
+        client_corr->server = client;
+        
+        
+        SmlDsServer *server = smlDsServerNew(SML_CONTENT_TYPE_VCARD, loc, &error);
+        _server_corr *server_corr = g_malloc0(sizeof(_server_corr));
+        server_corr->server = server;
+        smlDsServerSetConnectCallback(server, _recv_init_alert, server_corr);
+        
+        
+        /* Start a new session from the client */
+        SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error);
+        client_corr->thread = smlSessionRunAsync(session, &to_session);
+        smlSessionSetSendingLimit(session, limit);
+        SmlSession *session2 = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error);
+        server_corr->thread = smlSessionRunAsync(session2, &to_session2);
+        smlSessionSetSendingLimit(session2, limit);
+        
+        smlSessionSetEventCallback(session, _event_callback, client_corr);
+        smlSessionSetDataCallback(session, _data_send_callback, &to_session2);
+        smlSessionSetEventCallback(session2, _event_callback, server_corr);
+        smlSessionSetDataCallback(session2, _data_send_callback, &to_session);
+        
+        client_corr->dsession = smlDsServerSendAlert(client, session, SML_ALERT_TWO_WAY, "last", "next", _alert_reply, GINT_TO_POINTER(1), &error);
+        fail_unless(client_corr->dsession != NULL, NULL);
+        fail_unless(error == NULL, NULL);
+        
+        fail_unless(smlSessionFlush(session, TRUE, &error), NULL);
+        fail_unless(error == NULL, NULL);
+        
+        while (init_alerts_received != 1) {
+                usleep(500);
+        }
+        
+        smlDsSessionGetAlert(server_corr->dsession, _recv_alert, GINT_TO_POINTER(1));
+        smlDsSessionSendAlert(server_corr->dsession, SML_ALERT_TWO_WAY, "last", "next", _alert_reply, GINT_TO_POINTER(1), &error);
+        
+        
+        
+        while (alerts_received != 1) {
+                smlDsSessionDispatch(server_corr->dsession);
+                usleep(500);
+        }
+