Date: Wednesday, November 9, 2005 @ 14:35:34
Author: gilles
Path: /cvsroot/carob/carob/test
Modified: TestBeginCommitRollback.cpp (1.1 -> 1.2)
TestBeginCommitRollback.hpp (1.1 -> 1.2) TestExecReadRequest.cpp
(1.5 -> 1.6) TestExecReadRequest.hpp (1.3 -> 1.4)
TestExecWriteRequest.cpp (1.5 -> 1.6) TestExecWriteRequest.hpp
(1.3 -> 1.4)
Modified inheritance to make use of the new class TestOnValidConnection
Removed setUp and tearDown functions that are thus obsolete
-----------------------------+
TestBeginCommitRollback.cpp | 42 -----------------------------------------
TestBeginCommitRollback.hpp | 16 +--------------
TestExecReadRequest.cpp | 43 ------------------------------------------
TestExecReadRequest.hpp | 16 +--------------
TestExecWriteRequest.cpp | 43 ------------------------------------------
TestExecWriteRequest.hpp | 15 +-------------
6 files changed, 6 insertions(+), 169 deletions(-)
Index: carob/test/TestBeginCommitRollback.cpp
diff -u carob/test/TestBeginCommitRollback.cpp:1.1
carob/test/TestBeginCommitRollback.cpp:1.2
--- carob/test/TestBeginCommitRollback.cpp:1.1 Fri Nov 4 11:27:44 2005
+++ carob/test/TestBeginCommitRollback.cpp Wed Nov 9 14:35:34 2005
@@ -20,52 +20,10 @@
*/
#include <iostream>
-#include "ConnectionParameters.hpp"
-#include "ConnectionPool.hpp"
#include "TestBeginCommitRollback.hpp"
#include "SelectRequest.hpp"
#include "UpdateRequest.hpp"
-void TestBeginCommitRollback::setUp()
-{
- wstring fctName(L"TestBeginCommitRollback::setUp");
- ConnectionPool& connectionPool = ConnectionPool::getInstance();
- ConnectionParameters connectionPrms(L"localhost",
- 25322,
- L"myDB",
- L"user",
- L"",
- DEBUG_LEVEL_DEBUG);
- try
- {
- connectionPtr = connectionPool.connectToController(connectionPrms);
- }
- catch (ConnectionException ce)
- {
- logError(fctName, L"ConnectionException "+ce.description());
- connectionPtr = NULL;
- CPPUNIT_ASSERT(false);
- }
- catch (AuthenticationException ae)
- {
- logError(fctName, L"AuthenticationException "+ae.description());
- connectionPtr = NULL;
- CPPUNIT_ASSERT(false);
- }
- catch (...)
- {
- logError(fctName, L"Unexpected excption. Aborting ");
- connectionPtr = NULL;
- CPPUNIT_ASSERT(false);
- }
-}
-
-void TestBeginCommitRollback::tearDown()
-{
- if (connectionPtr)
- delete connectionPtr;
-}
-
void TestBeginCommitRollback::testReadRequestAndCommit()
{
wstring fctName(L"TestBeginCommitRollback::testReadRequestAndCommit");
Index: carob/test/TestBeginCommitRollback.hpp
diff -u carob/test/TestBeginCommitRollback.hpp:1.1
carob/test/TestBeginCommitRollback.hpp:1.2
--- carob/test/TestBeginCommitRollback.hpp:1.1 Fri Nov 4 11:27:44 2005
+++ carob/test/TestBeginCommitRollback.hpp Wed Nov 9 14:35:34 2005
@@ -22,29 +22,20 @@
#ifndef TESTBEGINCOMMITROLLBACK_H_
#define TESTBEGINCOMMITROLLBACK_H_
-
-#include <cppunit/TestFixture.h>
-#include <cppunit/TestCase.h>
-#include <cppunit/TestSuite.h>
-#include <cppunit/TestCaller.h>
-
#include "Connection.hpp"
+#include "TestOnValidConnection.hpp"
/**
* Test class for Begin/Commit/Rollback commands.
* Runs read and write requests inside transactions.
* A controller *MUST* run locally for test success !!!
*/
-class TestBeginCommitRollback : CppUnit::TestFixture
+class TestBeginCommitRollback : public TestOnValidConnection
{
public:
/** Suite of tests to be run */
static CppUnit::Test* suite();
- /** Creates the connection and connects to the running local controller. */
- void setUp();
- /** Destroys the connection if applicable */
- void tearDown();
/**
* Sends a read request and a commit inside a transaction and checks that
* there is no error.
@@ -65,9 +56,6 @@
* there is no error.
*/
void testWriteRequestAndRollback();
-
-private:
- Connection* connectionPtr;
};
#endif /*TESTBEGINCOMMITROLLBACK_H_*/
Index: carob/test/TestExecReadRequest.cpp
diff -u carob/test/TestExecReadRequest.cpp:1.5
carob/test/TestExecReadRequest.cpp:1.6
--- carob/test/TestExecReadRequest.cpp:1.5 Fri Nov 4 11:00:49 2005
+++ carob/test/TestExecReadRequest.cpp Wed Nov 9 14:35:34 2005
@@ -20,55 +20,12 @@
*/
#include <iostream>
-#include "Connection.hpp"
#include "Common.hpp"
-#include "ConnectionParameters.hpp"
-#include "ConnectionPool.hpp"
#include "CarobException.hpp"
#include "DriverResultSet.hpp"
#include "TestExecReadRequest.hpp"
#include "SelectRequest.hpp"
-void TestExecReadRequest::setUp()
-{
- wstring fctName(L"TestExecReadRequest::setUp");
- ConnectionPool& connectionPool = ConnectionPool::getInstance();
- ConnectionParameters connectionPrms(L"localhost",
- 25322,
- L"myDB",
- L"user",
- L"",
- DEBUG_LEVEL_DEBUG);
- try
- {
- connectionPtr = connectionPool.connectToController(connectionPrms);
- }
- catch (ConnectionException ce)
- {
- logError(fctName, L"ConnectionException "+ce.description());
- connectionPtr = NULL;
- CPPUNIT_ASSERT(false);
- }
- catch (AuthenticationException ae)
- {
- logError(fctName, L"AuthenticationException "+ae.description());
- connectionPtr = NULL;
- CPPUNIT_ASSERT(false);
- }
- catch (...)
- {
- logError(fctName, L"Unexpected excption. Aborting ");
- connectionPtr = NULL;
- CPPUNIT_ASSERT(false);
- }
-}
-
-void TestExecReadRequest::tearDown()
-{
- if (connectionPtr)
- delete connectionPtr;
-}
-
void TestExecReadRequest::testReadBadRequest()
{
wstring fctName(L"TestExecReadRequest::testReadBadRequest");
Index: carob/test/TestExecReadRequest.hpp
diff -u carob/test/TestExecReadRequest.hpp:1.3
carob/test/TestExecReadRequest.hpp:1.4
--- carob/test/TestExecReadRequest.hpp:1.3 Fri Nov 4 11:00:49 2005
+++ carob/test/TestExecReadRequest.hpp Wed Nov 9 14:35:34 2005
@@ -22,12 +22,7 @@
#ifndef TESTEXECREADREQUEST_H_
#define TESTEXECREADREQUEST_H_
-
-#include <cppunit/TestFixture.h>
-#include <cppunit/TestCase.h>
-#include <cppunit/TestSuite.h>
-#include <cppunit/TestCaller.h>
-
+#include "TestOnValidConnection.hpp"
/**
* Test class for ExecReadRequest command.
@@ -35,16 +30,12 @@
* correct request and displays the 50 first rows.
* A controller *MUST* run locally for test success !!!
*/
-class TestExecReadRequest : CppUnit::TestFixture
+class TestExecReadRequest : public TestOnValidConnection
{
public:
/** Suite of tests to be run */
static CppUnit::Test* suite();
- /** Creates the connection and connects to the running local controller. */
- void setUp();
- /** Destroys the connection if applicable */
- void tearDown();
/**
* Tries to send a dummy read request to the controller and checks that the
* error is consistent.
@@ -60,9 +51,6 @@
* error. Also displays a part of the result for manual check.
*/
void testReadGood();
-
-private:
- Connection* connectionPtr;
};
#endif /*TESTEXECREADREQUEST_H_*/
Index: carob/test/TestExecWriteRequest.cpp
diff -u carob/test/TestExecWriteRequest.cpp:1.5
carob/test/TestExecWriteRequest.cpp:1.6
--- carob/test/TestExecWriteRequest.cpp:1.5 Fri Nov 4 11:00:49 2005
+++ carob/test/TestExecWriteRequest.cpp Wed Nov 9 14:35:34 2005
@@ -19,55 +19,12 @@
* Contributor(s):
*/
-#include "Connection.hpp"
#include "Common.hpp"
-#include "ConnectionParameters.hpp"
-#include "ConnectionPool.hpp"
#include "CarobException.hpp"
#include "DriverResultSet.hpp"
#include "TestExecWriteRequest.hpp"
#include "UpdateRequest.hpp"
-void TestExecWriteRequest::setUp()
-{
- wstring fctName(L"TestExecWriteRequest::setUp");
- ConnectionPool& connectionPool = ConnectionPool::getInstance();
- ConnectionParameters connectionPrms(L"localhost",
- 25322,
- L"myDB",
- L"user",
- L"",
- DEBUG_LEVEL_DEBUG);
- try
- {
- connectionPtr = connectionPool.connectToController(connectionPrms);
- }
- catch (ConnectionException ce)
- {
- logError(fctName, L"ConnectionException "+ce.description());
- connectionPtr = NULL;
- CPPUNIT_ASSERT(false);
- }
- catch (AuthenticationException ae)
- {
- logError(fctName, L"AuthenticationException "+ae.description());
- connectionPtr = NULL;
- CPPUNIT_ASSERT(false);
- }
- catch (...)
- {
- logError(fctName, L"Unexpected excption. Aborting ");
- connectionPtr = NULL;
- CPPUNIT_ASSERT(false);
- }
-}
-
-void TestExecWriteRequest::tearDown()
-{
- if (connectionPtr)
- delete connectionPtr;
-}
-
void TestExecWriteRequest::testWriteBadRequest()
{
wstring fctName(L"TestExecWriteRequest::testWriteBadRequest");
Index: carob/test/TestExecWriteRequest.hpp
diff -u carob/test/TestExecWriteRequest.hpp:1.3
carob/test/TestExecWriteRequest.hpp:1.4
--- carob/test/TestExecWriteRequest.hpp:1.3 Fri Nov 4 11:00:49 2005
+++ carob/test/TestExecWriteRequest.hpp Wed Nov 9 14:35:34 2005
@@ -22,12 +22,7 @@
#ifndef TESTEXECWRITEREQUEST_H_
#define TESTEXECWRITEREQUEST_H_
-
-#include <cppunit/TestFixture.h>
-#include <cppunit/TestCase.h>
-#include <cppunit/TestSuite.h>
-#include <cppunit/TestCaller.h>
-
+#include "TestOnValidConnection.hpp"
/**
* Test class for ExecWriteRequest command.
@@ -35,16 +30,12 @@
* correct request and finally a correct request played 1000 times
* A controller *MUST* run locally for test success !!!
*/
-class TestExecWriteRequest : CppUnit::TestFixture
+class TestExecWriteRequest : public TestOnValidConnection
{
public:
/** Suite of tests to be run */
static CppUnit::Test* suite();
- /** Creates the connection and connects to the running local controller. */
- void setUp();
- /** Destroys the connection if applicable */
- void tearDown();
/**
* Tries to send a dummy write request to the controller and checks that the
* error is consistent.
@@ -65,8 +56,6 @@
* no error.
*/
void testWriteThousandGood();
-private:
- Connection* connectionPtr;
};
#endif /*TESTEXECWRITEREQUEST_H_*/
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
