GNOME.org
 

[libgda] db-module: moved tests to db directory

commit 6607d3c9f83238829af335879aefc7bba5193466
Author: Daniel Espinosa Ortiz <esodan gmail com>
Date:   Mon Jan 7 10:49:33 2019 -0600

    db-module: moved tests to db directory
    
    Fixes some unit tests

 configure.ac                                    |  2 +-
 tests/Makefile.am                               |  2 +-
 tests/{ddl => db}/Makefile.am                   |  2 +-
 tests/{ddl => db}/check-db-base.c               |  0
 tests/{ddl => db}/check-db-catalog-postgresql.c |  0
 tests/{ddl => db}/check-db-catalog.c            | 40 ++++++++++++-------------
 tests/{ddl => db}/check-db-column.c             |  2 +-
 tests/{ddl => db}/check-db-db-create.c          | 35 +++++++++++++++++-----
 tests/{ddl => db}/check-db-fkey.c               |  2 +-
 tests/{ddl => db}/check-db-view.c               |  8 ++---
 tests/{ddl => db}/check_db.xml                  |  0
 tests/{ddl => db}/column_test.xml               |  0
 tests/{ddl/ddl-db.xml => db/db.xml}             |  0
 tests/{ddl => db}/fkey_test.xml                 |  0
 tests/{ddl => db}/libgda-ddl-creator.dtd        |  0
 tests/{ddl => db}/meson.build                   |  0
 tests/{ddl => db}/view_test.xml                 |  0
 tests/meson.build                               |  2 +-
 18 files changed, 57 insertions(+), 38 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 46836c110..ca447d1cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1055,7 +1055,7 @@ tests/value-holders/Makefile
 tests/meta-store/Makefile
 tests/multi-threading/Makefile
 tests/ui/Makefile
-tests/ddl/Makefile
+tests/db/Makefile
 doc/Makefile
 doc/C/Makefile
 doc/C/libgda/Makefile
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 795cf7fcd..496f82efa 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -8,7 +8,7 @@ if HAVE_UI
 UI_EXTENSION = ui
 endif
 
-SUBDIRS = providers parser value-holders meta-store data-models multi-threading ddl $(UI_EXTENSION) 
$(VALA_EXTENSIONS)
+SUBDIRS = providers parser value-holders meta-store data-models multi-threading db $(UI_EXTENSION) 
$(VALA_EXTENSIONS)
 
 AM_CPPFLAGS = \
         -I$(top_builddir) \
diff --git a/tests/ddl/Makefile.am b/tests/db/Makefile.am
similarity index 98%
rename from tests/ddl/Makefile.am
rename to tests/db/Makefile.am
index f83b68a8a..adb7de0ce 100644
--- a/tests/ddl/Makefile.am
+++ b/tests/db/Makefile.am
@@ -48,7 +48,7 @@ check_db_catalog_postgresql_LDADD = \
 include $(top_srcdir)/glib-tap.mk
 
 EXTRA_DIST += column_test.xml \
-            db-db.xml \
+            db.xml \
             fkey_test.xml \
             view_test.xml
 
diff --git a/tests/ddl/check-db-base.c b/tests/db/check-db-base.c
similarity index 100%
rename from tests/ddl/check-db-base.c
rename to tests/db/check-db-base.c
diff --git a/tests/ddl/check-db-catalog-postgresql.c b/tests/db/check-db-catalog-postgresql.c
similarity index 100%
rename from tests/ddl/check-db-catalog-postgresql.c
rename to tests/db/check-db-catalog-postgresql.c
diff --git a/tests/ddl/check-db-catalog.c b/tests/db/check-db-catalog.c
similarity index 97%
rename from tests/ddl/check-db-catalog.c
rename to tests/db/check-db-catalog.c
index dbf0e0fed..1a7f3356a 100644
--- a/tests/ddl/check-db-catalog.c
+++ b/tests/db/check-db-catalog.c
@@ -73,8 +73,8 @@ test_db_catalog_start (CheckDbObject *self,
 
   self->xmlfile = g_build_filename(topsrcdir,
                                    "tests",
-                                   "ddl",
-                                   "ddl-db.xml",NULL);
+                                   "db",
+                                   "db.xml",NULL);
 
   g_assert_nonnull (self->xmlfile);
 
