r16687 - gnucash/branches/gda-dev - 1) Fix xml tests so that they compile again
Phil Longstaff
plongstaff at cvs.gnucash.org
Wed Dec 19 19:59:17 EST 2007
Author: plongstaff
Date: 2007-12-19 19:59:17 -0500 (Wed, 19 Dec 2007)
New Revision: 16687
Trac: http://svn.gnucash.org/trac/changeset/16687
Added:
gnucash/branches/gda-dev/src/backend/gda/test/
gnucash/branches/gda-dev/src/backend/gda/test/Makefile.am
gnucash/branches/gda-dev/src/backend/gda/test/test-load-backend.c
Modified:
gnucash/branches/gda-dev/configure.in
gnucash/branches/gda-dev/src/backend/gda/Makefile.am
gnucash/branches/gda-dev/src/backend/gda/gnc-backend-util-gda.c
gnucash/branches/gda-dev/src/backend/xml/test/Makefile.am
gnucash/branches/gda-dev/src/backend/xml/test/test-load-backend.c
gnucash/branches/gda-dev/src/backend/xml/test/test-load-xml2.c
Log:
1) Fix xml tests so that they compile again
2) Add test dir for gda backend
3) Create gda backend boolean handler separate from int handler
Modified: gnucash/branches/gda-dev/configure.in
===================================================================
--- gnucash/branches/gda-dev/configure.in 2007-12-19 22:39:02 UTC (rev 16686)
+++ gnucash/branches/gda-dev/configure.in 2007-12-20 00:59:17 UTC (rev 16687)
@@ -1482,6 +1482,7 @@
src/backend/xml/test/test-files/Makefile
src/backend/xml/test/test-files/xml2/Makefile
src/backend/gda/Makefile
+ src/backend/gda/test/Makefile
src/backend/postgres/Makefile
src/backend/postgres/test/Makefile
src/bin/Makefile
Modified: gnucash/branches/gda-dev/src/backend/gda/Makefile.am
===================================================================
--- gnucash/branches/gda-dev/src/backend/gda/Makefile.am 2007-12-19 22:39:02 UTC (rev 16686)
+++ gnucash/branches/gda-dev/src/backend/gda/Makefile.am 2007-12-20 00:59:17 UTC (rev 16687)
@@ -1,4 +1,4 @@
-SUBDIRS = .
+SUBDIRS = . test
# Now a shared library AND a GModule
lib_LTLIBRARIES = libgnc-backend-gda-utils.la
Modified: gnucash/branches/gda-dev/src/backend/gda/gnc-backend-util-gda.c
===================================================================
--- gnucash/branches/gda-dev/src/backend/gda/gnc-backend-util-gda.c 2007-12-19 22:39:02 UTC (rev 16686)
+++ gnucash/branches/gda-dev/src/backend/gda/gnc-backend-util-gda.c 2007-12-20 00:59:17 UTC (rev 16687)
@@ -297,6 +297,79 @@
/* ----------------------------------------------------------------- */
static void
+load_boolean( GdaDataModel* pModel, gint row,
+ QofSetterFunc setter, gpointer pObject,
+ const col_cvt_t* table )
+{
+ const GValue* val;
+ gint int_value;
+
+ val = gda_data_model_get_value_at_col_name( pModel, table->col_name, row );
+ if( gda_value_is_null( val ) ) {
+ int_value = 0;
+ } else {
+ int_value = g_value_get_int( val );
+ }
+ if( table->gobj_param_name != NULL ) {
+ g_object_set( pObject, table->gobj_param_name, int_value, NULL );
+ } else {
+ (*setter)( pObject, GINT_TO_POINTER(int_value) );
+ }
+}
+
+static void
+get_gvalue_boolean( GncGdaBackend* be, QofIdTypeConst obj_name,
+ gpointer pObject, const col_cvt_t* table_row, GValue* value )
+{
+ gint int_value;
+ QofAccessFunc getter;
+
+ memset( value, 0, sizeof( GValue ) );
+
+ getter = get_getter( obj_name, table_row );
+ int_value = GPOINTER_TO_INT((*getter)( pObject, NULL ));
+ g_value_init( value, G_TYPE_INT );
+ g_value_set_int( value, int_value );
+}
+
+static void
+get_gvalue_boolean_for_query( GncGdaBackend* be, QofIdTypeConst obj_name,
+ gpointer pObject, const col_cvt_t* table_row, GdaQuery* query )
+{
+ GValue value;
+
+ get_gvalue_int( be, obj_name, pObject, table_row, &value );
+ add_field_to_query( query, table_row->col_name, &value );
+}
+
+static GdaQueryCondition*
+get_gvalue_boolean_cond( GncGdaBackend* be, QofIdTypeConst obj_name,
+ gpointer pObject, const col_cvt_t* table_row, GdaQuery* query )
+{
+ GValue value;
+
+ get_gvalue_int( be, obj_name, pObject, table_row, &value );
+ return gnc_gda_create_condition_from_field( query, table_row->col_name, &value );
+}
+
+static void
+create_boolean_col( GdaServerProvider* server, GdaConnection* cnn,
+ xmlNodePtr array_data, const col_cvt_t* table_row, gboolean pkey )
+{
+ const gchar* dbms_type;
+
+ dbms_type = gda_server_provider_get_default_dbms_type( server,
+ cnn, G_TYPE_INT );
+ add_table_column( server, cnn, array_data, table_row->col_name,
+ dbms_type, table_row->size, table_row->flags | pkey ? COL_PKEY : 0 );
+}
+
+static col_type_handler_t boolean_handler =
+ { load_boolean, create_boolean_col,
+ get_gvalue_boolean_for_query, get_gvalue_boolean_cond };
+/* ----------------------------------------------------------------- */
+
+static void
load_int64( GdaDataModel* pModel, gint row,
QofSetterFunc setter, gpointer pObject,
const col_cvt_t* table )
@@ -877,6 +950,9 @@
break;
case CT_BOOLEAN:
+ pHandler = &boolean_handler;
+ break;
+
case CT_INT:
pHandler = &int_handler;
break;
Added: gnucash/branches/gda-dev/src/backend/gda/test/Makefile.am
===================================================================
--- gnucash/branches/gda-dev/src/backend/gda/test/Makefile.am (rev 0)
+++ gnucash/branches/gda-dev/src/backend/gda/test/Makefile.am 2007-12-20 00:59:17 UTC (rev 16687)
@@ -0,0 +1,48 @@
+SUBDIRS = .
+
+TESTS = \
+ test-load-backend
+
+GNC_TEST_DEPS := \
+ --gnc-module-dir ${top_builddir}/src/engine \
+ --guile-load-dir ${top_builddir}/src/engine \
+ --library-dir ${top_builddir}/lib/libqof/qof \
+ --library-dir ${top_builddir}/src/core-utils \
+ --library-dir ${top_builddir}/src/gnc-module \
+ --library-dir ${top_builddir}/src/engine \
+ --library-dir ${top_builddir}/src/backend/gda
+
+TESTS_ENVIRONMENT := \
+ GNC_ACCOUNT_PATH=${top_srcdir}/accounts/C \
+ SRCDIR=${srcdir} \
+ $(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
+
+check_PROGRAMS = \
+ test-load-backend
+
+#noinst_HEADERS = test-file-stuff.h
+
+LDADD = ${top_builddir}/src/test-core/libgncmod-test.la \
+ ${top_builddir}/src/gnc-module/libgnc-module.la \
+ ${top_builddir}/src/engine/libgncmod-engine.la \
+ ${top_builddir}/src/engine/test-core/libgncmod-test-engine.la \
+ ${top_builddir}/src/core-utils/libgnc-core-utils.la \
+ ${QOF_LIBS} \
+ ${top_builddir}/lib/libc/libc-missing.la
+
+AM_CFLAGS = \
+ -I${top_srcdir}/lib/libc \
+ -I${top_srcdir}/src \
+ -I${top_srcdir}/src/core-utils \
+ -I${top_srcdir}/src/gnc-module \
+ -I${top_srcdir}/src/test-core \
+ -I${top_srcdir}/src/engine \
+ -I${top_srcdir}/src/engine/test-core \
+ -I${top_srcdir}/src/backend/gda \
+ -I${top_srcdir}/src/backend/qsf \
+ ${GLIB_CFLAGS} \
+ ${QOF_CFLAGS} \
+ ${GUILE_INCS} \
+ ${GCONF_CFLAGS}
+
+INCLUDES = -DG_LOG_DOMAIN=\"gnc.backend.gda\"
Added: gnucash/branches/gda-dev/src/backend/gda/test/test-load-backend.c
===================================================================
--- gnucash/branches/gda-dev/src/backend/gda/test/test-load-backend.c (rev 0)
+++ gnucash/branches/gda-dev/src/backend/gda/test/test-load-backend.c 2007-12-20 00:59:17 UTC (rev 16687)
@@ -0,0 +1,45 @@
+/***************************************************************************
+ * test-load-backend.c
+ *
+ * Replaces the guile version to test the GModule file backend loading.
+ *
+ * Sun Oct 9 18:58:47 2005
+ * Copyright 2005 Neil Williams
+ * linux at codehelp.co.uk
+ ****************************************************************************/
+
+/*
+ * 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 "qof.h"
+#include "cashobjects.h"
+#include "test-stuff.h"
+
+#define GNC_LIB_NAME "gncmod-backend-gda"
+
+int main (int argc, char ** argv)
+{
+ qof_init();
+ cashobjects_register();
+ do_test(
+ qof_load_backend_library ("../.libs/", GNC_LIB_NAME),
+ " loading gnc-backend-gda GModule failed");
+ print_test_results();
+ qof_close();
+ exit(get_rv());
+}
Modified: gnucash/branches/gda-dev/src/backend/xml/test/Makefile.am
===================================================================
--- gnucash/branches/gda-dev/src/backend/xml/test/Makefile.am 2007-12-19 22:39:02 UTC (rev 16686)
+++ gnucash/branches/gda-dev/src/backend/xml/test/Makefile.am 2007-12-20 00:59:17 UTC (rev 16687)
@@ -1,167 +1,167 @@
SUBDIRS = test-files
test_date_converting_SOURCES = \
- ${top_srcdir}/src/backend/file/sixtp-dom-parsers.c \
- ${top_srcdir}/src/backend/file/sixtp-dom-generators.c \
- ${top_srcdir}/src/backend/file/sixtp-utils.c \
- ${top_srcdir}/src/backend/file/sixtp.c \
- ${top_srcdir}/src/backend/file/sixtp-stack.c \
- ${top_srcdir}/src/backend/file/sixtp-to-dom-parser.c \
+ ${top_srcdir}/src/backend/xml/sixtp-dom-parsers.c \
+ ${top_srcdir}/src/backend/xml/sixtp-dom-generators.c \
+ ${top_srcdir}/src/backend/xml/sixtp-utils.c \
+ ${top_srcdir}/src/backend/xml/sixtp.c \
+ ${top_srcdir}/src/backend/xml/sixtp-stack.c \
+ ${top_srcdir}/src/backend/xml/sixtp-to-dom-parser.c \
test-date-converting.c
test_dom_converters1_SOURCES = \
- ${top_srcdir}/src/backend/file/sixtp-dom-parsers.c \
- ${top_srcdir}/src/backend/file/sixtp-dom-generators.c \
- ${top_srcdir}/src/backend/file/sixtp-utils.c \
- ${top_srcdir}/src/backend/file/sixtp.c \
- ${top_srcdir}/src/backend/file/sixtp-stack.c \
- ${top_srcdir}/src/backend/file/sixtp-to-dom-parser.c \
+ ${top_srcdir}/src/backend/xml/sixtp-dom-parsers.c \
+ ${top_srcdir}/src/backend/xml/sixtp-dom-generators.c \
+ ${top_srcdir}/src/backend/xml/sixtp-utils.c \
+ ${top_srcdir}/src/backend/xml/sixtp.c \
+ ${top_srcdir}/src/backend/xml/sixtp-stack.c \
+ ${top_srcdir}/src/backend/xml/sixtp-to-dom-parser.c \
test-dom-converters1.c
test_kvp_frames_SOURCES = \
- ${top_srcdir}/src/backend/file/sixtp-dom-parsers.c \
- ${top_srcdir}/src/backend/file/sixtp-dom-generators.c \
- ${top_srcdir}/src/backend/file/sixtp-utils.c \
- ${top_srcdir}/src/backend/file/sixtp.c \
- ${top_srcdir}/src/backend/file/sixtp-stack.c \
- ${top_srcdir}/src/backend/file/sixtp-to-dom-parser.c \
+ ${top_srcdir}/src/backend/xml/sixtp-dom-parsers.c \
+ ${top_srcdir}/src/backend/xml/sixtp-dom-generators.c \
+ ${top_srcdir}/src/backend/xml/sixtp-utils.c \
+ ${top_srcdir}/src/backend/xml/sixtp.c \
+ ${top_srcdir}/src/backend/xml/sixtp-stack.c \
+ ${top_srcdir}/src/backend/xml/sixtp-to-dom-parser.c \
test-kvp-frames.c
-# the file backend is now a GModule - this test does
+# the xml backend is now a GModule - this test does
# not load it as a module and cannot link to it
# and remain portable.
test_load_example_account_SOURCES = \
- ${top_srcdir}/src/backend/file/sixtp-dom-parsers.c \
- ${top_srcdir}/src/backend/file/sixtp-dom-generators.c \
- ${top_srcdir}/src/backend/file/sixtp-utils.c \
- ${top_srcdir}/src/backend/file/sixtp.c \
- ${top_srcdir}/src/backend/file/sixtp-stack.c \
- ${top_srcdir}/src/backend/file/sixtp-to-dom-parser.c \
- ${top_srcdir}/src/backend/file/io-example-account.c \
- ${top_srcdir}/src/backend/file/io-gncxml-gen.c \
- ${top_srcdir}/src/backend/file/io-gncxml-v2.c \
- ${top_srcdir}/src/backend/file/io-utils.c \
- ${top_srcdir}/src/backend/file/gnc-account-xml-v2.c \
- ${top_srcdir}/src/backend/file/gnc-budget-xml-v2.c \
- ${top_srcdir}/src/backend/file/gnc-lot-xml-v2.c \
- ${top_srcdir}/src/backend/file/gnc-recurrence-xml-v2.c \
- ${top_srcdir}/src/backend/file/gnc-schedxaction-xml-v2.c \
- ${top_srcdir}/src/backend/file/gnc-freqspec-xml-v2.c \
- ${top_srcdir}/src/backend/file/gnc-transaction-xml-v2.c \
- ${top_srcdir}/src/backend/file/gnc-commodity-xml-v2.c \
- ${top_srcdir}/src/backend/file/gnc-book-xml-v2.c \
- ${top_srcdir}/src/backend/file/gnc-pricedb-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/sixtp-dom-parsers.c \
+ ${top_srcdir}/src/backend/xml/sixtp-dom-generators.c \
+ ${top_srcdir}/src/backend/xml/sixtp-utils.c \
+ ${top_srcdir}/src/backend/xml/sixtp.c \
+ ${top_srcdir}/src/backend/xml/sixtp-stack.c \
+ ${top_srcdir}/src/backend/xml/sixtp-to-dom-parser.c \
+ ${top_srcdir}/src/backend/xml/io-example-account.c \
+ ${top_srcdir}/src/backend/xml/io-gncxml-gen.c \
+ ${top_srcdir}/src/backend/xml/io-gncxml-v2.c \
+ ${top_srcdir}/src/backend/xml/io-utils.c \
+ ${top_srcdir}/src/backend/xml/gnc-account-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/gnc-budget-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/gnc-lot-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/gnc-recurrence-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/gnc-schedxaction-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/gnc-freqspec-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/gnc-transaction-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/gnc-commodity-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/gnc-book-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/gnc-pricedb-xml-v2.c \
test-load-example-account.c
test_string_converters_SOURCES = \
- ${top_srcdir}/src/backend/file/sixtp-dom-parsers.c \
- ${top_srcdir}/src/backend/file/sixtp-dom-generators.c \
- ${top_srcdir}/src/backend/file/sixtp-utils.c \
- ${top_srcdir}/src/backend/file/sixtp.c \
- ${top_srcdir}/src/backend/file/sixtp-stack.c \
- ${top_srcdir}/src/backend/file/sixtp-to-dom-parser.c \
+ ${top_srcdir}/src/backend/xml/sixtp-dom-parsers.c \
+ ${top_srcdir}/src/backend/xml/sixtp-dom-generators.c \
+ ${top_srcdir}/src/backend/xml/sixtp-utils.c \
+ ${top_srcdir}/src/backend/xml/sixtp.c \
+ ${top_srcdir}/src/backend/xml/sixtp-stack.c \
+ ${top_srcdir}/src/backend/xml/sixtp-to-dom-parser.c \
test-string-converters.c
test_xml_account_SOURCES = \
- ${top_srcdir}/src/backend/file/sixtp-dom-parsers.c \
- ${top_srcdir}/src/backend/file/sixtp-dom-generators.c \
- ${top_srcdir}/src/backend/file/sixtp-utils.c \
- ${top_srcdir}/src/backend/file/sixtp.c \
- ${top_srcdir}/src/backend/file/sixtp-stack.c \
- ${top_srcdir}/src/backend/file/sixtp-to-dom-parser.c \
- ${top_srcdir}/src/backend/file/io-gncxml-gen.c \
- ${top_srcdir}/src/backend/file/gnc-account-xml-v2.c \
- ${top_srcdir}/src/backend/file/gnc-lot-xml-v2.c \
- ${top_srcdir}/src/backend/file/gnc-schedxaction-xml-v2.c \
- ${top_srcdir}/src/backend/file/gnc-recurrence-xml-v2.c \
- ${top_srcdir}/src/backend/file/gnc-freqspec-xml-v2.c \
- ${top_srcdir}/src/backend/file/gnc-transaction-xml-v2.c \
- ${top_srcdir}/src/backend/file/gnc-commodity-xml-v2.c \
- ${top_srcdir}/src/backend/file/gnc-book-xml-v2.c \
- ${top_srcdir}/src/backend/file/gnc-pricedb-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/sixtp-dom-parsers.c \
+ ${top_srcdir}/src/backend/xml/sixtp-dom-generators.c \
+ ${top_srcdir}/src/backend/xml/sixtp-utils.c \
+ ${top_srcdir}/src/backend/xml/sixtp.c \
+ ${top_srcdir}/src/backend/xml/sixtp-stack.c \
+ ${top_srcdir}/src/backend/xml/sixtp-to-dom-parser.c \
+ ${top_srcdir}/src/backend/xml/io-gncxml-gen.c \
+ ${top_srcdir}/src/backend/xml/gnc-account-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/gnc-lot-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/gnc-schedxaction-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/gnc-recurrence-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/gnc-freqspec-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/gnc-transaction-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/gnc-commodity-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/gnc-book-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/gnc-pricedb-xml-v2.c \
test-xml-account.c
test_xml_commodity_SOURCES = \
- ${top_srcdir}/src/backend/file/sixtp-dom-parsers.c \
- ${top_srcdir}/src/backend/file/sixtp-dom-generators.c \
- ${top_srcdir}/src/backend/file/sixtp-utils.c \
- ${top_srcdir}/src/backend/file/sixtp.c \
- ${top_srcdir}/src/backend/file/sixtp-stack.c \
- ${top_srcdir}/src/backend/file/sixtp-to-dom-parser.c \
- ${top_srcdir}/src/backend/file/io-gncxml-gen.c \
- ${top_srcdir}/src/backend/file/gnc-account-xml-v2.c \
- ${top_srcdir}/src/backend/file/gnc-lot-xml-v2.c \
- ${top_srcdir}/src/backend/file/gnc-schedxaction-xml-v2.c \
- ${top_srcdir}/src/backend/file/gnc-recurrence-xml-v2.c \
- ${top_srcdir}/src/backend/file/gnc-freqspec-xml-v2.c \
- ${top_srcdir}/src/backend/file/gnc-transaction-xml-v2.c \
- ${top_srcdir}/src/backend/file/gnc-commodity-xml-v2.c \
- ${top_srcdir}/src/backend/file/gnc-book-xml-v2.c \
- ${top_srcdir}/src/backend/file/gnc-pricedb-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/sixtp-dom-parsers.c \
+ ${top_srcdir}/src/backend/xml/sixtp-dom-generators.c \
+ ${top_srcdir}/src/backend/xml/sixtp-utils.c \
+ ${top_srcdir}/src/backend/xml/sixtp.c \
+ ${top_srcdir}/src/backend/xml/sixtp-stack.c \
+ ${top_srcdir}/src/backend/xml/sixtp-to-dom-parser.c \
+ ${top_srcdir}/src/backend/xml/io-gncxml-gen.c \
+ ${top_srcdir}/src/backend/xml/gnc-account-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/gnc-lot-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/gnc-schedxaction-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/gnc-recurrence-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/gnc-freqspec-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/gnc-transaction-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/gnc-commodity-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/gnc-book-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/gnc-pricedb-xml-v2.c \
test-xml-commodity.c
test_xml_pricedb_SOURCES = \
- ${top_srcdir}/src/backend/file/sixtp-dom-parsers.c \
- ${top_srcdir}/src/backend/file/sixtp-dom-generators.c \
- ${top_srcdir}/src/backend/file/sixtp-utils.c \
- ${top_srcdir}/src/backend/file/sixtp.c \
- ${top_srcdir}/src/backend/file/sixtp-stack.c \
- ${top_srcdir}/src/backend/file/sixtp-to-dom-parser.c \
- ${top_srcdir}/src/backend/file/io-gncxml-gen.c \
- ${top_srcdir}/src/backend/file/gnc-account-xml-v2.c \
- ${top_srcdir}/src/backend/file/gnc-lot-xml-v2.c \
- ${top_srcdir}/src/backend/file/gnc-schedxaction-xml-v2.c \
- ${top_srcdir}/src/backend/file/gnc-recurrence-xml-v2.c \
- ${top_srcdir}/src/backend/file/gnc-freqspec-xml-v2.c \
- ${top_srcdir}/src/backend/file/gnc-transaction-xml-v2.c \
- ${top_srcdir}/src/backend/file/gnc-commodity-xml-v2.c \
- ${top_srcdir}/src/backend/file/gnc-book-xml-v2.c \
- ${top_srcdir}/src/backend/file/gnc-pricedb-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/sixtp-dom-parsers.c \
+ ${top_srcdir}/src/backend/xml/sixtp-dom-generators.c \
+ ${top_srcdir}/src/backend/xml/sixtp-utils.c \
+ ${top_srcdir}/src/backend/xml/sixtp.c \
+ ${top_srcdir}/src/backend/xml/sixtp-stack.c \
+ ${top_srcdir}/src/backend/xml/sixtp-to-dom-parser.c \
+ ${top_srcdir}/src/backend/xml/io-gncxml-gen.c \
+ ${top_srcdir}/src/backend/xml/gnc-account-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/gnc-lot-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/gnc-schedxaction-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/gnc-recurrence-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/gnc-freqspec-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/gnc-transaction-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/gnc-commodity-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/gnc-book-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/gnc-pricedb-xml-v2.c \
test-xml-pricedb.c
test_xml_transaction_SOURCES = \
- ${top_srcdir}/src/backend/file/sixtp-dom-parsers.c \
- ${top_srcdir}/src/backend/file/sixtp-dom-generators.c \
- ${top_srcdir}/src/backend/file/sixtp-utils.c \
- ${top_srcdir}/src/backend/file/sixtp.c \
- ${top_srcdir}/src/backend/file/sixtp-stack.c \
- ${top_srcdir}/src/backend/file/sixtp-to-dom-parser.c \
- ${top_srcdir}/src/backend/file/io-gncxml-gen.c \
- ${top_srcdir}/src/backend/file/gnc-account-xml-v2.c \
- ${top_srcdir}/src/backend/file/gnc-budget-xml-v2.c \
- ${top_srcdir}/src/backend/file/gnc-lot-xml-v2.c \
- ${top_srcdir}/src/backend/file/gnc-schedxaction-xml-v2.c \
- ${top_srcdir}/src/backend/file/gnc-freqspec-xml-v2.c \
- ${top_srcdir}/src/backend/file/gnc-recurrence-xml-v2.c \
- ${top_srcdir}/src/backend/file/gnc-transaction-xml-v2.c \
- ${top_srcdir}/src/backend/file/gnc-commodity-xml-v2.c \
- ${top_srcdir}/src/backend/file/gnc-book-xml-v2.c \
- ${top_srcdir}/src/backend/file/gnc-pricedb-xml-v2.c \
- ${top_srcdir}/src/backend/file/io-gncxml-v2.c \
- ${top_srcdir}/src/backend/file/io-utils.c \
+ ${top_srcdir}/src/backend/xml/sixtp-dom-parsers.c \
+ ${top_srcdir}/src/backend/xml/sixtp-dom-generators.c \
+ ${top_srcdir}/src/backend/xml/sixtp-utils.c \
+ ${top_srcdir}/src/backend/xml/sixtp.c \
+ ${top_srcdir}/src/backend/xml/sixtp-stack.c \
+ ${top_srcdir}/src/backend/xml/sixtp-to-dom-parser.c \
+ ${top_srcdir}/src/backend/xml/io-gncxml-gen.c \
+ ${top_srcdir}/src/backend/xml/gnc-account-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/gnc-budget-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/gnc-lot-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/gnc-schedxaction-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/gnc-freqspec-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/gnc-recurrence-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/gnc-transaction-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/gnc-commodity-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/gnc-book-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/gnc-pricedb-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/io-gncxml-v2.c \
+ ${top_srcdir}/src/backend/xml/io-utils.c \
test-xml-transaction.c
test_xml2_is_file_SOURCES = \
- ${top_srcdir}/src/backend/file/sixtp-dom-parsers.c \
- ${top_srcdir}/src/backend/file/sixtp-dom-generators.c \
- ${top_srcdir}/src/backend/file/sixtp-utils.c \
- ${top_srcdir}/src/backend/file/sixtp.c \
- ${top_srcdir}/src/backend/file/sixtp-stack.c \
- ${top_srcdir}/src/backend/file/sixtp-to-dom-parser.c \
- ${top_srcdir}/src/backend/file/gnc-account-xml-v2.c \
- ${top_srcdir}/src/backend/file/gnc-budget-xml-v2.c \
- ${top_srcdir}/src/backend/file/gnc-lot-xml-v2.c \
- ${top_srcdir}/src/backend/file/gnc-recurrence-xml-v2.c \
- ${top_srcdir}/src/backend/file/gnc-schedxaction-xml-v2.c \
- ${top_srcdir}/src/backend/file/gnc-freqspec-xml-v2.c \
- ${top_srcdir}/src/backend/file/gnc-transaction-xml-v2.c \
- ${top_srcdir}/src/backend/file/gnc-commodity-xml-v2.c \
- ${top_srcdir}/src/backend/file/gnc-book-xml-v2.c \
- ${top_srcdir}/src/backend/file/gnc-pricedb-xml-v2.c \
- ${top_srcdir}/src/backend/file/io-gncxml-gen.c \
- ${top_srcdir}/src/backend/file/io-gncxml-v2.c \
- ${top_srcdir}/src/backend/file/io-utils.c \
+ ${top_srcdir}/src/backend/xml/sixtp-dom-parsers.c \
+ ${top_srcdir}/src/backend/xml/sixtp-dom-generators.c \
+ ${top_srcdir}/src/backend/xml/sixtp-utils.c \
+ ${top_srcdir}/src/backend/xml/sixtp.c \
+ ${top_srcdir}/src/backend/xml/sixtp-stack.c \
+ ${top_srcdir}/src/backend/xml/sixtp-to-dom-parser.c \
+ ${top_srcdir}/src/backend/xml/gnc-account-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/gnc-budget-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/gnc-lot-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/gnc-recurrence-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/gnc-schedxaction-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/gnc-freqspec-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/gnc-transaction-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/gnc-commodity-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/gnc-book-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/gnc-pricedb-xml-v2.c \
+ ${top_srcdir}/src/backend/xml/io-gncxml-gen.c \
+ ${top_srcdir}/src/backend/xml/io-gncxml-v2.c \
+ ${top_srcdir}/src/backend/xml/io-utils.c \
test-xml2-is-file.c
TESTS = \
@@ -186,7 +186,7 @@
--library-dir ${top_builddir}/src/core-utils \
--library-dir ${top_builddir}/src/gnc-module \
--library-dir ${top_builddir}/src/engine \
- --library-dir ${top_builddir}/src/backend/file
+ --library-dir ${top_builddir}/src/backend/xml
TESTS_ENVIRONMENT := \
GNC_ACCOUNT_PATH=${top_srcdir}/accounts/C \
@@ -235,7 +235,7 @@
-I${top_srcdir}/src/test-core \
-I${top_srcdir}/src/engine \
-I${top_srcdir}/src/engine/test-core \
- -I${top_srcdir}/src/backend/file \
+ -I${top_srcdir}/src/backend/xml \
-I${top_srcdir}/src/backend/qsf \
${LIBXML2_CFLAGS} \
${GLIB_CFLAGS} \
Modified: gnucash/branches/gda-dev/src/backend/xml/test/test-load-backend.c
===================================================================
--- gnucash/branches/gda-dev/src/backend/xml/test/test-load-backend.c 2007-12-19 22:39:02 UTC (rev 16686)
+++ gnucash/branches/gda-dev/src/backend/xml/test/test-load-backend.c 2007-12-20 00:59:17 UTC (rev 16687)
@@ -30,7 +30,7 @@
#include "cashobjects.h"
#include "test-stuff.h"
-#define GNC_LIB_NAME "gncmod-backend-file"
+#define GNC_LIB_NAME "gncmod-backend-xml"
int main (int argc, char ** argv)
{
@@ -38,7 +38,7 @@
cashobjects_register();
do_test(
qof_load_backend_library ("../.libs/", GNC_LIB_NAME),
- " loading gnc-backend-file GModule failed");
+ " loading gnc-backend-xml GModule failed");
print_test_results();
qof_close();
exit(get_rv());
Modified: gnucash/branches/gda-dev/src/backend/xml/test/test-load-xml2.c
===================================================================
--- gnucash/branches/gda-dev/src/backend/xml/test/test-load-xml2.c 2007-12-19 22:39:02 UTC (rev 16686)
+++ gnucash/branches/gda-dev/src/backend/xml/test/test-load-xml2.c 2007-12-20 00:59:17 UTC (rev 16687)
@@ -40,14 +40,14 @@
#include "cashobjects.h"
#include "TransLog.h"
#include "gnc-engine.h"
-#include "gnc-backend-file.h"
+#include "gnc-backend-xml.h"
#include "io-gncxml-v2.h"
#include "test-stuff.h"
#include "test-engine-stuff.h"
#include "test-file-stuff.h"
-#define GNC_LIB_NAME "gncmod-backend-file"
+#define GNC_LIB_NAME "gncmod-backend-xml"
static void
remove_files_pattern(const char *begining, const char *ending)
@@ -112,7 +112,7 @@
qof_init();
cashobjects_register();
do_test(qof_load_backend_library ("../.libs/", GNC_LIB_NAME),
- " loading gnc-backend-file GModule failed");
+ " loading gnc-backend-xml GModule failed");
if (!location)
{
More information about the gnucash-changes
mailing list