r18879 - gnucash/trunk/src/core-utils/test - Fix failing core-utils tests
Geert Janssens
gjanssens at code.gnucash.org
Tue Mar 9 07:17:13 EST 2010
Author: gjanssens
Date: 2010-03-09 07:17:12 -0500 (Tue, 09 Mar 2010)
New Revision: 18879
Trac: http://svn.gnucash.org/trac/changeset/18879
Removed:
gnucash/trunk/src/core-utils/test/test-resolve-url.c
Modified:
gnucash/trunk/src/core-utils/test/Makefile.am
gnucash/trunk/src/core-utils/test/test-resolve-file-path.c
Log:
Fix failing core-utils tests
I simply removed the obsolete test cases. More work is still needed to add new valid tests.
Modified: gnucash/trunk/src/core-utils/test/Makefile.am
===================================================================
--- gnucash/trunk/src/core-utils/test/Makefile.am 2010-03-08 21:57:23 UTC (rev 18878)
+++ gnucash/trunk/src/core-utils/test/Makefile.am 2010-03-09 12:17:12 UTC (rev 18879)
@@ -18,8 +18,7 @@
# that they should be executed, with more basic tests coming first.
#
TESTS = \
- test-resolve-file-path \
- test-resolve-url
+ test-resolve-file-path
GNC_TEST_DEPS = \
--library-dir ${top_builddir}/lib/libqof/qof \
@@ -30,8 +29,7 @@
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
check_PROGRAMS = \
- test-resolve-file-path \
- test-resolve-url
+ test-resolve-file-path
EXTRA_DIST =
Modified: gnucash/trunk/src/core-utils/test/test-resolve-file-path.c
===================================================================
--- gnucash/trunk/src/core-utils/test/test-resolve-file-path.c 2010-03-08 21:57:23 UTC (rev 18878)
+++ gnucash/trunk/src/core-utils/test/test-resolve-file-path.c 2010-03-09 12:17:12 UTC (rev 18879)
@@ -49,26 +49,8 @@
G_DIR_SEPARATOR_S "tmp" G_DIR_SEPARATOR_S "test-account-name2",
G_DIR_SEPARATOR_S "tmp" G_DIR_SEPARATOR_S "test-account-name2", 0
},
- {
- "postgres://localhost/foo/bar",
- G_DIR_SEPARATOR_S ".gnucash" G_DIR_SEPARATOR_S "data" G_DIR_SEPARATOR_S "postgres___localhost_foo_bar", 2
- },
- {
- "file:/tmp/test-account-name3",
- G_DIR_SEPARATOR_S "tmp" G_DIR_SEPARATOR_S "test-account-name3", 0
- },
- {
- "file:///tmp/test-account-name3",
- G_DIR_SEPARATOR_S "tmp" G_DIR_SEPARATOR_S "test-account-name3", 0
- },
- {
- "xml:/tmp/test-account-name3",
- G_DIR_SEPARATOR_S "tmp" G_DIR_SEPARATOR_S "test-account-name3", 0
- },
- {
- "xml:///tmp/test-account-name3",
- G_DIR_SEPARATOR_S "tmp" G_DIR_SEPARATOR_S "test-account-name3", 0
- },
+ /* TODO Figure out how to write tests that actually verify the relative
+ * pathname resolution. The above tests only test absolut pathnames */
{ NULL, NULL, 0 },
};
@@ -104,9 +86,9 @@
wantout = g_strdup(strs[i].output);
}
- daout = xaccResolveFilePath(dain);
+ daout = gnc_resolve_file_path(dain);
do_test_args(safe_strcmp(daout, wantout) == 0,
- "xaccResolveFilePath",
+ "gnc_resolve_file_path",
__FILE__, __LINE__,
"%s (%s) vs %s", daout, dain, wantout);
g_free(dain);
Deleted: gnucash/trunk/src/core-utils/test/test-resolve-url.c
===================================================================
--- gnucash/trunk/src/core-utils/test/test-resolve-url.c 2010-03-08 21:57:23 UTC (rev 18878)
+++ gnucash/trunk/src/core-utils/test/test-resolve-url.c 2010-03-09 12:17:12 UTC (rev 18879)
@@ -1,126 +0,0 @@
-/***************************************************************************
- * test-resolve-file-path.c
- *
- * Thu Sep 29 22:48:57 2005
- * Copyright 2005 GnuCash team
- ****************************************************************************/
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-#include "config.h"
-#include <stdlib.h>
-#include <string.h>
-
-#include <glib.h>
-#include "qof.h"
-#include "test-stuff.h"
-#include "gnc-filepath-utils.h"
-
-struct test_strings_struct
-{
- char *input;
- char *output;
- int prefix_home;
-};
-
-typedef struct test_strings_struct test_strings;
-
-test_strings strs[] =
-{
- {
- G_DIR_SEPARATOR_S ".gnucash" G_DIR_SEPARATOR_S "test-account-name",
- G_DIR_SEPARATOR_S ".gnucash" G_DIR_SEPARATOR_S "test-account-name", 1
- },
- {
- G_DIR_SEPARATOR_S "tmp" G_DIR_SEPARATOR_S "test-account-name2",
- G_DIR_SEPARATOR_S "tmp" G_DIR_SEPARATOR_S "test-account-name2", 0
- },
- {
- "postgres://localhost/foo/bar",
- G_DIR_SEPARATOR_S ".gnucash" G_DIR_SEPARATOR_S "data" G_DIR_SEPARATOR_S "postgres___localhost_foo_bar", 2
- },
- {
- "http://www.gnucash.org/index.html",
- "http://www.gnucash.org/index.html", 0
- },
- {
- "https://www.gnucash.org/index.html",
- "https://www.gnucash.org/index.html", 0
- },
- {
- "file:/tmp/test-account-name3",
- G_DIR_SEPARATOR_S "tmp" G_DIR_SEPARATOR_S "test-account-name3", 0
- },
- {
- "file:///tmp/test-account-name3",
- G_DIR_SEPARATOR_S "tmp" G_DIR_SEPARATOR_S "test-account-name3", 0
- },
- {
- "xml:/tmp/test-account-name3",
- "xml:" G_DIR_SEPARATOR_S "tmp" G_DIR_SEPARATOR_S "test-account-name3", 0
- },
- {
- "xml:///tmp/test-account-name3",
- "xml:" G_DIR_SEPARATOR_S "tmp" G_DIR_SEPARATOR_S "test-account-name3", 0
- },
- { NULL, NULL, 0 },
-};
-
-int
-main(int argc, char **argv)
-{
- int i;
-
- qof_init();
-
- for (i = 0; strs[i].input != NULL; i++)
- {
- char *daout;
- char *dain;
- char *wantout;
-
- if (strs[i].prefix_home == 1)
- {
- dain = g_build_filename(g_get_home_dir(), strs[i].input,
- (gchar *)NULL);
- wantout = g_build_filename(g_get_home_dir(), strs[i].output,
- (gchar *)NULL);
- }
- else if (strs[i].prefix_home == 2)
- {
- dain = g_strdup(strs[i].input);
- wantout = g_build_filename(g_get_home_dir(), strs[i].output,
- (gchar *)NULL);
- }
- else
- {
- dain = g_strdup(strs[i].input);
- wantout = g_strdup(strs[i].output);
- }
-
- daout = xaccResolveURL(dain);
- do_test_args(safe_strcmp(daout, wantout) == 0,
- "xaccResolveFilePath",
- __FILE__, __LINE__,
- "%s (%s) vs %s", daout, dain, wantout);
- g_free(dain);
- g_free(wantout);
- g_free(daout);
- }
- print_test_results();
- return get_rv();
-}
More information about the gnucash-changes
mailing list