[libgda: 7/9] DDL: New tests were added

[Rodrigo Moya <rodrigo src gnome org>]

commit cfbcaea26db8690186e8866050b713d26c7ef33f
Author: Pavlo Solntsev <p sun fun gmail com>
Date:   Wed Jul 11 15:35:25 2018 -0500

    DDL: New tests were added
    
    Tests were added for GdaDdlBase and GdaDdlColumn objects

 tests/ddl/Makefile.am        | 17 +++++++++++++-
 tests/ddl/check-ddl-column.c | 54 ++++++++------------------------------------
 tests/ddl/column_test.xml    |  3 +--
 3 files changed, 26 insertions(+), 48 deletions(-)
---
diff --git a/tests/ddl/Makefile.am b/tests/ddl/Makefile.am
index 702f839bf..95c89033b 100644
--- a/tests/ddl/Makefile.am
+++ b/tests/ddl/Makefile.am
@@ -9,9 +9,24 @@ AM_CPPFLAGS = \
        -DROOT_DIR=\""$(top_srcdir)"\"
 
 test_programs = \
-    check_ddl_creator
+    check_ddl_creator \
+    check_ddl_base \
+    check_ddl_column
 
 check_ddl_creator_SOURCES = check-ddl-creator.c
 check_ddl_creator_LDADD = \
        $(top_builddir)/libgda/libgda-6.0.la \
        $(COREDEPS_LIBS)
+
+check_ddl_base_SOURCES = check-ddl-base.c
+check_ddl_base_LDADD = \
+       $(top_builddir)/libgda/libgda-6.0.la \
+       $(COREDEPS_LIBS)
+
+check_ddl_column_SOURCES = check-ddl-column.c
+check_ddl_column_LDADD = \
+       $(top_builddir)/libgda/libgda-6.0.la \
+       $(COREDEPS_LIBS)
+
+EXTRA_DIST = column_test.xml \
+            ddl-db.xml
diff --git a/tests/ddl/check-ddl-column.c b/tests/ddl/check-ddl-column.c
index 1e6777898..90f4026d9 100644
--- a/tests/ddl/check-ddl-column.c
+++ b/tests/ddl/check-ddl-column.c
@@ -34,8 +34,7 @@ typedef struct {
     GdaDdlColumn *column;
     gchar *xmlfile;
     xmlDocPtr doc;
-    xmlBufferPtr buffer;
-    xmlTextWriterPtr writer;
+    xmlNodePtr node;
 } CheckDdlObject;
 
 static void
@@ -59,13 +58,13 @@ test_ddl_column_check_default (CheckDdlObject *self,
                                gconstpointer user_data)
 {
   const gchar *cname = gda_ddl_column_get_default (self->column);
-  g_assert_cmpstr (cname, ==,"0");
+  g_assert_cmpstr (cname, ==,"12.34");
 
-  const gchar *inval = "1";
+  const gchar *inval = "default value";
 
-  gda_ddl_column_set_name (self->column,inval);
+  gda_ddl_column_set_default (self->column,inval);
 
-  const gchar *resval = gda_ddl_column_get_name (self->column);
+  const gchar *resval = gda_ddl_column_get_default (self->column);
 
   g_assert_cmpstr (inval, ==, resval);
 }
@@ -218,7 +217,7 @@ test_ddl_column_startup (CheckDdlObject *self,
   self->doc = NULL;
   self->xmlfile = NULL;
   self->column = NULL;
-  self->buffer = NULL;
+  self->node = NULL;
 
   const gchar *topsrcdir = g_getenv ("GDA_TOP_SRC_DIR");
 
@@ -235,27 +234,15 @@ test_ddl_column_startup (CheckDdlObject *self,
   self->doc = xmlParseFile(self->xmlfile);
   g_assert_nonnull (self->doc);
 
-  xmlNodePtr node = xmlDocGetRootElement (self->doc);
-  g_assert_nonnull (node);
+  self->node = xmlDocGetRootElement (self->doc);
+  g_assert_nonnull (self->node);
 
   self->column = gda_ddl_column_new ();
   g_assert_nonnull(self->column);
 
   gboolean res = gda_ddl_buildable_parse_node (GDA_DDL_BUILDABLE(self->column),
-                                               node,NULL);
+                                               self->node,NULL);
   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
@@ -267,23 +254,6 @@ test_ddl_column_cleanup (CheckDdlObject *self,
   xmlFreeDoc (self->doc);
 }
 
-static void
-test_ddl_column_write_node (CheckDdlObject *self,
-                            gconstpointer user_data)
-{
-  gboolean res = gda_ddl_buildable_write_node(GDA_DDL_BUILDABLE(self->column),
-                                         self->writer,NULL);
-
-  g_assert_true (res);
-
-  //   res = xmlTextWriterEndDocument (self->writer);
-
-  //   g_assert_true (res >= 0);
-  xmlFreeTextWriter (self->writer);
-
-  g_print ("%s\n",(gchar*)self->buffer->content);
-}
-
 gint
 main (gint   argc,
       gchar *argv[])
@@ -363,11 +333,5 @@ main (gint   argc,
               test_ddl_column_check_check,
               test_ddl_column_cleanup);
 
-  g_test_add ("/test-ddl/column-write",
-              CheckDdlObject,
-              NULL,
-              test_ddl_column_startup,
-              test_ddl_column_write_node,
-              test_ddl_column_cleanup);
   return g_test_run();
 }
diff --git a/tests/ddl/column_test.xml b/tests/ddl/column_test.xml
index be030f094..9a2ca1afa 100644
--- a/tests/ddl/column_test.xml
+++ b/tests/ddl/column_test.xml
@@ -2,8 +2,7 @@
 <column name="column_name" type="string" pkey="TRUE" unique="TRUE"
         autoinc="FALSE" nnul="FALSE">
        <comment>Simple_Comment</comment>
-       <size>5</size>
-       <default>0</default>
+       <value size="5" scale="2">12.34</value>
        <check>compound_id &gt; 0</check>
 </column>