Changeset 802

Show
Ignore:
Timestamp:
08/28/06 11:48:52
Author:
pvanhoof
Message:

Added a unit test

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk

    • Property svn:ignore changed from tags py* anjuta.anjuta config.h stamp-h1 libtinymail-*.tar.gz libtinymail.spec .anjuta .svnignore .tm_project2.cache configure config.log depcomp TODO.tasks config.guess ltmain.sh config.sub anjuta gtk-doc.make tinymail.anjuta Makefile Makefile.in mkinstalldirs config.status autom4te.cache libtool tm_project2.cache missing aclocal.m4 install-sh to compile tags py* anjuta.anjuta config.h stamp-h1 libtinymail-*.tar.gz libtinymail.spec .anjuta .svnignore .tm_project2.cache configure config.log depcomp TODO.tasks config.guess ltmain.sh config.sub anjuta gtk-doc.make tinymail.anjuta Makefile Makefile.in mkinstalldirs config.status autom4te.cache libtool tm_project2.cache missing aclocal.m4 install-sh

  • trunk/.svnignore

    r688 r802  
     1compile 
    12tags 
    23py* 

  • trunk/ChangeLog

    r801 r802  
     12006-08-28  Philip Van Hoof <pvanhoof@gnome.org> 
     2 
     3        *  Added a unit test for TnyFolderStoreQuery 
     4         
    152006-08-27  Philip Van Hoof <pvanhoof@gnome.org> 
    26 

  • trunk/Makefile.am

    r751 r802  
    1414endif 
    1515 
    16 SUBDIRS += $(PLATFORMDIR) libtinymail-camel tinymail docs bindings po tests 
     16SUBDIRS += $(PLATFORMDIR) libtinymail-camel tinymail docs bindings po tests  
    1717 
    1818if BUILD_UNITTESTS 

  • trunk/libtinymail-camel/tny-folder.c

    r799 r802  
    10111011          iter = iter->child; 
    10121012                 
    1013           while (iter && _tny_folder_store_query_passes (query, iter)) 
     1013          while (iter) 
    10141014          { 
    1015                 TnyFolder *folder = tny_folder_new (); 
    1016                 _tny_folder_set_id (folder, iter->full_name); 
    1017                 _tny_folder_set_folder_type (folder, iter); 
    1018                 _tny_folder_set_unread_count (folder, iter->unread); 
    1019                 _tny_folder_set_all_count (folder, iter->total); 
    1020                 _tny_folder_set_name (folder, iter->name); 
    1021                 _tny_folder_set_iter (folder, iter); 
    1022                  
    1023                 apriv->managed_folders = g_list_prepend (apriv->managed_folders, folder); 
    1024                  
    1025                 tny_folder_iface_set_account (TNY_FOLDER_IFACE (folder),  
    1026                         TNY_ACCOUNT_IFACE (priv->account)); 
    1027  
    1028                 tny_list_iface_prepend (list, G_OBJECT (folder)); 
     1015                if (_tny_folder_store_query_passes (query, iter)) 
     1016                { 
     1017                        TnyFolder *folder = tny_folder_new (); 
     1018                        _tny_folder_set_id (folder, iter->full_name); 
     1019                        _tny_folder_set_folder_type (folder, iter); 
     1020                        _tny_folder_set_unread_count (folder, iter->unread); 
     1021                        _tny_folder_set_all_count (folder, iter->total); 
     1022                        _tny_folder_set_name (folder, iter->name); 
     1023                        _tny_folder_set_iter (folder, iter); 
     1024                         
     1025                        apriv->managed_folders = g_list_prepend (apriv->managed_folders, folder); 
     1026                         
     1027                        tny_folder_iface_set_account (TNY_FOLDER_IFACE (folder),  
     1028                                TNY_ACCOUNT_IFACE (priv->account)); 
     1029 
     1030                        tny_list_iface_prepend (list, G_OBJECT (folder)); 
     1031                }            
    10291032                iter = iter->next; 
    10301033          } 

  • trunk/libtinymail-camel/tny-store-account.c

    r797 r802  
    344344        if (iter) 
    345345        { 
    346           while (iter && _tny_folder_store_query_passes (query, iter)) 
     346          while (iter) 
    347347          { 
    348                 TnyFolder *folder = tny_folder_new (); 
    349              
    350                 _tny_folder_set_id (folder, iter->full_name); 
    351                 _tny_folder_set_folder_type (folder, iter); 
    352                 _tny_folder_set_unread_count (folder, iter->unread); 
    353                 _tny_folder_set_all_count (folder, iter->total); 
    354                 _tny_folder_set_name (folder, iter->name); 
    355                 _tny_folder_set_iter (folder, iter); 
    356                
    357                 priv->managed_folders = g_list_prepend (priv->managed_folders, folder); 
    358                
    359                 tny_folder_iface_set_account (TNY_FOLDER_IFACE (folder),  
    360                         TNY_ACCOUNT_IFACE (self)); 
    361  
    362                 tny_list_iface_prepend (list, G_OBJECT (folder)); 
     348                if (_tny_folder_store_query_passes (query, iter)) 
     349                { 
     350                        TnyFolder *folder = tny_folder_new (); 
     351                     
     352                        _tny_folder_set_id (folder, iter->full_name); 
     353                        _tny_folder_set_folder_type (folder, iter); 
     354                        _tny_folder_set_unread_count (folder, iter->unread); 
     355                        _tny_folder_set_all_count (folder, iter->total); 
     356                        _tny_folder_set_name (folder, iter->name); 
     357                        _tny_folder_set_iter (folder, iter); 
     358                       
     359                        priv->managed_folders = g_list_prepend (priv->managed_folders, folder); 
     360                       
     361                        tny_folder_iface_set_account (TNY_FOLDER_IFACE (folder),  
     362                                TNY_ACCOUNT_IFACE (self)); 
     363 
     364                        tny_list_iface_prepend (list, G_OBJECT (folder));        
     365                } 
    363366                iter = iter->next; 
    364367          } 

  • trunk/libtinymail-test/Makefile.am

    r791 r802  
    1313 
    1414libtinymail_test_suite_la_SOURCES =             \ 
     15        tny-folder-store-query-test.c           \ 
     16        tny-folder-store-query-test.h           \ 
    1517        tny-test-object.h                       \ 
    1618        tny-test-object.c                       \ 

  • trunk/libtinymail-test/tny-account-iface-test.c

    r791 r802  
    3636static TnyAccountIface *iface = NULL; 
    3737static TnyAccountStoreIface *account_store; 
    38 static TnyListIface *accounts;// *root_folders; 
     38static TnyListIface *accounts; 
    3939static TnyIteratorIface *aiter; 
    4040static gboolean online_tests=FALSE; 
    …… 
    7272{ 
    7373        g_object_unref (G_OBJECT (iface)); 
    74         g_object_unref (G_OBJECT (iface)); 
    7574        g_object_unref (G_OBJECT (aiter)); 
    7675        g_object_unref (G_OBJECT (accounts)); 
    …… 
    8281tny_store_account_iface_test_get_folders (void) 
    8382{ 
    84         TnyListIface *folders = (tny_list_new()); 
     83        TnyListIface *folders = NULL; 
    8584     
    8685        if (!online_tests) 
    8786                return; 
     87     
     88        folders = (TnyListIface *) tny_list_new(); 
    8889     
    8990        tny_folder_store_iface_get_folders (TNY_FOLDER_STORE_IFACE (iface), 

  • trunk/libtinymail-test/tny-test-suite.c

    r715 r802  
    3636#include "tny-platform-factory-iface-test.h" 
    3737#include "tny-account-store-iface-test.h" 
     38#include "tny-folder-store-query-test.h" 
    3839 
    3940GList* 
    …… 
    4142{ 
    4243        GList *suites = NULL; 
     44 
     45        suites = g_list_append (suites, create_tny_folder_store_query_suite ()); 
    4346 
    4447        suites = g_list_append (suites, create_tny_header_iface_suite ()); 
    …… 
    5356        suites = g_list_append (suites, create_tny_platform_factory_iface_suite ()); 
    5457        suites = g_list_append (suites, create_tny_account_store_iface_suite ()); 
    55  
     58     
    5659        return suites; 
    5760} 

  • trunk/libtinymail/tny-folder-store-query.c

    r790 r802  
    4444        if (self->regex) 
    4545                regfree (self->regex); 
    46         self->regex = NULL; 
    4746     
    4847        item_parent_class->finalize (object); 
    …… 
    9089tny_folder_store_query_item_init (TnyFolderStoreQueryItem *self) 
    9190{ 
    92         self->regex = NULL; 
    9391        self->options = 0; 
    94      
     92       self->regex = NULL; 
    9593        return; 
    9694} 
    …… 
    180178        gint er=0; 
    181179        gboolean addit=pattern?TRUE:FALSE; 
    182         regex_t *regex = NULL; 
     180        regex_t *regex = g_new0 (regex_t, 1); 
     181        gboolean has_regex = FALSE; 
    183182     
    184183        if (addit) 
    …… 
    191190                g_free (erstr); 
    192191                regfree (regex); 
    193                 regex = NULL; 
    194192                addit = FALSE; 
    195         } else  
     193                regex = NULL; 
     194        } else { 
     195                has_regex = TRUE; 
    196196                addit = TRUE; 
     197        } 
    197198     
    198199        if (addit) 
    …… 
    200201                TnyFolderStoreQueryItem *add = g_object_new (TNY_TYPE_FOLDER_STORE_QUERY_ITEM, NULL); 
    201202                add->options = options; 
    202                 add->regex = regex; 
     203                if (has_regex) 
     204                        add->regex = regex; 
     205                else add->regex = NULL; 
    203206                tny_list_iface_prepend (query->items, G_OBJECT (add)); 
    204207                g_object_unref (G_OBJECT (add)); 

  • trunk/libtinymail/tny-folder-store-query.h

    r770 r802  
    2121 */ 
    2222 
    23 #include <regex.h> 
    2423#include <tny-shared.h> 
    2524#include <tny-list-iface.h> 
    2625#include <tny-iterator-iface.h> 
     26 
     27#include <regex.h> 
    2728 
    2829G_BEGIN_DECLS