[libgda: 1/2] TEST: Fixing passing argument



commit d1e8149d3ce4fe9e3915e4ff43d0590747e80782
Author: Pavlo Solntsev <p sun fun gmail com>
Date:   Tue Dec 18 23:26:09 2018 -0600

    TEST: Fixing passing argument
    
    ddl-fkey test was added to Autotools. It was added to meson but missed
    for Autotools. Code was also cleanned.

 tests/ddl/Makefile.am      |  9 +++++++--
 tests/ddl/check-ddl-fkey.c | 40 +++++++++++++++-------------------------
 2 files changed, 22 insertions(+), 27 deletions(-)
---
diff --git a/tests/ddl/Makefile.am b/tests/ddl/Makefile.am
index 34aec1ad2..f7ee1a885 100644
--- a/tests/ddl/Makefile.am
+++ b/tests/ddl/Makefile.am
@@ -11,7 +11,8 @@ test_programs = \
     check_ddl_creator \
     check_ddl_base \
     check_ddl_column \
-    check_ddl_view
+    check_ddl_view \
+    check_ddl_fkey
 
 check_ddl_creator_SOURCES = check-ddl-creator.c
 check_ddl_creator_LDADD = \
@@ -33,6 +34,10 @@ check_ddl_view_LDADD = \
        $(top_builddir)/libgda/libgda-6.0.la \
        $(COREDEPS_LIBS)
 
+check_ddl_fkey_SOURCES = check-ddl-fkey.c
+check_ddl_fkey_LDADD = \
+       $(top_builddir)/libgda/libgda-6.0.la \
+       $(COREDEPS_LIBS)
 
 include $(top_srcdir)/glib-tap.mk
 
@@ -41,4 +46,4 @@ EXTRA_DIST += column_test.xml \
             fkey_test.xml \
             view_test.xml
 
-DISTCLEANFILES=ddl-test-out.xml ddl_test.db
\ No newline at end of file
+DISTCLEANFILES=ddl-test-out.xml ddl_test.db
diff --git a/tests/ddl/check-ddl-fkey.c b/tests/ddl/check-ddl-fkey.c
index 221cc76fd..e52c09784 100644
--- a/tests/ddl/check-ddl-fkey.c
+++ b/tests/ddl/check-ddl-fkey.c
@@ -41,7 +41,6 @@ typedef struct {
 
     xmlDocPtr doc;
     xmlTextWriterPtr writer;
-    xmlBufferPtr buffer;
 } CheckDdlObject;
 
 static void
@@ -87,28 +86,34 @@ test_ddl_fkey_run2 (CheckDdlObject *self,
 static void
 test_ddl_fkey_run1 (void)
 {
-  g_print ("Run 1 start\n");
   GdaDdlFkey *self = gda_ddl_fkey_new ();
-
   g_object_unref (self);
-  g_print ("Run 1 end\n");
 }
 
 static void
 test_ddl_fkey_run3 (CheckDdlObject *self,
                     gconstpointer user_data)
 {
+  xmlNodePtr node = NULL;
+  xmlDocPtr doc = NULL;
+  xmlChar *xmlbuffer = NULL;
+  int buffersize;
+
+  node = xmlNewNode (NULL, BAD_CAST "root");
   int res = gda_ddl_buildable_write_node(GDA_DDL_BUILDABLE(self->fkey),
-                                         self->writer,NULL);
+                                         node,NULL);
 
   g_assert_true (res >= 0);
 
-  //   res = xmlTextWriterEndDocument (self->writer);
+  doc = xmlNewDoc (BAD_CAST "1.0");
+  xmlDocSetRootElement (doc,node);
+
+  xmlDocDumpFormatMemory (doc,&xmlbuffer,&buffersize,1);
 
-  //   g_assert_true (res >= 0);
-  xmlFreeTextWriter (self->writer);
+  g_print ("%s\n",(gchar*)xmlbuffer);
 
-  g_print ("%s\n",(gchar*)self->buffer->content);
+  xmlFree (xmlbuffer);
+  xmlFreeDoc (doc);
 }
 
 static void
@@ -157,23 +162,10 @@ test_ddl_fkey_start (CheckDdlObject *self,
   self->fkey = gda_ddl_fkey_new ();
 
   g_assert_nonnull(self->fkey);
-  g_print("Before parse node\n");
+
   gboolean res = gda_ddl_buildable_parse_node(GDA_DDL_BUILDABLE(self->fkey),
                                               node,NULL);
-  g_print("After parse node\n");
   g_assert_true (res);
-
-  self->buffer = xmlBufferCreate ();
-
-  g_assert_nonnull (self->buffer);
-
-  self->writer = xmlNewTextWriterMemory (self->buffer,0);
-
-  g_assert_nonnull (self->writer);
-
-  res = xmlTextWriterStartDocument (self->writer, NULL, NULL, NULL);
-
-  g_assert_true (res >= 0);
 }
 
 static void
@@ -188,8 +180,6 @@ test_ddl_fkey_finish (CheckDdlObject *self,
   g_free (self->reftable);
   g_free (self->ondelete);
   g_free (self->onupdate);
-
-  xmlBufferFree (self->buffer);
 }
 
 gint


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]