ODBC C-tests commit: r44 - in trunk: testsuites/t_jbalint testutil

[jbalint]

Modified:
   trunk/testsuites/t_jbalint/basic.c
   trunk/testsuites/t_jbalint/catalog.c
   trunk/testutil/util.c
Log:
fixed leak
other small cleanups in t_jbalint

Modified: trunk/testsuites/t_jbalint/basic.c
===================================================================
--- trunk/testsuites/t_jbalint/basic.c	2007-03-22 02:46:30 UTC (rev 43)
+++ trunk/testsuites/t_jbalint/basic.c	2007-03-30 01:56:43 UTC (rev 44)
@@ -59,7 +59,7 @@
 
     /* change */
     CHECK_SQL(SQLSetConnectAttr(dbc, SQL_ATTR_CURRENT_CATALOG,
-        tstcatalog, SQL_NTS), dbc, SQL_HANDLE_DBC);
+        (SQLPOINTER)tstcatalog, SQL_NTS), dbc, SQL_HANDLE_DBC);
 
     /* verify */
     CHECK_SQL_S(SQLExecDirect(stmt, "select database()", SQL_NTS), stmt);

Modified: trunk/testsuites/t_jbalint/catalog.c
===================================================================
--- trunk/testsuites/t_jbalint/catalog.c	2007-03-22 02:46:30 UTC (rev 43)
+++ trunk/testsuites/t_jbalint/catalog.c	2007-03-30 01:56:43 UTC (rev 44)
@@ -312,8 +312,10 @@
     free_statement(stmt);
 }
 
-/* seems the I_S has no keys for views,
- * test that we have an empty result (for completeness ;) */
+/*
+ * seems the I_S has no keys for views,
+ * test that we have an empty result (for completeness ;)
+ */
 OT_TEST_METHOD(specialcolumns_view_no_rowid)
 {
     SQLHANDLE stmt = get_statement();
@@ -328,9 +330,6 @@
 
 /*
  * Test basic use of SQLPrimaryKeys.
- *
- * API doc for SQLPrimaryKeys:
- * http://windowssdk.msdn.microsoft.com/en-us/library/ms711005.aspx
  */
 OT_TEST_METHOD(primarykeys)
 {
@@ -343,7 +342,6 @@
     SQLCHAR column[STRLEN];
     SQLSMALLINT keyseq;
     SQLCHAR pkname[STRLEN];
-    int i;
     const char *testtable = "simple1";
     const char *realpkcolumn = "rowid";
     const char *realpkname = "PRIMARY";
@@ -364,31 +362,31 @@
     CHECK_SQL_S(SQLBindCol(stmt, PKNAM+1, SQL_C_CHAR,
         pkname, STRLEN, &len[PKNAM]), stmt);
 
-    for(i = 0; (rc = SQLFetch(stmt)) == SQL_SUCCESS; ++i)
-    {
-        test_printf("------ Primary Key:\n");
+    CHECK_SQL_S(SQLFetch(stmt), stmt);
 
-        test_printf("\tCatalog=%s\n", catalog);
-        /*
-        CuAssertStrEquals_Msg(tc, "Catalog name", TD_DBNAME, catalog);
-        CuAssertIntEquals(tc, (int)strlen(TD_DBNAME), len[PKCAT]);
-        */
-        test_printf("\tSchema=<null>\n");
-        CuAssertIntEquals_Msg(tc, "Schema is NULL", SQL_NULL_DATA, len[PKSCH]);
-        test_printf("\tTable=%s\n", table);
-        CuAssertStrEquals_Msg(tc, "Table name", testtable, table);
-        CuAssertIntEquals(tc, (int)strlen(testtable), len[PKTBL]);
-        test_printf("\tColumn=%s\n", column);
-        CuAssertStrEquals_Msg(tc, "Column name", realpkcolumn, column);
-        CuAssertIntEquals(tc, (int)strlen(realpkcolumn), len[PKCOL]);
-        test_printf("\tSequence=%d\n", keyseq);
-        CuAssertIntEquals_Msg(tc, "Only one primary key", 1, keyseq);
-        test_printf("\tName=%s\n", pkname);
-        CuAssertStrEquals_Msg(tc, "Pk name", realpkname, pkname);
-        CuAssertIntEquals(tc, (int)strlen(realpkname), len[PKNAM]);
-    }
+    test_printf("------ Primary Key:\n");
+
+    test_printf("\tCatalog=%s\n", catalog);
+    /*
+    CuAssertStrEquals_Msg(tc, "Catalog name", TD_DBNAME, catalog);
+    CuAssertIntEquals(tc, (int)strlen(TD_DBNAME), len[PKCAT]);
+    */
+    test_printf("\tSchema=<null>\n");
+    CuAssertIntEquals_Msg(tc, "Schema is NULL", SQL_NULL_DATA, len[PKSCH]);
+    test_printf("\tTable=%s\n", table);
+    CuAssertStrEquals_Msg(tc, "Table name", testtable, table);
+    CuAssertIntEquals(tc, (int)strlen(testtable), len[PKTBL]);
+    test_printf("\tColumn=%s\n", column);
+    CuAssertStrEquals_Msg(tc, "Column name", realpkcolumn, column);
+    CuAssertIntEquals(tc, (int)strlen(realpkcolumn), len[PKCOL]);
+    test_printf("\tSequence=%d\n", keyseq);
+    CuAssertIntEquals_Msg(tc, "Only one primary key", 1, keyseq);
+    test_printf("\tName=%s\n", pkname);
+    CuAssertStrEquals_Msg(tc, "Pk name", realpkname, pkname);
+    CuAssertIntEquals(tc, (int)strlen(realpkname), len[PKNAM]);
+
+    CHECK_SQL_RC(rc = SQLFetch(stmt), stmt, SQL_HANDLE_STMT, SQL_NO_DATA);
     CuAssertIntEquals(tc, SQL_NO_DATA, rc);
-    CuAssertIntEquals_Msg(tc, "Saw only one PK", 1, i);
 
     free_statement(stmt);
 }
@@ -398,9 +396,6 @@
  * one primary and one other unique index.
  *
  * TODO we could use constants for column offsets.
- *
- * SQLStatistics API doc:
- * http://msdn2.microsoft.com/en-us/library/ms711022.aspx
  */
 OT_TEST_METHOD(statistics)
 {

Modified: trunk/testutil/util.c
===================================================================
--- trunk/testutil/util.c	2007-03-22 02:46:30 UTC (rev 43)
+++ trunk/testutil/util.c	2007-03-30 01:56:43 UTC (rev 44)
@@ -330,7 +330,6 @@
 */
 int global_connect() 
 {
-	global_init_connect();
 	return global_do_connect();
 }