Date: Thursday, December 8, 2005 @ 14:41:01
Author: csaba
Path: /cvsroot/carob/libmysequoia/test
Modified: Globals.hpp (1.1 -> 1.2) TestMySQLAPI.cpp (1.3 -> 1.4)
Added more unit test: mysql_change_user_test() and
mysql_change_user_negative_test(). Also added a new user USER2 with passwd
PASSWD2.
------------------+
Globals.hpp | 7 +++++--
TestMySQLAPI.cpp | 53 ++++++++++++++++++++++++++++++++++++++---------------
2 files changed, 43 insertions(+), 17 deletions(-)
Index: libmysequoia/test/Globals.hpp
diff -u libmysequoia/test/Globals.hpp:1.1 libmysequoia/test/Globals.hpp:1.2
--- libmysequoia/test/Globals.hpp:1.1 Wed Dec 7 11:48:24 2005
+++ libmysequoia/test/Globals.hpp Thu Dec 8 14:41:01 2005
@@ -1,13 +1,16 @@
#ifndef _GLOBALS_HPP
#define _GLOBALS_HPP
-const char *USER = "user";
+const char *USER1 = "user1";
+const char *PASSWD1 = "userpass1";
+const char *USER2 = "user2";
+const char *PASSWD2 = "userpass2";
const char *BAD_USER = "nonexistent_user_name";
-const char *PASSWD = "userpass";
const char *BAD_PASSWD = "bad_password";
const char *HOST = "localhost";
const char *DB1 = "db1";
const char *DB2 = "db2";
const char *BAD_DB = "nonexistent_db_name";
+const char *SOCKET = "/var/run/mysqld/mysqld.sock";
#endif /* _GLOBALS_HPP */
Index: libmysequoia/test/TestMySQLAPI.cpp
diff -u libmysequoia/test/TestMySQLAPI.cpp:1.3
libmysequoia/test/TestMySQLAPI.cpp:1.4
--- libmysequoia/test/TestMySQLAPI.cpp:1.3 Thu Dec 8 10:07:46 2005
+++ libmysequoia/test/TestMySQLAPI.cpp Thu Dec 8 14:41:01 2005
@@ -47,27 +47,33 @@
void TestMySQLAPI::mysql_real_connect_test(void)
{
// connect specifying every parameter
- CPPUNIT_ASSERT(mysql_real_connect(mysql, HOST, USER, PASSWD, DB1, 0, 0, 0)
!= 0);
+ CPPUNIT_ASSERT(mysql_real_connect(mysql, HOST, USER1, PASSWD1, DB1, 0, 0, 0)
!= 0);
CPPUNIT_ASSERT(strcmp(HOST, mysql->host) == 0);
- CPPUNIT_ASSERT(strcmp(USER, mysql->user) == 0);
- CPPUNIT_ASSERT(strcmp(PASSWD, mysql->passwd) == 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->port != 0);
// connect without the hostname parameter
// implicit localhost
- CPPUNIT_ASSERT(mysql_real_connect(mysql, "", USER, PASSWD, DB1, 0, 0, 0) !=
0);
- CPPUNIT_ASSERT(mysql_real_connect(mysql, 0, USER, PASSWD, DB1, 0, 0, 0) !=
0);
+ CPPUNIT_ASSERT(mysql_real_connect(mysql, "", USER1, PASSWD1, DB1, 0, 0, 0)
!= 0);
+ CPPUNIT_ASSERT(mysql_real_connect(mysql, 0, USER1, PASSWD1, DB1, 0, 0, 0) !=
0);
}
void TestMySQLAPI::mysql_real_connect_negative_test(void)
{
+ // connect specifying unix socket
+ CPPUNIT_ASSERT(mysql_real_connect(mysql, HOST, USER1, PASSWD1, DB1, 0,
SOCKET, 0) == 0);
+
+ // giving no user name
+ CPPUNIT_ASSERT(mysql_real_connect(mysql, HOST, 0, PASSWD1, DB1, 0, 0, 0) ==
0);
+
// connect with bad username
- CPPUNIT_ASSERT(mysql_real_connect(mysql, HOST, BAD_USER, PASSWD, DB1, 0, 0,
0) == 0);
+ CPPUNIT_ASSERT(mysql_real_connect(mysql, HOST, BAD_USER, PASSWD1, DB1, 0, 0,
0) == 0);
// TODO check error message
// connect with bad password
- CPPUNIT_ASSERT(mysql_real_connect(mysql, HOST, USER, BAD_PASSWD, DB1, 0, 0,
0) == 0);
+ CPPUNIT_ASSERT(mysql_real_connect(mysql, HOST, USER1, BAD_PASSWD, DB1, 0, 0,
0) == 0);
// TODO check error message
// connect with bad username and bad password
@@ -78,22 +84,22 @@
void TestMySQLAPI::mysql_connect_test(void)
{
// connect specifying every parameter
- CPPUNIT_ASSERT(mysql_connect(mysql, HOST, USER, PASSWD) != 0);
+ CPPUNIT_ASSERT(mysql_connect(mysql, HOST, USER1, PASSWD1) != 0);
// connect without the hostname parameter
// implicit localhost
- CPPUNIT_ASSERT(mysql_connect(mysql, "", USER, PASSWD) != 0);
- CPPUNIT_ASSERT(mysql_connect(mysql, 0, USER, PASSWD) != 0);
+ CPPUNIT_ASSERT(mysql_connect(mysql, "", USER1, PASSWD1) != 0);
+ CPPUNIT_ASSERT(mysql_connect(mysql, 0, USER1, PASSWD1) != 0);
}
void TestMySQLAPI::mysql_select_db_test(void)
{
// connect to the database - do not specify the DB name
- CPPUNIT_ASSERT(mysql_real_connect(mysql, HOST, USER, PASSWD, 0, 0, 0, 0) !=
0);
+ CPPUNIT_ASSERT(mysql_real_connect(mysql, HOST, USER1, PASSWD1, 0, 0, 0, 0)
!= 0);
CPPUNIT_ASSERT(strcmp(HOST, mysql->host) == 0);
- CPPUNIT_ASSERT(strcmp(USER, mysql->user) == 0);
- CPPUNIT_ASSERT(strcmp(PASSWD, mysql->passwd) == 0);
+ CPPUNIT_ASSERT(strcmp(USER1, mysql->user) == 0);
+ CPPUNIT_ASSERT(strcmp(PASSWD1, mysql->passwd) == 0);
CPPUNIT_ASSERT(mysql->db == 0);
CPPUNIT_ASSERT(mysql->port != 0);
@@ -107,18 +113,35 @@
void TestMySQLAPI::mysql_select_db_negative_test(void)
{
+ // try to select DB without connecting to server
+ CPPUNIT_ASSERT(mysql_select_db(mysql, DB1) == 0);
+
// connect to the database
- CPPUNIT_ASSERT(mysql_real_connect(mysql, HOST, USER, PASSWD, DB1, 0, 0, 0)
!= 0);
+ 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)
{
+ // connect to the database
+ 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);
+ // 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);
}
void TestMySQLAPI::mysql_change_user_negative_test(void)
{
+ // connect to the database
+ CPPUNIT_ASSERT(mysql_real_connect(mysql, HOST, USER1, PASSWD1, DB1, 0, 0, 0)
!= 0);
+ // change user specifying every parameter but a BAD username 0 = success
+ CPPUNIT_ASSERT(mysql_change_user(mysql, BAD_USER, PASSWD2, DB1) != 0);
}
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