@@ -93,7 +93,7 @@ test_db_catalog_start (CheckDbObject *self,
 
   g_assert_nonnull (self->catalog);
 
-  self->file = g_file_new_for_path (self->xmlfile); 
+  self->file = g_file_new_for_path (self->xmlfile);
   g_print ("GFile is %s\n",g_file_get_path(self->file));
 }
 
@@ -105,7 +105,7 @@ test_db_catalog_start_db (DbCatalogCnc *self,
 
   self->cnc = NULL;
   self->catalog = NULL;
- 
+
   self->cnc = gda_connection_new_from_string ("SQLite",
                                               "DB_DIR=.;DB_NAME=db_types",
                                               NULL,
@@ -225,7 +225,7 @@ test_db_catalog_create_db (CheckDbObject *self,
                                                       NULL);
 
   g_assert_true (res);
- 
+
   res = gda_db_catalog_write_to_path (self->catalog,
                                        "db-test-out.xml",
                                              NULL);
@@ -234,7 +234,7 @@ test_db_catalog_create_db (CheckDbObject *self,
 
   GError *error = NULL;
   gboolean resop = gda_db_catalog_perform_operation(self->catalog,
-                                                     &error);  
+                                                     &error);
 
   if (!resop)
     g_print ("myerr: %s\n",error && error->message ? error->message : "No default");
@@ -299,8 +299,8 @@ test_db_catalog_parse_cnc (DbCatalogCnc *self,
           GdaDbColumn *column = GDA_DB_COLUMN (jt->data);
           GType column_type = gda_db_column_get_gtype (column);
           g_assert_true (column_type != G_TYPE_NONE);
-          
-          if (!g_strcmp0 ("id",gda_db_column_get_name (column))) 
+
+          if (!g_strcmp0 ("id",gda_db_column_get_name (column)))
             {
               GError *error = NULL;
               const GValue *value = gda_data_model_get_typed_value_at (model,
@@ -318,10 +318,10 @@ test_db_catalog_parse_cnc (DbCatalogCnc *self,
               GType ggtype = G_VALUE_TYPE(value);
 
               g_print ("for ID type is %s\n",g_type_name (ggtype));
-              
+
             }
-          
-          if (!g_strcmp0 ("name",gda_db_column_get_name (column))) 
+
+          if (!g_strcmp0 ("name",gda_db_column_get_name (column)))
             {
               const GValue *value = gda_data_model_get_typed_value_at (model,
                                                                        column_count++,
@@ -335,10 +335,10 @@ test_db_catalog_parse_cnc (DbCatalogCnc *self,
               GType ggtype = G_VALUE_TYPE(value);
 
               g_print ("for NAME type is %s\n",g_type_name (ggtype));
-              
+
             }
 
-          if (!g_strcmp0 ("state",gda_db_column_get_name (column))) 
+          if (!g_strcmp0 ("state",gda_db_column_get_name (column)))
             {
               const GValue *value = gda_data_model_get_typed_value_at (model,
                                                                            column_count++,
@@ -350,11 +350,11 @@ test_db_catalog_parse_cnc (DbCatalogCnc *self,
               g_assert_nonnull (value);
 
               GType ggtype = G_VALUE_TYPE(value);
-              
+
               g_assert_true (TRUE && g_value_get_boolean (value));
             }
 
-          if (!g_strcmp0 ("create_time",gda_db_column_get_name (column))) 
+          if (!g_strcmp0 ("create_time",gda_db_column_get_name (column)))
             {
               const GValue *value = gda_data_model_get_typed_value_at (model,
                                                                            column_count++,
@@ -368,10 +368,10 @@ test_db_catalog_parse_cnc (DbCatalogCnc *self,
               GType ggtype = G_VALUE_TYPE(value);
 
               g_print ("for created_time type is %s\n",g_type_name (ggtype));
-              
+
             }
 
-          if (!g_strcmp0 ("mytimestamp",gda_db_column_get_name (column))) 
+          if (!g_strcmp0 ("mytimestamp",gda_db_column_get_name (column)))
             {
               const GValue *value = gda_data_model_get_typed_value_at (model,
                                                                            column_count++,
@@ -389,7 +389,7 @@ test_db_catalog_parse_cnc (DbCatalogCnc *self,
               g_print ("YYYY-MM-DD: %d-%d-%d\n",g_date_time_get_year (dt),
                                                 g_date_time_get_month (dt),
                                                 g_date_time_get_day_of_month (dt));
-               
+
             }
         }
       raw++;
@@ -441,11 +441,11 @@ main (gint   argc,
               test_db_catalog_validate_xml,
               test_db_catalog_finish);
   g_test_add ("/test-db/catalog-parse-cnc",
-              DbCatalogCnc, 
+              DbCatalogCnc,
               NULL,
               test_db_catalog_start_db,
               test_db_catalog_parse_cnc,
               test_db_catalog_finish_db);
- 
+
   return g_test_run();
 }
diff --git a/tests/ddl/check-db-column.c b/tests/db/check-db-column.c
similarity index 99%
rename from tests/ddl/check-db-column.c
rename to tests/db/check-db-column.c
index a7b5be0ea..23226a4a1 100644
--- a/tests/ddl/check-db-column.c
+++ b/tests/db/check-db-column.c
@@ -226,7 +226,7 @@ test_db_column_startup (CheckDbObject *self,
 
   self->xmlfile = g_build_filename(topsrcdir,
                                    "tests",
-                                   "ddl",
+                                   "db",
                                    "column_test.xml",NULL);
 
   g_assert_nonnull (self->xmlfile);
diff --git a/tests/ddl/check-db-db-create.c b/tests/db/check-db-db-create.c
similarity index 82%
rename from tests/ddl/check-db-db-create.c
rename to tests/db/check-db-db-create.c
index 993880d00..52d0e024b 100644
--- a/tests/ddl/check-db-db-create.c
+++ b/tests/db/check-db-db-create.c
@@ -44,6 +44,7 @@ test_db_db_create_start(CheckCreatedb *self,
   gda_init ();
   self->catalog = NULL;
   self->cnc = NULL;
+  GError *error = NULL;
 
   const gchar *topsrcdir = g_getenv ("GDA_TOP_SRC_DIR");
 
@@ -61,29 +62,47 @@ test_db_db_create_start(CheckCreatedb *self,
                                               "DB_DIR=.;DB_NAME=db_test_create",
                                               NULL,
                                               GDA_CONNECTION_OPTIONS_NONE,
-                                              NULL);
+                                              &error);
+  if (self->cnc == NULL) {
+    g_warning ("Error creating connection from string: %s",
+               error && error->message ? error->message : "(No message was set)");
+
+  }
 
   g_assert_nonnull (self->cnc);
 
-  gboolean res = gda_connection_open (self->cnc,NULL);
+  gboolean res = gda_connection_open (self->cnc, &error);
+  if (!res) {
+    g_warning ("Error openning connection: %s",
+               error && error->message ? error->message : "(No message was set)");
+  }
   g_assert_true (res);
 
   self->catalog = gda_connection_create_db_catalog (self->cnc);
 
   g_assert_nonnull (self->catalog);
 
-  res = gda_db_catalog_validate_file_from_path (self->xmlfile,NULL);
-  g_assert_true (res);
+  res = gda_db_catalog_validate_file_from_path (self->xmlfile, &error);
+  if (!res) {
+    g_warning ("Error validating xml file: %s",
+               error && error->message ? error->message : "(No message was set)");
+  }
 
   res = gda_db_catalog_parse_file_from_path (self->catalog,
                                               self->xmlfile,
-                                              NULL);
+                                              &error);
+  if (!res) {
+    g_warning ("Error parsing file: %s",
+               error && error->message ? error->message : "(No message was set)");
 
-  g_assert_true (res);
+  }
   
   res = gda_db_catalog_perform_operation (self->catalog,
-                                           NULL);
-  g_assert_true (res);
+                                           &error);
+  if (!res) {
+    g_warning ("Error performing operation: %s",
+               error && error->message ? error->message : "(No message was set)");
+  }
 }
 
 static void
diff --git a/tests/ddl/check-db-fkey.c b/tests/db/check-db-fkey.c
similarity index 99%
rename from tests/ddl/check-db-fkey.c
rename to tests/db/check-db-fkey.c
index 5de183dd7..42945e71b 100644
--- a/tests/ddl/check-db-fkey.c
+++ b/tests/db/check-db-fkey.c
@@ -148,7 +148,7 @@ test_db_fkey_start (CheckDbObject *self,
 
   self->xmlfile = g_build_filename(topsrcdir,
                                    "tests",
-                                   "ddl",
+                                   "db",
                                    "fkey_test.xml",NULL);
 
   g_assert_nonnull (self->xmlfile);
diff --git a/tests/ddl/check-db-view.c b/tests/db/check-db-view.c
similarity index 98%
rename from tests/ddl/check-db-view.c
rename to tests/db/check-db-view.c
index 231f2fd24..f39371ad4 100644
--- a/tests/ddl/check-db-view.c
+++ b/tests/db/check-db-view.c
@@ -36,7 +36,7 @@ typedef struct {
     gboolean istemp;
     gboolean ifnoexist;
     gboolean replace;
-     
+
     xmlDocPtr doc;
     gchar *xmlfile;
 } CheckDbObject;
@@ -124,7 +124,7 @@ test_db_view_start (CheckDbObject *self,
 
   self->xmlfile = g_build_filename(topsrcdir,
                                    "tests",
-                                   "ddl",
+                                   "db",
                                    "view_test.xml",NULL);
 
   g_assert_nonnull (self->xmlfile);
@@ -194,13 +194,13 @@ main (gint   argc,
               test_db_view_start,
               test_db_view_replace,
               test_db_view_finish);
-  
+
   g_test_add ("/test-db/view-defstr",
               CheckDbObject,
               NULL,
               test_db_view_start,
               test_db_view_defstr,
               test_db_view_finish);
-  
+
   return g_test_run();
 }
diff --git a/tests/ddl/check_db.xml b/tests/db/check_db.xml
similarity index 100%
rename from tests/ddl/check_db.xml
rename to tests/db/check_db.xml
diff --git a/tests/ddl/column_test.xml b/tests/db/column_test.xml
similarity index 100%
rename from tests/ddl/column_test.xml
rename to tests/db/column_test.xml
diff --git a/tests/ddl/ddl-db.xml b/tests/db/db.xml
similarity index 100%
rename from tests/ddl/ddl-db.xml
rename to tests/db/db.xml
diff --git a/tests/ddl/fkey_test.xml b/tests/db/fkey_test.xml
similarity index 100%
rename from tests/ddl/fkey_test.xml
rename to tests/db/fkey_test.xml
diff --git a/tests/ddl/libgda-ddl-creator.dtd b/tests/db/libgda-ddl-creator.dtd
similarity index 100%
rename from tests/ddl/libgda-ddl-creator.dtd
rename to tests/db/libgda-ddl-creator.dtd
diff --git a/tests/ddl/meson.build b/tests/db/meson.build
similarity index 100%
rename from tests/ddl/meson.build
rename to tests/db/meson.build
diff --git a/tests/ddl/view_test.xml b/tests/db/view_test.xml
similarity index 100%
rename from tests/ddl/view_test.xml
rename to tests/db/view_test.xml
diff --git a/tests/meson.build b/tests/meson.build
index f7558bcbc..11dd5af26 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -290,7 +290,7 @@ subdir('multi-threading')
 subdir('parser')
 subdir('providers')
 subdir('value-holders')
-subdir('ddl')
+subdir('db')
 if enable_ui
 subdir('ui')
 endif
\ No newline at end of file
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]