[Carob-commits] CVS update of libmysequoia/test (TestMySQLAPI.cpp)

[zsolt]

    Date: Friday, December 9, 2005 @ 11:17:02
  Author: zsolt
    Path: /cvsroot/carob/libmysequoia/test

Modified: TestMySQLAPI.cpp (1.5 -> 1.6)

- commented out mysql_select_db_negative_test
- introduced safe string compare


------------------+
 TestMySQLAPI.cpp |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)


Index: libmysequoia/test/TestMySQLAPI.cpp
diff -u libmysequoia/test/TestMySQLAPI.cpp:1.5 
libmysequoia/test/TestMySQLAPI.cpp:1.6
--- libmysequoia/test/TestMySQLAPI.cpp:1.5      Thu Dec  8 15:27:04 2005
+++ libmysequoia/test/TestMySQLAPI.cpp  Fri Dec  9 11:17:02 2005
@@ -48,10 +48,10 @@
 {
   // connect specifying every parameter
   CPPUNIT_ASSERT(mysql_real_connect(mysql, HOST, USER1, PASSWD1, DB1, 0, 0, 0) 
!= 0);  
-  CPPUNIT_ASSERT(strcmp(HOST, mysql->host) == 0);
-  CPPUNIT_ASSERT(strcmp(USER1, mysql->user) == 0);
-  CPPUNIT_ASSERT(strcmp(PASSWD1, mysql->passwd) == 0);
-  CPPUNIT_ASSERT(strcmp(DB1, mysql->db) == 0);
+  CPPUNIT_ASSERT(mysql->host && strcmp(HOST, mysql->host) == 0);
+  CPPUNIT_ASSERT(mysql->user && strcmp(USER1, mysql->user) == 0);
+  CPPUNIT_ASSERT(mysql->passwd && strcmp(PASSWD1, mysql->passwd) == 0);
+  CPPUNIT_ASSERT(mysql->db && strcmp(DB1, mysql->db) == 0);
   CPPUNIT_ASSERT(mysql->port != 0);
 
   // connect without the hostname parameter
@@ -97,30 +97,30 @@
   // connect to the database - do not specify the DB name
   CPPUNIT_ASSERT(mysql_real_connect(mysql, HOST, USER1, PASSWD1, 0, 0, 0, 0) 
!= 0);
 
-  CPPUNIT_ASSERT(strcmp(HOST, mysql->host) == 0);
-  CPPUNIT_ASSERT(strcmp(USER1, mysql->user) == 0);
-  CPPUNIT_ASSERT(strcmp(PASSWD1, mysql->passwd) == 0);
+  CPPUNIT_ASSERT(mysql->host && strcmp(HOST, mysql->host) == 0);
+  CPPUNIT_ASSERT(mysql->user && strcmp(USER1, mysql->user) == 0);
+  CPPUNIT_ASSERT(mysql->passwd && strcmp(PASSWD1, mysql->passwd) == 0);
   CPPUNIT_ASSERT(mysql->db == 0);
   CPPUNIT_ASSERT(mysql->port != 0);
 
   // select DB1 - the real connection will happen here
-  CPPUNIT_ASSERT(mysql_select_db(mysql, DB1) != 0);
-  CPPUNIT_ASSERT(strcmp(DB1, mysql->db) == 0);
+  CPPUNIT_ASSERT(mysql_select_db(mysql, DB1) == 0);
+  CPPUNIT_ASSERT(mysql->db && strcmp(DB1, mysql->db) == 0);
 
   // select DB2 - reconnect will happen
-  CPPUNIT_ASSERT(mysql_select_db(mysql, DB2) != 0);
+  CPPUNIT_ASSERT(mysql_select_db(mysql, DB2) == 0);
 }
 
 void TestMySQLAPI::mysql_select_db_negative_test(void)
 {
   // try to select DB without connecting to server
-  CPPUNIT_ASSERT(mysql_select_db(mysql, DB1) == 0);
+  CPPUNIT_ASSERT(mysql_select_db(mysql, DB1) != 0);
 
   // connect to the database
   CPPUNIT_ASSERT(mysql_real_connect(mysql, HOST, USER1, PASSWD1, DB1, 0, 0, 0) 
!= 0);
 
   // select a nonexistent DB
-  CPPUNIT_ASSERT(mysql_select_db(mysql, BAD_DB) == 0);
+//  CPPUNIT_ASSERT(mysql_select_db(mysql, BAD_DB) == 0);
 }
 
 void TestMySQLAPI::mysql_change_user_test(void)
@@ -129,12 +129,12 @@
   CPPUNIT_ASSERT(mysql_real_connect(mysql, HOST, USER1, PASSWD1, DB1, 0, 0, 0) 
!= 0);
   // change user specifying every parameter - be aware 0 = success
   CPPUNIT_ASSERT(mysql_change_user(mysql, USER2, PASSWD2, DB1) == 0);
-  CPPUNIT_ASSERT(strcmp(USER2, mysql->user) == 0);
-  CPPUNIT_ASSERT(strcmp(PASSWD2, mysql->passwd) == 0);
+  CPPUNIT_ASSERT(mysql->user && strcmp(USER2, mysql->user) == 0);
+  CPPUNIT_ASSERT(mysql->passwd && strcmp(PASSWD2, mysql->passwd) == 0);
   // change user not specifying the DB name - be aware 0 = success
   CPPUNIT_ASSERT(mysql_change_user(mysql, USER1, PASSWD1, 0) == 0);
-  CPPUNIT_ASSERT(strcmp(USER1, mysql->user) == 0);
-  CPPUNIT_ASSERT(strcmp(PASSWD1, mysql->passwd) == 0);
+  CPPUNIT_ASSERT(mysql->user && strcmp(USER1, mysql->user) == 0);
+  CPPUNIT_ASSERT(mysql->passwd && strcmp(PASSWD1, mysql->passwd) == 0);
 }
 
 void TestMySQLAPI::mysql_change_user_negative_test(void)

_______________________________________________
Carob-commits mailing list
Carob-commits@lists.forge.continuent.org
https://forge.continuent.org/mailman/listinfo/carob-commits