Menu
▾
▴
opensync-commits — Mailing list that will receive the commit information
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
(56) |
Apr
(109) |
May
(15) |
Jun
(3) |
Jul
(37) |
Aug
(96) |
Sep
(40) |
Oct
(4) |
Nov
(54) |
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(47) |
Feb
(30) |
Mar
(102) |
Apr
(120) |
May
(68) |
Jun
(54) |
Jul
(53) |
Aug
(122) |
Sep
(190) |
Oct
(71) |
Nov
(85) |
Dec
(108) |
| 2007 |
Jan
(72) |
Feb
(190) |
Mar
(53) |
Apr
(101) |
May
(145) |
Jun
(148) |
Jul
(167) |
Aug
(143) |
Sep
(23) |
Oct
(198) |
Nov
(223) |
Dec
(195) |
| 2008 |
Jan
(100) |
Feb
(129) |
Mar
(79) |
Apr
(77) |
May
(34) |
Jun
(95) |
Jul
(112) |
Aug
(160) |
Sep
(82) |
Oct
(124) |
Nov
(199) |
Dec
(355) |
| 2009 |
Jan
(436) |
Feb
(89) |
Mar
(298) |
Apr
(189) |
May
(33) |
Jun
(88) |
Jul
(105) |
Aug
(44) |
Sep
(181) |
Oct
(87) |
Nov
(75) |
Dec
(1) |
| 2010 |
Jan
(63) |
Feb
(21) |
Mar
(3) |
Apr
(1) |
May
(1) |
Jun
(3) |
Jul
(26) |
Aug
(37) |
Sep
(26) |
Oct
(15) |
Nov
(13) |
Dec
|
|
From: <dg...@su...> - 2009-01-12 20:50:02
|
Author: Graham Cobb Date: Mon Jan 12 21:49:20 2009 New Revision: 5125 URL: http://www.opensync.org/changeset/5125 Log: gpe-sync: more README updates Modified: plugins/gpe/README Modified: plugins/gpe/README ============================================================================== --- plugins/gpe/README Mon Jan 12 21:39:01 2009 (r5124) +++ plugins/gpe/README Mon Jan 12 21:49:20 2009 (r5125) @@ -89,9 +89,7 @@ == Features == -'' - * what parts of those specs it implements, what not? -'' +''what parts of those specs it implements, what not?'' == Related OpenSync Pages == |
|
From: <dg...@su...> - 2009-01-12 20:39:46
|
Author: Graham Cobb Date: Mon Jan 12 21:39:01 2009 New Revision: 5124 URL: http://www.opensync.org/changeset/5124 Log: gpe-sync: bring README up to date Modified: plugins/gpe/ChangeLog plugins/gpe/README Modified: plugins/gpe/ChangeLog ============================================================================== --- plugins/gpe/ChangeLog Mon Jan 12 01:58:48 2009 (r5123) +++ plugins/gpe/ChangeLog Mon Jan 12 21:39:01 2009 (r5124) @@ -1,3 +1,7 @@ +2009-01-12 Graham Cobb <g+...@co...> + + * README: Rewrite to bring up to date + 2009-01-03 Graham Cobb <g+...@co...> * src/gpe_sync.c (discover): Only parse config during discover phase. Modified: plugins/gpe/README ============================================================================== --- plugins/gpe/README Mon Jan 12 01:58:48 2009 (r5123) +++ plugins/gpe/README Mon Jan 12 21:39:01 2009 (r5124) @@ -1,27 +1,39 @@ -This is a plugin for opensync (www.opensync.org) to sync with handhelds -using GPE (http://gpe.handhelds.org). += GPE plugin = -General information -------------------- -You need to install the gpesyncd on the gpe side. This will read out the -sqlite databases and convert the data into vcards, vevents and vtodos. +This is a sync plugin for [http://www.opensync.org/ OpenSync] to sync with handhelds +using the [http://gpe.linuxtogo.org/ GPE] PIM applications. +For more information on the supported peers see [wiki:peers/gpe]. + +This plugin implements a proprietary protocol implemented by ''gpesyncd''. +''gpesyncd'' is the daemon on the GPE side which reads out the +sqlite databases and converts the data into vcards, vevents and vtodos. Syncing can be done by using tcp/ip or over ssh. Both have their advantages and disadvantages. But anyway I would recommend anyone to do syncing over ssh. -Syncing over ssh ----------------- -By using ssh, you need to additionally install the sshd on the gpe side. If -you want to use it, just set in the configuration xml file "use_ssh" to 1 -(which is default). +== Syncing over ssh == +By using ssh, you need to additionally install the sshd on the gpe side. +To configure it you need to set the following information in the configuration file: +{{{ +<Authentication><Username>gpeuser</Username></Authentication> +<Connection><ActiveConnection>Network</ActiveConnection> + <Network> + <Address>hostname</Address> + <Protocol>ssh</Protocol> + </Network> + </Connection> +}}} + +''gpeuser'' should be replaced with the username in use with SSH on the device. +''hostname'' should be replaced by the host name or IP address of the device. To have it as comfortable as with the syncing over tcp/ip, you should use key authentication. To do so, you need to generate a new ssh-key pair with $ ssh-keygen -t dsa -I recommend you to choose a passphrase although you don't need one. After it +Do not specify a passphrase. After it you have two keys: id_dsa and id_dsa.pub. The id_dsa is you private key, never loose it, never give it away. Now you need to append the contents of id_dsa.pub to ~/.ssh/authorized_keys @@ -30,7 +42,8 @@ $ ssh-add ~/.ssh/id_dsa -And enter the passphrase for you private key. This will add your key to the +And enter the passphrase for your private key if you specified one. +This will add your key to the ssh-agent, which manages all the authentication of the ssh-connections. Now you won't anymore need to re-enter you passphrase while your X-session is running and you can connect to the gpe device without typing in any @@ -39,42 +52,54 @@ If this didn't work or you want more information, go to http://sial.org/howto/openssh/publickey-auth/ -Syncing over tcp/ip -------------------- -For this you need to run the gpesyncd on the gpe device as the user with -whom you want to sync. You also need to run it with the -D parameter so +== Syncing over tcp/ip == +For this you need to run the ''gpesyncd'' on the gpe device as the user with +whom you want to sync. You also need to run it with the ''-d'' parameter so that it will be in the "daemon mode". Optionaly you can specify a port after -the -D parameter. If you provide none, the default port 6446 will be used. +the ''-d'' parameter. If you provide none, the default port 6446 will be used. Additionally you need to list the ip(s) from the computer(s) you want to -allow to sync the file $HOME/.gpe/gpesyncd.allow . If you don't have -this file, or it is empty, the gpesyncd will block all incoming connections. +allow to sync the file ''$HOME/.gpe/gpesyncd.allow''. If you don't have +this file, or it is empty, the ''gpesyncd'' will block all incoming connections. Whenever a connection is blocked and you try to sync, you should get an error like "Your're not allowed to connect!" from opensync. -In the configuration xml file you need to set "use_ssh" to 0. - -Syncing locally ---------------- -If you are running Opensync and GPE on the same system, you can just fork gpesyncd -locally. In order to do that, set "use_local" to 1 in the configuration file. +In the configuration xml file you need to specify: +{{{ + <Connection><ActiveConnection>Network</ActiveConnection> + <Network> + <Address>hostname</Address> + <Port>6446</Port> + <Protocol>gpesyncd</Protocol> + </Network> + </Connection> +}}} +''hostname'' should be replaced by the host name or IP address of the device. + +== Syncing locally == +If you are running !OpenSync and GPE on the same system, you can just fork ''gpesyncd'' +locally. In order to do that, do not specify any ''<Connection>'' tag in the config file. -Troubleshooting ---------------- +== Troubleshooting == Should there be any problems with the conversion, the problems are probably -adressed to gpesyncd. Please look at its BUGS file before reporting a +addressed to ''gpesyncd''. Please look at its BUGS file before reporting a conversion problem. Otherwise, see BUGS for known problems. -Have fun. -Martin (ma...@si...) -Graham (g+o...@co...) - -Some personal notes: - -A BIG THANKS to google, for making the "Summer of Code" -(http://code.google.com/summerofcode.html). -and a BIG THANK AS LEAST AS BIG AS TO GOOGLE, to handhelds.org for doing all -this great stuff and letting me code this while the summer of code for you. -I REALLY enjoyed it (and hopefully still enjoy it). +== Features == + +'' + * what parts of those specs it implements, what not? +'' + +== Related OpenSync Pages == + + * Information on GPE peer devices: [wiki:peers/gpe] + +'' +Link here relevant pages from different releases: + * installation guides + * related other plugin pages (dependencies, format plugins etc) + * track ticket listing +'' |
|
From: <dg...@su...> - 2009-01-12 13:56:27
|
Author: bellmich Date: Mon Jan 12 14:55:46 2009 New Revision: 892 URL: http://libsyncml.opensync.org/changeset/892 Log: added comment to document the unclean test environment Modified: trunk/tests/support.c Modified: trunk/tests/support.c ============================================================================== --- trunk/tests/support.c Mon Jan 12 14:55:05 2009 (r891) +++ trunk/tests/support.c Mon Jan 12 14:55:46 2009 (r892) @@ -21,6 +21,10 @@ #include "support.h" #include <libsyncml/sml_error_internals.h> +/* FIXME: These settings should be controlled by the test environment. + * FIXME: The hard coding of the environment creates an unreal test scenario. + * FIXME: The build host environment must be changed appropriately. + */ void configure_environment() { /* Several libraries do things which confuse debuggers and |
|
From: <dg...@su...> - 2009-01-12 13:55:51
|
Author: bellmich Date: Mon Jan 12 14:55:05 2009 New Revision: 891 URL: http://libsyncml.opensync.org/changeset/891 Log: fixed ticket #210 Modified: trunk/libsyncml/data_sync_api/data_sync_server.c Modified: trunk/libsyncml/data_sync_api/data_sync_server.c ============================================================================== --- trunk/libsyncml/data_sync_api/data_sync_server.c Wed Jan 7 14:31:00 2009 (r890) +++ trunk/libsyncml/data_sync_api/data_sync_server.c Mon Jan 12 14:55:05 2009 (r891) @@ -171,7 +171,14 @@ * let's respect the remote's anchor style */ if (smlDataSyncIsTimestamp(next, dsObject->useTimestampAnchor) != dsObject->useTimestampAnchor) - g_warning("libsyncml uses different timestamp anchor modes."); + { + /* Many users are confused by warnings which can be ignored. + * Therefore the issue is only traced. + */ + smlTrace(TRACE_INTERNAL, + "%s: libsyncml uses different timestamp anchor modes.", + __func__); + } } datastore->localNext = smlDataSyncGetNextAnchor(datastore, local_last, &error); if (!datastore->localNext) |
|
From: <dg...@su...> - 2009-01-12 00:59:39
|
Author: dgollub Date: Mon Jan 12 01:58:48 2009 New Revision: 5123 URL: http://www.opensync.org/changeset/5123 Log: Updated regression testcase for #1021 Assembling XMLFormat with osync_xmlformat_set_() interfaces doesn't set child links. This cause failing comparsing with osync_xmlformat_parse() assembled xmlformat documents. Modified: format-plugins/xmlformat/trunk/tests/check_xmlformat.c format-plugins/xmlformat/trunk/tests/data/compare/contact1.xml Modified: format-plugins/xmlformat/trunk/tests/check_xmlformat.c ============================================================================== --- format-plugins/xmlformat/trunk/tests/check_xmlformat.c Mon Jan 12 01:11:07 2009 (r5122) +++ format-plugins/xmlformat/trunk/tests/check_xmlformat.c Mon Jan 12 01:58:48 2009 (r5123) @@ -243,9 +243,7 @@ char *testbed = setup_testbed("compare"); char *buffer1; - char *buffer2; unsigned int size1; - unsigned int size2; OSyncError *error = NULL; OSyncConvCmpResult result; @@ -256,14 +254,22 @@ fail_unless(xmlformat1 != NULL, NULL); fail_unless(error == NULL, NULL); - fail_unless(osync_file_read( "contact2.xml", &buffer2, &size2, &error), NULL); - - OSyncXMLFormat *xmlformat2 = osync_xmlformat_parse(buffer2, size2, &error); + OSyncXMLFormat *xmlformat2 = osync_xmlformat_new("contact", &error); fail_unless(xmlformat2 != NULL, NULL); fail_unless(error == NULL, NULL); + OSyncXMLField *name = osync_xmlfield_new(xmlformat2, "Name", &error); + fail_unless(name != NULL, NULL); + fail_unless(error == NULL, NULL); + + osync_xmlfield_set_key_value(name, "LastName", "llllllllll"); + osync_xmlfield_set_key_value(name, "FirstName", "ffffffffff"); + + OSyncXMLField *tel = osync_xmlfield_new(xmlformat2, "Telephone", &error); + osync_xmlfield_set_key_value(tel, "Content", "hhhhhhhhhh"); + osync_xmlfield_set_attr(tel, "Location", "Home"); + g_free(buffer1); - g_free(buffer2); result = compare_contact((char*)xmlformat1, osync_xmlformat_size(), (char*)xmlformat2, osync_xmlformat_size(), NULL); Modified: format-plugins/xmlformat/trunk/tests/data/compare/contact1.xml ============================================================================== --- format-plugins/xmlformat/trunk/tests/data/compare/contact1.xml Mon Jan 12 01:11:07 2009 (r5122) +++ format-plugins/xmlformat/trunk/tests/data/compare/contact1.xml Mon Jan 12 01:58:48 2009 (r5123) @@ -1,8 +1,5 @@ <?xml version="1.0"?> <contact> - <FormattedName> - <Content>ffffffffff llllllllll</Content> - </FormattedName> <Name> <LastName>llllllllll</LastName> <FirstName>ffffffffff</FirstName> @@ -10,7 +7,4 @@ <Telephone Location="Home"> <Content>hhhhhhhhhh</Content> </Telephone> - <Telephone Location="Work"> - <Content>wwwwwwwwww</Content> - </Telephone> </contact> |
|
From: <dg...@su...> - 2009-01-12 00:11:52
|
Author: dgollub Date: Mon Jan 12 01:11:07 2009 New Revision: 5122 URL: http://www.opensync.org/changeset/5122 Log: Refactor and cleanup engine write command. Modified: trunk/opensync/engine/opensync_obj_engine.c trunk/opensync/engine/opensync_obj_engine_internals.h trunk/opensync/engine/opensync_sink_engine.c trunk/opensync/engine/opensync_sink_engine_internals.h Modified: trunk/opensync/engine/opensync_obj_engine.c ============================================================================== --- trunk/opensync/engine/opensync_obj_engine.c Mon Jan 12 00:26:28 2009 (r5121) +++ trunk/opensync/engine/opensync_obj_engine.c Mon Jan 12 01:11:07 2009 (r5122) @@ -477,7 +477,7 @@ osync_trace(TRACE_EXIT, "%s", __func__); } -static void _osync_obj_engine_commit_change_callback(OSyncClientProxy *proxy, void *userdata, const char *uid, OSyncError *error) +void osync_obj_engine_commit_change_callback(OSyncClientProxy *proxy, void *userdata, const char *uid, OSyncError *error) { OSyncMappingEntryEngine *entry_engine = userdata; OSyncObjEngine *engine = entry_engine->objengine; @@ -538,7 +538,7 @@ osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(&error)); } -static void _osync_obj_engine_written_callback(OSyncClientProxy *proxy, void *userdata, OSyncError *error) +void osync_obj_engine_written_callback(OSyncClientProxy *proxy, void *userdata, OSyncError *error) { OSyncSinkEngine *sinkengine = userdata; OSyncObjEngine *engine = sinkengine->engine; @@ -1090,74 +1090,13 @@ engine->written = TRUE; - osync_trace(TRACE_INTERNAL, "Starting to write"); - for (p = engine->sink_engines; p; p = p->next) { - OSyncMember *member = NULL; - long long int memberid = 0; - OSyncObjTypeSink *objtype_sink = NULL; - OSyncCapabilities *caps; - - sinkengine = p->data; - /* FIXME: for "clean" mixed-objtype syncing - all peers should report - * via their native OSyncObjEngine. This temp. solution uses not the - * ObjTypeSink to write/commit changes. Later the "native" ObjEngine - * should be used. - - if (osync_sink_engine_is_dummy(sinkengine)) - continue; - */ - - member = osync_client_proxy_get_member(sinkengine->proxy); - memberid = osync_member_get_id(member); - caps = osync_member_get_capabilities(member); - objtype_sink = osync_member_find_objtype_sink(member, engine->objtype); - - /* If sink could not be found use "data" sink if available */ - /* TODO: Get rid of hardcoded-"data". Make this indepdendent of "data" */ - if (!objtype_sink) - objtype_sink = osync_member_find_objtype_sink(member, "data"); - /* TODO: Review if objtype_sink = NULL is valid at all. */ + osync_trace(TRACE_INTERNAL, "Starting to write"); + if (!osync_obj_engine_write(engine, error)) + goto error; - for (o = sinkengine->entries; o; o = o->next) { - OSyncMappingEntryEngine *entry_engine = o->data; - osync_assert(entry_engine); + /* TODO: Reviewe error handling here! */ - /* Only commit change if the objtype sink is able/allowed to write. */ - if (objtype_sink && osync_objtype_sink_get_write(objtype_sink) && osync_entry_engine_is_dirty(entry_engine)) { - OSyncChange *change = entry_engine->change; - osync_assert(entry_engine->change); - - osync_trace(TRACE_INTERNAL, "Writing change %s, changetype %i, format %s , objtype %s from member %lli", - osync_change_get_uid(change), - osync_change_get_changetype(change), - osync_objformat_get_name(osync_change_get_objformat(change)), - osync_change_get_objtype(change), - osync_member_get_id(osync_client_proxy_get_member(sinkengine->proxy))); - - if (!osync_client_proxy_commit_change(sinkengine->proxy, _osync_obj_engine_commit_change_callback, entry_engine, osync_entry_engine_get_change(entry_engine), error)) - goto error; - } else if (entry_engine->change) { - OSyncMapping *mapping = entry_engine->mapping_engine->mapping; - OSyncMember *member = osync_client_proxy_get_member(sinkengine->proxy); - OSyncMappingEntry *entry = entry_engine->entry; - const char *objtype = osync_change_get_objtype(entry_engine->change); - - if (engine->archive) { - if (osync_change_get_changetype(entry_engine->change) == OSYNC_CHANGE_TYPE_DELETED) { - if (!osync_archive_delete_change(engine->archive, osync_mapping_entry_get_id(entry), objtype, error)) - goto error; - } else { - if (!osync_archive_save_change(engine->archive, osync_mapping_entry_get_id(entry), osync_change_get_uid(entry_engine->change), objtype, osync_mapping_get_id(mapping), osync_member_get_id(member), error)) - goto error; - } - } - } - } - - if (!osync_client_proxy_committed_all(sinkengine->proxy, _osync_obj_engine_written_callback, sinkengine, engine->objtype, error)) - goto error; - } break; case OSYNC_ENGINE_COMMAND_SYNC_DONE: for (p = engine->sink_engines; p; p = p->next) { @@ -1313,6 +1252,52 @@ } return TRUE; + +error: + return FALSE; +} + +osync_bool osync_obj_engine_write(OSyncObjEngine *engine, OSyncError **error) +{ + GList *p; + OSyncMember *member; + OSyncObjTypeSink *objtype_sink; + + osync_assert(engine); + + for (p = engine->sink_engines; p; p = p->next) { + OSyncSinkEngine *sinkengine = p->data; + + /* FIXME: for "clean" mixed-objtype syncing - all peers should report + * via their native OSyncObjEngine. This temp. solution uses not the + * ObjTypeSink to write/commit changes. Later the "native" ObjEngine + * should be used. + + if (osync_sink_engine_is_dummy(sinkengine)) + continue; + */ + + member = osync_client_proxy_get_member(sinkengine->proxy); + objtype_sink = osync_member_find_objtype_sink(member, engine->objtype); + + + + /* If sink could not be found use "data" sink if available */ + /* TODO: Get rid of hardcoded-"data". Make this indepdendent of "data" */ + if (!objtype_sink) + objtype_sink = osync_member_find_objtype_sink(member, "data"); + /* TODO: Review if objtype_sink = NULL is valid at all. */ + osync_assert(objtype_sink); + + /* Only commit change if the objtype sink is able/allowed to write. */ + if (!osync_objtype_sink_get_write(objtype_sink)) + continue; + + if (!osync_sink_engine_write(sinkengine, engine->archive, error)) + goto error; + } + + return TRUE; error: return FALSE; Modified: trunk/opensync/engine/opensync_obj_engine_internals.h ============================================================================== --- trunk/opensync/engine/opensync_obj_engine_internals.h Mon Jan 12 00:26:28 2009 (r5121) +++ trunk/opensync/engine/opensync_obj_engine_internals.h Mon Jan 12 01:11:07 2009 (r5122) @@ -117,5 +117,39 @@ */ osync_bool osync_obj_engine_prepare_write(OSyncObjEngine *engine, OSyncError **error); +/*! @brief Start write/commit for OSyncObjEngine + * + * This function writes/commits the entries of all OSyncSinkEngine, which are + * related to the OSyncObjEngine + * + * @param engine Pointer to an OSyncObjEngine which should start writing + @param error Pointer to error struct, which get set on any error + * @returns TRUE on success, FALSE otherwise + */ +osync_bool osync_obj_engine_write(OSyncObjEngine *engine, OSyncError **error); + +/*! @brief Commit Callback function for OSyncClientProxy + * + * This is the commit callback function of the OSyncObjEngine gets called + * by OSyncClientProxy for each change which got committed. + * + * @param proxy Pointer to an OSyncClientProxy object + * @param userdata Pointer to user data, which got set in the commit-proxy call + * @param uid The UID of the commit + * @param error Pointer to error struct, which has an error set + */ +void osync_obj_engine_commit_change_callback(OSyncClientProxy *proxy, void *userdata, const char *uid, OSyncError *error); + +/*! @brief Written Callback function for OSyncClientProxy + * + * This is the written callback function of the OSyncObjEngine gets called + * by OSyncClientProxy once all changes got committed. + * + * @param proxy Pointer to an OSyncClientProxy object + * @param userdata Pointer to user data, which got set in the written-proxy call + * @param error Pointer to error struct, which has an error set + */ +void osync_obj_engine_written_callback(OSyncClientProxy *proxy, void *userdata, OSyncError *error); + #endif /* OPENSYNC_OBJ_ENGINE_INTERNALS_H_ */ Modified: trunk/opensync/engine/opensync_sink_engine.c ============================================================================== --- trunk/opensync/engine/opensync_sink_engine.c Mon Jan 12 00:26:28 2009 (r5121) +++ trunk/opensync/engine/opensync_sink_engine.c Mon Jan 12 01:11:07 2009 (r5122) @@ -31,7 +31,9 @@ #include "opensync_obj_engine_internals.h" #include "opensync_sink_engine_internals.h" #include "opensync_mapping_entry_engine_internals.h" +#include "opensync_mapping_engine_internals.h" +#include "archive/opensync_archive_internals.h" #include "client/opensync_client_proxy_internals.h" #include "format/opensync_objformat_internals.h" /* osync_objformat_has_merger() */ @@ -216,3 +218,66 @@ return FALSE; } +osync_bool osync_sink_engine_write(OSyncSinkEngine *engine, OSyncArchive *archive, OSyncError **error) +{ + OSyncList *o; + const char *objtype; + OSyncMember *member; + + osync_assert(engine); + osync_assert(archive); + + objtype = osync_obj_engine_get_objtype(engine->engine); + member = osync_client_proxy_get_member(engine->proxy); + + for (o = engine->entries; o; o = o->next) { + OSyncMappingEntryEngine *entry_engine = o->data; + osync_assert(entry_engine); + + if (osync_entry_engine_is_dirty(entry_engine)) { + OSyncChange *change = osync_entry_engine_get_change(entry_engine); + osync_assert(change); + + osync_trace(TRACE_INTERNAL, "Writing change %s, changetype %i, format %s , objtype %s from member %lli", + osync_change_get_uid(change), + osync_change_get_changetype(change), + osync_objformat_get_name(osync_change_get_objformat(change)), + osync_change_get_objtype(change), + osync_member_get_id(member)); + + if (!osync_client_proxy_commit_change(engine->proxy, + osync_obj_engine_commit_change_callback, + entry_engine, change, error)) + goto error; + + } else if (entry_engine->change) { + OSyncMapping *mapping = entry_engine->mapping_engine->mapping; + OSyncMappingEntry *entry = entry_engine->entry; + + /* FIXME: Don't mix up in this function objtypes */ + /* osync_assert_msg(!strcmp(objtype, osync_change_get_objtype(entry_engine->change), "Mixed-objtype in final write!")); */ + const char *objtype = osync_change_get_objtype(entry_engine->change); + + if (osync_change_get_changetype(entry_engine->change) == OSYNC_CHANGE_TYPE_DELETED) { + if (!osync_archive_delete_change(archive, osync_mapping_entry_get_id(entry), objtype, error)) + goto error; + } else { + if (!osync_archive_save_change(archive, + osync_mapping_entry_get_id(entry), + osync_change_get_uid(entry_engine->change), + objtype, osync_mapping_get_id(mapping), + osync_member_get_id(member), error)) + goto error; + } + } + } + + if (!osync_client_proxy_committed_all(engine->proxy, osync_obj_engine_written_callback, engine, objtype, error)) + goto error; + + return TRUE; + +error: + return FALSE; +} + Modified: trunk/opensync/engine/opensync_sink_engine_internals.h ============================================================================== --- trunk/opensync/engine/opensync_sink_engine_internals.h Mon Jan 12 00:26:28 2009 (r5121) +++ trunk/opensync/engine/opensync_sink_engine_internals.h Mon Jan 12 01:11:07 2009 (r5122) @@ -87,10 +87,21 @@ * preferd/requested format (destination). * * @param engine Pointer to an OSyncSinkEngine which should convert - * @param archive Pointer to an OSyncFormatEnv for plugins to use + * @param formatenv Pointer to an OSyncFormatEnv for plugins to use * @param error Pointer to error struct, which get set on any error * @returns TRUE on success, FALSE otherwise */ osync_bool osync_sink_engine_convert_to_dest(OSyncSinkEngine *engine, OSyncFormatEnv *formatenv, OSyncError **error); +/*! @brief Write/commit all entries of OSyncSinkEngine to the client/peer + * + * This function writes/commits all entries of the OSyncSinkEngine to the member. + * + * @param engine Pointer to an OSyncSinkEngine which should write + * @param archive Pointer to an OSyncArchive to update the mappings + * @param error Pointer to error struct, which get set on any error + * @returns TRUE on success, FALSE otherwise + */ +osync_bool osync_sink_engine_write(OSyncSinkEngine *engine, OSyncArchive *archive, OSyncError **error); + #endif /*OPENSYNC_SINK_ENGINE_INTERNALS_H_*/ |
|
From: <dg...@su...> - 2009-01-11 23:27:10
|
Author: dgollub Date: Mon Jan 12 00:26:28 2009 New Revision: 5121 URL: http://www.opensync.org/changeset/5121 Log: Refactor the destination conversion of the engine WRITE command. Conversion got moved to engine PREPARE_WRITE command. Modified: trunk/opensync/engine/opensync_obj_engine.c trunk/opensync/engine/opensync_sink_engine.c trunk/opensync/engine/opensync_sink_engine_internals.h Modified: trunk/opensync/engine/opensync_obj_engine.c ============================================================================== --- trunk/opensync/engine/opensync_obj_engine.c Mon Jan 12 00:00:46 2009 (r5120) +++ trunk/opensync/engine/opensync_obj_engine.c Mon Jan 12 00:26:28 2009 (r5121) @@ -1095,7 +1095,6 @@ OSyncMember *member = NULL; long long int memberid = 0; OSyncObjTypeSink *objtype_sink = NULL; - OSyncFormatConverterPath *path = NULL; OSyncCapabilities *caps; sinkengine = p->data; @@ -1128,13 +1127,6 @@ if (objtype_sink && osync_objtype_sink_get_write(objtype_sink) && osync_entry_engine_is_dirty(entry_engine)) { OSyncChange *change = entry_engine->change; osync_assert(entry_engine->change); - - /* Convert to requested target format if the changetype is not DELETED */ - if (osync_group_get_converter_enabled(osync_engine_get_group(engine->parent)) && (osync_change_get_changetype(change) != OSYNC_CHANGE_TYPE_DELETED)) { - if (!osync_entry_engine_convert(entry_engine, engine->formatenv, objtype_sink, &path, error)) - goto error; - - } osync_trace(TRACE_INTERNAL, "Writing change %s, changetype %i, format %s , objtype %s from member %lli", osync_change_get_uid(change), @@ -1162,10 +1154,7 @@ } } } - - if (path) - osync_converter_path_unref(path); - + if (!osync_client_proxy_committed_all(sinkengine->proxy, _osync_obj_engine_written_callback, sinkengine, engine->objtype, error)) goto error; } @@ -1295,7 +1284,6 @@ return g_list_length(engine->mapping_engines); } - osync_bool osync_obj_engine_prepare_write(OSyncObjEngine *engine, OSyncError **error) { GList *p; @@ -1318,6 +1306,10 @@ && !osync_sink_engine_demerge(sinkengine, engine->archive, error)) goto error; + if (converter_enabled + && !osync_sink_engine_convert_to_dest(sinkengine, engine->formatenv, error)) + goto error; + } return TRUE; Modified: trunk/opensync/engine/opensync_sink_engine.c ============================================================================== --- trunk/opensync/engine/opensync_sink_engine.c Mon Jan 12 00:00:46 2009 (r5120) +++ trunk/opensync/engine/opensync_sink_engine.c Mon Jan 12 00:26:28 2009 (r5121) @@ -25,6 +25,7 @@ #include "opensync-group.h" #include "opensync-engine.h" #include "opensync-data.h" +#include "opensync-format.h" #include "opensync-mapping.h" #include "opensync_obj_engine_internals.h" @@ -170,3 +171,48 @@ return FALSE; } +osync_bool osync_sink_engine_convert_to_dest(OSyncSinkEngine *engine, OSyncFormatEnv *formatenv, OSyncError **error) +{ + OSyncList *o; + OSyncMember *member; + OSyncObjTypeSink *objtype_sink; + const char *objtype; + OSyncFormatConverterPath *path = NULL; + + osync_assert(engine); + osync_assert(formatenv); + + member = osync_client_proxy_get_member(engine->proxy); + osync_assert(member); + + objtype = osync_obj_engine_get_objtype(engine->engine); + objtype_sink = osync_member_find_objtype_sink(member, objtype); + osync_assert(objtype_sink); + + for (o = engine->entries; o; o = o->next) { + OSyncMappingEntryEngine *entry_engine = o->data; + osync_assert(entry_engine); + + if (entry_engine->change == NULL) + continue; + + if (osync_change_get_changetype(entry_engine->change) == OSYNC_CHANGE_TYPE_DELETED) + continue; + + if (!osync_entry_engine_convert(entry_engine, formatenv, objtype_sink, &path, error)) + goto error; + } + + if (path) + osync_converter_path_unref(path); + + + return TRUE; + +error: + if (path) + osync_converter_path_unref(path); + + return FALSE; +} + Modified: trunk/opensync/engine/opensync_sink_engine_internals.h ============================================================================== --- trunk/opensync/engine/opensync_sink_engine_internals.h Mon Jan 12 00:00:46 2009 (r5120) +++ trunk/opensync/engine/opensync_sink_engine_internals.h Mon Jan 12 00:26:28 2009 (r5121) @@ -81,4 +81,16 @@ */ osync_bool osync_sink_engine_demerge(OSyncSinkEngine *engine, OSyncArchive *archive, OSyncError **error); +/*! @brief Convert all entries of OSyncSinkEngine to destitination format + * + * This function converters all entries of the OSyncSinkEngine to the member + * preferd/requested format (destination). + * + * @param engine Pointer to an OSyncSinkEngine which should convert + * @param archive Pointer to an OSyncFormatEnv for plugins to use + * @param error Pointer to error struct, which get set on any error + * @returns TRUE on success, FALSE otherwise + */ +osync_bool osync_sink_engine_convert_to_dest(OSyncSinkEngine *engine, OSyncFormatEnv *formatenv, OSyncError **error); + #endif /*OPENSYNC_SINK_ENGINE_INTERNALS_H_*/ |
|
From: <dg...@su...> - 2009-01-11 23:01:27
|
Author: dgollub Date: Mon Jan 12 00:00:46 2009 New Revision: 5120 URL: http://www.opensync.org/changeset/5120 Log: Refactor demerge process in enigne. Move demerge process into the PREPARE_WRITE engine command. Modified: trunk/opensync/engine/opensync_obj_engine.c trunk/opensync/engine/opensync_obj_engine_internals.h trunk/opensync/engine/opensync_sink_engine.c trunk/opensync/engine/opensync_sink_engine_internals.h Modified: trunk/opensync/engine/opensync_obj_engine.c ============================================================================== --- trunk/opensync/engine/opensync_obj_engine.c Sun Jan 11 22:42:15 2009 (r5119) +++ trunk/opensync/engine/opensync_obj_engine.c Mon Jan 12 00:00:46 2009 (r5120) @@ -1073,7 +1073,7 @@ break; case OSYNC_ENGINE_COMMAND_PREPARE_WRITE: - /* TODO: PLACEHOLDER for demerge and conversion */ + osync_obj_engine_prepare_write(engine, error); osync_obj_engine_event(engine, OSYNC_ENGINE_EVENT_PREPARED_WRITE, *error); break; @@ -1124,26 +1124,6 @@ OSyncMappingEntryEngine *entry_engine = o->data; osync_assert(entry_engine); - - - /* Merger - Save the entire data and demerge */ - /* TODO: Review those conditionals! - * Candidates to drop are: - */ - if (osync_group_get_merger_enabled(osync_engine_get_group(engine->parent)) && - osync_member_get_capabilities(member) && /* Candidate to drop */ - osync_group_get_converter_enabled(osync_engine_get_group(engine->parent)) && /* Candidate to drop */ - entry_engine->change && - (osync_change_get_changetype(entry_engine->change) != OSYNC_CHANGE_TYPE_DELETED) && - osync_objformat_has_merger(osync_change_get_objformat(entry_engine->change)) ) - - - { - if (!osync_entry_engine_demerge(entry_engine, engine->archive, caps, error)) - goto error; - } - - /* Only commit change if the objtype sink is able/allowed to write. */ if (objtype_sink && osync_objtype_sink_get_write(objtype_sink) && osync_entry_engine_is_dirty(entry_engine)) { OSyncChange *change = entry_engine->change; @@ -1315,3 +1295,34 @@ return g_list_length(engine->mapping_engines); } + +osync_bool osync_obj_engine_prepare_write(OSyncObjEngine *engine, OSyncError **error) +{ + GList *p; + osync_bool merger_enabled, converter_enabled; + OSyncGroup *group; + + osync_assert(engine); + + group = osync_engine_get_group(engine->parent); + merger_enabled = osync_group_get_merger_enabled(group); + converter_enabled = osync_group_get_converter_enabled(group); + + if (!merger_enabled && !converter_enabled) + return TRUE; + + for (p = engine->sink_engines; p; p = p->next) { + OSyncSinkEngine *sinkengine = p->data; + + if (merger_enabled + && !osync_sink_engine_demerge(sinkengine, engine->archive, error)) + goto error; + + } + + return TRUE; + +error: + return FALSE; +} + Modified: trunk/opensync/engine/opensync_obj_engine_internals.h ============================================================================== --- trunk/opensync/engine/opensync_obj_engine_internals.h Sun Jan 11 22:42:15 2009 (r5119) +++ trunk/opensync/engine/opensync_obj_engine_internals.h Mon Jan 12 00:00:46 2009 (r5120) @@ -106,5 +106,16 @@ */ unsigned int osync_obj_engine_num_mapping_engines(OSyncObjEngine *engine); -#endif /*OPENSYNC_OBJ_ENGINE_INTERNALS_H_*/ +/*! @brief Prepare the OSyncObjEngine for writing + * + * This function prepare the write process, by demerging and converting if + * required/configured. + * + * @param engine Pointer to OSyncObjEngine to prepare + * @param engine Pointer to error struct, which get set on any error + * @returns TRUE on success, FALSE otherwise + */ +osync_bool osync_obj_engine_prepare_write(OSyncObjEngine *engine, OSyncError **error); + +#endif /* OPENSYNC_OBJ_ENGINE_INTERNALS_H_ */ Modified: trunk/opensync/engine/opensync_sink_engine.c ============================================================================== --- trunk/opensync/engine/opensync_sink_engine.c Sun Jan 11 22:42:15 2009 (r5119) +++ trunk/opensync/engine/opensync_sink_engine.c Mon Jan 12 00:00:46 2009 (r5120) @@ -32,6 +32,7 @@ #include "opensync_mapping_entry_engine_internals.h" #include "client/opensync_client_proxy_internals.h" +#include "format/opensync_objformat_internals.h" /* osync_objformat_has_merger() */ OSyncSinkEngine *osync_sink_engine_new(int position, OSyncClientProxy *proxy, OSyncObjEngine *objengine, OSyncError **error) { @@ -130,3 +131,42 @@ return osync_client_proxy_get_member(engine->proxy); } +osync_bool osync_sink_engine_demerge(OSyncSinkEngine *engine, OSyncArchive *archive, OSyncError **error) +{ + OSyncList *o; + OSyncMember *member; + OSyncCapabilities *caps; + + osync_assert(engine); + osync_assert(archive); + + member = osync_client_proxy_get_member(engine->proxy); + osync_assert(member); + caps = osync_member_get_capabilities(member); + + if (!caps) + return TRUE; + + for (o = engine->entries; o; o = o->next) { + OSyncMappingEntryEngine *entry_engine = o->data; + osync_assert(entry_engine); + + if (entry_engine->change == NULL) + continue; + + if (osync_change_get_changetype(entry_engine->change) == OSYNC_CHANGE_TYPE_DELETED) + continue; + + if (!osync_objformat_has_merger(osync_change_get_objformat(entry_engine->change))) + continue; + + if (!osync_entry_engine_demerge(entry_engine, archive, caps, error)) + goto error; + + } + + return TRUE; +error: + return FALSE; +} + Modified: trunk/opensync/engine/opensync_sink_engine_internals.h ============================================================================== --- trunk/opensync/engine/opensync_sink_engine_internals.h Sun Jan 11 22:42:15 2009 (r5119) +++ trunk/opensync/engine/opensync_sink_engine_internals.h Mon Jan 12 00:00:46 2009 (r5120) @@ -67,4 +67,18 @@ */ osync_bool osync_sink_engine_is_dummy(OSyncSinkEngine *engine); +/*! @brief Demerge all entries of OSyncSinkEngine + * + * If the Member/Client of the OSyncSinkEngine doesn't have capabilities + * this functions is NOOP and just returns with TRUE, without error. + * + * Changes with a current OSyncObjFormat, without merge/demerge get skipped. + * + * @param engine Pointer to an OSyncSinkEngine which should demerge + * @param archive Pointer to an OSyncArchive to store the dermerged information + * @param error Pointer to error struct, which get set on any error + * @returns TRUE on success, FALSE otherwise + */ +osync_bool osync_sink_engine_demerge(OSyncSinkEngine *engine, OSyncArchive *archive, OSyncError **error); + #endif /*OPENSYNC_SINK_ENGINE_INTERNALS_H_*/ |
|
From: <dg...@su...> - 2009-01-11 22:06:09
|
Author: dgollub Date: Sun Jan 11 22:42:15 2009 New Revision: 5119 URL: http://www.opensync.org/changeset/5119 Log: Port unittest for OSYNC_TESTCASE macros: version, objformat, time xmlformat, updater, plugin_config, serializer, proxy, sync_error Modified: trunk/tests/CMakeLists.txt trunk/tests/capabilities-tests/check_xmlformat.c trunk/tests/client-tests/check_proxy.c trunk/tests/format-tests/check_objformat.c trunk/tests/format-tests/check_time.c trunk/tests/group-tests/check_updater.c trunk/tests/ipc-tests/check_serializer.c trunk/tests/plugin-tests/check_plugin_config.c trunk/tests/sync-tests/check_sync_error.c trunk/tests/version-tests/check_version.c Modified: trunk/tests/CMakeLists.txt ============================================================================== --- trunk/tests/CMakeLists.txt Sun Jan 11 22:19:08 2009 (r5118) +++ trunk/tests/CMakeLists.txt Sun Jan 11 22:42:15 2009 (r5119) @@ -294,15 +294,83 @@ OSYNC_TESTCASE( sync sync_slowsync_mainsink_connect) OSYNC_TESTCASE( sync sync_initial_slow_sync) -ADD_CHECK_TEST( sync-error sync-tests/check_sync_error.c ${TEST_TARGET_LIBRARIES} ) -ADD_CHECK_TEST( objformat format-tests/check_objformat.c ${TEST_TARGET_LIBRARIES} ) -ADD_CHECK_TEST( pluginconfig plugin-tests/check_plugin_config.c ${TEST_TARGET_LIBRARIES} ) -ADD_CHECK_TEST( proxy client-tests/check_proxy.c ${TEST_TARGET_LIBRARIES} ) -ADD_CHECK_TEST( serializer ipc-tests/check_serializer.c ${TEST_TARGET_LIBRARIES} ) -ADD_CHECK_TEST( time format-tests/check_time.c ${TEST_TARGET_LIBRARIES} ) -ADD_CHECK_TEST( version version-tests/check_version.c ${TEST_TARGET_LIBRARIES} ) -ADD_CHECK_TEST( updater group-tests/check_updater.c ${TEST_TARGET_LIBRARIES} ) -ADD_CHECK_TEST( xmlformat capabilities-tests/check_xmlformat.c ${TEST_TARGET_LIBRARIES} ) +BUILD_CHECK_TEST( sync-error sync-tests/check_sync_error.c ${TEST_TARGET_LIBRARIES} ) +OSYNC_TESTCASE(sync-error sync_error_single_init_error_noerror) + +BUILD_CHECK_TEST( objformat format-tests/check_objformat.c ${TEST_TARGET_LIBRARIES} ) +OSYNC_TESTCASE(objformat objformat_new) +OSYNC_TESTCASE(objformat objformat_get) +OSYNC_TESTCASE(objformat objformat_equal) +OSYNC_TESTCASE(objformat objformat_compare) +OSYNC_TESTCASE(objformat objformat_destroy) +OSYNC_TESTCASE(objformat objformat_copy) +OSYNC_TESTCASE(objformat objformat_duplicate) +OSYNC_TESTCASE(objformat objformat_create) +OSYNC_TESTCASE(objformat objformat_print) +OSYNC_TESTCASE(objformat objformat_revision) +OSYNC_TESTCASE(objformat objformat_marshal) +OSYNC_TESTCASE(objformat objformat_demarshal) + +BUILD_CHECK_TEST( plugin_config plugin-tests/check_plugin_config.c ${TEST_TARGET_LIBRARIES} ) +OSYNC_TESTCASE(plugin_config plugin_config_new) +OSYNC_TESTCASE(plugin_config plugin_config_new_nomemory) +OSYNC_TESTCASE(plugin_config plugin_config_supported) +OSYNC_TESTCASE(plugin_config plugin_config_subcomponents) +OSYNC_TESTCASE(plugin_config plugin_config_subcomponents_nomemory) +OSYNC_TESTCASE(plugin_config plugin_config_advancedoption) +OSYNC_TESTCASE(plugin_config plugin_config_advancedoption_set_get) +OSYNC_TESTCASE(plugin_config plugin_config_advancedoption_param) +OSYNC_TESTCASE(plugin_config plugin_config_authentication) +OSYNC_TESTCASE(plugin_config plugin_config_connection) +OSYNC_TESTCASE(plugin_config plugin_config_localization) +OSYNC_TESTCASE(plugin_config plugin_config_resources) +OSYNC_TESTCASE(plugin_config plugin_config_save_and_load) +OSYNC_TESTCASE(plugin_config plugin_config_save_and_load_connection_bluetooth) +OSYNC_TESTCASE(plugin_config plugin_config_save_and_load_connection_usb) +OSYNC_TESTCASE(plugin_config plugin_config_save_and_load_connection_irda) +OSYNC_TESTCASE(plugin_config plugin_config_save_and_load_connection_network) +OSYNC_TESTCASE(plugin_config plugin_config_save_and_load_connection_serial) + +BUILD_CHECK_TEST( proxy client-tests/check_proxy.c ${TEST_TARGET_LIBRARIES} ) +OSYNC_TESTCASE(proxy proxy_new) +OSYNC_TESTCASE(proxy proxy_spawn) +OSYNC_TESTCASE(proxy proxy_init) +OSYNC_TESTCASE(proxy proxy_discover) +OSYNC_TESTCASE(proxy proxy_connect) + +BUILD_CHECK_TEST( serializer ipc-tests/check_serializer.c ${TEST_TARGET_LIBRARIES} ) +OSYNC_TESTCASE(serializer serializer_pluginconfig) +OSYNC_TESTCASE(serializer serializer_pluginconfig_full) + +BUILD_CHECK_TEST( time format-tests/check_time.c ${TEST_TARGET_LIBRARIES} ) +OSYNC_TESTCASE(time time_timezone_diff) +OSYNC_TESTCASE(time time_relative2tm) +OSYNC_TESTCASE(time time_unix_converters) + +BUILD_CHECK_TEST( version version-tests/check_version.c ${TEST_TARGET_LIBRARIES} ) +OSYNC_TESTCASE(version version_new) +OSYNC_TESTCASE(version version_matches) +OSYNC_TESTCASE(version version_load_from_descriptions) + +BUILD_CHECK_TEST( updater group-tests/check_updater.c ${TEST_TARGET_LIBRARIES} ) +OSYNC_TESTCASE(updater updater_init) +OSYNC_TESTCASE(updater updater_without_loaded_group) +OSYNC_TESTCASE(updater updater_action_required) +OSYNC_TESTCASE(updater updater_updates_directory) +OSYNC_TESTCASE(updater updater_invalid_stylesheet) +OSYNC_TESTCASE(updater updater_valid_stylesheet) +OSYNC_TESTCASE(updater updater_group_three_steps) + +BUILD_CHECK_TEST( xmlformat capabilities-tests/check_xmlformat.c ${TEST_TARGET_LIBRARIES} ) +OSYNC_TESTCASE(xmlformat xmlformat_new) +OSYNC_TESTCASE(xmlformat xmlformat_parse) +OSYNC_TESTCASE(xmlformat xmlformat_sort) +OSYNC_TESTCASE(xmlformat xmlformat_is_sorted) +OSYNC_TESTCASE(xmlformat xmlformat_search_field) +OSYNC_TESTCASE(xmlformat xmlformat_schema_validate) +OSYNC_TESTCASE(xmlformat xmlfield_new) +OSYNC_TESTCASE(xmlformat xmlfield_sort) + CONFIGURE_FILE( "${CMAKE_CURRENT_SOURCE_DIR}/CTestCustom.cmake" "${CMAKE_BINARY_DIR}/CTestCustom.ctest") Modified: trunk/tests/capabilities-tests/check_xmlformat.c ============================================================================== --- trunk/tests/capabilities-tests/check_xmlformat.c Sun Jan 11 22:19:08 2009 (r5118) +++ trunk/tests/capabilities-tests/check_xmlformat.c Sun Jan 11 22:42:15 2009 (r5119) @@ -222,38 +222,17 @@ } END_TEST -Suite *xmlformat_suite(void) -{ - Suite *s = suite_create("XMLFormat"); -// Suite *s2 = suite_create("XMLFormat"); +OSYNC_TESTCASE_START("xmlformat") +// xmlformat +OSYNC_TESTCASE_ADD(xmlformat_new) +OSYNC_TESTCASE_ADD(xmlformat_parse) +OSYNC_TESTCASE_ADD(xmlformat_sort) +OSYNC_TESTCASE_ADD(xmlformat_is_sorted) +OSYNC_TESTCASE_ADD(xmlformat_search_field) +// xmlformat schema +OSYNC_TESTCASE_ADD(xmlformat_schema_validate) +// xmlfield +OSYNC_TESTCASE_ADD(xmlfield_new) +OSYNC_TESTCASE_ADD(xmlfield_sort) +OSYNC_TESTCASE_END - // xmlformat - create_case(s, "xmlformat_new", xmlformat_new); - create_case(s, "xmlformat_parse", xmlformat_parse); - create_case(s, "xmlformat_sort", xmlformat_sort); - create_case(s, "xmlformat_is_sorted", xmlformat_is_sorted); - create_case(s, "xmlformat_search_field", xmlformat_search_field); - - // xmlformat schema - create_case(s, "xmlformat_schema_validate", xmlformat_schema_validate); - - // xmlfield - create_case(s, "xmlfield_new", xmlfield_new); - create_case(s, "xmlfield_sort", xmlfield_sort); - - return s; -} - -int main(void) -{ - int nf; - - Suite *s = xmlformat_suite(); - - SRunner *sr; - sr = srunner_create(s); - srunner_run_all(sr, CK_VERBOSE); - nf = srunner_ntests_failed(sr); - srunner_free(sr); - return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE; -} Modified: trunk/tests/client-tests/check_proxy.c ============================================================================== --- trunk/tests/client-tests/check_proxy.c Sun Jan 11 22:19:08 2009 (r5118) +++ trunk/tests/client-tests/check_proxy.c Sun Jan 11 22:42:15 2009 (r5119) @@ -264,30 +264,11 @@ } END_TEST -Suite *proxy_suite(void) -{ - Suite *s = suite_create("Proxy"); -// Suite *s2 = suite_create("Proxy"); - - create_case(s, "proxy_new", proxy_new); - create_case(s, "proxy_spawn", proxy_spawn); - create_case(s, "proxy_init", proxy_init); - create_case(s, "proxy_discover", proxy_discover); - create_case(s, "proxy_connect", proxy_connect); - - return s; -} - -int main(void) -{ - int nf; +OSYNC_TESTCASE_START("proxy") +OSYNC_TESTCASE_ADD(proxy_new) +OSYNC_TESTCASE_ADD(proxy_spawn) +OSYNC_TESTCASE_ADD(proxy_init) +OSYNC_TESTCASE_ADD(proxy_discover) +OSYNC_TESTCASE_ADD(proxy_connect) +OSYNC_TESTCASE_END - Suite *s = proxy_suite(); - - SRunner *sr; - sr = srunner_create(s); - srunner_run_all(sr, CK_VERBOSE); - nf = srunner_ntests_failed(sr); - srunner_free(sr); - return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE; -} Modified: trunk/tests/format-tests/check_objformat.c ============================================================================== --- trunk/tests/format-tests/check_objformat.c Sun Jan 11 22:19:08 2009 (r5118) +++ trunk/tests/format-tests/check_objformat.c Sun Jan 11 22:42:15 2009 (r5119) @@ -343,38 +343,18 @@ } END_TEST -Suite *objformat_suite(void) -{ - Suite *s = suite_create("Objformat"); -// Suite *s2 = suite_create("Objformat"); - - create_case(s, "objformat_new", objformat_new); - create_case(s, "objformat_get", objformat_get); - create_case(s, "objformat_equal", objformat_equal); - create_case(s, "objformat_compare", objformat_compare); - create_case(s, "objformat_destroy", objformat_destroy); - create_case(s, "objformat_copy", objformat_copy); - create_case(s, "objformat_duplicate", objformat_duplicate); - create_case(s, "objformat_create", objformat_create); - create_case(s, "objformat_print", objformat_print); - create_case(s, "objformat_revision", objformat_revision); - create_case(s, "objformat_marshal", objformat_marshal); - create_case(s, "objformat_demarshal", objformat_demarshal); - - return s; -} - -int main(void) -{ - int nf; - - Suite *s = objformat_suite(); - - SRunner *sr; - sr = srunner_create(s); +OSYNC_TESTCASE_START("objformat") +OSYNC_TESTCASE_ADD(objformat_new) +OSYNC_TESTCASE_ADD(objformat_get) +OSYNC_TESTCASE_ADD(objformat_equal) +OSYNC_TESTCASE_ADD(objformat_compare) +OSYNC_TESTCASE_ADD(objformat_destroy) +OSYNC_TESTCASE_ADD(objformat_copy) +OSYNC_TESTCASE_ADD(objformat_duplicate) +OSYNC_TESTCASE_ADD(objformat_create) +OSYNC_TESTCASE_ADD(objformat_print) +OSYNC_TESTCASE_ADD(objformat_revision) +OSYNC_TESTCASE_ADD(objformat_marshal) +OSYNC_TESTCASE_ADD(objformat_demarshal) +OSYNC_TESTCASE_END - srunner_run_all(sr, CK_VERBOSE); - nf = srunner_ntests_failed(sr); - srunner_free(sr); - return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE; -} Modified: trunk/tests/format-tests/check_time.c ============================================================================== --- trunk/tests/format-tests/check_time.c Sun Jan 11 22:19:08 2009 (r5118) +++ trunk/tests/format-tests/check_time.c Sun Jan 11 22:42:15 2009 (r5119) @@ -7,6 +7,8 @@ #include <string.h> #include <stdio.h> +#include "support.h" + // this test assumes Eastern time, sorry. START_TEST (time_timezone_diff) { @@ -194,38 +196,9 @@ } END_TEST -Suite *env_suite(void) -{ - Suite *s = suite_create("Time"); - - TCase *tc_timezones = tcase_create("timezones"); - TCase *tc_relative = tcase_create("relative"); - TCase *tc_unix = tcase_create("unix_converters"); - - suite_add_tcase (s, tc_timezones); - tcase_add_test(tc_timezones, time_timezone_diff); - - suite_add_tcase (s, tc_relative); - tcase_add_test(tc_relative, time_relative2tm); - - suite_add_tcase (s, tc_unix); - tcase_add_test(tc_unix, time_unix_converters); - - return s; -} - -int main(void) -{ - int nf; - - Suite *s = env_suite(); - - SRunner *sr; - sr = srunner_create(s); - - srunner_run_all(sr, CK_VERBOSE); - nf = srunner_ntests_failed(sr); - srunner_free(sr); - return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE; -} +OSYNC_TESTCASE_START("time") +OSYNC_TESTCASE_ADD(time_timezone_diff) +OSYNC_TESTCASE_ADD(time_relative2tm) +OSYNC_TESTCASE_ADD(time_unix_converters) +OSYNC_TESTCASE_END Modified: trunk/tests/group-tests/check_updater.c ============================================================================== --- trunk/tests/group-tests/check_updater.c Sun Jan 11 22:19:08 2009 (r5118) +++ trunk/tests/group-tests/check_updater.c Sun Jan 11 22:42:15 2009 (r5119) @@ -247,34 +247,13 @@ } END_TEST -Suite *group_suite(void) -{ - Suite *s = suite_create("Updater"); - //Suite *s2 = suite_create("Updater"); +OSYNC_TESTCASE_START("updater") +OSYNC_TESTCASE_ADD(updater_init) +OSYNC_TESTCASE_ADD(updater_without_loaded_group) +OSYNC_TESTCASE_ADD(updater_action_required) +OSYNC_TESTCASE_ADD(updater_updates_directory) +OSYNC_TESTCASE_ADD(updater_invalid_stylesheet) +OSYNC_TESTCASE_ADD(updater_valid_stylesheet) +OSYNC_TESTCASE_ADD(updater_group_three_steps) +OSYNC_TESTCASE_END - create_case(s, "updater_init", updater_init); - create_case(s, "updater_without_loaded_group", updater_without_loaded_group); - create_case(s, "updater_action_required", updater_action_required); - create_case(s, "updater_updates_directory", updater_updates_directory); - create_case(s, "updater_invalid_stylesheet", updater_invalid_stylesheet); - - create_case(s, "updater_valid_stylesheet", updater_valid_stylesheet); - create_case(s, "updater_group_three_steps", updater_group_three_steps); - - return s; -} - -int main(void) -{ - int nf; - - Suite *s = group_suite(); - - SRunner *sr; - sr = srunner_create(s); - - srunner_run_all(sr, CK_VERBOSE); - nf = srunner_ntests_failed(sr); - srunner_free(sr); - return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE; -} Modified: trunk/tests/ipc-tests/check_serializer.c ============================================================================== --- trunk/tests/ipc-tests/check_serializer.c Sun Jan 11 22:19:08 2009 (r5118) +++ trunk/tests/ipc-tests/check_serializer.c Sun Jan 11 22:42:15 2009 (r5119) @@ -383,28 +383,8 @@ } END_TEST +OSYNC_TESTCASE_START("serializer") +OSYNC_TESTCASE_ADD(serializer_pluginconfig) +OSYNC_TESTCASE_ADD(serializer_pluginconfig_full) +OSYNC_TESTCASE_END -Suite *ipc_suite(void) -{ - Suite *s = suite_create("Serializer"); -// Suite *s2 = suite_create("Serializer"); - - create_case(s, "serializer_pluginconfig", serializer_pluginconfig); - create_case(s, "serializer_pluginconfig_full", serializer_pluginconfig_full); - - return s; -} - -int main(void) -{ - int nf; - - Suite *s = ipc_suite(); - - SRunner *sr; - sr = srunner_create(s); - srunner_run_all(sr, CK_VERBOSE); - nf = srunner_ntests_failed(sr); - srunner_free(sr); - return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE; -} Modified: trunk/tests/plugin-tests/check_plugin_config.c ============================================================================== --- trunk/tests/plugin-tests/check_plugin_config.c Sun Jan 11 22:19:08 2009 (r5118) +++ trunk/tests/plugin-tests/check_plugin_config.c Sun Jan 11 22:42:15 2009 (r5119) @@ -1196,43 +1196,24 @@ } END_TEST -Suite *client_suite(void) -{ - Suite *s = suite_create("PluginConfig"); -// Suite *s2 = suite_create("PluginConfig"); - - create_case(s, "plugin_config_new", plugin_config_new); - create_case(s, "plugin_config_new_nomemory", plugin_config_new_nomemory); - create_case(s, "plugin_config_supported", plugin_config_supported); - create_case(s, "plugin_config_subcomponents", plugin_config_subcomponents); - create_case(s, "plugin_config_subcomponents_nomemory", plugin_config_subcomponents_nomemory); - create_case(s, "plugin_config_advancedoption", plugin_config_advancedoption); - create_case(s, "plugin_config_advancedoption_set_get", plugin_config_advancedoption_set_get); - create_case(s, "plugin_config_advancedoption_param", plugin_config_advancedoption_param); - create_case(s, "plugin_config_authentication", plugin_config_authentication); - create_case(s, "plugin_config_connection", plugin_config_connection); - create_case(s, "plugin_config_localization", plugin_config_localization); - create_case(s, "plugin_config_resources", plugin_config_resources); - create_case(s, "plugin_config_save_and_load", plugin_config_save_and_load); - create_case(s, "plugin_config_save_and_load_connection_bluetooth", plugin_config_save_and_load_connection_bluetooth); - create_case(s, "plugin_config_save_and_load_connection_usb", plugin_config_save_and_load_connection_usb); - create_case(s, "plugin_config_save_and_load_connection_irda", plugin_config_save_and_load_connection_irda); - create_case(s, "plugin_config_save_and_load_connection_network", plugin_config_save_and_load_connection_network); - create_case(s, "plugin_config_save_and_load_connection_serial", plugin_config_save_and_load_connection_serial); - - return s; -} - -int main(void) -{ - int nf; +OSYNC_TESTCASE_START("plugin_config") +OSYNC_TESTCASE_ADD(plugin_config_new) +OSYNC_TESTCASE_ADD(plugin_config_new_nomemory) +OSYNC_TESTCASE_ADD(plugin_config_supported) +OSYNC_TESTCASE_ADD(plugin_config_subcomponents) +OSYNC_TESTCASE_ADD(plugin_config_subcomponents_nomemory) +OSYNC_TESTCASE_ADD(plugin_config_advancedoption) +OSYNC_TESTCASE_ADD(plugin_config_advancedoption_set_get) +OSYNC_TESTCASE_ADD(plugin_config_advancedoption_param) +OSYNC_TESTCASE_ADD(plugin_config_authentication) +OSYNC_TESTCASE_ADD(plugin_config_connection) +OSYNC_TESTCASE_ADD(plugin_config_localization) +OSYNC_TESTCASE_ADD(plugin_config_resources) +OSYNC_TESTCASE_ADD(plugin_config_save_and_load) +OSYNC_TESTCASE_ADD(plugin_config_save_and_load_connection_bluetooth) +OSYNC_TESTCASE_ADD(plugin_config_save_and_load_connection_usb) +OSYNC_TESTCASE_ADD(plugin_config_save_and_load_connection_irda) +OSYNC_TESTCASE_ADD(plugin_config_save_and_load_connection_network) +OSYNC_TESTCASE_ADD(plugin_config_save_and_load_connection_serial) +OSYNC_TESTCASE_END - Suite *s = client_suite(); - - SRunner *sr; - sr = srunner_create(s); - srunner_run_all(sr, CK_VERBOSE); - nf = srunner_ntests_failed(sr); - srunner_free(sr); - return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE; -} Modified: trunk/tests/sync-tests/check_sync_error.c ============================================================================== --- trunk/tests/sync-tests/check_sync_error.c Sun Jan 11 22:19:08 2009 (r5118) +++ trunk/tests/sync-tests/check_sync_error.c Sun Jan 11 22:42:15 2009 (r5119) @@ -4,7 +4,7 @@ #include "opensync/engine/opensync_engine_internals.h" /* Regression test for Ticket #988 */ -START_TEST (single_init_error_noerror) +START_TEST (sync_error_single_init_error_noerror) { char *testbed = setup_testbed("sync"); char *formatdir = g_strdup_printf("%s/formats", testbed); @@ -43,7 +43,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (single_init_error) +OSYNC_UNUSED START_TEST (sync_error_single_init_error) { char *testbed = setup_testbed("multisync_easy_new"); @@ -79,7 +79,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (dual_connect_error) +OSYNC_UNUSED START_TEST (sync_error_dual_connect_error) { char *testbed = setup_testbed("sync_easy_new"); @@ -119,7 +119,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (one_of_two_connect_error) +OSYNC_UNUSED START_TEST (sync_error_one_of_two_connect_error) { char *testbed = setup_testbed("sync_easy_new"); @@ -160,7 +160,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (two_of_three_connect_error) +OSYNC_UNUSED START_TEST (sync_error_two_of_three_connect_error) { char *testbed = setup_testbed("multisync_easy_new"); @@ -201,7 +201,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (two_of_three_connect_error2) +OSYNC_UNUSED START_TEST (sync_error_two_of_three_connect_error2) { char *testbed = setup_testbed("multisync_easy_new"); @@ -242,7 +242,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (three_of_three_connect_error) +OSYNC_UNUSED START_TEST (sync_error_three_of_three_connect_error) { char *testbed = setup_testbed("multisync_easy_new"); @@ -283,7 +283,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (one_of_three_connect_error) +OSYNC_UNUSED START_TEST (sync_error_one_of_three_connect_error) { char *testbed = setup_testbed("multisync_easy_new"); @@ -324,7 +324,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (no_connect_error) +OSYNC_UNUSED START_TEST (sync_error_no_connect_error) { char *testbed = setup_testbed("multisync_easy_new"); @@ -366,7 +366,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (single_connect_timeout) +OSYNC_UNUSED START_TEST (sync_error_single_connect_timeout) { char *testbed = setup_testbed("sync_easy_new"); @@ -408,7 +408,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (dual_connect_timeout) +OSYNC_UNUSED START_TEST (sync_error_dual_connect_timeout) { char *testbed = setup_testbed("sync_easy_new"); @@ -450,7 +450,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (one_of_three_timeout) +OSYNC_UNUSED START_TEST (sync_error_one_of_three_timeout) { char *testbed = setup_testbed("multisync_easy_new"); @@ -492,7 +492,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (timeout_and_error) +OSYNC_UNUSED START_TEST (sync_error_timeout_and_error) { char *testbed = setup_testbed("multisync_easy_new"); @@ -535,7 +535,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (single_get_changes_error) +OSYNC_UNUSED START_TEST (sync_error_single_get_changes_error) { char *testbed = setup_testbed("sync_easy_conflict"); @@ -580,7 +580,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (dual_get_changes_error) +OSYNC_UNUSED START_TEST (sync_error_dual_get_changes_error) { char *testbed = setup_testbed("sync_easy_conflict"); @@ -625,7 +625,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (two_of_three_get_changes_error) +OSYNC_UNUSED START_TEST (sync_error_two_of_three_get_changes_error) { char *testbed = setup_testbed("multisync_conflict_data_choose2"); @@ -669,7 +669,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (one_of_three_get_changes_error) +OSYNC_UNUSED START_TEST (sync_error_one_of_three_get_changes_error) { char *testbed = setup_testbed("multisync_conflict_data_choose2"); @@ -714,7 +714,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (one_of_three_get_changes_timeout) +OSYNC_UNUSED START_TEST (sync_error_one_of_three_get_changes_timeout) { char *testbed = setup_testbed("multisync_conflict_data_choose2"); @@ -761,7 +761,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (get_changes_timeout_and_error) +OSYNC_UNUSED START_TEST (sync_error_get_changes_timeout_and_error) { char *testbed = setup_testbed("multisync_conflict_data_choose2"); @@ -807,7 +807,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (get_changes_timeout_sleep) +OSYNC_UNUSED START_TEST (sync_error_get_changes_timeout_sleep) { char *testbed = setup_testbed("multisync_conflict_data_choose2"); @@ -856,7 +856,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (single_commit_error) +OSYNC_UNUSED START_TEST (sync_error_single_commit_error) { char *testbed = setup_testbed("multisync_easy_new"); @@ -908,7 +908,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (dual_commit_error) +OSYNC_UNUSED START_TEST (sync_error_dual_commit_error) { char *testbed = setup_testbed("multisync_easy_new"); @@ -960,7 +960,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (single_commit_timeout) +OSYNC_UNUSED START_TEST (sync_error_single_commit_timeout) { char *testbed = setup_testbed("multisync_easy_new"); @@ -1012,7 +1012,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (dual_commit_timeout) +OSYNC_UNUSED START_TEST (sync_error_dual_commit_timeout) { char *testbed = setup_testbed("multisync_easy_new"); @@ -1064,7 +1064,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (commit_timeout_and_error) +OSYNC_UNUSED START_TEST (sync_error_commit_timeout_and_error) { char *testbed = setup_testbed("multisync_easy_new"); @@ -1117,7 +1117,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (commit_timeout_and_error2) +OSYNC_UNUSED START_TEST (sync_error_commit_timeout_and_error2) { char *testbed = setup_testbed("multisync_easy_new"); @@ -1170,7 +1170,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (commit_error_modify) +OSYNC_UNUSED START_TEST (sync_error_commit_error_modify) { char *testbed = setup_testbed("multisync_easy_new"); @@ -1231,7 +1231,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (commit_error_delete) +OSYNC_UNUSED START_TEST (sync_error_commit_error_delete) { char *testbed = setup_testbed("multisync_easy_new"); @@ -1292,7 +1292,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (committed_all_error) +OSYNC_UNUSED START_TEST (sync_error_committed_all_error) { char *testbed = setup_testbed("multisync_easy_new"); @@ -1344,7 +1344,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (committed_all_batch_error) +OSYNC_UNUSED START_TEST (sync_error_committed_all_batch_error) { char *testbed = setup_testbed("multisync_easy_new"); @@ -1397,7 +1397,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (single_sync_done_error) +OSYNC_UNUSED START_TEST (sync_error_single_sync_done_error) { char *testbed = setup_testbed("multisync_easy_new"); @@ -1450,7 +1450,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (dual_sync_done_error) +OSYNC_UNUSED START_TEST (sync_error_dual_sync_done_error) { char *testbed = setup_testbed("multisync_easy_new"); @@ -1503,7 +1503,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (triple_sync_done_error) +OSYNC_UNUSED START_TEST (sync_error_triple_sync_done_error) { char *testbed = setup_testbed("multisync_easy_new"); @@ -1556,7 +1556,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (single_sync_done_timeout) +OSYNC_UNUSED START_TEST (sync_error_single_sync_done_timeout) { char *testbed = setup_testbed("multisync_easy_new"); @@ -1609,7 +1609,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (dual_sync_done_timeout) +OSYNC_UNUSED START_TEST (sync_error_dual_sync_done_timeout) { char *testbed = setup_testbed("multisync_easy_new"); @@ -1662,7 +1662,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (sync_done_timeout_and_error) +OSYNC_UNUSED START_TEST (sync_error_sync_done_timeout_and_error) { char *testbed = setup_testbed("multisync_easy_new"); @@ -1716,7 +1716,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (single_disconnect_error) +OSYNC_UNUSED START_TEST (sync_error_single_disconnect_error) { char *testbed = setup_testbed("multisync_easy_new"); @@ -1769,7 +1769,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (dual_disconnect_error) +OSYNC_UNUSED START_TEST (sync_error_dual_disconnect_error) { char *testbed = setup_testbed("multisync_easy_new"); @@ -1822,7 +1822,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (triple_disconnect_error) +OSYNC_UNUSED START_TEST (sync_error_triple_disconnect_error) { char *testbed = setup_testbed("multisync_easy_new"); @@ -1875,7 +1875,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (single_disconnect_timeout) +OSYNC_UNUSED START_TEST (sync_error_single_disconnect_timeout) { char *testbed = setup_testbed("multisync_easy_new"); @@ -1928,7 +1928,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (dual_disconnect_timeout) +OSYNC_UNUSED START_TEST (sync_error_dual_disconnect_timeout) { char *testbed = setup_testbed("multisync_easy_new"); @@ -1981,7 +1981,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (disconnect_timeout_and_error) +OSYNC_UNUSED START_TEST (sync_error_disconnect_timeout_and_error) { char *testbed = setup_testbed("multisync_easy_new"); @@ -2035,7 +2035,7 @@ } END_TEST -OSYNC_UNUSED START_TEST (get_changes_disconnect_error) +OSYNC_UNUSED START_TEST (sync_error_get_changes_disconnect_error) { char *testbed = setup_testbed("multisync_easy_new"); @@ -2091,73 +2091,54 @@ } END_TEST +OSYNC_TESTCASE_START("sync_error") +OSYNC_TESTCASE_ADD(sync_error_single_init_error_noerror) + +#if 0 +/* Disabled as not ported see http://opensync.org/ticket/980 */ +OSYNC_TESTCASE_ADD(sync_error_single_init_error) +OSYNC_TESTCASE_ADD(sync_error_dual_connect_error) +OSYNC_TESTCASE_ADD(sync_error_one_of_two_connect_error) +OSYNC_TESTCASE_ADD(sync_error_two_of_three_connect_error) +OSYNC_TESTCASE_ADD(sync_error_two_of_three_connect_error2) +OSYNC_TESTCASE_ADD(sync_error_three_of_three_connect_error) +OSYNC_TESTCASE_ADD(sync_error_one_of_three_connect_error) +OSYNC_TESTCASE_ADD(sync_error_no_connect_error) +OSYNC_TESTCASE_ADD(sync_error_single_connect_timeout) +OSYNC_TESTCASE_ADD(sync_error_dual_connect_timeout) +OSYNC_TESTCASE_ADD(sync_error_one_of_three_timeout) +OSYNC_TESTCASE_ADD(sync_error_timeout_and_error) +OSYNC_TESTCASE_ADD(sync_error_single_get_changes_error) +OSYNC_TESTCASE_ADD(sync_error_dual_get_changes_error) +OSYNC_TESTCASE_ADD(sync_error_two_of_three_get_changes_error) +OSYNC_TESTCASE_ADD(sync_error_one_of_three_get_changes_error) +OSYNC_TESTCASE_ADD(sync_error_one_of_three_get_changes_timeout) +OSYNC_TESTCASE_ADD(sync_error_get_changes_timeout_and_error) +OSYNC_TESTCASE_ADD(sync_error_get_changes_timeout_sleep) +OSYNC_TESTCASE_ADD(sync_error_single_commit_error) +OSYNC_TESTCASE_ADD(sync_error_dual_commit_error) +OSYNC_TESTCASE_ADD(sync_error_single_commit_timeout) +OSYNC_TESTCASE_ADD(sync_error_dual_commit_timeout) +OSYNC_TESTCASE_ADD(sync_error_commit_timeout_and_error) +OSYNC_TESTCASE_ADD(sync_error_commit_timeout_and_error2) +OSYNC_TESTCASE_ADD(sync_error_commit_error_modify) +OSYNC_TESTCASE_ADD(sync_error_commit_error_delete) +OSYNC_TESTCASE_ADD(sync_error_committed_all_error) +OSYNC_TESTCASE_ADD(sync_error_committed_all_batch_error) +OSYNC_TESTCASE_ADD(sync_error_single_sync_done_error) +OSYNC_TESTCASE_ADD(sync_error_dual_sync_done_error) +OSYNC_TESTCASE_ADD(sync_error_triple_sync_done_error) +OSYNC_TESTCASE_ADD(sync_error_single_sync_done_timeout) +OSYNC_TESTCASE_ADD(sync_error_dual_sync_done_timeout) +OSYNC_TESTCASE_ADD(sync_error_sync_done_timeout_and_error) +OSYNC_TESTCASE_ADD(sync_error_single_disconnect_error) +OSYNC_TESTCASE_ADD(sync_error_dual_disconnect_error) +OSYNC_TESTCASE_ADD(sync_error_triple_disconnect_error) +OSYNC_TESTCASE_ADD(sync_error_single_disconnect_timeout) +OSYNC_TESTCASE_ADD(sync_error_dual_disconnect_timeout) +OSYNC_TESTCASE_ADD(sync_error_disconnect_timeout_and_error) +OSYNC_TESTCASE_ADD(sync_error_get_changes_disconnect_error) +#endif + +OSYNC_TESTCASE_END -Suite *multisync_suite(void) -{ - Suite *s = suite_create("Error Codes"); - //Suite *s2 = suite_create("Error Codes"); - create_case(s, "single_init_error_noerror", single_init_error_noerror); - - /* Disabled as not ported see http://opensync.org/ticket/980 - - create_case(s, "single_init_error", single_init_error); - create_case(s, "dual_connect_error", dual_connect_error); - create_case(s, "one_of_two_connect_error", one_of_two_connect_error); - create_case(s, "two_of_three_connect_error", two_of_three_connect_error); - create_case(s, "two_of_three_connect_error2", two_of_three_connect_error2); - create_case(s, "three_of_three_connect_error", three_of_three_connect_error); - create_case(s, "one_of_three_connect_error", one_of_three_connect_error); - create_case(s, "no_connect_error", no_connect_error); - create_case(s, "single_connect_timeout", single_connect_timeout); - create_case(s, "dual_connect_timeout", dual_connect_timeout); - create_case(s, "one_of_three_timeout", one_of_three_timeout); - create_case(s, "timeout_and_error", timeout_and_error); - create_case(s, "single_get_changes_error", single_get_changes_error); - create_case(s, "dual_get_changes_error", dual_get_changes_error); - create_case(s, "two_of_three_get_changes_error", two_of_three_get_changes_error); - create_case(s, "one_of_three_get_changes_error", one_of_three_get_changes_error); - create_case(s, "one_of_three_get_changes_timeout", one_of_three_get_changes_timeout); - create_case(s, "get_changes_timeout_and_error", get_changes_timeout_and_error); - create_case(s, "get_changes_timeout_sleep", get_changes_timeout_sleep); - create_case(s, "single_commit_error", single_commit_error); - create_case(s, "dual_commit_error", dual_commit_error); - create_case(s, "single_commit_timeout", single_commit_timeout); - create_case(s, "dual_commit_timeout", dual_commit_timeout); - create_case(s, "commit_timeout_and_error", commit_timeout_and_error); - create_case(s, "commit_timeout_and_error2", commit_timeout_and_error2); - create_case(s, "commit_error_modify", commit_error_modify); - create_case(s, "commit_error_delete", commit_error_delete); - create_case(s, "committed_all_error", committed_all_error); - create_case(s, "committed_all_batch_error", committed_all_batch_error); - create_case(s, "single_sync_done_error", single_sync_done_error); - create_case(s, "dual_sync_done_error", dual_sync_done_error); - create_case(s, "triple_sync_done_error", triple_sync_done_error); - create_case(s, "single_sync_done_timeout", single_sync_done_timeout); - create_case(s, "dual_sync_done_timeout", dual_sync_done_timeout); - create_case(s, "sync_done_timeout_and_error", sync_done_timeout_and_error); - create_case(s, "single_disconnect_error", single_disconnect_error); - create_case(s, "dual_disconnect_error", dual_disconnect_error); - create_case(s, "triple_disconnect_error", triple_disconnect_error); - create_case(s, "single_disconnect_timeout", single_disconnect_timeout); - create_case(s, "dual_disconnect_timeout", dual_disconnect_timeout); - create_case(s, "disconnect_timeout_and_error", disconnect_timeout_and_error); - create_case(s, "get_changes_disconnect_error", get_changes_disconnect_error); - */ - return s; -} - -int main(void) -{ - int nf; - - check_env(); - - Suite *s = multisync_suite(); - - SRunner *sr; - sr = srunner_create(s); - srunner_run_all(sr, CK_VERBOSE); - nf = srunner_ntests_failed(sr); - srunner_free(sr); - return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE; -} Modified: trunk/tests/version-tests/check_version.c ============================================================================== --- trunk/tests/version-tests/check_version.c Sun Jan 11 22:19:08 2009 (r5118) +++ trunk/tests/version-tests/check_version.c Sun Jan 11 22:42:15 2009 (r5119) @@ -79,25 +79,9 @@ } END_TEST -Suite *version_suite(void) -{ - Suite *s = suite_create("Version"); - create_case(s, "version_new", version_new); - create_case(s, "version_matches", version_matches); - create_case(s, "version_load_from_descriptions", version_load_from_descriptions); - return s; -} - -int main(void) -{ - int nf; +OSYNC_TESTCASE_START("version") +OSYNC_TESTCASE_ADD(version_new) +OSYNC_TESTCASE_ADD(version_matches) +OSYNC_TESTCASE_ADD(version_load_from_descriptions) +OSYNC_TESTCASE_END - Suite *s = version_suite(); - - SRunner *sr; - sr = srunner_create(s); - srunner_run_all(sr, CK_VERBOSE); - nf = srunner_ntests_failed(sr); - srunner_free(sr); - return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE; -} |
|
From: <dg...@su...> - 2009-01-11 21:19:48
|
Author: dgollub Date: Sun Jan 11 22:19:08 2009 New Revision: 5118 URL: http://www.opensync.org/changeset/5118 Log: Ported more unittests to OSYNC_TESTCASE macro: hashtable, module, format_env, member, lock, group, multisync Modified: trunk/tests/CMakeLists.txt trunk/tests/format-tests/check_format_env.c trunk/tests/group-tests/check_group.c trunk/tests/group-tests/check_lock.c trunk/tests/group-tests/check_member.c trunk/tests/helper-tests/check_hash.c trunk/tests/module-tests/check_module.c trunk/tests/sync-tests/check_multisync.c Modified: trunk/tests/CMakeLists.txt ============================================================================== --- trunk/tests/CMakeLists.txt Sun Jan 11 22:01:22 2009 (r5117) +++ trunk/tests/CMakeLists.txt Sun Jan 11 22:19:08 2009 (r5118) @@ -192,10 +192,36 @@ OSYNC_TESTCASE( engine-error engine_error_get_changes_disconnect_error) OSYNC_TESTCASE( engine-error engine_error_missing_format_plugin) -ADD_CHECK_TEST( formatenv format-tests/check_format_env.c ${TEST_TARGET_LIBRARIES} ) -ADD_CHECK_TEST( group group-tests/check_group.c ${TEST_TARGET_LIBRARIES} ) -ADD_CHECK_TEST( hash helper-tests/check_hash.c ${TEST_TARGET_LIBRARIES} ) -ADD_CHECK_TEST( lock group-tests/check_lock.c ${TEST_TARGET_LIBRARIES} ) +BUILD_CHECK_TEST( formatenv format-tests/check_format_env.c ${TEST_TARGET_LIBRARIES} ) +OSYNC_TESTCASE(formatenv format_env_create) +OSYNC_TESTCASE(formatenv format_env_register_objformat) +OSYNC_TESTCASE(formatenv format_env_register_objformat_count) +OSYNC_TESTCASE(formatenv format_env_objformat_find) +OSYNC_TESTCASE(formatenv format_env_objformat_find_false) +OSYNC_TESTCASE(formatenv format_env_register_converter) +OSYNC_TESTCASE(formatenv format_env_register_converter_count) +OSYNC_TESTCASE(formatenv format_env_converter_find) +OSYNC_TESTCASE(formatenv format_env_converter_find_false) +OSYNC_TESTCASE(formatenv format_env_register_filter) +OSYNC_TESTCASE(formatenv format_env_register_filter_count) +OSYNC_TESTCASE(formatenv format_env_load_plugins) +OSYNC_TESTCASE(formatenv format_env_plugin) + +BUILD_CHECK_TEST( group group-tests/check_group.c ${TEST_TARGET_LIBRARIES} ) +OSYNC_TESTCASE(group group_last_sync) + +BUILD_CHECK_TEST( hashtable helper-tests/check_hash.c ${TEST_TARGET_LIBRARIES} ) +OSYNC_TESTCASE(hashtable hashtable_new) +OSYNC_TESTCASE(hashtable hashtable_reload) +OSYNC_TESTCASE(hashtable hashtable_stress) + +BUILD_CHECK_TEST( lock group-tests/check_lock.c ${TEST_TARGET_LIBRARIES} ) +OSYNC_TESTCASE(lock lock_simple_lock) +OSYNC_TESTCASE(lock lock_simple_seq_lock) +OSYNC_TESTCASE(lock lock_dual_lock) +OSYNC_TESTCASE(lock lock_dual_lock2) +OSYNC_TESTCASE(lock lock_dual_sync_engine_lock) +OSYNC_TESTCASE(lock lock_dual_sync_engine_unclean) IF (NOT WIN32) BUILD_CHECK_TEST( ipc ipc-tests/check_ipc.c ${TEST_TARGET_LIBRARIES} ) @@ -230,9 +256,22 @@ OSYNC_TESTCASE(mapping_engine mapping_engine_same_similar_conflict) OSYNC_TESTCASE(mapping_engine mapping_engine_same_similar_conflict_multi) -ADD_CHECK_TEST( member group-tests/check_member.c ${TEST_TARGET_LIBRARIES} ) -ADD_CHECK_TEST( module module-tests/check_module.c ${TEST_TARGET_LIBRARIES} ) -ADD_CHECK_TEST( multisync sync-tests/check_multisync.c ${TEST_TARGET_LIBRARIES} ) +BUILD_CHECK_TEST( member group-tests/check_member.c ${TEST_TARGET_LIBRARIES} ) +OSYNC_TESTCASE(member member_new) + +BUILD_CHECK_TEST( module module-tests/check_module.c ${TEST_TARGET_LIBRARIES} ) +OSYNC_TESTCASE(module module_create) +OSYNC_TESTCASE(module module_load) +OSYNC_TESTCASE(module module_load_false) +OSYNC_TESTCASE(module module_function) +OSYNC_TESTCASE(module module_function_false) +OSYNC_TESTCASE(module module_version) +OSYNC_TESTCASE(module module_check) + +BUILD_CHECK_TEST( multisync sync-tests/check_multisync.c ${TEST_TARGET_LIBRARIES} ) +OSYNC_TESTCASE(multisync multisync_easy_new) +OSYNC_TESTCASE(multisync multisync_dual_new) +OSYNC_TESTCASE(multisync multisync_triple_new) BUILD_CHECK_TEST( sync sync-tests/check_sync.c ${TEST_TARGET_LIBRARIES} ) OSYNC_TESTCASE( sync sync_setup_connect) Modified: trunk/tests/format-tests/check_format_env.c ============================================================================== --- trunk/tests/format-tests/check_format_env.c Sun Jan 11 22:01:22 2009 (r5117) +++ trunk/tests/format-tests/check_format_env.c Sun Jan 11 22:19:08 2009 (r5118) @@ -6,7 +6,7 @@ #include "opensync/format/opensync_format_env_internals.h" #include "opensync/module/opensync_module_internals.h" -START_TEST (conv_env_create) +START_TEST (format_env_create) { char *testbed = setup_testbed(NULL); @@ -21,7 +21,7 @@ } END_TEST -START_TEST (conv_env_register_objformat) +START_TEST (format_env_register_objformat) { char *testbed = setup_testbed(NULL); @@ -44,7 +44,7 @@ } END_TEST -START_TEST (conv_env_register_objformat_count) +START_TEST (format_env_register_objformat_count) { char *testbed = setup_testbed(NULL); @@ -71,7 +71,7 @@ } END_TEST -START_TEST (conv_env_objformat_find) +START_TEST (format_env_objformat_find) { char *testbed = setup_testbed(NULL); @@ -95,7 +95,7 @@ } END_TEST -START_TEST (conv_env_objformat_find_false) +START_TEST (format_env_objformat_find_false) { char *testbed = setup_testbed(NULL); @@ -124,7 +124,7 @@ return TRUE; } -START_TEST (conv_env_register_converter) +START_TEST (format_env_register_converter) { char *testbed = setup_testbed(NULL); @@ -160,7 +160,7 @@ } END_TEST -START_TEST (conv_env_register_converter_count) +START_TEST (format_env_register_converter_count) { char *testbed = setup_testbed(NULL); @@ -201,7 +201,7 @@ } END_TEST -START_TEST (conv_env_converter_find) +START_TEST (format_env_converter_find) { char *testbed = setup_testbed(NULL); @@ -238,7 +238,7 @@ } END_TEST -START_TEST (conv_env_converter_find_false) +START_TEST (format_env_converter_find_false) { char *testbed = setup_testbed(NULL); @@ -287,7 +287,7 @@ return TRUE; } -START_TEST (conv_env_register_filter) +START_TEST (format_env_register_filter) { char *testbed = setup_testbed(NULL); @@ -310,7 +310,7 @@ } END_TEST -START_TEST (conv_env_register_filter_count) +START_TEST (format_env_register_filter_count) { char *testbed = setup_testbed(NULL); @@ -338,7 +338,7 @@ } END_TEST -START_TEST (conv_env_load_plugins) +START_TEST (format_env_load_plugins) { char *testbed = setup_testbed(NULL); @@ -358,7 +358,7 @@ } END_TEST -START_TEST (conv_env_plugin) +START_TEST (format_env_plugin) { char *testbed = setup_testbed(NULL); @@ -395,43 +395,23 @@ } END_TEST -Suite *format_env_suite(void) -{ - Suite *s = suite_create("Format-Env"); -// Suite *s2 = suite_create("Format-Env"); - - create_case(s, "conv_env_create", conv_env_create); - - create_case(s, "conv_env_register_objformat", conv_env_register_objformat); - create_case(s, "conv_env_register_objformat_count", conv_env_register_objformat_count); - create_case(s, "conv_env_objformat_find", conv_env_objformat_find); - create_case(s, "conv_env_objformat_find_false", conv_env_objformat_find_false); - - create_case(s, "conv_env_register_converter", conv_env_register_converter); - create_case(s, "conv_env_register_converter_count", conv_env_register_converter_count); - create_case(s, "conv_env_converter_find", conv_env_converter_find); - create_case(s, "conv_env_converter_find_false", conv_env_converter_find_false); - - create_case(s, "conv_env_register_filter", conv_env_register_filter); - create_case(s, "conv_env_register_filter_count", conv_env_register_filter_count); - - create_case(s, "conv_env_load_plugins", conv_env_load_plugins); - create_case(s, "conv_env_plugin", conv_env_plugin); - - return s; -} +OSYNC_TESTCASE_START("format_env") +OSYNC_TESTCASE_ADD(format_env_create) -int main(void) -{ - int nf; - - Suite *s = format_env_suite(); - - SRunner *sr; - sr = srunner_create(s); +OSYNC_TESTCASE_ADD(format_env_register_objformat) +OSYNC_TESTCASE_ADD(format_env_register_objformat_count) +OSYNC_TESTCASE_ADD(format_env_objformat_find) +OSYNC_TESTCASE_ADD(format_env_objformat_find_false) + +OSYNC_TESTCASE_ADD(format_env_register_converter) +OSYNC_TESTCASE_ADD(format_env_register_converter_count) +OSYNC_TESTCASE_ADD(format_env_converter_find) +OSYNC_TESTCASE_ADD(format_env_converter_find_false) + +OSYNC_TESTCASE_ADD(format_env_register_filter) +OSYNC_TESTCASE_ADD(format_env_register_filter_count) + +OSYNC_TESTCASE_ADD(format_env_load_plugins) +OSYNC_TESTCASE_ADD(format_env_plugin) +OSYNC_TESTCASE_END - srunner_run_all(sr, CK_VERBOSE); - nf = srunner_ntests_failed(sr); - srunner_free(sr); - return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE; -} Modified: trunk/tests/group-tests/check_group.c ============================================================================== --- trunk/tests/group-tests/check_group.c Sun Jan 11 22:01:22 2009 (r5117) +++ trunk/tests/group-tests/check_group.c Sun Jan 11 22:19:08 2009 (r5118) @@ -63,26 +63,7 @@ } END_TEST -Suite *group_suite(void) -{ - Suite *s = suite_create("Group"); +OSYNC_TESTCASE_START("group") +OSYNC_TESTCASE_ADD(group_last_sync) +OSYNC_TESTCASE_END - create_case(s, "group_last_sync", group_last_sync); - - return s; -} - -int main(void) -{ - int nf; - - Suite *s = group_suite(); - - SRunner *sr; - sr = srunner_create(s); - - srunner_run_all(sr, CK_VERBOSE); - nf = srunner_ntests_failed(sr); - srunner_free(sr); - return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE; -} Modified: trunk/tests/group-tests/check_lock.c ============================================================================== --- trunk/tests/group-tests/check_lock.c Sun Jan 11 22:01:22 2009 (r5117) +++ trunk/tests/group-tests/check_lock.c Sun Jan 11 22:19:08 2009 (r5118) @@ -9,7 +9,7 @@ #include "opensync/group/opensync_group_internals.h" -START_TEST (simple_lock) +START_TEST (lock_simple_lock) { char *testbed = setup_testbed("multisync_easy_new"); @@ -27,7 +27,7 @@ } END_TEST -START_TEST (simple_seq_lock) +START_TEST (lock_simple_seq_lock) { char *testbed = setup_testbed("multisync_easy_new"); @@ -48,7 +48,7 @@ } END_TEST -START_TEST (dual_lock) +START_TEST (lock_dual_lock) { char *testbed = setup_testbed("multisync_easy_new"); @@ -66,7 +66,7 @@ } END_TEST -START_TEST (dual_lock2) +START_TEST (lock_dual_lock2) { char *testbed = setup_testbed("multisync_easy_new"); @@ -88,7 +88,7 @@ } END_TEST -START_TEST (dual_sync_engine_lock) +START_TEST (lock_dual_sync_engine_lock) { char *testbed = setup_testbed("multisync_easy_new"); char *formatdir = g_strdup_printf("%s/formats", testbed); @@ -155,7 +155,7 @@ } END_TEST -START_TEST (dual_sync_engine_unclean) +START_TEST (lock_dual_sync_engine_unclean) { char *testbed = setup_testbed("multisync_easy_new"); char *formatdir = g_strdup_printf("%s/formats", testbed); @@ -275,30 +275,12 @@ } END_TEST -Suite *lock_suite(void) -{ - Suite *s = suite_create("Locks"); - //Suite *s2 = suite_create("Locks"); - create_case(s, "simple_lock", simple_lock); - create_case(s, "simple_seq_lock", simple_seq_lock); - create_case(s, "dual_lock", dual_lock); - create_case(s, "dual_lock2", dual_lock2); - create_case(s, "dual_sync_engine_lock", dual_sync_engine_lock); - create_case(s, "dual_sync_engine_unclean", dual_sync_engine_unclean); - - return s; -} +OSYNC_TESTCASE_START("lock") +OSYNC_TESTCASE_ADD(lock_simple_lock) +OSYNC_TESTCASE_ADD(lock_simple_seq_lock) +OSYNC_TESTCASE_ADD(lock_dual_lock) +OSYNC_TESTCASE_ADD(lock_dual_lock2) +OSYNC_TESTCASE_ADD(lock_dual_sync_engine_lock) +OSYNC_TESTCASE_ADD(lock_dual_sync_engine_unclean) +OSYNC_TESTCASE_END -int main(void) -{ - int nf; - - Suite *s = lock_suite(); - - SRunner *sr; - sr = srunner_create(s); - srunner_run_all(sr, CK_VERBOSE); - nf = srunner_ntests_failed(sr); - srunner_free(sr); - return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE; -} Modified: trunk/tests/group-tests/check_member.c ============================================================================== --- trunk/tests/group-tests/check_member.c Sun Jan 11 22:01:22 2009 (r5117) +++ trunk/tests/group-tests/check_member.c Sun Jan 11 22:19:08 2009 (r5118) @@ -7,7 +7,9 @@ #include <glib.h> #include <gmodule.h> -START_TEST (test_create) +#include "support.h" + +START_TEST (member_new) { OSyncMember *member = NULL; member = osync_member_new(NULL); @@ -16,28 +18,7 @@ } END_TEST -Suite *member_suite(void) -{ - Suite *s = suite_create("Member"); - TCase *tc_core = tcase_create("Core"); - - suite_add_tcase (s, tc_core); - tcase_add_test(tc_core, test_create); - - return s; -} - -int main(void) -{ - int nf; - - Suite *s = member_suite(); - - SRunner *sr; - sr = srunner_create(s); +OSYNC_TESTCASE_START("member") +OSYNC_TESTCASE_ADD(member_new) +OSYNC_TESTCASE_END - srunner_run_all(sr, CK_VERBOSE); - nf = srunner_ntests_failed(sr); - srunner_free(sr); - return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE; -} Modified: trunk/tests/helper-tests/check_hash.c ============================================================================== --- trunk/tests/helper-tests/check_hash.c Sun Jan 11 22:01:22 2009 (r5117) +++ trunk/tests/helper-tests/check_hash.c Sun Jan 11 22:19:08 2009 (r5118) @@ -190,30 +190,9 @@ } END_TEST -Suite *env_suite(void) -{ - Suite *s = suite_create("Hashtable"); +OSYNC_TESTCASE_START("hashtable") +OSYNC_TESTCASE_ADD(hashtable_new) +OSYNC_TESTCASE_ADD(hashtable_reload) +OSYNC_TESTCASE_ADD(hashtable_stress) +OSYNC_TESTCASE_END - create_case(s, "hashtable_new", hashtable_new); - create_case(s, "hashtable_reload", hashtable_reload); - create_case(s, "hashtable_stress", hashtable_stress); - - return s; -} - -int main(void) -{ - int nf; - - check_env(); - - Suite *s = env_suite(); - - SRunner *sr; - sr = srunner_create(s); - - srunner_run_all(sr, CK_VERBOSE); - nf = srunner_ntests_failed(sr); - srunner_free(sr); - return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE; -} Modified: trunk/tests/module-tests/check_module.c ============================================================================== --- trunk/tests/module-tests/check_module.c Sun Jan 11 22:01:22 2009 (r5117) +++ trunk/tests/module-tests/check_module.c Sun Jan 11 22:19:08 2009 (r5118) @@ -178,33 +178,13 @@ } END_TEST -Suite *module_suite(void) -{ - Suite *s = suite_create("Module"); - //Suite *s2 = suite_create("Module"); - - create_case(s, "module_create", module_create); - create_case(s, "module_load", module_load); - create_case(s, "module_load_false", module_load_false); - create_case(s, "module_function", module_function); - create_case(s, "module_function_false", module_function_false); - create_case(s, "module_version", module_version); - create_case(s, "module_check", module_check); - - return s; -} - -int main(void) -{ - int nf; - - Suite *s = module_suite(); - - SRunner *sr; - sr = srunner_create(s); +OSYNC_TESTCASE_START("module") +OSYNC_TESTCASE_ADD(module_create) +OSYNC_TESTCASE_ADD(module_load) +OSYNC_TESTCASE_ADD(module_load_false) +OSYNC_TESTCASE_ADD(module_function) +OSYNC_TESTCASE_ADD(module_function_false) +OSYNC_TESTCASE_ADD(module_version) +OSYNC_TESTCASE_ADD(module_check) +OSYNC_TESTCASE_END - srunner_run_all(sr, CK_VERBOSE); - nf = srunner_ntests_failed(sr); - srunner_free(sr); - return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE; -} Modified: trunk/tests/sync-tests/check_multisync.c ============================================================================== --- trunk/tests/sync-tests/check_multisync.c Sun Jan 11 22:01:22 2009 (r5117) +++ trunk/tests/sync-tests/check_multisync.c Sun Jan 11 22:19:08 2009 (r5118) @@ -2476,72 +2476,55 @@ END_TEST #endif -Suite *multisync_suite(void) -{ - Suite *s = suite_create("Multisync"); - //Suite *s2 = suite_create("Multisync"); - create_case(s, "multisync_easy_new", multisync_easy_new); - create_case(s, "multisync_dual_new", multisync_dual_new); - create_case(s, "multisync_triple_new", multisync_triple_new); +OSYNC_TESTCASE_START("multisync") +OSYNC_TESTCASE_ADD(multisync_easy_new) +OSYNC_TESTCASE_ADD(multisync_dual_new) +OSYNC_TESTCASE_ADD(multisync_triple_new) /* FIXME: port testcases, see ticket #981 */ #if 0 - create_case(s, "multisync_easy_mod", multisync_easy_mod); - create_case(s, "multisync_dual_mod", multisync_dual_mod); - create_case(s, "multisync_triple_mod", multisync_triple_mod); - create_case(s, "multisync_easy_del", multisync_easy_del); - create_case(s, "multisync_dual_del", multisync_dual_del); - create_case(s, "multisync_triple_del", multisync_triple_del); - - create_case(s, "multisync_conflict_data_choose", multisync_conflict_data_choose); - create_case(s, "multisync_conflict_data_choose2", multisync_conflict_data_choose2); - create_case(s, "multisync_conflict_changetype_choose", multisync_conflict_changetype_choose); - create_case(s, "multisync_conflict_changetype_choose2", multisync_conflict_changetype_choose2); - create_case(s, "multisync_conflict_hybrid_choose", multisync_conflict_hybrid_choose); - create_case(s, "multisync_conflict_hybrid_choose2", multisync_conflict_hybrid_choose2); - create_case(s, "multisync_conflict_data_duplicate", multisync_conflict_data_duplicate); - create_case(s, "multisync_conflict_data_duplicate2", multisync_conflict_data_duplicate2); - create_case(s, "multisync_conflict_changetype_duplicate", multisync_conflict_changetype_duplicate); - create_case(s, "multisync_conflict_changetype_duplicate2", multisync_conflict_changetype_duplicate2); - create_case(s, "multisync_conflict_hybrid_duplicate", multisync_conflict_hybrid_duplicate); - create_case(s, "multisync_multi_conflict", multisync_multi_conflict); - - create_case(s, "multisync_delayed_conflict_handler", multisync_delayed_conflict_handler); - create_case(s, "multisync_delayed_slow", multisync_delayed_slow); - - create_case(s, "multisync_conflict_ignore", multisync_conflict_ignore); - create_case(s, "multisync_conflict_ignore2", multisync_conflict_ignore2); - - create_case(s, "multisync_easy_new_b", multisync_easy_new_b); - create_case(s, "multisync_triple_del_b", multisync_triple_del_b); - create_case(s, "multisync_conflict_hybrid_choose2_b", multisync_conflict_hybrid_choose2_b); - create_case(s, "multisync_delayed_conflict_handler_b", multisync_delayed_conflict_handler_b); - create_case(s, "multisync_delayed_slow_b", multisync_delayed_slow_b); - create_case(s, "multisync_conflict_ignore_b", multisync_conflict_ignore_b); - create_case(s, "multisync_conflict_ignore2_b", multisync_conflict_ignore2_b); - create_case(s, "multisync_conflict_hybrid_duplicate_b", multisync_conflict_hybrid_duplicate_b); - create_case(s, "multisync_multi_conflict_b", multisync_multi_conflict_b); - create_case(s, "multisync_zero_changes_b", multisync_zero_changes_b); - - create_case(s, "multisync_conflict_hybrid_choose2_b2", multisync_conflict_hybrid_choose2_b2); - create_case(s, "multisync_delayed_conflict_handler_b2", multisync_delayed_conflict_handler_b2); - create_case(s, "multisync_conflict_ignore_b2", multisync_conflict_ignore_b2); - create_case(s, "multisync_multi_conflict_b2", multisync_multi_conflict_b2); +OSYNC_TESTCASE_ADD(multisync_easy_mod) +OSYNC_TESTCASE_ADD(multisync_dual_mod) +OSYNC_TESTCASE_ADD(multisync_triple_mod) +OSYNC_TESTCASE_ADD(multisync_easy_del) +OSYNC_TESTCASE_ADD(multisync_dual_del) +OSYNC_TESTCASE_ADD(multisync_triple_del) + +OSYNC_TESTCASE_ADD(multisync_conflict_data_choose) +OSYNC_TESTCASE_ADD(multisync_conflict_data_choose2) +OSYNC_TESTCASE_ADD(multisync_conflict_changetype_choose) +OSYNC_TESTCASE_ADD(multisync_conflict_changetype_choose2) +OSYNC_TESTCASE_ADD(multisync_conflict_hybrid_choose) +OSYNC_TESTCASE_ADD(multisync_conflict_hybrid_choose2) +OSYNC_TESTCASE_ADD(multisync_conflict_data_duplicate) +OSYNC_TESTCASE_ADD(multisync_conflict_data_duplicate2) +OSYNC_TESTCASE_ADD(multisync_conflict_changetype_duplicate) +OSYNC_TESTCASE_ADD(multisync_conflict_changetype_duplicate2) +OSYNC_TESTCASE_ADD(multisync_conflict_hybrid_duplicate) +OSYNC_TESTCASE_ADD(multisync_multi_conflict) + +OSYNC_TESTCASE_ADD(multisync_delayed_conflict_handler) +OSYNC_TESTCASE_ADD(multisync_delayed_slow) + +OSYNC_TESTCASE_ADD(multisync_conflict_ignore) +OSYNC_TESTCASE_ADD(multisync_conflict_ignore2) + +OSYNC_TESTCASE_ADD(multisync_easy_new_b) +OSYNC_TESTCASE_ADD(multisync_triple_del_b) +OSYNC_TESTCASE_ADD(multisync_conflict_hybrid_choose2_b) +OSYNC_TESTCASE_ADD(multisync_delayed_conflict_handler_b) +OSYNC_TESTCASE_ADD(multisync_delayed_slow_b) +OSYNC_TESTCASE_ADD(multisync_conflict_ignore_b) +OSYNC_TESTCASE_ADD(multisync_conflict_ignore2_b) +OSYNC_TESTCASE_ADD(multisync_conflict_hybrid_duplicate_b) +OSYNC_TESTCASE_ADD(multisync_multi_conflict_b) +OSYNC_TESTCASE_ADD(multisync_zero_changes_b) + +OSYNC_TESTCASE_ADD(multisync_conflict_hybrid_choose2_b2) +OSYNC_TESTCASE_ADD(multisync_delayed_conflict_handler_b2) +OSYNC_TESTCASE_ADD(multisync_conflict_ignore_b2) +OSYNC_TESTCASE_ADD(multisync_multi_conflict_b2) #endif - - return s; -} - -int main(void) -{ - int nf; - - Suite *s = multisync_suite(); - - SRunner *sr; - sr = srunner_create(s); - srunner_run_all(sr, CK_VERBOSE); - nf = srunner_ntests_failed(sr); - srunner_free(sr); - return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE; -} + +OSYNC_TESTCASE_END + |
|
From: <dg...@su...> - 2009-01-11 21:02:12
|
Author: dgollub Date: Sun Jan 11 22:01:22 2009 New Revision: 5117 URL: http://www.opensync.org/changeset/5117 Log: Port more unittests to OSYNC_TESTCASE macro: archive, conv, converter, detect, capabilities, error, data, filter, client. Some still left ... Modified: trunk/tests/CMakeLists.txt trunk/tests/archive-tests/check_archive.c trunk/tests/capabilities-tests/check_capabilities.c trunk/tests/check_error.c trunk/tests/client-tests/check_client.c trunk/tests/data-tests/check_data.c trunk/tests/format-tests/check_conv.c trunk/tests/format-tests/check_converter.c trunk/tests/format-tests/check_detect.c trunk/tests/sync-tests/check_filter.c Modified: trunk/tests/CMakeLists.txt ============================================================================== --- trunk/tests/CMakeLists.txt Sun Jan 11 20:10:17 2009 (r5116) +++ trunk/tests/CMakeLists.txt Sun Jan 11 22:01:22 2009 (r5117) @@ -15,15 +15,122 @@ SET( TEST_TARGET_LIBRARIES support ) ADD_TEST( symbols ${CMAKE_CURRENT_SOURCE_DIR}/abiapi-tests/check-symbols ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ) -ADD_CHECK_TEST( error check_error.c ${TEST_TARGET_LIBRARIES} ) -ADD_CHECK_TEST( archive archive-tests/check_archive.c ${TEST_TARGET_LIBRARIES} ) -ADD_CHECK_TEST( capabilities capabilities-tests/check_capabilities.c ${TEST_TARGET_LIBRARIES} ) -ADD_CHECK_TEST( client client-tests/check_client.c ${TEST_TARGET_LIBRARIES} ) -ADD_CHECK_TEST( filter sync-tests/check_filter.c ${TEST_TARGET_LIBRARIES} ) -ADD_CHECK_TEST( conv format-tests/check_conv.c ${TEST_TARGET_LIBRARIES} ) -ADD_CHECK_TEST( converter format-tests/check_converter.c ${TEST_TARGET_LIBRARIES} ) -ADD_CHECK_TEST( datatest data-tests/check_data.c ${TEST_TARGET_LIBRARIES} ) -ADD_CHECK_TEST( detect format-tests/check_detect.c ${TEST_TARGET_LIBRARIES} ) +BUILD_CHECK_TEST( error check_error.c ${TEST_TARGET_LIBRARIES} ) +OSYNC_TESTCASE(error error_create) +OSYNC_TESTCASE(error error_create_null) +OSYNC_TESTCASE(error error_get_name_null) +OSYNC_TESTCASE(error error_get_name_null2) +OSYNC_TESTCASE(error error_get_name) +OSYNC_TESTCASE(error error_free_null) +OSYNC_TESTCASE(error error_free_null2) +OSYNC_TESTCASE(error error_free) +OSYNC_TESTCASE(error error_check_null) +OSYNC_TESTCASE(error error_check_null2) +OSYNC_TESTCASE(error error_check) +OSYNC_TESTCASE(error error_check2) +OSYNC_TESTCASE(error error_stack_null) +OSYNC_TESTCASE(error error_stack_null2) +OSYNC_TESTCASE(error error_stack) +OSYNC_TESTCASE(error error_stack2) +OSYNC_TESTCASE(error error_set_null) +OSYNC_TESTCASE(error error_duplicate_null) +OSYNC_TESTCASE(error error_duplicate) + +BUILD_CHECK_TEST( archive archive-tests/check_archive.c ${TEST_TARGET_LIBRARIES} ) +OSYNC_TESTCASE(archive archive_new) +OSYNC_TESTCASE(archive archive_load_changes) +OSYNC_TESTCASE(archive archive_save_change) +OSYNC_TESTCASE(archive archive_save_data) +OSYNC_TESTCASE(archive archive_load_data) +OSYNC_TESTCASE(archive archive_load_data_with_closing_db) + +BUILD_CHECK_TEST(capabilities capabilities-tests/check_capabilities.c ${TEST_TARGET_LIBRARIES} ) +OSYNC_TESTCASE(capabilities capabilities_new) +OSYNC_TESTCASE(capabilities capability_new) +OSYNC_TESTCASE(capabilities capabilities_parse) +OSYNC_TESTCASE(capabilities capabilities_sort) + +BUILD_CHECK_TEST(client client-tests/check_client.c ${TEST_TARGET_LIBRARIES} ) +OSYNC_TESTCASE(client client_new) +OSYNC_TESTCASE(client client_pipes) +OSYNC_TESTCASE(client client_run) + +BUILD_CHECK_TEST( filter sync-tests/check_filter.c ${TEST_TARGET_LIBRARIES} ) +OSYNC_TESTCASE(filter filter_setup) +OSYNC_TESTCASE(filter filter_sync_deny_all) +OSYNC_TESTCASE(filter filter_sync_custom) +OSYNC_TESTCASE(filter filter_save_and_load) +OSYNC_TESTCASE(filter filter_destobjtype_delete) + +BUILD_CHECK_TEST( conv format-tests/check_conv.c ${TEST_TARGET_LIBRARIES} ) +OSYNC_TESTCASE(conv conv_env_create) +OSYNC_TESTCASE(conv conv_env_register_objformat) +OSYNC_TESTCASE(conv conv_env_register_objformat_count) +OSYNC_TESTCASE(conv conv_env_objformat_find) +OSYNC_TESTCASE(conv conv_env_objformat_find_false) +OSYNC_TESTCASE(conv conv_env_register_converter) +OSYNC_TESTCASE(conv conv_env_register_converter_count) +OSYNC_TESTCASE(conv conv_env_converter_find) +OSYNC_TESTCASE(conv conv_env_converter_find_false) +OSYNC_TESTCASE(conv conv_env_register_filter) +OSYNC_TESTCASE(conv conv_env_register_filter_count) +OSYNC_TESTCASE(conv conv_find_path) +OSYNC_TESTCASE(conv conv_find_path2) +OSYNC_TESTCASE(conv conv_find_path_false) +OSYNC_TESTCASE(conv conv_find_multi_path) +OSYNC_TESTCASE(conv conv_find_multi_path_with_preferred) +OSYNC_TESTCASE(conv conv_find_circular_false) +OSYNC_TESTCASE(conv conv_find_complex) +OSYNC_TESTCASE(conv conv_find_multi_target) +OSYNC_TESTCASE(conv conv_find_multi_target2) +OSYNC_TESTCASE(conv conv_find_multi_path_multi_target) +OSYNC_TESTCASE(conv conv_find_multi_path_multi_target_with_preferred) +OSYNC_TESTCASE(conv conv_env_convert1) +OSYNC_TESTCASE(conv conv_env_convert_back) +OSYNC_TESTCASE(conv conv_env_convert_desenc) +OSYNC_TESTCASE(conv conv_env_convert_desenc_complex) +OSYNC_TESTCASE(conv conv_env_detect_and_convert) +OSYNC_TESTCASE(conv conv_prefer_not_desencap) +OSYNC_TESTCASE(conv conv_prefer_same_objtype) +OSYNC_TESTCASE(conv conv_prefer_not_lossy_objtype_change) +OSYNC_TESTCASE(conv conv_env_detect_false) +OSYNC_TESTCASE(conv conv_env_decap_and_detect) +OSYNC_TESTCASE(conv conv_env_decap_and_detect2) + +BUILD_CHECK_TEST( converter format-tests/check_converter.c ${TEST_TARGET_LIBRARIES} ) +OSYNC_TESTCASE(converter converter_create) +OSYNC_TESTCASE(converter converter_get) +OSYNC_TESTCASE(converter converter_create_decap) +OSYNC_TESTCASE(converter converter_create_detector) +OSYNC_TESTCASE(converter converter_matches) +OSYNC_TESTCASE(converter converter_detect) +OSYNC_TESTCASE(converter converter_detector_invoke) +OSYNC_TESTCASE(converter converter_detect_non_detector) + +OSYNC_TESTCASE(converter converter_conv_invoke) +OSYNC_TESTCASE(converter converter_decap_invoke) +OSYNC_TESTCASE(converter converter_encap_invoke) + +OSYNC_TESTCASE(converter converter_conv_invoke_const) +OSYNC_TESTCASE(converter converter_decap_invoke_const) +OSYNC_TESTCASE(converter converter_encap_invoke_const) + +OSYNC_TESTCASE(converter converter_path_create) +OSYNC_TESTCASE(converter converter_path_add) +OSYNC_TESTCASE(converter converter_config) + +BUILD_CHECK_TEST( datatest data-tests/check_data.c ${TEST_TARGET_LIBRARIES} ) +OSYNC_TESTCASE(datatest data_new) +OSYNC_TESTCASE(datatest data_new_with_data) +OSYNC_TESTCASE(datatest data_set_data) +OSYNC_TESTCASE(datatest data_set_data2) +OSYNC_TESTCASE(datatest data_objformat) +OSYNC_TESTCASE(datatest data_objtype) + +BUILD_CHECK_TEST( detect format-tests/check_detect.c ${TEST_TARGET_LIBRARIES} ) +OSYNC_TESTCASE(detect detect_smart) +OSYNC_TESTCASE(detect detect_different_objtype) +OSYNC_TESTCASE(detect detect_smart_no) BUILD_CHECK_TEST( engine engine-tests/check_engine.c ${TEST_TARGET_LIBRARIES} ) OSYNC_TESTCASE( engine engine_new ) Modified: trunk/tests/archive-tests/check_archive.c ============================================================================== --- trunk/tests/archive-tests/check_archive.c Sun Jan 11 20:10:17 2009 (r5116) +++ trunk/tests/archive-tests/check_archive.c Sun Jan 11 22:01:22 2009 (r5117) @@ -182,28 +182,12 @@ } END_TEST -Suite *archive_suite(void) -{ - Suite *s = suite_create("Archive"); - create_case(s, "archive_new", archive_new); - create_case(s, "archive_load_changes", archive_load_changes); - create_case(s, "archive_save_change", archive_save_change); - create_case(s, "archive_save_data", archive_save_data); - create_case(s, "archive_load_data", archive_load_data); - create_case(s, "archive_load_data_with_closing_db", archive_load_data_with_closing_db); - return s; -} - -int main(void) -{ - int nf; +OSYNC_TESTCASE_START("archive") +OSYNC_TESTCASE_ADD(archive_new) +OSYNC_TESTCASE_ADD(archive_load_changes) +OSYNC_TESTCASE_ADD(archive_save_change) +OSYNC_TESTCASE_ADD(archive_save_data) +OSYNC_TESTCASE_ADD(archive_load_data) +OSYNC_TESTCASE_ADD(archive_load_data_with_closing_db) +OSYNC_TESTCASE_END - Suite *s = archive_suite(); - - SRunner *sr; - sr = srunner_create(s); - srunner_run_all(sr, CK_VERBOSE); - nf = srunner_ntests_failed(sr); - srunner_free(sr); - return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE; -} Modified: trunk/tests/capabilities-tests/check_capabilities.c ============================================================================== --- trunk/tests/capabilities-tests/check_capabilities.c Sun Jan 11 20:10:17 2009 (r5116) +++ trunk/tests/capabilities-tests/check_capabilities.c Sun Jan 11 22:01:22 2009 (r5117) @@ -84,26 +84,10 @@ } END_TEST -Suite *capabilities_suite(void) -{ - Suite *s = suite_create("Capabilities"); - create_case(s, "capabilities_new", capabilities_new); - create_case(s, "capability_new", capability_new); - create_case(s, "capabilities_parse", capabilities_parse); - create_case(s, "capabilities_sort", capabilities_sort); - return s; -} - -int main(void) -{ - int nf; +OSYNC_TESTCASE_START("capabilities") +OSYNC_TESTCASE_ADD(capabilities_new) +OSYNC_TESTCASE_ADD(capability_new) +OSYNC_TESTCASE_ADD(capabilities_parse) +OSYNC_TESTCASE_ADD(capabilities_sort) +OSYNC_TESTCASE_END - Suite *s = capabilities_suite(); - - SRunner *sr; - sr = srunner_create(s); - srunner_run_all(sr, CK_VERBOSE); - nf = srunner_ntests_failed(sr); - srunner_free(sr); - return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE; -} Modified: trunk/tests/check_error.c ============================================================================== --- trunk/tests/check_error.c Sun Jan 11 20:10:17 2009 (r5116) +++ trunk/tests/check_error.c Sun Jan 11 22:01:22 2009 (r5117) @@ -201,45 +201,25 @@ } END_TEST -Suite *error_suite(void) -{ - Suite *s = suite_create("Error"); - //Suite *s2 = suite_create("Error"); +OSYNC_TESTCASE_START("error") +OSYNC_TESTCASE_ADD(error_create) +OSYNC_TESTCASE_ADD(error_create_null) +OSYNC_TESTCASE_ADD(error_get_name_null) +OSYNC_TESTCASE_ADD(error_get_name_null2) +OSYNC_TESTCASE_ADD(error_get_name) +OSYNC_TESTCASE_ADD(error_free_null) +OSYNC_TESTCASE_ADD(error_free_null2) +OSYNC_TESTCASE_ADD(error_free) +OSYNC_TESTCASE_ADD(error_check_null) +OSYNC_TESTCASE_ADD(error_check_null2) +OSYNC_TESTCASE_ADD(error_check) +OSYNC_TESTCASE_ADD(error_check2) +OSYNC_TESTCASE_ADD(error_stack_null) +OSYNC_TESTCASE_ADD(error_stack_null2) +OSYNC_TESTCASE_ADD(error_stack) +OSYNC_TESTCASE_ADD(error_stack2) +OSYNC_TESTCASE_ADD(error_set_null) +OSYNC_TESTCASE_ADD(error_duplicate_null) +OSYNC_TESTCASE_ADD(error_duplicate) +OSYNC_TESTCASE_END - create_case(s, "error_create", error_create); - create_case(s, "error_create_null", error_create_null); - create_case(s, "error_get_name_null", error_get_name_null); - create_case(s, "error_get_name_null2", error_get_name_null2); - create_case(s, "error_get_name", error_get_name); - create_case(s, "error_free_null", error_free_null); - create_case(s, "error_free_null2", error_free_null2); - create_case(s, "error_free", error_free); - create_case(s, "error_check_null", error_check_null); - create_case(s, "error_check_null2", error_check_null2); - create_case(s, "error_check", error_check); - create_case(s, "error_check2", error_check2); - create_case(s, "error_stack_null", error_stack_null); - create_case(s, "error_stack_null2", error_stack_null2); - create_case(s, "error_stack", error_stack); - create_case(s, "error_stack2", error_stack2); - create_case(s, "error_set_null", error_set_null); - create_case(s, "error_duplicate_null", error_duplicate_null); - create_case(s, "error_duplicate", error_duplicate); - - return s; -} - -int main(void) -{ - int nf; - - Suite *s = error_suite(); - - SRunner *sr; - sr = srunner_create(s); - - srunner_run_all(sr, CK_NORMAL); - nf = srunner_ntests_failed(sr); - srunner_free(sr); - return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE; -} Modified: trunk/tests/client-tests/check_client.c ============================================================================== --- trunk/tests/client-tests/check_client.c Sun Jan 11 20:10:17 2009 (r5116) +++ trunk/tests/client-tests/check_client.c Sun Jan 11 22:01:22 2009 (r5117) @@ -187,28 +187,9 @@ } END_TEST -Suite *client_suite(void) -{ - Suite *s = suite_create("Client"); -// Suite *s2 = suite_create("Client"); - - create_case(s, "client_new", client_new); - create_case(s, "client_pipes", client_pipes); - create_case(s, "client_run", client_run); - - return s; -} - -int main(void) -{ - int nf; +OSYNC_TESTCASE_START("client") +OSYNC_TESTCASE_ADD(client_new) +OSYNC_TESTCASE_ADD(client_pipes) +OSYNC_TESTCASE_ADD(client_run) +OSYNC_TESTCASE_END - Suite *s = client_suite(); - - SRunner *sr; - sr = srunner_create(s); - srunner_run_all(sr, CK_VERBOSE); - nf = srunner_ntests_failed(sr); - srunner_free(sr); - return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE; -} Modified: trunk/tests/data-tests/check_data.c ============================================================================== --- trunk/tests/data-tests/check_data.c Sun Jan 11 20:10:17 2009 (r5116) +++ trunk/tests/data-tests/check_data.c Sun Jan 11 22:01:22 2009 (r5117) @@ -189,33 +189,12 @@ } END_TEST -Suite *data_suite(void) -{ - Suite *s = suite_create("Data"); -// Suite *s2 = suite_create("Data"); - - create_case(s, "data_new", data_new); - create_case(s, "data_new_with_data", data_new_with_data); - create_case(s, "data_set_data", data_set_data); - create_case(s, "data_set_data2", data_set_data2); - create_case(s, "data_objformat", data_objformat); - create_case(s, "data_objtype", data_objtype); - - /* OSyncData *osync_data_clone(OSyncData *data, OSyncError **error); */ - - return s; -} - -int main(void) -{ - int nf; +OSYNC_TESTCASE_START("data") +OSYNC_TESTCASE_ADD(data_new) +OSYNC_TESTCASE_ADD(data_new_with_data) +OSYNC_TESTCASE_ADD(data_set_data) +OSYNC_TESTCASE_ADD(data_set_data2) +OSYNC_TESTCASE_ADD(data_objformat) +OSYNC_TESTCASE_ADD(data_objtype) +OSYNC_TESTCASE_END - Suite *s = data_suite(); - - SRunner *sr; - sr = srunner_create(s); - srunner_run_all(sr, CK_VERBOSE); - nf = srunner_ntests_failed(sr); - srunner_free(sr); - return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE; -} Modified: trunk/tests/format-tests/check_conv.c ============================================================================== --- trunk/tests/format-tests/check_conv.c Sun Jan 11 20:10:17 2009 (r5116) +++ trunk/tests/format-tests/check_conv.c Sun Jan 11 22:01:22 2009 (r5117) @@ -2450,55 +2450,10 @@ END_TEST -Suite *format_env_suite(void) -{ - Suite *s = suite_create("Format-Env"); - //Suite *s2 = suite_create("Format-Env"); - - create_case(s, "conv_env_create", conv_env_create); - - create_case(s, "conv_env_register_objformat", conv_env_register_objformat); - create_case(s, "conv_env_register_objformat_count", conv_env_register_objformat_count); - create_case(s, "conv_env_objformat_find", conv_env_objformat_find); - create_case(s, "conv_env_objformat_find_false", conv_env_objformat_find_false); - - create_case(s, "conv_env_register_converter", conv_env_register_converter); - create_case(s, "conv_env_register_converter_count", conv_env_register_converter_count); - create_case(s, "conv_env_converter_find", conv_env_converter_find); - create_case(s, "conv_env_converter_find_false", conv_env_converter_find_false); - - create_case(s, "conv_env_register_filter", conv_env_register_filter); - create_case(s, "conv_env_register_filter_count", conv_env_register_filter_count); - - create_case(s, "conv_find_path", conv_find_path); - create_case(s, "conv_find_path2", conv_find_path2); - create_case(s, "conv_find_path_false", conv_find_path_false); - create_case(s, "conv_find_multi_path", conv_find_multi_path); - create_case(s, "conv_find_multi_path_with_preferred", conv_find_multi_path_with_preferred); - create_case(s, "conv_find_circular_false", conv_find_circular_false); - create_case(s, "conv_find_complex", conv_find_complex); - - create_case(s, "conv_find_multi_target", conv_find_multi_target); - create_case(s, "conv_find_multi_target2", conv_find_multi_target2); - create_case(s, "conv_find_multi_path_multi_target", conv_find_multi_path_multi_target); - create_case(s, "conv_find_multi_path_multi_target_with_preferred", conv_find_multi_path_multi_target_with_preferred); - // Gone? //create_case(s, "conv_env_osp_circular_false", conv_env_osp_circular_false); //create_case(s, "conv_env_osp_complex", conv_env_osp_complex); - create_case(s, "conv_env_convert1", conv_env_convert1); - create_case(s, "conv_env_convert_back", conv_env_convert_back); - create_case(s, "conv_env_convert_desenc", conv_env_convert_desenc); - - create_case(s, "conv_env_convert_desenc_complex", conv_env_convert_desenc_complex); - create_case(s, "conv_env_detect_and_convert", conv_env_detect_and_convert); - create_case(s, "conv_prefer_not_desencap", conv_prefer_not_desencap); - create_case(s, "conv_prefer_same_objtype", conv_prefer_same_objtype); - create_case(s, "conv_prefer_not_lossy_objtype_change", conv_prefer_not_lossy_objtype_change); - create_case(s, "conv_env_detect_false", conv_env_detect_false); - create_case(s, "conv_env_decap_and_detect", conv_env_decap_and_detect); - create_case(s, "conv_env_decap_and_detect2", conv_env_decap_and_detect2); /* * osync_bool osync_format_env_load_plugins(OSyncFormatEnv *env, const char *path, OSyncError **error); @@ -2512,21 +2467,48 @@ OSyncFormatConverterPath *osync_format_env_find_path_formats(OSyncFormatEnv *env, OSyncObjFormat *sourceformat, OSyncObjFormat **targets, OSyncError **error); * */ - - return s; -} - -int main(void) -{ - int nf; - - Suite *s = format_env_suite(); - - SRunner *sr; - sr = srunner_create(s); - - srunner_run_all(sr, CK_VERBOSE); - nf = srunner_ntests_failed(sr); - srunner_free(sr); - return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE; -} + + +OSYNC_TESTCASE_START("format-env") +OSYNC_TESTCASE_ADD(conv_env_create) + +OSYNC_TESTCASE_ADD(conv_env_register_objformat) +OSYNC_TESTCASE_ADD(conv_env_register_objformat_count) +OSYNC_TESTCASE_ADD(conv_env_objformat_find) +OSYNC_TESTCASE_ADD(conv_env_objformat_find_false) + +OSYNC_TESTCASE_ADD(conv_env_register_converter) +OSYNC_TESTCASE_ADD(conv_env_register_converter_count) +OSYNC_TESTCASE_ADD(conv_env_converter_find) +OSYNC_TESTCASE_ADD(conv_env_converter_find_false) + +OSYNC_TESTCASE_ADD(conv_env_register_filter) +OSYNC_TESTCASE_ADD(conv_env_register_filter_count) + +OSYNC_TESTCASE_ADD(conv_find_path) +OSYNC_TESTCASE_ADD(conv_find_path2) +OSYNC_TESTCASE_ADD(conv_find_path_false) +OSYNC_TESTCASE_ADD(conv_find_multi_path) +OSYNC_TESTCASE_ADD(conv_find_multi_path_with_preferred) +OSYNC_TESTCASE_ADD(conv_find_circular_false) +OSYNC_TESTCASE_ADD(conv_find_complex) + +OSYNC_TESTCASE_ADD(conv_find_multi_target) +OSYNC_TESTCASE_ADD(conv_find_multi_target2) +OSYNC_TESTCASE_ADD(conv_find_multi_path_multi_target) +OSYNC_TESTCASE_ADD(conv_find_multi_path_multi_target_with_preferred) + +OSYNC_TESTCASE_ADD(conv_env_convert1) +OSYNC_TESTCASE_ADD(conv_env_convert_back) +OSYNC_TESTCASE_ADD(conv_env_convert_desenc) + +OSYNC_TESTCASE_ADD(conv_env_convert_desenc_complex) +OSYNC_TESTCASE_ADD(conv_env_detect_and_convert) +OSYNC_TESTCASE_ADD(conv_prefer_not_desencap) +OSYNC_TESTCASE_ADD(conv_prefer_same_objtype) +OSYNC_TESTCASE_ADD(conv_prefer_not_lossy_objtype_change) +OSYNC_TESTCASE_ADD(conv_env_detect_false) +OSYNC_TESTCASE_ADD(conv_env_decap_and_detect) +OSYNC_TESTCASE_ADD(conv_env_decap_and_detect2) +OSYNC_TESTCASE_END + Modified: trunk/tests/format-tests/check_converter.c ============================================================================== --- trunk/tests/format-tests/check_converter.c Sun Jan 11 20:10:17 2009 (r5116) +++ trunk/tests/format-tests/check_converter.c Sun Jan 11 22:01:22 2009 (r5117) @@ -707,46 +707,26 @@ } END_TEST -Suite *converter_suite(void) -{ - Suite *s = suite_create("Converter"); - //Suite *s2 = suite_create("Converter"); - - create_case(s, "converter_create", converter_create); - create_case(s, "converter_get", converter_get); - create_case(s, "converter_create_decap", converter_create_decap); - create_case(s, "converter_create_detector", converter_create_detector); - create_case(s, "converter_matches", converter_matches); - create_case(s, "converter_detect", converter_detect); - create_case(s, "converter_detector_invoke", converter_detector_invoke); - create_case(s, "converter_detect_non_detector", converter_detect_non_detector); - - create_case(s, "converter_conv_invoke", converter_conv_invoke); - create_case(s, "converter_decap_invoke", converter_decap_invoke); - create_case(s, "converter_encap_invoke", converter_encap_invoke); - - create_case(s, "converter_conv_invoke_const", converter_conv_invoke_const); - create_case(s, "converter_decap_invoke_const", converter_decap_invoke_const); - create_case(s, "converter_encap_invoke_const", converter_encap_invoke_const); - - create_case(s, "converter_path_create", converter_path_create); - create_case(s, "converter_path_add", converter_path_add); - create_case(s, "converter_config", converter_config); - - return s; -} +OSYNC_TESTCASE_START("converter") +OSYNC_TESTCASE_ADD(converter_create) +OSYNC_TESTCASE_ADD(converter_get) +OSYNC_TESTCASE_ADD(converter_create_decap) +OSYNC_TESTCASE_ADD(converter_create_detector) +OSYNC_TESTCASE_ADD(converter_matches) +OSYNC_TESTCASE_ADD(converter_detect) +OSYNC_TESTCASE_ADD(converter_detector_invoke) +OSYNC_TESTCASE_ADD(converter_detect_non_detector) -int main(void) -{ - int nf; - - Suite *s = converter_suite(); - - SRunner *sr; - sr = srunner_create(s); +OSYNC_TESTCASE_ADD(converter_conv_invoke) +OSYNC_TESTCASE_ADD(converter_decap_invoke) +OSYNC_TESTCASE_ADD(converter_encap_invoke) + +OSYNC_TESTCASE_ADD(converter_conv_invoke_const) +OSYNC_TESTCASE_ADD(converter_decap_invoke_const) +OSYNC_TESTCASE_ADD(converter_encap_invoke_const) + +OSYNC_TESTCASE_ADD(converter_path_create) +OSYNC_TESTCASE_ADD(converter_path_add) +OSYNC_TESTCASE_ADD(converter_config) +OSYNC_TESTCASE_END - srunner_run_all(sr, CK_VERBOSE); - nf = srunner_ntests_failed(sr); - srunner_free(sr); - return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE; -} Modified: trunk/tests/format-tests/check_detect.c ============================================================================== --- trunk/tests/format-tests/check_detect.c Sun Jan 11 20:10:17 2009 (r5116) +++ trunk/tests/format-tests/check_detect.c Sun Jan 11 22:01:22 2009 (r5117) @@ -10,7 +10,7 @@ return FALSE; } -START_TEST (conv_env_detect_smart) +START_TEST (detect_smart) { OSyncError *error = NULL; @@ -40,7 +40,7 @@ } END_TEST -START_TEST (conv_env_detect_different_objtype) +START_TEST (detect_different_objtype) { OSyncError *error = NULL; @@ -72,7 +72,7 @@ END_TEST -START_TEST (conv_env_detect_smart_no) +START_TEST (detect_smart_no) { OSyncError *error = NULL; @@ -102,28 +102,9 @@ } END_TEST -Suite *env_suite(void) -{ - Suite *s = suite_create("Detect"); - - create_case(s, "conv_env_detect_smart", conv_env_detect_smart); - create_case(s, "conv_env_detect_different_objtype", conv_env_detect_different_objtype); - create_case(s, "conv_env_detect_smart_no", conv_env_detect_smart_no); +OSYNC_TESTCASE_START("detect") +OSYNC_TESTCASE_ADD(detect_smart) +OSYNC_TESTCASE_ADD(detect_different_objtype) +OSYNC_TESTCASE_ADD(detect_smart_no) +OSYNC_TESTCASE_END - return s; -} - -int main(void) -{ - int nf; - - Suite *s = env_suite(); - - SRunner *sr; - sr = srunner_create(s); - - srunner_run_all(sr, CK_VERBOSE); - nf = srunner_ntests_failed(sr); - srunner_free(sr); - return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE; -} Modified: trunk/tests/sync-tests/check_filter.c ============================================================================== --- trunk/tests/sync-tests/check_filter.c Sun Jan 11 20:10:17 2009 (r5116) +++ trunk/tests/sync-tests/check_filter.c Sun Jan 11 22:01:22 2009 (r5117) @@ -446,31 +446,12 @@ } END_TEST*/ -Suite *filter_suite(void) -{ - Suite *s = suite_create("Filter"); - //Suite *s2 = suite_create("Filter"); - - create_case(s, "filter_setup", filter_setup); - create_case(s, "filter_sync_deny_all", filter_sync_deny_all); - create_case(s, "filter_sync_custom", filter_sync_custom); - create_case(s, "filter_save_and_load", filter_save_and_load); - //create_case(s, "filter_sync_vcard_only", filter_sync_vcard_only); // TODO, see testcase description - create_case(s, "filter_destobjtype_delete", filter_destobjtype_delete); - - return s; -} - -int main(void) -{ - int nf; +OSYNC_TESTCASE_START("filter") +OSYNC_TESTCASE_ADD(filter_setup) +OSYNC_TESTCASE_ADD(filter_sync_deny_all) +OSYNC_TESTCASE_ADD(filter_sync_custom) +OSYNC_TESTCASE_ADD(filter_save_and_load) +/* TODO: Port OSYNC_TESTCASE_ADD(filter_sync_vcard_only) */ +OSYNC_TESTCASE_ADD(filter_destobjtype_delete) +OSYNC_TESTCASE_END - Suite *s = filter_suite(); - - SRunner *sr; - sr = srunner_create(s); - srunner_run_all(sr, CK_VERBOSE); - nf = srunner_ntests_failed(sr); - srunner_free(sr); - return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE; -} |
|
From: <dg...@su...> - 2009-01-11 19:10:59
|
Author: dgollub Date: Sun Jan 11 20:10:17 2009 New Revision: 5116 URL: http://www.opensync.org/changeset/5116 Log: More heavy trace instrumentation to track where a xmlfield differes. Modified: format-plugins/xmlformat/trunk/src/xmlformat_compare.c Modified: format-plugins/xmlformat/trunk/src/xmlformat_compare.c ============================================================================== --- format-plugins/xmlformat/trunk/src/xmlformat_compare.c Sun Jan 11 19:05:32 2009 (r5115) +++ format-plugins/xmlformat/trunk/src/xmlformat_compare.c Sun Jan 11 20:10:17 2009 (r5116) @@ -119,6 +119,7 @@ } if(key1 == NULL || key2 == NULL) { + osync_trace(TRACE_INTERNAL, "At least one key is empty. key1:%p key2:%p", key1, key2); same = FALSE; break; } @@ -146,7 +147,7 @@ /* both lists must have the same length */ if(g_slist_length(keylist1) != g_slist_length(keylist2)) { - osync_trace(TRACE_INTERNAL, "It's not the same anymore..."); + osync_trace(TRACE_INTERNAL, "It's not the same anymore. Differnt list length."); same = FALSE; break; } @@ -160,6 +161,7 @@ break; cur_list2 = g_slist_next(cur_list2); if(cur_list2 == NULL) { + osync_trace(TRACE_INTERNAL, "Run out of list2 elements. Different."); same = FALSE; break; } @@ -191,6 +193,7 @@ if(i1 != i2) { same = FALSE; + osync_trace(TRACE_INTERNAL, "Attribute count different: %d != %d\n", i1, i2); break; } @@ -198,6 +201,15 @@ const char *attrvalue = osync_xmlfield_get_attr(xmlfield2, osync_xmlfield_get_nth_attr_name(xmlfield1, i)); if( attrvalue == NULL || strcmp(attrvalue, osync_xmlfield_get_nth_attr_value(xmlfield1, i))) { + osync_trace(TRACE_INTERNAL, "Attribute mismatch (%s/%s)", + __NULLSTR(osync_xmlfield_get_nth_attr_name(xmlfield1, i)), + __NULLSTR(osync_xmlfield_get_nth_attr_name(xmlfield2, i))); + osync_trace(TRACE_SENSITIVE, "Attribute mismatch values\n" + "xmlfield1: %s\n" + "xmlfield2: %s\n", + __NULLSTR(osync_xmlfield_get_nth_attr_value(xmlfield1, i)), + __NULLSTR(osync_xmlfield_get_nth_attr_value(xmlfield2, i))); + same = FALSE; break; } |
|
From: <dg...@su...> - 2009-01-11 18:06:10
|
Author: dgollub Date: Sun Jan 11 19:05:32 2009 New Revision: 5115 URL: http://www.opensync.org/changeset/5115 Log: Reverted directory creation due to BUILDROOT issues svn merge -r 5114:5113 . Modified: trunk/CMakeLists.txt Modified: trunk/CMakeLists.txt ============================================================================== --- trunk/CMakeLists.txt Sun Jan 11 18:51:52 2009 (r5114) +++ trunk/CMakeLists.txt Sun Jan 11 19:05:32 2009 (r5115) @@ -136,16 +136,6 @@ ########## INSTALL ############################## INSTALL( FILES "${CMAKE_CURRENT_BINARY_DIR}/libopensync.pc" DESTINATION ${LIBDATA_INSTALL_DIR}/pkgconfig/ ) -FILE( MAKE_DIRECTORY - ${OPENSYNC_PLUGINDIR} - ${OPENSYNC_FORMATSDIR} - ${OPENSYNC_PYTHON_PLUGINDIR} - ${OPENSYNC_CAPABILITIESDIR} - ${OPENSYNC_CONFIGDIR} - ${OPENSYNC_DESCRIPTIONSDIR} - ${OPENSYNC_SCHEMASDIR} - ${OPENSYNC_UPDATESDIR} - ) ### CPack ######################################## |
|
From: <dg...@su...> - 2009-01-11 17:52:33
|
Author: dgollub Date: Sun Jan 11 18:51:52 2009 New Revision: 5114 URL: http://www.opensync.org/changeset/5114 Log: Create all default direcotries inside the build environment. This hopefully makes packaging easier. Modified: trunk/CMakeLists.txt Modified: trunk/CMakeLists.txt ============================================================================== --- trunk/CMakeLists.txt Sun Jan 11 18:35:30 2009 (r5113) +++ trunk/CMakeLists.txt Sun Jan 11 18:51:52 2009 (r5114) @@ -136,6 +136,16 @@ ########## INSTALL ############################## INSTALL( FILES "${CMAKE_CURRENT_BINARY_DIR}/libopensync.pc" DESTINATION ${LIBDATA_INSTALL_DIR}/pkgconfig/ ) +FILE( MAKE_DIRECTORY + ${OPENSYNC_PLUGINDIR} + ${OPENSYNC_FORMATSDIR} + ${OPENSYNC_PYTHON_PLUGINDIR} + ${OPENSYNC_CAPABILITIESDIR} + ${OPENSYNC_CONFIGDIR} + ${OPENSYNC_DESCRIPTIONSDIR} + ${OPENSYNC_SCHEMASDIR} + ${OPENSYNC_UPDATESDIR} + ) ### CPack ######################################## |
|
From: <dg...@su...> - 2009-01-11 17:36:08
|
Author: henrik Date: Sun Jan 11 18:35:30 2009 New Revision: 5113 URL: http://www.opensync.org/changeset/5113 Log: Added Dart / CDash support Added: plugins/mozilla-sync/trunk/CTestConfig.cmake Modified: plugins/mozilla-sync/trunk/CMakeLists.txt Modified: plugins/mozilla-sync/trunk/CMakeLists.txt ============================================================================== --- plugins/mozilla-sync/trunk/CMakeLists.txt Sun Jan 11 18:27:21 2009 (r5112) +++ plugins/mozilla-sync/trunk/CMakeLists.txt Sun Jan 11 18:35:30 2009 (r5113) @@ -68,6 +68,7 @@ IF( ENABLE_TESTING ) MESSAGE( "TESTING ENABLED" ) ENABLE_TESTING() + INCLUDE( Dart ) FIND_PACKAGE( Check REQUIRED ) ADD_SUBDIRECTORY( tests ) ENDIF ( ENABLE_TESTING ) Added: plugins/mozilla-sync/trunk/CTestConfig.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ plugins/mozilla-sync/trunk/CTestConfig.cmake Sun Jan 11 18:35:30 2009 (r5113) @@ -0,0 +1,13 @@ +## This file should be placed in the root directory of your project. +## Then modify the CMakeLists.txt file in the root directory of your +## project to incorporate the testing dashboard. +## # The following are required to uses Dart and the Cdash dashboard +## ENABLE_TESTING() +## INCLUDE(Dart) +set(CTEST_PROJECT_NAME "mozilla-sync") +set(CTEST_NIGHTLY_START_TIME "00:00:00 CET") + +set(CTEST_DROP_METHOD "http") +set(CTEST_DROP_SITE "opensync.org") +set(CTEST_DROP_LOCATION "/testing/submit.php?project=mozilla-sync") +set(CTEST_DROP_SITE_CDASH TRUE) |
|
From: <dg...@su...> - 2009-01-11 17:27:59
|
Author: cstender Date: Sun Jan 11 18:27:21 2009 New Revision: 5112 URL: http://www.opensync.org/changeset/5112 Log: removed call to osync_format_env_detect_objformat_full because we don't get encapsulated formats in vconvert. Modified: format-plugins/vformat/tools/vconvert.c Modified: format-plugins/vformat/tools/vconvert.c ============================================================================== --- format-plugins/vformat/tools/vconvert.c Sun Jan 11 18:27:09 2009 (r5111) +++ format-plugins/vformat/tools/vconvert.c Sun Jan 11 18:27:21 2009 (r5112) @@ -316,21 +316,14 @@ goto error; } - // detect source and target xmlformat. First update the initial objformat. - // Then run decapsulator driven detection. + // detect source and target xmlformat sourceformat = osync_format_env_detect_objformat(format_env, data); if (sourceformat) osync_data_set_objformat(data, sourceformat); - sourceformat = osync_format_env_detect_objformat_full(format_env, data, &error); - if (sourceformat) - osync_data_set_objformat(data, sourceformat); - if (osync_error_is_set(&error)) goto error; - sourceformat = osync_data_get_objformat(data); - targetformat = conv_run_detection(format_env, osync_objformat_get_name(sourceformat), type); if (!targetformat) { goto error; |
|
From: <dg...@su...> - 2009-01-11 17:27:50
|
Author: dgollub Date: Sun Jan 11 18:27:09 2009 New Revision: 5111 URL: http://www.opensync.org/changeset/5111 Log: Testcase for #1021 But not reproducible on my development platform. Added: format-plugins/xmlformat/trunk/tests/data/compare/ format-plugins/xmlformat/trunk/tests/data/compare/contact1.xml format-plugins/xmlformat/trunk/tests/data/compare/contact2.xml Modified: format-plugins/xmlformat/trunk/src/xmlformat.c format-plugins/xmlformat/trunk/src/xmlformat.h format-plugins/xmlformat/trunk/tests/check_xmlformat.c Modified: format-plugins/xmlformat/trunk/src/xmlformat.c ============================================================================== --- format-plugins/xmlformat/trunk/src/xmlformat.c Sun Jan 11 18:24:41 2009 (r5110) +++ format-plugins/xmlformat/trunk/src/xmlformat.c Sun Jan 11 18:27:09 2009 (r5111) @@ -125,7 +125,7 @@ } -static OSyncConvCmpResult compare_contact(const char *leftdata, unsigned int leftsize, const char *rightdata, unsigned int rightsize, void *userdata) +OSyncConvCmpResult compare_contact(const char *leftdata, unsigned int leftsize, const char *rightdata, unsigned int rightsize, void *userdata) { char* keys_content[] = {"Content", NULL}; char* keys_name[] = {"FirstName", "LastName", NULL}; Modified: format-plugins/xmlformat/trunk/src/xmlformat.h ============================================================================== --- format-plugins/xmlformat/trunk/src/xmlformat.h Sun Jan 11 18:24:41 2009 (r5110) +++ format-plugins/xmlformat/trunk/src/xmlformat.h Sun Jan 11 18:27:09 2009 (r5111) @@ -75,5 +75,7 @@ osync_bool marshal_xmlformat(const char *input, unsigned int inpsize, OSyncMarshal *marshal, void *userdata, OSyncError **error); osync_bool demarshal_xmlformat(OSyncMarshal *marshal, char **output, unsigned int *outpsize, void *userdata, OSyncError **error); +OSyncConvCmpResult compare_contact(const char *leftdata, unsigned int leftsize, const char *rightdata, unsigned int rightsize, void *userdata); + #endif /* XMLFORMAT_H_ */ Modified: format-plugins/xmlformat/trunk/tests/check_xmlformat.c ============================================================================== --- format-plugins/xmlformat/trunk/tests/check_xmlformat.c Sun Jan 11 18:24:41 2009 (r5110) +++ format-plugins/xmlformat/trunk/tests/check_xmlformat.c Sun Jan 11 18:27:09 2009 (r5111) @@ -238,6 +238,50 @@ } END_TEST +START_TEST (xmlformat_compare_ticket1021) +{ + char *testbed = setup_testbed("compare"); + + char *buffer1; + char *buffer2; + unsigned int size1; + unsigned int size2; + OSyncError *error = NULL; + OSyncConvCmpResult result; + + + fail_unless(osync_file_read( "contact1.xml", &buffer1, &size1, &error), NULL); + + OSyncXMLFormat *xmlformat1 = osync_xmlformat_parse(buffer1, size1, &error); + fail_unless(xmlformat1 != NULL, NULL); + fail_unless(error == NULL, NULL); + + fail_unless(osync_file_read( "contact2.xml", &buffer2, &size2, &error), NULL); + + OSyncXMLFormat *xmlformat2 = osync_xmlformat_parse(buffer2, size2, &error); + fail_unless(xmlformat2 != NULL, NULL); + fail_unless(error == NULL, NULL); + + g_free(buffer1); + g_free(buffer2); + + result = compare_contact((char*)xmlformat1, osync_xmlformat_size(), + (char*)xmlformat2, osync_xmlformat_size(), NULL); + fail_unless(result == OSYNC_CONV_DATA_SAME, NULL); + + result = compare_contact((char*)xmlformat2, osync_xmlformat_size(), + (char*)xmlformat1, osync_xmlformat_size(), NULL); + fail_unless(result == OSYNC_CONV_DATA_SAME, NULL); + + + osync_xmlformat_unref((OSyncXMLFormat*)xmlformat1); + osync_xmlformat_unref((OSyncXMLFormat*)xmlformat2); + + destroy_testbed(testbed); +} +END_TEST + + START_TEST (xmlformat_marshal) { char *testbed = setup_testbed("xmlformats"); @@ -309,6 +353,7 @@ create_case(s, "xmlformat_compare_test", xmlformat_compare_test); create_case(s, "xmlformat_compare_field2null", xmlformat_compare_field2null); create_case(s, "xmlformat_compare_ignore_fields", xmlformat_compare_ignore_fields); + create_case(s, "xmlformat_compare_ticket1021", xmlformat_compare_ticket1021); create_case(s, "xmlformat_marshal", xmlformat_marshal); create_case(s, "xmlformat_demarshal", xmlformat_demarshal); Added: format-plugins/xmlformat/trunk/tests/data/compare/contact1.xml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ format-plugins/xmlformat/trunk/tests/data/compare/contact1.xml Sun Jan 11 18:27:09 2009 (r5111) @@ -0,0 +1,16 @@ +<?xml version="1.0"?> +<contact> + <FormattedName> + <Content>ffffffffff llllllllll</Content> + </FormattedName> + <Name> + <LastName>llllllllll</LastName> + <FirstName>ffffffffff</FirstName> + </Name> + <Telephone Location="Home"> + <Content>hhhhhhhhhh</Content> + </Telephone> + <Telephone Location="Work"> + <Content>wwwwwwwwww</Content> + </Telephone> +</contact> Added: format-plugins/xmlformat/trunk/tests/data/compare/contact2.xml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ format-plugins/xmlformat/trunk/tests/data/compare/contact2.xml Sun Jan 11 18:27:09 2009 (r5111) @@ -0,0 +1,16 @@ +<?xml version="1.0"?> +<contact> + <FormattedName> + <Content>ffffffffff llllllllll</Content> + </FormattedName> + <Name> + <LastName>llllllllll</LastName> + <FirstName>ffffffffff</FirstName> + </Name> + <Telephone Location="Home"> + <Content>hhhhhhhhhh</Content> + </Telephone> + <Telephone Location="Work"> + <Content>wwwwwwwwww</Content> + </Telephone> +</contact> |
|
From: <dg...@su...> - 2009-01-11 17:25:27
|
Author: cstender Date: Sun Jan 11 18:24:41 2009 New Revision: 5110 URL: http://www.opensync.org/changeset/5110 Log: added plain to xmlformat-*-doc detector which allows vconvert to convert from xmlformat-* to v* again. This got broken with commit 5007. Modified: format-plugins/xmlformat/trunk/src/xmlformat-doc.c Modified: format-plugins/xmlformat/trunk/src/xmlformat-doc.c ============================================================================== --- format-plugins/xmlformat/trunk/src/xmlformat-doc.c Sun Jan 11 17:19:57 2009 (r5109) +++ format-plugins/xmlformat/trunk/src/xmlformat-doc.c Sun Jan 11 18:24:41 2009 (r5110) @@ -143,12 +143,22 @@ OSyncObjFormat *fromformat = osync_format_env_find_objformat(env, fromname); OSyncObjFormat *toformat = osync_format_env_find_objformat(env, toname); + OSyncObjFormat *plain = osync_format_env_find_objformat(env, "plain"); if (!fromformat || !toformat) { osync_trace(TRACE_ERROR, "Unable to register converter for %s->%s, format not found\n", fromname, toname); return FALSE; } + /* Install detector if plain is available */ + if (plain) { + conv = osync_converter_new_detector(plain, fromformat, detect_func, &error); + if (!conv) + return FALSE; + osync_format_env_register_converter(env, conv); + osync_converter_unref(conv); + } + /* Converters */ conv = osync_converter_new(OSYNC_CONVERTER_CONV, fromformat, toformat, to_xml, &error); if (!conv) { |
|
From: <dg...@su...> - 2009-01-11 16:20:36
|
Author: bricks Date: Sun Jan 11 17:19:57 2009 New Revision: 5109 URL: http://www.opensync.org/changeset/5109 Log: Changed osync_plugin_initialize to return osync_bool Now plugins don't have to return any data in their initialize function Modified: trunk/opensync/client/opensync_client.c trunk/opensync/plugin/opensync_plugin.c trunk/opensync/plugin/opensync_plugin.h trunk/tests/mock-plugin/mock_sync.c trunk/tests/support.c trunk/tests/sync-tests/check_sync_error.c trunk/tools/osyncplugin.c trunk/wrapper/opensync-plugin.i Modified: trunk/opensync/client/opensync_client.c ============================================================================== --- trunk/opensync/client/opensync_client.c Sun Jan 11 17:14:51 2009 (r5108) +++ trunk/opensync/client/opensync_client.c Sun Jan 11 17:19:57 2009 (r5109) @@ -573,6 +573,7 @@ OSyncList *o = NULL; OSyncObjFormatSink *format_sink = NULL; unsigned int n, num_sinks; + osync_bool couldinit; osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, client, message, error); @@ -685,9 +686,9 @@ } } - client->plugin_data = osync_plugin_initialize(client->plugin, client->plugin_info, error); - if (!client->plugin_data) { - if (!*error) + couldinit = osync_plugin_initialize(client->plugin, &(client->plugin_data), client->plugin_info, error); + if (!couldinit) { + if (!osync_error_is_set(error)) osync_error_set(error, OSYNC_ERROR_GENERIC, "Plugin \"%s\" failed to initialize but gave no reason", pluginname); goto error; } Modified: trunk/opensync/plugin/opensync_plugin.c ============================================================================== --- trunk/opensync/plugin/opensync_plugin.c Sun Jan 11 17:14:51 2009 (r5108) +++ trunk/opensync/plugin/opensync_plugin.c Sun Jan 11 17:19:57 2009 (r5109) @@ -167,10 +167,24 @@ plugin->discover = discover; } -void *osync_plugin_initialize(OSyncPlugin *plugin, OSyncPluginInfo *info, OSyncError **error) +osync_bool osync_plugin_initialize(OSyncPlugin *plugin, void **plugin_data, OSyncPluginInfo *info, OSyncError **error) { osync_assert(plugin); - return plugin->initialize(plugin, info, error); + osync_assert(plugin_data); + + osync_return_val_if_fail_and_set_error(plugin, FALSE, error, OSYNC_ERROR_PARAMETER, "osync_plugin_initialize: plugin is null"); + osync_return_val_if_fail_and_set_error(plugin_data, FALSE, error, OSYNC_ERROR_PARAMETER, "osync_plugin_initialize: plugin_data is null"); + + /* Just return with FALSE, if no initialize function is registered */ + osync_return_val_if_fail_and_set_error(plugin->initialize, FALSE, error, OSYNC_ERROR_INITIALIZATION, "plugin %s has no plugin initialize function", osync_plugin_get_name(plugin) ); + + void *data = plugin->initialize(plugin, info, error); + if (osync_error_is_set(error)) { + return FALSE; + } + *plugin_data = data; + + return TRUE; } void osync_plugin_finalize(OSyncPlugin *plugin, void *data) Modified: trunk/opensync/plugin/opensync_plugin.h ============================================================================== --- trunk/opensync/plugin/opensync_plugin.h Sun Jan 11 17:14:51 2009 (r5108) +++ trunk/opensync/plugin/opensync_plugin.h Sun Jan 11 17:19:57 2009 (r5109) @@ -273,7 +273,7 @@ * @param error Pointer to error-struct * @return Userdata returned by the plugin on success, NULL on error */ -OSYNC_EXPORT void *osync_plugin_initialize(OSyncPlugin *plugin, OSyncPluginInfo *info, OSyncError **error); +OSYNC_EXPORT osync_bool osync_plugin_initialize(OSyncPlugin *plugin, void **plugin_data, OSyncPluginInfo *info, OSyncError **error); /** @brief Finalize Plugin * Modified: trunk/tests/mock-plugin/mock_sync.c ============================================================================== --- trunk/tests/mock-plugin/mock_sync.c Sun Jan 11 17:14:51 2009 (r5108) +++ trunk/tests/mock-plugin/mock_sync.c Sun Jan 11 17:19:57 2009 (r5109) @@ -566,7 +566,7 @@ osync_trace(TRACE_ENTRY, "%s(%p, %p)", __func__, info, error); if (mock_get_error(info->memberid, "INIT_NULL_NOERROR")) { - osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(error)); + osync_trace(TRACE_EXIT, "%s: %s", __func__, "Everything is fine. I don't need plugin userdata."); return NULL; } Modified: trunk/tests/support.c ============================================================================== --- trunk/tests/support.c Sun Jan 11 17:14:51 2009 (r5108) +++ trunk/tests/support.c Sun Jan 11 17:19:57 2009 (r5109) @@ -58,6 +58,7 @@ g_unsetenv("CONNECT_TIMEOUT"); g_unsetenv("CONNECT_SLOWSYNC"); g_unsetenv("INIT_NULL"); + g_unsetenv("INIT_NULL_NOERROR"); g_unsetenv("GET_CHANGES_ERROR"); g_unsetenv("GET_CHANGES_TIMEOUT"); g_unsetenv("GET_CHANGES_TIMEOUT2"); Modified: trunk/tests/sync-tests/check_sync_error.c ============================================================================== --- trunk/tests/sync-tests/check_sync_error.c Sun Jan 11 17:14:51 2009 (r5108) +++ trunk/tests/sync-tests/check_sync_error.c Sun Jan 11 17:19:57 2009 (r5109) @@ -32,8 +32,8 @@ osync_engine_set_memberstatus_callback(engine, member_status, GINT_TO_POINTER(1)); - fail_unless(!osync_engine_initialize(engine, &error), NULL); - fail_unless(error != NULL, NULL); + fail_unless(osync_engine_initialize(engine, &error), NULL); + fail_unless(error == NULL, NULL); osync_engine_unref(engine); g_free(formatdir); Modified: trunk/tools/osyncplugin.c ============================================================================== --- trunk/tools/osyncplugin.c Sun Jan 11 17:14:51 2009 (r5108) +++ trunk/tools/osyncplugin.c Sun Jan 11 17:19:57 2009 (r5109) @@ -450,7 +450,9 @@ static void *plugin_initialize(OSyncError **error) { unsigned int n, num_sinks = osync_plugin_info_num_objtypes(plugin_info); - void *plugin_data = osync_plugin_initialize(plugin, plugin_info, error); + void *plugin_data; + osync_bool couldinit; + couldinit = osync_plugin_initialize(plugin, &(plugin_data), plugin_info, error); for (n = 0; n < num_sinks; n++) { Modified: trunk/wrapper/opensync-plugin.i ============================================================================== --- trunk/wrapper/opensync-plugin.i Sun Jan 11 17:14:51 2009 (r5108) +++ trunk/wrapper/opensync-plugin.i Sun Jan 11 17:19:57 2009 (r5109) @@ -59,9 +59,9 @@ osync_plugin_set_config_type(self, config_type); } - void *initialize(PluginInfo *info) { + osync_bool initialize(PluginInfo *info, void **plugin_data) { Error *err = NULL; - void *ret = osync_plugin_initialize(self, info, &err); + osync_bool ret = osync_plugin_initialize(self, plugin_data, info, &err); raise_exception_on_error(err); return ret; } |
|
From: <dg...@su...> - 2009-01-11 16:15:28
|
Author: dgollub Date: Sun Jan 11 17:14:51 2009 New Revision: 5108 URL: http://www.opensync.org/changeset/5108 Log: Fix typo in testcase name. Modified: trunk/tests/CMakeLists.txt Modified: trunk/tests/CMakeLists.txt ============================================================================== --- trunk/tests/CMakeLists.txt Sun Jan 11 17:11:44 2009 (r5107) +++ trunk/tests/CMakeLists.txt Sun Jan 11 17:14:51 2009 (r5108) @@ -57,7 +57,7 @@ OSYNC_TESTCASE( engine-error engine_error_dual_get_changes_error) OSYNC_TESTCASE( engine-error engine_error_two_of_three_get_changes_error) OSYNC_TESTCASE( engine-error engine_error_one_of_three_get_changes_error) -OSYNC_TESTCASE( engine-error engine_error_one_of_three_get_changes_timeouteout) +OSYNC_TESTCASE( engine-error engine_error_one_of_three_get_changes_timeout) OSYNC_TESTCASE( engine-error engine_error_get_changes_timeout_and_error) OSYNC_TESTCASE_DISABLED( engine-error engine_error_get_changes_timeout_sleep "1030") OSYNC_TESTCASE( engine-error engine_error_single_commit_error) |
|
From: <dg...@su...> - 2009-01-11 16:12:26
|
Author: dgollub Date: Sun Jan 11 17:11:44 2009 New Revision: 5107 URL: http://www.opensync.org/changeset/5107 Log: Ported mapping and mapping_engine unittest to OSYNC_TESTCASE macros. Modified: trunk/tests/CMakeLists.txt trunk/tests/engine-tests/check_mapping_engine.c trunk/tests/mapping-tests/check_mapping.c Modified: trunk/tests/CMakeLists.txt ============================================================================== --- trunk/tests/CMakeLists.txt Sun Jan 11 16:49:44 2009 (r5106) +++ trunk/tests/CMakeLists.txt Sun Jan 11 17:11:44 2009 (r5107) @@ -115,8 +115,14 @@ OSYNC_TESTCASE(ipc ipc_timeout) ENDIF (NOT WIN32) -ADD_CHECK_TEST( mapping mapping-tests/check_mapping.c ${TEST_TARGET_LIBRARIES} ) -ADD_CHECK_TEST( mapping_engine engine-tests/check_mapping_engine.c ${TEST_TARGET_LIBRARIES} ) +BUILD_CHECK_TEST( mapping mapping-tests/check_mapping.c ${TEST_TARGET_LIBRARIES} ) +OSYNC_TESTCASE(mapping mapping_new) +OSYNC_TESTCASE(mapping mapping_compare) + +BUILD_CHECK_TEST( mapping_engine engine-tests/check_mapping_engine.c ${TEST_TARGET_LIBRARIES} ) +OSYNC_TESTCASE(mapping_engine mapping_engine_same_similar_conflict) +OSYNC_TESTCASE(mapping_engine mapping_engine_same_similar_conflict_multi) + ADD_CHECK_TEST( member group-tests/check_member.c ${TEST_TARGET_LIBRARIES} ) ADD_CHECK_TEST( module module-tests/check_module.c ${TEST_TARGET_LIBRARIES} ) ADD_CHECK_TEST( multisync sync-tests/check_multisync.c ${TEST_TARGET_LIBRARIES} ) Modified: trunk/tests/engine-tests/check_mapping_engine.c ============================================================================== --- trunk/tests/engine-tests/check_mapping_engine.c Sun Jan 11 16:49:44 2009 (r5106) +++ trunk/tests/engine-tests/check_mapping_engine.c Sun Jan 11 17:11:44 2009 (r5107) @@ -174,29 +174,8 @@ END_TEST +OSYNC_TESTCASE_START("mapping_engine") +OSYNC_TESTCASE_ADD(mapping_engine_same_similar_conflict) +OSYNC_TESTCASE_ADD(mapping_engine_same_similar_conflict_multi) +OSYNC_TESTCASE_END -Suite *mapping_engine_suite(void) -{ - Suite *s = suite_create("MappingEngine"); - - create_case(s, "mapping_engine_same_similar_conflict", mapping_engine_same_similar_conflict); - create_case(s, "mapping_engine_same_similar_conflict_multi", mapping_engine_same_similar_conflict_multi); - - return s; -} - -int main(void) -{ - int nf; - - check_env(); - - Suite *s = mapping_engine_suite(); - - SRunner *sr; - sr = srunner_create(s); - srunner_run_all(sr, CK_VERBOSE); - nf = srunner_ntests_failed(sr); - srunner_free(sr); - return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE; -} Modified: trunk/tests/mapping-tests/check_mapping.c ============================================================================== --- trunk/tests/mapping-tests/check_mapping.c Sun Jan 11 16:49:44 2009 (r5106) +++ trunk/tests/mapping-tests/check_mapping.c Sun Jan 11 17:11:44 2009 (r5107) @@ -64,27 +64,8 @@ } END_TEST -Suite *client_suite(void) -{ - Suite *s = suite_create("Mapping"); -// Suite *s2 = suite_create("Mapping"); - - create_case(s, "mapping_new", mapping_new); - create_case(s, "mapping_compare", mapping_compare); - - return s; -} - -int main(void) -{ - int nf; +OSYNC_TESTCASE_START("mapping") +OSYNC_TESTCASE_ADD(mapping_new) +OSYNC_TESTCASE_ADD(mapping_compare) +OSYNC_TESTCASE_END - Suite *s = client_suite(); - - SRunner *sr; - sr = srunner_create(s); - srunner_run_all(sr, CK_VERBOSE); - nf = srunner_ntests_failed(sr); - srunner_free(sr); - return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE; -} |
|
From: <dg...@su...> - 2009-01-11 15:50:25
|
Author: dgollub Date: Sun Jan 11 16:49:44 2009 New Revision: 5106 URL: http://www.opensync.org/changeset/5106 Log: Port IPC unittest to OSYNC_TESTCASE macro. Disable ipc build for WIN32. The IPC code was heavy instrumented with #ifndef _WIN32 - so i completely disabled the windows build for now. Modified: trunk/tests/CMakeLists.txt trunk/tests/ipc-tests/check_ipc.c Modified: trunk/tests/CMakeLists.txt ============================================================================== --- trunk/tests/CMakeLists.txt Sun Jan 11 16:40:29 2009 (r5105) +++ trunk/tests/CMakeLists.txt Sun Jan 11 16:49:44 2009 (r5106) @@ -89,7 +89,32 @@ ADD_CHECK_TEST( group group-tests/check_group.c ${TEST_TARGET_LIBRARIES} ) ADD_CHECK_TEST( hash helper-tests/check_hash.c ${TEST_TARGET_LIBRARIES} ) ADD_CHECK_TEST( lock group-tests/check_lock.c ${TEST_TARGET_LIBRARIES} ) -ADD_CHECK_TEST( ipc ipc-tests/check_ipc.c ${TEST_TARGET_LIBRARIES} ) + +IF (NOT WIN32) +BUILD_CHECK_TEST( ipc ipc-tests/check_ipc.c ${TEST_TARGET_LIBRARIES} ) +OSYNC_TESTCASE(ipc ipc_new) +OSYNC_TESTCASE(ipc ipc_ref) +OSYNC_TESTCASE(ipc ipc_create) +OSYNC_TESTCASE(ipc ipc_connect) +OSYNC_TESTCASE(ipc ipc_payload) +OSYNC_TESTCASE(ipc ipc_payload_wait) +OSYNC_TESTCASE(ipc ipc_payload_stress) +OSYNC_TESTCASE(ipc ipc_payload_stress2) +OSYNC_TESTCASE(ipc ipc_large_payload) +OSYNC_TESTCASE(ipc ipc_error_no_pipe) +OSYNC_TESTCASE(ipc ipc_error_perm) +OSYNC_TESTCASE(ipc ipc_error_rem) +OSYNC_TESTCASE(ipc ipc_error_rem2) +OSYNC_TESTCASE(ipc ipc_loop_payload) +OSYNC_TESTCASE(ipc ipc_loop_stress) +OSYNC_TESTCASE(ipc ipc_loop_callback) +OSYNC_TESTCASE(ipc ipc_callback_break) +OSYNC_TESTCASE(ipc ipc_pipes) +OSYNC_TESTCASE(ipc ipc_pipes_stress) +OSYNC_TESTCASE(ipc ipc_callback_break_pipes) +OSYNC_TESTCASE(ipc ipc_timeout) +ENDIF (NOT WIN32) + ADD_CHECK_TEST( mapping mapping-tests/check_mapping.c ${TEST_TARGET_LIBRARIES} ) ADD_CHECK_TEST( mapping_engine engine-tests/check_mapping_engine.c ${TEST_TARGET_LIBRARIES} ) ADD_CHECK_TEST( member group-tests/check_member.c ${TEST_TARGET_LIBRARIES} ) Modified: trunk/tests/ipc-tests/check_ipc.c ============================================================================== --- trunk/tests/ipc-tests/check_ipc.c Sun Jan 11 16:40:29 2009 (r5105) +++ trunk/tests/ipc-tests/check_ipc.c Sun Jan 11 16:49:44 2009 (r5106) @@ -7,8 +7,6 @@ #include "opensync/ipc/opensync_message_internals.h" #include "opensync/ipc/opensync_queue_internals.h" -#ifndef _WIN32 - START_TEST (ipc_new) { char *testbed = setup_testbed(NULL); @@ -2261,55 +2259,31 @@ } END_TEST +OSYNC_TESTCASE_START("ipc") +OSYNC_TESTCASE_ADD(ipc_new) +OSYNC_TESTCASE_ADD(ipc_ref) +OSYNC_TESTCASE_ADD(ipc_create) +OSYNC_TESTCASE_ADD(ipc_connect) +OSYNC_TESTCASE_ADD(ipc_payload) +OSYNC_TESTCASE_ADD(ipc_payload_wait) +OSYNC_TESTCASE_ADD(ipc_payload_stress) +OSYNC_TESTCASE_ADD(ipc_payload_stress2) +OSYNC_TESTCASE_ADD(ipc_large_payload) + +OSYNC_TESTCASE_ADD(ipc_error_no_pipe) +OSYNC_TESTCASE_ADD(ipc_error_perm) +OSYNC_TESTCASE_ADD(ipc_error_rem) +OSYNC_TESTCASE_ADD(ipc_error_rem2) + +OSYNC_TESTCASE_ADD(ipc_loop_payload) +OSYNC_TESTCASE_ADD(ipc_loop_stress) +OSYNC_TESTCASE_ADD(ipc_loop_callback) +OSYNC_TESTCASE_ADD(ipc_callback_break) + +OSYNC_TESTCASE_ADD(ipc_pipes) +OSYNC_TESTCASE_ADD(ipc_pipes_stress) +OSYNC_TESTCASE_ADD(ipc_callback_break_pipes) -Suite *ipc_suite(void) -{ - Suite *s = suite_create("IPC"); -// Suite *s2 = suite_create("IPC"); - - create_case(s, "ipc_new", ipc_new); - create_case(s, "ipc_ref", ipc_ref); - create_case(s, "ipc_create", ipc_create); - create_case(s, "ipc_connect", ipc_connect); - create_case(s, "ipc_payload", ipc_payload); - create_case(s, "ipc_payload_wait", ipc_payload_wait); - create_case(s, "ipc_payload_stress", ipc_payload_stress); - create_case(s, "ipc_payload_stress2", ipc_payload_stress2); - create_case(s, "ipc_large_payload", ipc_large_payload); - - create_case(s, "ipc_error_no_pipe", ipc_error_no_pipe); - create_case(s, "ipc_error_perm", ipc_error_perm); - create_case(s, "ipc_error_rem", ipc_error_rem); - create_case(s, "ipc_error_rem2", ipc_error_rem2); - - create_case(s, "ipc_loop_payload", ipc_loop_payload); - create_case(s, "ipc_loop_stress", ipc_loop_stress); - create_case(s, "ipc_loop_callback", ipc_loop_callback); - create_case(s, "ipc_callback_break", ipc_callback_break); - - create_case(s, "ipc_pipes", ipc_pipes); - create_case(s, "ipc_pipes_stress", ipc_pipes_stress); - create_case(s, "ipc_callback_break_pipes", ipc_callback_break_pipes); +OSYNC_TESTCASE_ADD(ipc_timeout) +OSYNC_TESTCASE_END - create_case(s, "ipc_timeout", ipc_timeout); - - return s; -} -#endif /* _WIN32*/ -int main(void) -{ -#ifndef _WIN32 - int nf; - - Suite *s = ipc_suite(); - - SRunner *sr; - sr = srunner_create(s); - srunner_run_all(sr, CK_VERBOSE); - nf = srunner_ntests_failed(sr); - srunner_free(sr); - return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE; -#else - return EXIT_FAILURE; -#endif -} |
|
From: <dg...@su...> - 2009-01-11 15:41:09
|
Author: dgollub Date: Sun Jan 11 16:40:29 2009 New Revision: 5105 URL: http://www.opensync.org/changeset/5105 Log: Port sync unittest to OSYNC_TESTCASE macros. Modified: trunk/tests/CMakeLists.txt trunk/tests/sync-tests/check_sync.c Modified: trunk/tests/CMakeLists.txt ============================================================================== --- trunk/tests/CMakeLists.txt Sun Jan 11 16:27:14 2009 (r5104) +++ trunk/tests/CMakeLists.txt Sun Jan 11 16:40:29 2009 (r5105) @@ -95,7 +95,28 @@ ADD_CHECK_TEST( member group-tests/check_member.c ${TEST_TARGET_LIBRARIES} ) ADD_CHECK_TEST( module module-tests/check_module.c ${TEST_TARGET_LIBRARIES} ) ADD_CHECK_TEST( multisync sync-tests/check_multisync.c ${TEST_TARGET_LIBRARIES} ) -ADD_CHECK_TEST( sync sync-tests/check_sync.c ${TEST_TARGET_LIBRARIES} ) + +BUILD_CHECK_TEST( sync sync-tests/check_sync.c ${TEST_TARGET_LIBRARIES} ) +OSYNC_TESTCASE( sync sync_setup_connect) +OSYNC_TESTCASE( sync sync_easy_new) +OSYNC_TESTCASE( sync sync_easy_new_del) +OSYNC_TESTCASE( sync sync_easy_conflict) +OSYNC_TESTCASE( sync sync_easy_new_mapping) +OSYNC_TESTCASE( sync sync_easy_conflict_duplicate) +OSYNC_TESTCASE( sync sync_easy_conflict_abort) +OSYNC_TESTCASE( sync sync_conflict_duplicate2) +OSYNC_TESTCASE( sync sync_conflict_delay) +OSYNC_TESTCASE( sync sync_conflict_deldel) +OSYNC_TESTCASE( sync sync_moddel) +OSYNC_TESTCASE( sync sync_conflict_moddel) +OSYNC_TESTCASE( sync sync_easy_dualdel) +OSYNC_TESTCASE( sync sync_large) +OSYNC_TESTCASE( sync sync_detect_obj) +OSYNC_TESTCASE( sync sync_detect_obj2) +OSYNC_TESTCASE( sync sync_slowsync_connect) +OSYNC_TESTCASE( sync sync_slowsync_mainsink_connect) +OSYNC_TESTCASE( sync sync_initial_slow_sync) + ADD_CHECK_TEST( sync-error sync-tests/check_sync_error.c ${TEST_TARGET_LIBRARIES} ) ADD_CHECK_TEST( objformat format-tests/check_objformat.c ${TEST_TARGET_LIBRARIES} ) ADD_CHECK_TEST( pluginconfig plugin-tests/check_plugin_config.c ${TEST_TARGET_LIBRARIES} ) Modified: trunk/tests/sync-tests/check_sync.c ============================================================================== --- trunk/tests/sync-tests/check_sync.c Sun Jan 11 16:27:14 2009 (r5104) +++ trunk/tests/sync-tests/check_sync.c Sun Jan 11 16:40:29 2009 (r5105) @@ -3347,53 +3347,26 @@ } END_TEST +OSYNC_TESTCASE_START("sync") +OSYNC_TESTCASE_ADD(sync_setup_connect) +OSYNC_TESTCASE_ADD(sync_easy_new) +OSYNC_TESTCASE_ADD(sync_easy_new_del) +OSYNC_TESTCASE_ADD(sync_easy_conflict) +OSYNC_TESTCASE_ADD(sync_easy_new_mapping) +OSYNC_TESTCASE_ADD(sync_easy_conflict_duplicate) +OSYNC_TESTCASE_ADD(sync_easy_conflict_abort) +OSYNC_TESTCASE_ADD(sync_conflict_duplicate2) +OSYNC_TESTCASE_ADD(sync_conflict_delay) +OSYNC_TESTCASE_ADD(sync_conflict_deldel) +OSYNC_TESTCASE_ADD(sync_moddel) +OSYNC_TESTCASE_ADD(sync_conflict_moddel) +OSYNC_TESTCASE_ADD(sync_easy_dualdel) +OSYNC_TESTCASE_ADD(sync_large) +OSYNC_TESTCASE_ADD(sync_detect_obj) +OSYNC_TESTCASE_ADD(sync_detect_obj2) +OSYNC_TESTCASE_ADD(sync_slowsync_connect) +OSYNC_TESTCASE_ADD(sync_slowsync_mainsink_connect) +OSYNC_TESTCASE_ADD(sync_initial_slow_sync) +/* TODO: stateless sync */ +OSYNC_TESTCASE_END -Suite *env_suite(void) -{ - Suite *s = suite_create("Sync"); -// Suite *s2 = suite_create("Sync"); -// Suite *s3 = suite_create("Sync"); // really broken... - - create_case(s, "sync_setup_connect", sync_setup_connect); - create_case(s, "sync_easy_new", sync_easy_new); - create_case(s, "sync_easy_new_del", sync_easy_new_del); - create_case(s, "sync_easy_conflict", sync_easy_conflict); - create_case(s, "sync_easy_new_mapping", sync_easy_new_mapping); - create_case(s, "sync_easy_conflict_duplicate", sync_easy_conflict_duplicate); - create_case(s, "sync_easy_conflict_abort", sync_easy_conflict_abort); - create_case(s, "sync_conflict_duplicate2", sync_conflict_duplicate2); - create_case(s, "sync_conflict_delay", sync_conflict_delay); - create_case(s, "sync_conflict_deldel", sync_conflict_deldel); - create_case(s, "sync_moddel", sync_moddel); - create_case(s, "sync_conflict_moddel", sync_conflict_moddel); - create_case(s, "sync_easy_dualdel", sync_easy_dualdel); - create_case(s, "sync_large", sync_large); - - create_case(s, "sync_detect_obj", sync_detect_obj); - create_case(s, "sync_detect_obj2", sync_detect_obj2); - - create_case(s, "sync_slowsync_connect", sync_slowsync_connect); - create_case(s, "sync_slowsync_mainsink_connect", sync_slowsync_mainsink_connect); - - create_case(s, "sync_initial_slow_sync", sync_initial_slow_sync); - - //stateless sync - - return s; -} - -int main(void) -{ - int nf; - - check_env(); - - Suite *s = env_suite(); - - SRunner *sr; - sr = srunner_create(s); - srunner_run_all(sr, CK_VERBOSE); - nf = srunner_ntests_failed(sr); - srunner_free(sr); - return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE; -} |
|
From: <dg...@su...> - 2009-01-11 15:27:52
|
Author: dgollub Date: Sun Jan 11 16:27:14 2009 New Revision: 5104 URL: http://www.opensync.org/changeset/5104 Log: Rename all engine-error testcases to start with engine_error_. Ported engine-error to use osync_testcase macros. Modified: trunk/tests/CMakeLists.txt trunk/tests/engine-tests/check_engine_error.c Modified: trunk/tests/CMakeLists.txt ============================================================================== --- trunk/tests/CMakeLists.txt Sun Jan 11 16:05:57 2009 (r5103) +++ trunk/tests/CMakeLists.txt Sun Jan 11 16:27:14 2009 (r5104) @@ -37,7 +37,54 @@ OSYNC_TESTCASE_DISABLED( engine engine_sync_read_write_stress "994" ) OSYNC_TESTCASE( engine engine_sync_read_write_stress2 ) -ADD_CHECK_TEST( engine-error engine-tests/check_engine_error.c ${TEST_TARGET_LIBRARIES} ) +BUILD_CHECK_TEST( engine-error engine-tests/check_engine_error.c ${TEST_TARGET_LIBRARIES} ) +OSYNC_TESTCASE( engine-error engine_error_single_init_error) +OSYNC_TESTCASE( engine-error engine_error_double_init_error) +OSYNC_TESTCASE( engine-error engine_error_no_config_error) +OSYNC_TESTCASE( engine-error engine_error_no_objtype_error) +OSYNC_TESTCASE_DISABLED( engine-error engine_error_dual_connect_error "995") +OSYNC_TESTCASE( engine-error engine_error_one_of_two_connect_error) +OSYNC_TESTCASE( engine-error engine_error_two_of_three_connect_error) +OSYNC_TESTCASE( engine-error engine_error_two_of_three_connect_error2) +OSYNC_TESTCASE( engine-error engine_error_three_of_three_connect_error) +OSYNC_TESTCASE( engine-error engine_error_one_of_three_connect_error) +OSYNC_TESTCASE( engine-error engine_error_no_connect_error) +OSYNC_TESTCASE( engine-error engine_error_single_connect_timeout) +OSYNC_TESTCASE( engine-error engine_error_dual_connect_timeout) +OSYNC_TESTCASE( engine-error engine_error_one_of_three_timeout) +OSYNC_TESTCASE( engine-error engine_error_timeout_and_error) +OSYNC_TESTCASE( engine-error engine_error_single_get_changes_error) +OSYNC_TESTCASE( engine-error engine_error_dual_get_changes_error) +OSYNC_TESTCASE( engine-error engine_error_two_of_three_get_changes_error) +OSYNC_TESTCASE( engine-error engine_error_one_of_three_get_changes_error) +OSYNC_TESTCASE( engine-error engine_error_one_of_three_get_changes_timeouteout) +OSYNC_TESTCASE( engine-error engine_error_get_changes_timeout_and_error) +OSYNC_TESTCASE_DISABLED( engine-error engine_error_get_changes_timeout_sleep "1030") +OSYNC_TESTCASE( engine-error engine_error_single_commit_error) +OSYNC_TESTCASE( engine-error engine_error_dual_commit_error) +OSYNC_TESTCASE( engine-error engine_error_single_commit_timeout) +OSYNC_TESTCASE( engine-error engine_error_dual_commit_timeout) +OSYNC_TESTCASE( engine-error engine_error_commit_timeout_and_error) +OSYNC_TESTCASE( engine-error engine_error_commit_timeout_and_error2) +OSYNC_TESTCASE( engine-error engine_error_commit_error_modify) +OSYNC_TESTCASE( engine-error engine_error_commit_error_delete) +OSYNC_TESTCASE( engine-error engine_error_committed_all_error) +OSYNC_TESTCASE( engine-error engine_error_committed_all_batch_error) +OSYNC_TESTCASE( engine-error engine_error_single_sync_done_error) +OSYNC_TESTCASE( engine-error engine_error_dual_sync_done_error) +OSYNC_TESTCASE( engine-error engine_error_triple_sync_done_error) +OSYNC_TESTCASE( engine-error engine_error_single_sync_done_timeout) +OSYNC_TESTCASE( engine-error engine_error_dual_sync_done_timeout) +OSYNC_TESTCASE( engine-error engine_error_sync_done_timeout_and_error) +OSYNC_TESTCASE( engine-error engine_error_single_disconnect_error) +OSYNC_TESTCASE( engine-error engine_error_dual_disconnect_error) +OSYNC_TESTCASE( engine-error engine_error_triple_disconnect_error) +OSYNC_TESTCASE( engine-error engine_error_single_disconnect_timeout) +OSYNC_TESTCASE( engine-error engine_error_dual_disconnect_timeout) +OSYNC_TESTCASE( engine-error engine_error_disconnect_timeout_and_error) +OSYNC_TESTCASE( engine-error engine_error_get_changes_disconnect_error) +OSYNC_TESTCASE( engine-error engine_error_missing_format_plugin) + ADD_CHECK_TEST( formatenv format-tests/check_format_env.c ${TEST_TARGET_LIBRARIES} ) ADD_CHECK_TEST( group group-tests/check_group.c ${TEST_TARGET_LIBRARIES} ) ADD_CHECK_TEST( hash helper-tests/check_hash.c ${TEST_TARGET_LIBRARIES} ) Modified: trunk/tests/engine-tests/check_engine_error.c ============================================================================== --- trunk/tests/engine-tests/check_engine_error.c Sun Jan 11 16:05:57 2009 (r5103) +++ trunk/tests/engine-tests/check_engine_error.c Sun Jan 11 16:27:14 2009 (r5104) @@ -536,7 +536,7 @@ osync_plugin_env_register_plugin(engine->pluginenv, debug->plugin2); } -START_TEST (single_init_error) +START_TEST (engine_error_single_init_error) { char *testbed = setup_testbed("sync_setup"); char *formatdir = g_strdup_printf("%s/formats", testbed); @@ -574,7 +574,7 @@ } END_TEST -START_TEST (double_init_error) +START_TEST (engine_error_double_init_error) { char *testbed = setup_testbed("sync_setup"); char *formatdir = g_strdup_printf("%s/formats", testbed); @@ -612,7 +612,7 @@ } END_TEST -START_TEST (no_config_error) +START_TEST (engine_error_no_config_error) { char *testbed = setup_testbed("sync_setup"); char *formatdir = g_strdup_printf("%s/formats", testbed); @@ -650,7 +650,7 @@ } END_TEST -START_TEST (no_objtype_error) +START_TEST (engine_error_no_objtype_error) { char *testbed = setup_testbed("sync_setup"); char *formatdir = g_strdup_printf("%s/formats", testbed); @@ -688,7 +688,9 @@ } END_TEST -OSYNC_UNUSED START_TEST (dual_connect_error) + +/* FIXME: Temprorarly disabled until reviewed/fixed - see #995 */ +START_TEST (engine_error_dual_connect_error) { char *testbed = setup_testbed("sync_setup"); char *formatdir = g_strdup_printf("%s/formats", testbed); @@ -777,7 +779,7 @@ } END_TEST -START_TEST (one_of_two_connect_error) +START_TEST (engine_error_one_of_two_connect_error) { char *testbed = setup_testbed("sync"); char *formatdir = g_strdup_printf("%s/formats", testbed); @@ -833,7 +835,7 @@ } END_TEST -START_TEST (two_of_three_connect_error) +START_TEST (engine_error_two_of_three_connect_error) { char *testbed = setup_testbed("multisync_easy_new"); char *formatdir = g_strdup_printf("%s/formats", testbed); @@ -887,7 +889,7 @@ } END_TEST -START_TEST (two_of_three_connect_error2) +START_TEST (engine_error_two_of_three_connect_error2) { char *testbed = setup_testbed("multisync_easy_new"); char *formatdir = g_strdup_printf("%s/formats", testbed); @@ -940,7 +942,7 @@ } END_TEST -START_TEST (three_of_three_connect_error) +START_TEST (engine_error_three_of_three_connect_error) { char *testbed = setup_testbed("multisync_easy_new"); char *formatdir = g_strdup_printf("%s/formats", testbed); @@ -993,7 +995,7 @@ } END_TEST -START_TEST (one_of_three_connect_error) +START_TEST (engine_error_one_of_three_connect_error) { char *testbed = setup_testbed("multisync_easy_new"); char *formatdir = g_strdup_printf("%s/formats", testbed); @@ -1046,7 +1048,7 @@ } END_TEST -START_TEST (no_connect_error) +START_TEST (engine_error_no_connect_error) { char *testbed = setup_testbed("multisync_easy_new"); char *formatdir = g_strdup_printf("%s/formats", testbed); @@ -1101,7 +1103,7 @@ } END_TEST -START_TEST (single_connect_timeout) +START_TEST (engine_error_single_connect_timeout) { char *testbed = setup_testbed("sync"); char *formatdir = g_strdup_printf("%s/formats", testbed); @@ -1160,7 +1162,7 @@ } END_TEST -START_TEST (dual_connect_timeout) +START_TEST (engine_error_dual_connect_timeout) { char *testbed = setup_testbed("sync"); char *formatdir = g_strdup_printf("%s/formats", testbed); @@ -1219,7 +1221,7 @@ } END_TEST -START_TEST (one_of_three_timeout) +START_TEST (engine_error_one_of_three_timeout) { char *testbed = setup_testbed("multisync_easy_new"); char *formatdir = g_strdup_printf("%s/formats", testbed); @@ -1275,7 +1277,7 @@ } END_TEST -START_TEST (timeout_and_error) +START_TEST (engine_error_timeout_and_error) { char *testbed = setup_testbed("multisync_easy_new"); char *formatdir = g_strdup_printf("%s/formats", testbed); @@ -1332,7 +1334,7 @@ } END_TEST -START_TEST (single_get_changes_error) +START_TEST (engine_error_single_get_changes_error) { char *testbed = setup_testbed("sync_easy_conflict"); char *formatdir = g_strdup_printf("%s/formats", testbed); @@ -1390,7 +1392,7 @@ } END_TEST -START_TEST (dual_get_changes_error) +START_TEST (engine_error_dual_get_changes_error) { char *testbed = setup_testbed("sync_easy_conflict"); char *formatdir = g_strdup_printf("%s/formats", testbed); @@ -1450,7 +1452,7 @@ } END_TEST -START_TEST (two_of_three_get_changes_error) +START_TEST (engine_error_two_of_three_get_changes_error) { char *testbed = setup_testbed("multisync_conflict_data_choose2"); char *formatdir = g_strdup_printf("%s/formats", testbed); @@ -1508,7 +1510,7 @@ } END_TEST -START_TEST (one_of_three_get_changes_error) +START_TEST (engine_error_one_of_three_get_changes_error) { char *testbed = setup_testbed("multisync_conflict_data_choose2"); char *formatdir = g_strdup_printf("%s/formats", testbed); @@ -1566,7 +1568,7 @@ } END_TEST -START_TEST (one_of_three_get_changes_timeout) +START_TEST (engine_error_one_of_three_get_changes_timeout) { char *testbed = setup_testbed("multisync_conflict_data_choose2"); char *formatdir = g_strdup_printf("%s/formats", testbed); @@ -1627,7 +1629,7 @@ } END_TEST -START_TEST (get_changes_timeout_and_error) +START_TEST (engine_error_get_changes_timeout_and_error) { char *testbed = setup_testbed("multisync_conflict_data_choose2"); char *formatdir = g_strdup_printf("%s/formats", testbed); @@ -1689,9 +1691,12 @@ } END_TEST -/* FIXME */ -#if 0 -START_TEST (get_changes_timeout_sleep) + +/* FIXME: If get_changes delays and got timed out .. set change_callback to NULL. + Make sure changes from the plugin got completely ignored by the engine when the timout handler got called. + Even better would be to abort the get_changes call from the plugin process... +*/ +START_TEST (engine_error_get_changes_timeout_sleep) { char *testbed = setup_testbed("multisync_conflict_data_choose2"); char *formatdir = g_strdup_printf("%s/formats", testbed); @@ -1754,9 +1759,8 @@ destroy_testbed(testbed); } END_TEST -#endif /* FIXME */ -START_TEST (single_commit_error) +START_TEST (engine_error_single_commit_error) { char *testbed = setup_testbed("multisync_easy_new"); char *formatdir = g_strdup_printf("%s/formats", testbed); @@ -1821,7 +1825,7 @@ } END_TEST -START_TEST (dual_commit_error) +START_TEST (engine_error_dual_commit_error) { char *testbed = setup_testbed("multisync_easy_new"); char *formatdir = g_strdup_printf("%s/formats", testbed); @@ -1882,7 +1886,7 @@ } END_TEST -START_TEST (single_commit_timeout) +START_TEST (engine_error_single_commit_timeout) { char *testbed = setup_testbed("multisync_easy_new"); char *formatdir = g_strdup_printf("%s/formats", testbed); @@ -1945,7 +1949,7 @@ } END_TEST -START_TEST (dual_commit_timeout) +START_TEST (engine_error_dual_commit_timeout) { char *testbed = setup_testbed("multisync_easy_new"); char *formatdir = g_strdup_printf("%s/formats", testbed); @@ -2008,7 +2012,7 @@ } END_TEST -START_TEST (commit_timeout_and_error) +START_TEST (engine_error_commit_timeout_and_error) { char *testbed = setup_testbed("multisync_easy_new"); char *formatdir = g_strdup_printf("%s/formats", testbed); @@ -2072,7 +2076,7 @@ } END_TEST -START_TEST (commit_timeout_and_error2) +START_TEST (engine_error_commit_timeout_and_error2) { char *testbed = setup_testbed("multisync_easy_new"); char *formatdir = g_strdup_printf("%s/formats", testbed); @@ -2137,7 +2141,7 @@ END_TEST /* FIXME: timeout */ -START_TEST (commit_error_modify) +START_TEST (engine_error_commit_error_modify) { char *testbed = setup_testbed("multisync_easy_new"); char *formatdir = g_strdup_printf("%s/formats", testbed); @@ -2210,7 +2214,7 @@ } END_TEST -START_TEST (commit_error_delete) +START_TEST (engine_error_commit_error_delete) { char *testbed = setup_testbed("multisync_easy_new"); char *formatdir = g_strdup_printf("%s/formats", testbed); @@ -2284,7 +2288,7 @@ } END_TEST -START_TEST (committed_all_error) +START_TEST (engine_error_committed_all_error) { char *testbed = setup_testbed("multisync_easy_new"); char *formatdir = g_strdup_printf("%s/formats", testbed); @@ -2345,7 +2349,7 @@ } END_TEST -START_TEST (committed_all_batch_error) +START_TEST (engine_error_committed_all_batch_error) { char *testbed = setup_testbed("multisync_easy_new"); char *formatdir = g_strdup_printf("%s/formats", testbed); @@ -2407,7 +2411,7 @@ } END_TEST -START_TEST (single_sync_done_error) +START_TEST (engine_error_single_sync_done_error) { char *testbed = setup_testbed("multisync_easy_new"); char *formatdir = g_strdup_printf("%s/formats", testbed); @@ -2468,7 +2472,7 @@ } END_TEST -START_TEST (dual_sync_done_error) +START_TEST (engine_error_dual_sync_done_error) { char *testbed = setup_testbed("multisync_easy_new"); char *formatdir = g_strdup_printf("%s/formats", testbed); @@ -2529,7 +2533,7 @@ } END_TEST -START_TEST (triple_sync_done_error) +START_TEST (engine_error_triple_sync_done_error) { char *testbed = setup_testbed("multisync_easy_new"); char *formatdir = g_strdup_printf("%s/formats", testbed); @@ -2590,7 +2594,7 @@ } END_TEST -START_TEST (single_sync_done_timeout) +START_TEST (engine_error_single_sync_done_timeout) { char *testbed = setup_testbed("multisync_easy_new"); char *formatdir = g_strdup_printf("%s/formats", testbed); @@ -2653,7 +2657,7 @@ } END_TEST -START_TEST (dual_sync_done_timeout) +START_TEST (engine_error_dual_sync_done_timeout) { char *testbed = setup_testbed("multisync_easy_new"); char *formatdir = g_strdup_printf("%s/formats", testbed); @@ -2716,7 +2720,7 @@ } END_TEST -START_TEST (sync_done_timeout_and_error) +START_TEST (engine_error_sync_done_timeout_and_error) { char *testbed = setup_testbed("multisync_easy_new"); char *formatdir = g_strdup_printf("%s/formats", testbed); @@ -2780,7 +2784,7 @@ } END_TEST -START_TEST (single_disconnect_error) +START_TEST (engine_error_single_disconnect_error) { char *testbed = setup_testbed("multisync_easy_new"); char *formatdir = g_strdup_printf("%s/formats", testbed); @@ -2841,7 +2845,7 @@ } END_TEST -START_TEST (dual_disconnect_error) +START_TEST (engine_error_dual_disconnect_error) { char *testbed = setup_testbed("multisync_easy_new"); char *formatdir = g_strdup_printf("%s/formats", testbed); @@ -2902,7 +2906,7 @@ } END_TEST -START_TEST (triple_disconnect_error) +START_TEST (engine_error_triple_disconnect_error) { char *testbed = setup_testbed("multisync_easy_new"); char *formatdir = g_strdup_printf("%s/formats", testbed); @@ -2963,7 +2967,7 @@ } END_TEST -START_TEST (single_disconnect_timeout) +START_TEST (engine_error_single_disconnect_timeout) { char *testbed = setup_testbed("multisync_easy_new"); char *formatdir = g_strdup_printf("%s/formats", testbed); @@ -3026,7 +3030,7 @@ } END_TEST -START_TEST (dual_disconnect_timeout) +START_TEST (engine_error_dual_disconnect_timeout) { char *testbed = setup_testbed("multisync_easy_new"); char *formatdir = g_strdup_printf("%s/formats", testbed); @@ -3089,7 +3093,7 @@ } END_TEST -START_TEST (disconnect_timeout_and_error) +START_TEST (engine_error_disconnect_timeout_and_error) { char *testbed = setup_testbed("multisync_easy_new"); char *formatdir = g_strdup_printf("%s/formats", testbed); @@ -3153,7 +3157,7 @@ } END_TEST -START_TEST (get_changes_disconnect_error) +START_TEST (engine_error_get_changes_disconnect_error) { char *testbed = setup_testbed("multisync_easy_new"); char *formatdir = g_strdup_printf("%s/formats", testbed); @@ -3207,7 +3211,7 @@ } END_TEST -START_TEST (missing_format_plugin) +START_TEST (engine_error_missing_format_plugin) { char *testbed = setup_testbed("missing_format_plugin"); char *formatdir = g_strdup_printf("%s/formats", testbed); @@ -3242,96 +3246,69 @@ } END_TEST -Suite *error_suite(void) -{ - Suite *s = suite_create("Engine Errors"); - //Suite *s2 = suite_create("Engine Errors"); - - create_case(s, "single_init_error", single_init_error); - create_case(s, "double_init_error", double_init_error); - - create_case(s, "no_config_error", no_config_error); - create_case(s, "no_objtype_error", no_objtype_error); - - /* Temprorarly disabled until reviewed/fixed - see #995 - create_case(s, "dual_connect_error", dual_connect_error); - */ +OSYNC_TESTCASE_START("engine_error") +OSYNC_TESTCASE_ADD(engine_error_single_init_error) +OSYNC_TESTCASE_ADD(engine_error_double_init_error) - create_case(s, "one_of_two_connect_error", one_of_two_connect_error); - create_case(s, "two_of_three_connect_error", two_of_three_connect_error); - create_case(s, "two_of_three_connect_error2", two_of_three_connect_error2); - create_case(s, "three_of_three_connect_error", three_of_three_connect_error); +OSYNC_TESTCASE_ADD(engine_error_no_config_error) +OSYNC_TESTCASE_ADD(engine_error_no_objtype_error) - create_case(s, "one_of_three_connect_error", one_of_three_connect_error); - create_case(s, "no_connect_error", no_connect_error); +OSYNC_TESTCASE_ADD(engine_error_dual_connect_error) +OSYNC_TESTCASE_ADD(engine_error_one_of_two_connect_error) +OSYNC_TESTCASE_ADD(engine_error_two_of_three_connect_error) +OSYNC_TESTCASE_ADD(engine_error_two_of_three_connect_error2) +OSYNC_TESTCASE_ADD(engine_error_three_of_three_connect_error) - create_case(s, "single_connect_timeout", single_connect_timeout); - create_case(s, "dual_connect_timeout", dual_connect_timeout); - create_case(s, "one_of_three_timeout", one_of_three_timeout); - create_case(s, "timeout_and_error", timeout_and_error); +OSYNC_TESTCASE_ADD(engine_error_one_of_three_connect_error) +OSYNC_TESTCASE_ADD(engine_error_no_connect_error) - create_case(s, "single_get_changes_error", single_get_changes_error); - create_case(s, "dual_get_changes_error", dual_get_changes_error); - create_case(s, "two_of_three_get_changes_error", two_of_three_get_changes_error); - create_case(s, "one_of_three_get_changes_error", one_of_three_get_changes_error); +OSYNC_TESTCASE_ADD(engine_error_single_connect_timeout) +OSYNC_TESTCASE_ADD(engine_error_dual_connect_timeout) +OSYNC_TESTCASE_ADD(engine_error_one_of_three_timeout) +OSYNC_TESTCASE_ADD(engine_error_timeout_and_error) - create_case(s, "one_of_three_get_changes_timeout", one_of_three_get_changes_timeout); - create_case(s, "get_changes_timeout_and_error", get_changes_timeout_and_error); +OSYNC_TESTCASE_ADD(engine_error_single_get_changes_error) +OSYNC_TESTCASE_ADD(engine_error_dual_get_changes_error) +OSYNC_TESTCASE_ADD(engine_error_two_of_three_get_changes_error) +OSYNC_TESTCASE_ADD(engine_error_one_of_three_get_changes_error) - /* FIXME: If get_changes delays and got timed out .. set change_callback to NULL. - Make sure changes from the plugin got completely ignored by the engine when the timout handler got called. - Even better would be to abort the get_changes call from the plugin process... +OSYNC_TESTCASE_ADD(engine_error_one_of_three_get_changes_timeout) +OSYNC_TESTCASE_ADD(engine_error_get_changes_timeout_and_error) +OSYNC_TESTCASE_ADD(engine_error_get_changes_timeout_sleep) - create_case(s2, "get_changes_timeout_sleep", get_changes_timeout_sleep); - */ +OSYNC_TESTCASE_ADD(engine_error_single_commit_error) +OSYNC_TESTCASE_ADD(engine_error_dual_commit_error) - create_case(s, "single_commit_error", single_commit_error); - create_case(s, "dual_commit_error", dual_commit_error); +OSYNC_TESTCASE_ADD(engine_error_single_commit_timeout) +OSYNC_TESTCASE_ADD(engine_error_dual_commit_timeout) +OSYNC_TESTCASE_ADD(engine_error_commit_timeout_and_error) +OSYNC_TESTCASE_ADD(engine_error_commit_timeout_and_error2) - create_case(s, "single_commit_timeout", single_commit_timeout); - create_case(s, "dual_commit_timeout", dual_commit_timeout); - create_case(s, "commit_timeout_and_error", commit_timeout_and_error); - create_case(s, "commit_timeout_and_error2", commit_timeout_and_error2); +OSYNC_TESTCASE_ADD(engine_error_commit_error_modify) +OSYNC_TESTCASE_ADD(engine_error_commit_error_delete) - create_case(s, "commit_error_modify", commit_error_modify); - create_case(s, "commit_error_delete", commit_error_delete); +OSYNC_TESTCASE_ADD(engine_error_committed_all_error) +OSYNC_TESTCASE_ADD(engine_error_committed_all_batch_error) - create_case(s, "committed_all_error", committed_all_error); - create_case(s, "committed_all_batch_error", committed_all_batch_error); +OSYNC_TESTCASE_ADD(engine_error_single_sync_done_error) +OSYNC_TESTCASE_ADD(engine_error_dual_sync_done_error) +OSYNC_TESTCASE_ADD(engine_error_triple_sync_done_error) - create_case(s, "single_sync_done_error", single_sync_done_error); - create_case(s, "dual_sync_done_error", dual_sync_done_error); - create_case(s, "triple_sync_done_error", triple_sync_done_error); +OSYNC_TESTCASE_ADD(engine_error_single_sync_done_timeout) +OSYNC_TESTCASE_ADD(engine_error_dual_sync_done_timeout) +OSYNC_TESTCASE_ADD(engine_error_sync_done_timeout_and_error) - create_case(s, "single_sync_done_timeout", single_sync_done_timeout); - create_case(s, "dual_sync_done_timeout", dual_sync_done_timeout); - create_case(s, "sync_done_timeout_and_error", sync_done_timeout_and_error); +OSYNC_TESTCASE_ADD(engine_error_single_disconnect_error) +OSYNC_TESTCASE_ADD(engine_error_dual_disconnect_error) +OSYNC_TESTCASE_ADD(engine_error_triple_disconnect_error) - create_case(s, "single_disconnect_error", single_disconnect_error); - create_case(s, "dual_disconnect_error", dual_disconnect_error); - create_case(s, "triple_disconnect_error", triple_disconnect_error); +OSYNC_TESTCASE_ADD(engine_error_single_disconnect_timeout) +OSYNC_TESTCASE_ADD(engine_error_dual_disconnect_timeout) +OSYNC_TESTCASE_ADD(engine_error_disconnect_timeout_and_error) - create_case(s, "single_disconnect_timeout", single_disconnect_timeout); - create_case(s, "dual_disconnect_timeout", dual_disconnect_timeout); - create_case(s, "disconnect_timeout_and_error", disconnect_timeout_and_error); +OSYNC_TESTCASE_ADD(engine_error_get_changes_disconnect_error) - create_case(s, "get_changes_disconnect_error", get_changes_disconnect_error); +OSYNC_TESTCASE_ADD(engine_error_missing_format_plugin) - create_case(s, "missing_format_plugin", missing_format_plugin); - - return s; -} - -int main(void) -{ - int nf; +OSYNC_TESTCASE_END - Suite *s = error_suite(); - - SRunner *sr; - sr = srunner_create(s); - srunner_run_all(sr, CK_VERBOSE); - nf = srunner_ntests_failed(sr); - srunner_free(sr); - return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE; -} |
|
From: <dg...@su...> - 2009-01-11 15:06:36
|
Author: cstender Date: Sun Jan 11 16:05:57 2009 New Revision: 5103 URL: http://www.opensync.org/changeset/5103 Log: fixed ticket 1029 (patch by henrik) Modified: plugins/file-sync/src/file_sync.c Modified: plugins/file-sync/src/file_sync.c ============================================================================== --- plugins/file-sync/src/file_sync.c Sun Jan 11 15:33:30 2009 (r5102) +++ plugins/file-sync/src/file_sync.c Sun Jan 11 16:05:57 2009 (r5103) @@ -20,7 +20,7 @@ #include "file_sync.h" #include "filename_scape.h" -#include <opensync/file.h> +#include "file.h" #include <opensync/opensync-version.h> #include <assert.h> #include <stdlib.h> |
