From 4921b29c08eb702b08f3eaa6e14878289580cf59 Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Tue, 23 Jan 2007 15:42:55 +0000 Subject: [PATCH] * all: - remove the presets stuff for now pmo-trunk-r707 --- scripts/modest-parse-presets.pl | 161 -------------------------------- src/Makefile.am | 2 - src/modest-presets.c | 189 -------------------------------------- src/modest-presets.h | 126 ------------------------- tests/Makefile.am | 6 -- tests/check_modest-presets.c | 127 ------------------------- tests/provider-data-test.keyfile | 31 ------- 7 files changed, 642 deletions(-) delete mode 100755 scripts/modest-parse-presets.pl delete mode 100644 src/modest-presets.c delete mode 100644 src/modest-presets.h delete mode 100644 tests/check_modest-presets.c delete mode 100644 tests/provider-data-test.keyfile diff --git a/scripts/modest-parse-presets.pl b/scripts/modest-parse-presets.pl deleted file mode 100755 index 59df154..0000000 --- a/scripts/modest-parse-presets.pl +++ /dev/null @@ -1,161 +0,0 @@ -#! /usr/bin/perl -w - -# Copyright (c) 2006, Nokia Corporation -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# * Neither the name of the Nokia Corporation nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS -# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -# PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER -# OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -# -# Perl script to converts an Excel spreadsheet (arg 1) -# with provider information in a GKeyFile readable format -# for use in modest (see modest-presets.[ch] for details] - -# The input is assumed to be MS-style UTF16-LE, and -# output will be UTF-8. -## -# Program requires Spreadsheet::ParseExcel, which does all -# the interesting stuff - -# input columns are like this: -# 0: MCC (0 For Global Email) -# 1: Mailbox Name -# 2: EmailAddress -# 3: OutgoingMailServer -# 4: Secure smtp: (0 = no\, 1=yes) -# 5: IncomingMailServer -# 6: SendMessage (0=Immediately; 1=During next conn.) -# 7: SendCopyToSelf (0=No; 1=Yes) -# 8: MailboxType (0=POP3; 1=IMAP4) -# 9: Security (0=Off; 1=On(143/110); 2=On(993/995);) -#10: APOPSecureLogin (0=Off; 1=On) -#11: RetrieveAttachment (0=No; 1=Yes) -#12: RetrieveHeaders (0=All; 1-99=User defined) - -# some of these are properties of user-settings; however, -# we are only interested in server settings, so some -# of the data (6,7,11,12) will be ignored for our output. - -use strict; -use Spreadsheet::ParseExcel; -#use Unicode::String qw(utf8 utf16le); -#Unicode::String->stringify_as('utf8'); - -die "usage: xls2cvs \n" unless @ARGV == 1; - -my $file = $ARGV[0]; -die "'$file' is not a readable file\n" unless -r $file; - - -my $xl = new Spreadsheet::ParseExcel; -my $data = $xl->Parse($file) or die "could not parse $file: $!"; - -my $sheet = $data->{Worksheet}[0]; - -my $now = `date`; -chomp $now; - -print "# generated on $now from " . $data->{File} . "\n"; -print "# keys and their meaning:\n"; -print "# [MailboxName]: name of the provider (eg. Wanadoo, Gmail)\n" . - "# MCC: Mobile Country Code (Netherlands=204, France=208, ...\n" . - "# globals like GMail don't have one)\n" . - "# OutgoingMailServer: name of the smtp server (eg. smtp.foo.fi)\n" . - "# SecureSMTP: 'true' if there's secure SMTP\n" . - "# IncomingMailServer\n" . - "# MailboxType: 'pop' or 'imap'\n" . - "# SMTPSecurity: 'true' if SMTP is secure\n" . - "# APOPSecureLogin: 'true' if APOP is supported\n\n"; - -# ignore the first row -for (my $r = $sheet->{MinRow} + 1 ; defined $sheet->{MaxRow} && $r <= $sheet->{MaxRow}; ++$r) { - - my $cell; - - # legend: - # 0: MCC (mobile country code, or 0 for Global) - # 1: MailboxName - # 2: EmailAddress - # 3: OutgoingMailServer - # 4: SecureSmtp - # 5: IncomingMailServer - # 6: SendMessage - # 7: - - next unless ($sheet->{Cells}[$r][0] && $sheet->{Cells}[$r][0]->Value =~ /\d+/); - - # name -> required, unique - $cell = $sheet->{Cells}[$r][1]; - next unless ($cell); - print "[" . $cell->Value . "]\n"; - - # MCC -> TODO: convert to normal country code - $cell = $sheet->{Cells}[$r][0]; - if ($cell->Value > 0) { - print "MCC=" . $cell->Value . "\n"; - } - - # address -> required, unique - #$cell = $sheet->{Cells}[$r][2]; - #print "EmailAddress=" . $cell->Value . "\n"; - - # OutgoingMailServer - $cell = $sheet->{Cells}[$r][3]; - print "OutgoingMailServer=" . $cell->Value . "\n" if ($cell); - - # SecureSmtp? - $cell = $sheet->{Cells}[$r][4]; - print "SecureSmtp=true\n" if ($cell && $cell->Value == 1); - - # IncomingMailServer - $cell = $sheet->{Cells}[$r][5]; - if ($cell) { - print "IncomingMailServer=" . $cell->Value; - - my $type = $sheet->{Cells}[$r][8]->Value; - my $sec = $sheet->{Cells}[$r][9]->Value; - - if ($sec == 2) { - if ($type == 0) { print ":995";} - if ($type == 1) { print ":993";} - } - print "\n"; - print "IncomingSecurity=$sec\n"; - } - - # MailboxType - $cell = $sheet->{Cells}[$r][8]; - if ($cell) { - print "MailboxType="; - if ($cell->Value == '0') {print "pop"} else {print "imap"}; - print "\n"; - } - - $cell = $sheet->{Cells}[$r][10]; - print "APOPSecureLogin=true\n" if ($cell && $cell->Value == 1); -} - -# the end diff --git a/src/Makefile.am b/src/Makefile.am index ab3af92..f5ac689 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -57,8 +57,6 @@ modest_SOURCES=\ modest-marshal.h \ modest-pair.c\ modest-pair.h\ - modest-presets.c\ - modest-presets.h\ modest-protocol-info.c\ modest-protocol-info.h\ modest-text-utils.c\ diff --git a/src/modest-presets.c b/src/modest-presets.c deleted file mode 100644 index 870160e..0000000 --- a/src/modest-presets.c +++ /dev/null @@ -1,189 +0,0 @@ -/* Copyright (c) 2006, Nokia Corporation - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of the Nokia Corporation nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS - * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include /* for strcmp */ -#include "modest-presets.h" - -#define MODEST_PRESETS_KEY_MCC "MCC" -#define MODEST_PRESETS_KEY_INCOMING "IncomingMailServer" -#define MODEST_PRESETS_KEY_OUTGOING "OutgoingMailServer" -#define MODEST_PRESETS_KEY_MAILBOX_TYPE "MailboxType" -#define MODEST_PRESETS_KEY_MAILBOX_TYPE_POP "pop" -#define MODEST_PRESETS_KEY_MAILBOX_TYPE_IMAP "imap" -#define MODEST_PRESETS_KEY_APOP "APOPSecureLogin" -#define MODEST_PRESETS_KEY_SECURE_SMTP "SecureSMTP" -#define MODEST_PRESETS_KEY_TRUE "true" - - -ModestPresets* -modest_presets_new (const gchar *presetfile) -{ - ModestPresets *presets = NULL; - GError *err = NULL; - - g_return_val_if_fail (presetfile, NULL); - - presets = g_new (ModestPresets, 1); - presets->keyfile = g_key_file_new (); - - if (!presets->keyfile) { - g_printerr ("modest: cannot instantiate GKeyFile\n"); - g_free (presets); - return NULL; - } - - if (!g_key_file_load_from_file (presets->keyfile, presetfile, - G_KEY_FILE_NONE, &err)) { - g_printerr ("modest: cannot open keyfile: %s\n", - err ? err->message : "unknown reason"); - g_error_free (err); - g_free (presets); - return NULL; - } - - return presets; -} - -gchar** -modest_presets_get_providers (ModestPresets *self, guint mcc, - gboolean include_globals) -{ - gchar **providers = NULL; - gchar **filtered = NULL; - GError *err = NULL; - guint i, j, len; - - g_return_val_if_fail (self && self->keyfile, NULL); - - providers = g_key_file_get_groups (self->keyfile, NULL); - - /* return *all* providers? */ - if (mcc == 0 && include_globals) - return providers; - - /* nope: filter them */ - len = g_strv_length(providers); - filtered = g_new(gchar*, len + 1); - - for (i=0, j=0; i != len; ++i) { - - int this_mcc; - this_mcc = g_key_file_get_integer (self->keyfile, providers[i], - MODEST_PRESETS_KEY_MCC, &err); - if (err) { - g_strfreev (providers); - g_strfreev (filtered); - g_error_free (err); - g_printerr ("modest: error parsing keyfile: %s\n", err->message); - return NULL; - } - - if (this_mcc == mcc || (this_mcc == 0 && include_globals)) { - filtered[j++] = providers[i]; - filtered[j] = NULL; /* the array must be NULL-terminated */ - providers[i] = NULL; /* g_strfreev: leave it alone */ - } - } - - g_strfreev (providers); - return filtered; -} - - -gchar* -modest_presets_get_server (ModestPresets *self, const gchar *provider, - gboolean incoming_server) -{ - g_return_val_if_fail (self && self->keyfile, NULL); - g_return_val_if_fail (provider, NULL); - - return g_key_file_get_string (self->keyfile, provider, - incoming_server ? - MODEST_PRESETS_KEY_INCOMING : - MODEST_PRESETS_KEY_OUTGOING, - NULL); -} - - -ModestPresetsInfo -modest_presets_get_info (ModestPresets *self, const gchar *provider, gboolean incoming_server) -{ - ModestPresetsInfo info = 0; - gchar *val = NULL; - - g_return_val_if_fail (self && self->keyfile, 0); - - val = g_key_file_get_string (self->keyfile, provider, - MODEST_PRESETS_KEY_INCOMING, NULL); - if (val) { - g_free (val); - val = g_key_file_get_string (self->keyfile, provider, - MODEST_PRESETS_KEY_MAILBOX_TYPE, NULL); - if (strcmp (val, MODEST_PRESETS_KEY_MAILBOX_TYPE_POP) == 0) - info |= MODEST_PRESETS_INFO_POP; - if (strcmp (val, MODEST_PRESETS_KEY_MAILBOX_TYPE_IMAP) == 0) - info |= MODEST_PRESETS_INFO_IMAP; - g_free (val); - - val = g_key_file_get_string (self->keyfile, provider, - MODEST_PRESETS_KEY_APOP, NULL); - if (val && strcmp(val, MODEST_PRESETS_KEY_TRUE) == 0) - info |= MODEST_PRESETS_INFO_APOP; - g_free(val); - } - - - val = g_key_file_get_string (self->keyfile, provider, - MODEST_PRESETS_KEY_OUTGOING, NULL); - if (val) { - g_free (val); - info |= MODEST_PRESETS_INFO_SMTP; - - val = g_key_file_get_string (self->keyfile, provider, - MODEST_PRESETS_KEY_SECURE_SMTP, NULL); - if (val && strcmp(val,MODEST_PRESETS_KEY_TRUE) == 0) - info |= MODEST_PRESETS_INFO_SECURE_SMTP; - g_free(val); - } - - return info; -} - - -void -modest_presets_destroy (ModestPresets *self) -{ - if (!self) - return; - - g_key_file_free (self->keyfile); - self->keyfile = NULL; - - g_free (self); -} diff --git a/src/modest-presets.h b/src/modest-presets.h deleted file mode 100644 index 4afabce..0000000 --- a/src/modest-presets.h +++ /dev/null @@ -1,126 +0,0 @@ -/* Copyright (c) 2006, Nokia Corporation - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of the Nokia Corporation nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS - * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef __MODEST_PRESETS_H__ -#define __MODEST_PRESETS_H__ - -#include - -struct _ModestPresets { -/* private data: don't touch */ - GKeyFile *keyfile; -}; -typedef struct _ModestPresets ModestPresets; - -typedef enum _ModestPresetsInfo { - /* two bits for the server type */ - MODEST_PRESETS_INFO_NONE = 0x0000, - MODEST_PRESETS_INFO_IMAP = 0x0001, - MODEST_PRESETS_INFO_POP = 0x0002, - MODEST_PRESETS_INFO_SMTP = 0x0003, - - /* one bit for each of these */ - MODEST_PRESETS_INFO_APOP = 0x0004, - MODEST_PRESETS_INFO_SECURE_SMTP = 0x0008, - MODEST_PRESETS_INFO_SECURE_INCOMING = 0x000f -} ModestPresetsInfo; - -/* typedef enum _ModestPresetsInfo ModestPresetsInfo; */ - - -/** - * modest_presets_new: - * @presetfile: the full path to the file with presets (in GKeyFile format) - * - * make a new ModestPresets instance - * - * Returns: a new ModestPresets instance, or NULL in case of error. - */ -ModestPresets* modest_presets_new (const gchar *presetfile); - - -/** - * modest_presets_get_providers: - * @self: a valid ModestPresets instance - * @mcc: limit the search to providers with this mcc (Mobile Country Code), - * or 0 to get all - * @include_globals: include (global) providers without MCC (such as GMail, Yahoo) - * - * get a list of providers matching certian criteria - * - * Returns: a newly allocated array of strings, or NULL in case of error - * should be freed with g_strvfree - * - **/ -gchar ** modest_presets_get_providers (ModestPresets *self, guint mcc, - gboolean include_globals); - -/** - * modest_presets_get_server: - * @self: a valid ModestPresets instance - * @provider: name of the provider - * @incoming_server: get the incoming mailserver if TRUE, get the - * outgoing server otherwise - * - * get the name of a incoming or outgoing mailserver - * - * Returns: a newly allocated string with the servername, or NULL in case - * of error, or server not found. (FIXME). Note that if the (incoming) server uses a - * non-standard port, the port number is appended to the name, eg. pop.foo.fi:995 - */ -gchar * modest_presets_get_server (ModestPresets *self, - const gchar *provider, - gboolean incoming_server); -/** - * modest_presets_get_info: - * @self: a valid ModestPresets instance - * @provider: name of the provider - * @incoming_server: get the incoming mailserver if TRUE, get the - * outgoing server otherwise - * - * get information about some incoming or outgoing mailserver - * - * Returns: a ModestPresetsInfo with the required information - */ -ModestPresetsInfo modest_presets_get_info (ModestPresets *self, - const gchar *provider, - gboolean incoming_server); - -/** - * modest_presets_destroy: - * @self: a valid ModestPresets instance (ie. must not be NULL) - * - * destroy ModestPresets instance; this is required after you're done with it. - */ -void modest_presets_destroy (ModestPresets *self); - - -#endif /*__MODEST_PRESETS__*/ - - diff --git a/tests/Makefile.am b/tests/Makefile.am index eb49c54..b6cfa74 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -9,7 +9,6 @@ TESTS_ENVIRONMENT = top_builddir=$(top_builddir) \ CK_VERBOSITY=verbose TESTS = \ - check_modest-presets \ check_folder-xfer \ check_text-utils \ check_modest-conf \ @@ -20,7 +19,6 @@ noinst_PROGRAMS= \ check_folder-xfer \ check_modest-conf \ check_text-utils \ - check_modest-presets \ check_update_account \ check_account-mgr @@ -74,10 +72,6 @@ check_text_utils_SOURCES=\ check_text-utils.c check_text_utils_LDADD = $(objects) -check_modest_presets_SOURCES=\ - check_modest-presets.c -check_modest_presets_LDADD = $(objects) - check_account_mgr_SOURCES=\ check_account-mgr.c check_account_mgr_LDADD = $(objects) diff --git a/tests/check_modest-presets.c b/tests/check_modest-presets.c deleted file mode 100644 index fd6ba8e..0000000 --- a/tests/check_modest-presets.c +++ /dev/null @@ -1,127 +0,0 @@ -/* Copyright (c) 2006, Nokia Corporation - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of the Nokia Corporation nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS - * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include -#include -#include - -START_TEST (test_modest_presets_new) -{ - ModestPresets *presets; - - presets = modest_presets_new ("provider-data-test.keyfile"); - fail_unless (presets != NULL, - "modest_presets_new should return a valid ModestPresets*"); - modest_presets_destroy (presets); - - presets = modest_presets_new ("/foo/bar/cuux"); - fail_unless (presets == NULL, - "modest_presets_new should return NULL when given an invalid file"); - if (presets) - modest_presets_destroy (presets); -} -END_TEST - - - -START_TEST (test_modest_presets_get_providers) -{ - ModestPresets *presets; - gchar **providers; - int len; - - presets = modest_presets_new ("provider-data-test.keyfile"); - fail_unless (presets != NULL, - "modest_presets_new should return a valid ModestPresets"); - - /* get all providers */ - providers = modest_presets_get_providers (presets, 0, TRUE); - len = g_strv_length(providers); -// for (i = 0; i != len; ++i) -// g_print ("%s\n", providers[i]); - - fail_unless (providers && len == 5, - "modest_presets_get_providers(presets, 0, TRUE) should return 5 providers " - "but I got %d", len); - g_strfreev (providers); - - /* get all providers in Finland */ - providers = modest_presets_get_providers (presets, 244, FALSE); - len = g_strv_length(providers); - fail_unless (providers && len == 2, - "modest_presets_get_providers (presets,244, FALSE) should return 2 providers " - "but I got %d", len); - g_strfreev (providers); - - /* get all providers in Afghanistan + international */ - providers = modest_presets_get_providers (presets, 412, TRUE); - len = g_strv_length(providers); - fail_unless (providers && len == 3, - "modest_presets_get_providers (presets, 412, TRUE) should return 3 providers " - "but I got %d", len); - g_strfreev (providers); - - if (presets) - modest_presets_destroy (presets); -} -END_TEST - - - -static Suite* -modest_presets_suite (void) -{ - Suite *suite = suite_create ("ModestPresets"); - - TCase *tc_core = tcase_create ("core"); - tcase_add_test (tc_core, test_modest_presets_new); - tcase_add_test (tc_core, test_modest_presets_get_providers); - - suite_add_tcase (suite, tc_core); - - return suite; -} - - -int -main () -{ - SRunner *srunner; - Suite *suite; - int failures; - - suite = modest_presets_suite (); - srunner = srunner_create (suite); - - srunner_run_all (srunner, CK_NORMAL); - failures = srunner_ntests_failed (srunner); - srunner_free (srunner); - - return failures; -} diff --git a/tests/provider-data-test.keyfile b/tests/provider-data-test.keyfile deleted file mode 100644 index ee1c1be..0000000 --- a/tests/provider-data-test.keyfile +++ /dev/null @@ -1,31 +0,0 @@ -[Bla] -MCC=0 -OutgoingMailServer=smtp.bla.com -SecureSmtp=true -IncomingMailServer=pop.bla.com:995 -IncomingSecurity=2 -MailboxType=pop -[Foo] -MCC=0 -OutgoingMailServer=mail.foo.com -IncomingMailServer=smtp.foo.com -IncomingSecurity=0 -MailboxType=pop -[XXX] -MCC=244 -OutgoingMailServer=smtp.xxx.fi -IncomingMailServer=mail.xxx.fi -IncomingSecurity=0 -MailboxType=imap -[ZZZ] -MCC=244 -OutgoingMailServer=smtp.zzz.fi -IncomingMailServer=mail.zzz.fi -IncomingSecurity=0 -MailboxType=pop -[RRR] -MCC=412 -OutgoingMailServer=smtp.rrr.af -IncomingMailServer=mail.rrr.af -IncomingSecurity=0 -MailboxType=imap -- 1.7.9.5