Date: Monday, February 12, 2007 @ 18:45:11
Author: gilles
Path: /cvsroot/carob/carob/test
Modified: 10-Connection/TestBeginCommitRollback.cpp (1.6 -> 1.7)
10-Connection/TestFailOver.cpp (1.10 -> 1.11)
20-Write/TestExecWriteRequest.cpp (1.8 -> 1.9)
30-ResultSet/TestBigDecimal.cpp (1.15 -> 1.16)
30-ResultSet/TestDriverResultSet.cpp (1.5 -> 1.6)
30-ResultSet/TestExecReadRequest.cpp (1.7 -> 1.8)
30-ResultSet/TestSimpleUnicode.cpp (1.12 -> 1.13)
35-ResultList/TestExec.cpp (1.5 -> 1.6)
40-Parameter-PreparedStatement/TestIEEE754.cpp (1.25 -> 1.26)
40-Parameter-PreparedStatement/TestParameterStatement.cpp (1.19
-> 1.20)
40-Parameter-PreparedStatement/TestPreparedStatement.cpp (1.8 ->
1.9)
Fixed memory leaks in tests: now delete created statements. The leak did not
appear before because we were deleting connection at each test (thus deleting
statements)
-----------------------------------------------------------+
10-Connection/TestBeginCommitRollback.cpp | 4 +++
10-Connection/TestFailOver.cpp | 1
20-Write/TestExecWriteRequest.cpp | 13 ++++++++--
30-ResultSet/TestBigDecimal.cpp | 2 +
30-ResultSet/TestDriverResultSet.cpp | 2 +
30-ResultSet/TestExecReadRequest.cpp | 15 ++++++++----
30-ResultSet/TestSimpleUnicode.cpp | 1
35-ResultList/TestExec.cpp | 4 +++
40-Parameter-PreparedStatement/TestIEEE754.cpp | 10 ++++----
40-Parameter-PreparedStatement/TestParameterStatement.cpp | 14 ++++++++++-
40-Parameter-PreparedStatement/TestPreparedStatement.cpp | 10 ++++++++
11 files changed, 64 insertions(+), 12 deletions(-)
Index: carob/test/10-Connection/TestBeginCommitRollback.cpp
diff -u carob/test/10-Connection/TestBeginCommitRollback.cpp:1.6
carob/test/10-Connection/TestBeginCommitRollback.cpp:1.7
--- carob/test/10-Connection/TestBeginCommitRollback.cpp:1.6 Thu Feb 8
11:06:49 2007
+++ carob/test/10-Connection/TestBeginCommitRollback.cpp Mon Feb 12
18:45:10 2007
@@ -48,6 +48,7 @@
{
logInfo(fctName, L"Read and commit succeeded");
}
+ connectionPtr->deleteStatement(stPtr);
}
void TestBeginCommitRollback::testReadRequestAndRollback()
@@ -60,6 +61,7 @@
{
logInfo(fctName, L"Read and rollback succeeded");
}
+ connectionPtr->deleteStatement(stPtr);
}
void TestBeginCommitRollback::testWriteRequestAndCommit()
@@ -77,6 +79,7 @@
{
logInfo(fctName, L"Write and commit succeeded");
}
+ connectionPtr->deleteStatement(stPtr);
}
void TestBeginCommitRollback::testWriteRequestAndRollback()
@@ -94,6 +97,7 @@
{
logInfo(fctName, L"Write and rollback succeeded");
}
+ connectionPtr->deleteStatement(stPtr);
}
CppUnit::Test* TestBeginCommitRollback::suite()
Index: carob/test/10-Connection/TestFailOver.cpp
diff -u carob/test/10-Connection/TestFailOver.cpp:1.10
carob/test/10-Connection/TestFailOver.cpp:1.11
--- carob/test/10-Connection/TestFailOver.cpp:1.10 Thu Feb 8 11:06:49 2007
+++ carob/test/10-Connection/TestFailOver.cpp Mon Feb 12 18:45:10 2007
@@ -153,6 +153,7 @@
CPPUNIT_ASSERT(rsuc == false);
sleep(1);
}
+ connectionPtr->deleteStatement(statementPtr);
}
CppUnit::Test* TestFailOver::suite()
Index: carob/test/20-Write/TestExecWriteRequest.cpp
diff -u carob/test/20-Write/TestExecWriteRequest.cpp:1.8
carob/test/20-Write/TestExecWriteRequest.cpp:1.9
--- carob/test/20-Write/TestExecWriteRequest.cpp:1.8 Thu Feb 8 11:06:50 2007
+++ carob/test/20-Write/TestExecWriteRequest.cpp Mon Feb 12 18:45:10 2007
@@ -36,9 +36,10 @@
void TestExecWriteRequest::testWriteBadRequest()
{
const wstring fctName(L"TestExecWriteRequest::testWriteBadRequest");
+ Statement* statementPtr = NULL;
try
{
- Statement* statementPtr = connectionPtr->createStatement();
+ statementPtr = connectionPtr->createStatement();
if (isInfoEnabled())
{
logInfo(fctName, L"Executing dummy update - should fail");
@@ -55,14 +56,16 @@
+ ce.description());
}
}
+ connectionPtr->deleteStatement(statementPtr);
}
void TestExecWriteRequest::testWriteBadTable()
{
const wstring fctName(L"TestExecWriteRequest::testWriteBadTable");
+ Statement* statementPtr = NULL;
try
{
- Statement* statementPtr = connectionPtr->createStatement();
+ statementPtr = connectionPtr->createStatement();
if (isInfoEnabled())
{
logInfo(fctName, L"Executing bad table update - this should fail");
@@ -79,6 +82,7 @@
+ be.description());
}
}
+ connectionPtr->deleteStatement(statementPtr);
}
void TestExecWriteRequest::testWriteGood()
@@ -97,6 +101,7 @@
+ toUserString(nbRowsAffected));
}
CPPUNIT_ASSERT(nbRowsAffected == 1);
+ connectionPtr->deleteStatement(statementPtr);
}
#define NB_THREADS 50
@@ -134,6 +139,7 @@
CPPUNIT_ASSERT(drsPtr->next());
logInfo(fctName, drsPtr->getAsString(1) + L"->" + drsPtr->getAsString(2));
}
+ me->instancePtr->connectionPtr->deleteStatement(statementPtr);
pthread_exit(0);
return NULL;
}
@@ -180,6 +186,7 @@
statementPtr->executeUpdate(L"CREATE TABLE product (id integer, cost
integer)");
for (int j=0; j<50; j++)
statementPtr->executeUpdate(L"INSERT INTO product VALUES(" + toWString(j)
+ L"," + toWString(j) + L")");
+ connectionPtr->deleteStatement(statementPtr);
doNWrites(fctName, 1000);
}
#endif
@@ -196,6 +203,7 @@
CPPUNIT_ASSERT(nbRowsAffected == 1);
logInfo(fctName, L"Request " + fullRequest + L" succeeded");
}
+ connectionPtr->deleteStatement(statementPtr);
if (isInfoEnabled())
{
logInfo(fctName, L"All writes succeeded");
@@ -218,6 +226,7 @@
{
statementPtr->executeQuery(L"SELECT SLEEP(30)");
}
+ connectionPtr->deleteStatement(statementPtr);
}
CppUnit::Test* TestExecWriteRequest::suite()
Index: carob/test/30-ResultSet/TestBigDecimal.cpp
diff -u carob/test/30-ResultSet/TestBigDecimal.cpp:1.15
carob/test/30-ResultSet/TestBigDecimal.cpp:1.16
--- carob/test/30-ResultSet/TestBigDecimal.cpp:1.15 Thu Feb 8 11:06:49 2007
+++ carob/test/30-ResultSet/TestBigDecimal.cpp Mon Feb 12 18:45:10 2007
@@ -103,6 +103,7 @@
//MIN LLONG +1
statementPtr->executeUpdate(
L"UPDATE product SET cost = -9223372036854775807 WHERE id= " +
toWString(id++));
+ connectionPtr->deleteStatement(statementPtr);
}
void TestBigDecimal::testGetAsStringUsingCLocale()
{
@@ -189,6 +190,7 @@
logInfo(fctName, toUserString(static_cast<int64_t>(123456789012LL)) +
thousandsSep + toUserString(345678901) + thousandsSep + toUserString(234567890)
+ decimalSep + L"123456789012345678901234567890 - getAsString=" +
drsPtr->getAsString(3, loc));
CPPUNIT_ASSERT(drsPtr->getAsString(3, loc) ==
toUserString(static_cast<int64_t>(123456789012LL)) + thousandsSep +
toUserString(345678901) + thousandsSep + toUserString(234567890) + decimalSep +
L"123456789012345678901234567890");
+ connectionPtr->deleteStatement(statementPtr);
}
//TODO: improve log msgs
Index: carob/test/30-ResultSet/TestDriverResultSet.cpp
diff -u carob/test/30-ResultSet/TestDriverResultSet.cpp:1.5
carob/test/30-ResultSet/TestDriverResultSet.cpp:1.6
--- carob/test/30-ResultSet/TestDriverResultSet.cpp:1.5 Thu Feb 8 11:06:49 2007
+++ carob/test/30-ResultSet/TestDriverResultSet.cpp Mon Feb 12 18:45:10 2007
@@ -79,6 +79,7 @@
+ nve.description());
}
}
+ connectionPtr->deleteStatement(statementPtr);
}
void TestDriverResultSet::testGetAsIntOnString()
@@ -132,6 +133,7 @@
+ de.description());
}
}
+ connectionPtr->deleteStatement(statementPtr);
}
CppUnit::Test* TestDriverResultSet::suite()
Index: carob/test/30-ResultSet/TestExecReadRequest.cpp
diff -u carob/test/30-ResultSet/TestExecReadRequest.cpp:1.7
carob/test/30-ResultSet/TestExecReadRequest.cpp:1.8
--- carob/test/30-ResultSet/TestExecReadRequest.cpp:1.7 Thu Feb 8 11:06:49 2007
+++ carob/test/30-ResultSet/TestExecReadRequest.cpp Mon Feb 12 18:45:10 2007
@@ -38,9 +38,10 @@
void TestExecReadRequest::testReadBadRequest()
{
const wstring fctName(L"TestExecReadRequest::testReadBadRequest");
+ Statement* statementPtr = NULL;
try
{
- Statement* statementPtr = connectionPtr->createStatement();
+ statementPtr = connectionPtr->createStatement();
if (isInfoEnabled())
{
logInfo(fctName, L"Executing dummy read - should fail");
@@ -57,14 +58,16 @@
+ be.description());
}
}
+ connectionPtr->deleteStatement(statementPtr);
}
void TestExecReadRequest::testReadBadTable()
{
const wstring fctName(L"TestExecReadRequest::testReadBadTable");
+ Statement* statementPtr = NULL;
try
{
- Statement* statementPtr = connectionPtr->createStatement();
+ statementPtr = connectionPtr->createStatement();
if (isInfoEnabled())
{
logInfo(fctName, L"Executing bad table read - should fail");
@@ -81,13 +84,13 @@
+ be.description());
}
}
+ connectionPtr->deleteStatement(statementPtr);
}
void TestExecReadRequest::testReadGood()
{
const wstring fctName(L"TestExecReadRequest::testReadGood");
-
Statement* statementPtr = connectionPtr->createStatement();
if (isInfoEnabled())
{
@@ -96,12 +99,12 @@
statementPtr->setFetchSize(1);
DriverResultSet* drsPtr = statementPtr->executeQuery(
L"SELECT * FROM address");
+ //Display 50 rows using metadata and toString
+ ResultSetMetaData rsmd(drsPtr);
if (isInfoEnabled())
{
logInfo(fctName, L"Read succeeded. Displaying 50 rows:");
}
- //Display 50 rows using metadata and toString
- ResultSetMetaData rsmd(drsPtr);
std::wostringstream buffer;
buffer<<L"25 first rows got as strings"<<endl;
for (int i=0; i<25; i++)
@@ -122,6 +125,7 @@
}
if (isInfoEnabled())
logInfo(fctName, buffer.str());
+ connectionPtr->deleteStatement(statementPtr);
}
void TestExecReadRequest::testReadWithMaxRows()
@@ -153,6 +157,7 @@
}
//This next() should return false because we asked just 1 row
CPPUNIT_ASSERT(drsPtr->next() == false);
+ connectionPtr->deleteStatement(statementPtr);
}
CppUnit::Test* TestExecReadRequest::suite()
Index: carob/test/30-ResultSet/TestSimpleUnicode.cpp
diff -u carob/test/30-ResultSet/TestSimpleUnicode.cpp:1.12
carob/test/30-ResultSet/TestSimpleUnicode.cpp:1.13
--- carob/test/30-ResultSet/TestSimpleUnicode.cpp:1.12 Thu Feb 8 11:06:49 2007
+++ carob/test/30-ResultSet/TestSimpleUnicode.cpp Mon Feb 12 18:45:10 2007
@@ -67,6 +67,7 @@
CPPUNIT_ASSERT(!drsPtr->next());
+ connectionPtr->deleteStatement(stmt);
}
void TestSimpleUnicode::testPBK()
Index: carob/test/35-ResultList/TestExec.cpp
diff -u carob/test/35-ResultList/TestExec.cpp:1.5
carob/test/35-ResultList/TestExec.cpp:1.6
--- carob/test/35-ResultList/TestExec.cpp:1.5 Thu Feb 8 11:06:49 2007
+++ carob/test/35-ResultList/TestExec.cpp Mon Feb 12 18:45:10 2007
@@ -76,6 +76,7 @@
+ be.description());
}
}
+ connectionPtr->deleteStatement(statementPtr);
}
void TestExec::testExecuteWithSelect()
@@ -110,6 +111,7 @@
{
logInfo(fctName, buffer.str());
}
+ connectionPtr->deleteStatement(statementPtr);
}
void TestExec::testExecuteWithUpdate()
{
@@ -128,6 +130,7 @@
+ toUserString(statementPtr->getUpdateCount()));
}
CPPUNIT_ASSERT(statementPtr->getUpdateCount() == 1);
+ connectionPtr->deleteStatement(statementPtr);
}
void TestExec::testExecuteWithSelectStreamed()
@@ -162,6 +165,7 @@
{
logInfo(fctName, buffer.str());
}
+ connectionPtr->deleteStatement(statementPtr);
}
CppUnit::Test* TestExec::suite()
Index: carob/test/40-Parameter-PreparedStatement/TestIEEE754.cpp
diff -u carob/test/40-Parameter-PreparedStatement/TestIEEE754.cpp:1.25
carob/test/40-Parameter-PreparedStatement/TestIEEE754.cpp:1.26
--- carob/test/40-Parameter-PreparedStatement/TestIEEE754.cpp:1.25 Thu Feb
8 11:06:49 2007
+++ carob/test/40-Parameter-PreparedStatement/TestIEEE754.cpp Mon Feb 12
18:45:10 2007
@@ -122,7 +122,7 @@
CPPUNIT_ASSERT(1 == uc);
row++;
}
-
+ conn->deleteStatement(insert);
}
void
@@ -154,6 +154,7 @@
#endif
row++;
}
+ conn->deleteStatement(retrieve);
}
} // unnamed namespace
@@ -183,6 +184,7 @@
read_compare(connectionPtr, basicdata);
+ connectionPtr->deleteStatement(insert);
}
@@ -252,13 +254,13 @@
// TODO: check why mysql throws errors
#ifndef CAROB_TEST_USE_MYSQL
suiteOfTests->addTest(new CppUnit::TestCaller<TestIEEE754>(
-
"40.PreparedStatement/TestIEEE754::testSimpleReceiveOnly",
+ "40.TestIEEE754::testSimpleReceiveOnly",
&TestIEEE754::testSimpleReceiveOnly));
suiteOfTests->addTest(new CppUnit::TestCaller<TestIEEE754>(
- "40.PreparedStatement/TestIEEE754::testBasic",
+ "40.TestIEEE754::testBasic",
&TestIEEE754::testBasic));
suiteOfTests->addTest(new CppUnit::TestCaller<TestIEEE754>(
- "40.PreparedStatement/TestIEEE754::testInfNaN",
+ "40.TestIEEE754::testInfNaN",
&TestIEEE754::testInfNaN));
#endif
return suiteOfTests;
Index: carob/test/40-Parameter-PreparedStatement/TestParameterStatement.cpp
diff -u
carob/test/40-Parameter-PreparedStatement/TestParameterStatement.cpp:1.19
carob/test/40-Parameter-PreparedStatement/TestParameterStatement.cpp:1.20
--- carob/test/40-Parameter-PreparedStatement/TestParameterStatement.cpp:1.19
Thu Feb 8 11:06:49 2007
+++ carob/test/40-Parameter-PreparedStatement/TestParameterStatement.cpp
Mon Feb 12 18:45:10 2007
@@ -64,6 +64,7 @@
+ be.description());
}
}
+ connectionPtr->deleteStatement(statementPtr);
}
void TestParameterStatement::testExecuteQueryGood()
@@ -95,6 +96,7 @@
if (isInfoEnabled())
logInfo(fctName, buffer.str());
+ connectionPtr->deleteStatement(statementPtr);
}
//EXECUTE UPDATE
@@ -123,6 +125,7 @@
+ be.description());
}
}
+ connectionPtr->deleteStatement(statementPtr);
}
void TestParameterStatement::testExecuteUpdateGood()
@@ -143,6 +146,7 @@
+ toUserString(nbRowsAffected));
}
CPPUNIT_ASSERT(nbRowsAffected == 1);
+ connectionPtr->deleteStatement(statementPtr);
}
void TestParameterStatement::testExecuteWithSelect()
@@ -177,6 +181,7 @@
{
logInfo(fctName, buffer.str());
}
+ connectionPtr->deleteStatement(statementPtr);
}
void TestParameterStatement::testExecuteWithUpdate()
@@ -208,6 +213,7 @@
+ toUserString(statementPtr->getUpdateCount()));
}
CPPUNIT_ASSERT(statementPtr->getUpdateCount() == 1);
+ connectionPtr->deleteStatement(statementPtr);
}
@@ -243,7 +249,7 @@
CPPUNIT_ASSERT(0 == drs->getAsInt(1)); // FIXME: replace by getBoolean()
CPPUNIT_ASSERT(1 == drs->getAsInt(2));
-
+ connectionPtr->deleteStatement(pstmt);
}
void TestParameterStatement::testStrings()
@@ -263,12 +269,14 @@
pstmt->setString(1, teststring);
int uc = pstmt->executeUpdate();
CPPUNIT_ASSERT(1 == uc);
+ connectionPtr->deleteStatement(pstmt);
Statement* stmt = connectionPtr-> createStatement();
DriverResultSet * drs = stmt->executeQuery(std::wstring() + L"SELECT * from
" + TABLE_NAME);
CPPUNIT_ASSERT(drs->next());
CPPUNIT_ASSERT(teststring == drs->getString(1)); // FIXME: replace by
getBoolean()
+ connectionPtr->deleteStatement(stmt);
}
void TestParameterStatement::testBigDecimal()
@@ -314,6 +322,7 @@
int uc = pstmt->executeUpdate();
CPPUNIT_ASSERT(uc == 1);
}
+ connectionPtr->deleteStatement(pstmt);
Statement* stmt = connectionPtr-> createStatement();
DriverResultSet * drs = stmt->executeQuery(std::wstring(L"SELECT * from ") +
TABLE_NAME);
@@ -323,6 +332,7 @@
logDebug(fctName, L"testing with value " +
static_cast<wstring>(testVals[i]));
CPPUNIT_ASSERT(drs->getBigDecimal(1) == testVals[i]);
}
+ connectionPtr->deleteStatement(stmt);
}
void TestParameterStatement::testSetNull()
@@ -339,6 +349,7 @@
pstmt->setInt(1, -125);
pstmt->setNull(2, SQLT_SMALLINT);
pstmt->execute();
+ connectionPtr->deleteStatement(pstmt);
Statement* stmt = connectionPtr-> createStatement();
DriverResultSet* drs = stmt->executeQuery(std::wstring(L"SELECT * from ") +
TABLE_NAME);
CPPUNIT_ASSERT(drs->next());
@@ -352,6 +363,7 @@
{
logDebug(fctName, L"NullValueException caught - this is ok");
}
+ connectionPtr->deleteStatement(stmt);
}
CppUnit::Test* TestParameterStatement::suite()
Index: carob/test/40-Parameter-PreparedStatement/TestPreparedStatement.cpp
diff -u carob/test/40-Parameter-PreparedStatement/TestPreparedStatement.cpp:1.8
carob/test/40-Parameter-PreparedStatement/TestPreparedStatement.cpp:1.9
--- carob/test/40-Parameter-PreparedStatement/TestPreparedStatement.cpp:1.8
Thu Feb 8 11:06:49 2007
+++ carob/test/40-Parameter-PreparedStatement/TestPreparedStatement.cpp Mon Feb
12 18:45:10 2007
@@ -53,6 +53,7 @@
+ be.description());
}
}
+ connectionPtr->deleteStatement(statementPtr);
}
void TestPreparedStatement::testPrepareEmptyParameterStatement()
{
@@ -76,6 +77,7 @@
+ be.description());
}
}
+ connectionPtr->deleteStatement(psPtr);
}
void TestPreparedStatement::testPrepareUpdateStatement()
@@ -102,6 +104,7 @@
+ be.description());
}
}
+ connectionPtr->deleteStatement(statementPtr);
}
void TestPreparedStatement::testPrepareUpdateParameterStatement()
@@ -116,6 +119,7 @@
}
ResultSetMetaData* rsmdPtr = psPtr->getMetaData();
CPPUNIT_ASSERT(rsmdPtr == NULL);
+ connectionPtr->deleteStatement(psPtr);
}
void TestPreparedStatement::testPrepareExecuteQueryStatement()
@@ -130,6 +134,7 @@
ResultSetMetaData* rsmdPtr = statementPtr->getMetaData();
CPPUNIT_ASSERT(rsmdPtr != NULL); //just to avoid warning on unsused var
CPPUNIT_ASSERT(rsmdPtr->getColumnCount() == 5);
+ connectionPtr->deleteStatement(statementPtr);
}
void TestPreparedStatement::testPrepareExecuteQueryParameterStatement()
@@ -145,6 +150,7 @@
ResultSetMetaData* rsmdPtr = psPtr->getMetaData();
CPPUNIT_ASSERT(rsmdPtr != NULL);
CPPUNIT_ASSERT(rsmdPtr->getColumnName(1) == L"ID");
+ connectionPtr->deleteStatement(psPtr);
}
void TestPreparedStatement::testPrepareExecuteStatement()
@@ -159,6 +165,7 @@
ResultSetMetaData* rsmdPtr = statementPtr->getMetaData();
CPPUNIT_ASSERT(rsmdPtr != NULL); //just to avoid warning on unsused var
CPPUNIT_ASSERT(rsmdPtr->getTableName(2) == L"ADDRESS");
+ connectionPtr->deleteStatement(statementPtr);
}
void TestPreparedStatement::testPrepareExecuteParameterStatement()
@@ -174,6 +181,7 @@
ResultSetMetaData* rsmdPtr = psPtr->getMetaData();
CPPUNIT_ASSERT(rsmdPtr != NULL);
CPPUNIT_ASSERT(rsmdPtr->getColumnType(3) == SQLT_VARCHAR);
+ connectionPtr->deleteStatement(psPtr);
}
void TestPreparedStatement::testPrepareStatement()
@@ -188,6 +196,7 @@
ResultSetMetaData* rsmdPtr = statementPtr->getMetaData();
CPPUNIT_ASSERT(rsmdPtr != NULL); //just to avoid warning on unsused var
CPPUNIT_ASSERT(rsmdPtr->getTableName(2) == L"ADDRESS");
+ connectionPtr->deleteStatement(statementPtr);
}
void TestPreparedStatement::testPrepareParameterStatement()
@@ -202,6 +211,7 @@
ResultSetMetaData* rsmdPtr = psPtr->getMetaData();
CPPUNIT_ASSERT(rsmdPtr != NULL);
CPPUNIT_ASSERT(rsmdPtr->getColumnType(3) == SQLT_VARCHAR);
+ connectionPtr->deleteStatement(psPtr);
}
CppUnit::Test* TestPreparedStatement::suite()
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
