Date: Wednesday, June 21, 2006 @ 18:43:21
Author: marc
Path: /cvsroot/carob/carob/test
Modified: 10-Connection/TestConnect.cpp (1.7 -> 1.8)
10-Connection/TestControllerConnectPolicy.cpp (1.3 -> 1.4)
10-Connection/TestFailOver.cpp (1.3 -> 1.4) ConnectionSetup.cpp
(1.9 -> 1.10) ConnectionSetup.hpp (1.5 -> 1.6)
Created static const ConnectionSetup::DEFAULT_HOST = L"localhost"
-----------------------------------------------+
10-Connection/TestConnect.cpp | 14 +++++++-----
10-Connection/TestControllerConnectPolicy.cpp | 27 +++++++++++++-----------
10-Connection/TestFailOver.cpp | 23 +++++++++++---------
ConnectionSetup.cpp | 6 +++--
ConnectionSetup.hpp | 9 +++++---
5 files changed, 46 insertions(+), 33 deletions(-)
Index: carob/test/10-Connection/TestConnect.cpp
diff -u carob/test/10-Connection/TestConnect.cpp:1.7
carob/test/10-Connection/TestConnect.cpp:1.8
--- carob/test/10-Connection/TestConnect.cpp:1.7 Wed Jun 21 16:20:40 2006
+++ carob/test/10-Connection/TestConnect.cpp Wed Jun 21 18:43:21 2006
@@ -19,6 +19,9 @@
* Contributor(s):
*/
+// not to derive: just to get default parameters
+#include "../ConnectionSetup.hpp"
+
#include "Connection.hpp"
#include "Common.hpp"
#include "ConnectionParameters.hpp"
@@ -70,8 +73,7 @@
void TestConnect::testConnectBadPort()
{
wstring fctName(L"TestConnect::testConnectBadPort");
- ConnectionParameters connectionPrms(L"localhost", // TODO: should use the
- // hostname found in ConnectionSetup.cpp
+ ConnectionParameters connectionPrms(ConnectionSetup::DEFAULT_HOST,
12345,
L"myDB",
L"user",
@@ -97,7 +99,7 @@
void TestConnect::testConnectBadDB()
{
wstring fctName(L"TestConnect::testConnectBadDB");
- ConnectionParameters connectionPrms(L"localhost",
+ ConnectionParameters connectionPrms(ConnectionSetup::DEFAULT_HOST,
25322,
L"dummyDB",
L"user",
@@ -125,7 +127,7 @@
void TestConnect::testConnectBadUser()
{
wstring fctName(L"TestConnect::testConnectBadUser");
- ConnectionParameters connectionPrms(L"localhost",
+ ConnectionParameters connectionPrms(ConnectionSetup::DEFAULT_HOST,
25322,
L"myDB",
L"dummyuser",
@@ -153,7 +155,7 @@
void TestConnect::testConnectBadPass()
{
wstring fctName(L"TestConnect::testConnectBadPass");
- ConnectionParameters connectionPrms(L"localhost",
+ ConnectionParameters connectionPrms(ConnectionSetup::DEFAULT_HOST,
25322,
L"myDB",
L"user",
@@ -181,7 +183,7 @@
void TestConnect::testConnectGood()
{
wstring fctName(L"TestConnect::testConnectGood");
- ConnectionParameters connectionPrms(L"localhost",
+ ConnectionParameters connectionPrms(ConnectionSetup::DEFAULT_HOST,
25322,
L"myDB",
L"user",
Index: carob/test/10-Connection/TestControllerConnectPolicy.cpp
diff -u carob/test/10-Connection/TestControllerConnectPolicy.cpp:1.3
carob/test/10-Connection/TestControllerConnectPolicy.cpp:1.4
--- carob/test/10-Connection/TestControllerConnectPolicy.cpp:1.3 Fri Feb
24 12:29:04 2006
+++ carob/test/10-Connection/TestControllerConnectPolicy.cpp Wed Jun 21
18:43:21 2006
@@ -21,6 +21,9 @@
#include "TestControllerConnectPolicy.hpp"
+// not to derive: just to get default parameters
+#include "../ConnectionSetup.hpp"
+
#include "ControllerConnectPolicy.hpp"
#include "Statement.hpp"
#include "Connection.hpp"
@@ -46,10 +49,10 @@
{
wstring fctName(L"TestControllerConnectPolicy::testSuspectListUpdate");
- ControllerInfo c1(L"localhost", 4000);
- ControllerInfo c2(L"localhost", 4001);
- ControllerInfo c3(L"localhost", 4002);
- ControllerInfo c4(L"localhost", 4003);
+ ControllerInfo c1(ConnectionSetup::DEFAULT_HOST, 4000);
+ ControllerInfo c2(ConnectionSetup::DEFAULT_HOST, 4001);
+ ControllerInfo c3(ConnectionSetup::DEFAULT_HOST, 4002);
+ ControllerInfo c4(ConnectionSetup::DEFAULT_HOST, 4003);
std::vector<ControllerInfo> v;
v.push_back(c1);
@@ -73,10 +76,10 @@
{
wstring fctName(L"TestControllerConnectPolicy::testNoMoreController");
- ControllerInfo c1(L"localhost", 4000);
- ControllerInfo c2(L"localhost", 4001);
- ControllerInfo c3(L"localhost", 4002);
- ControllerInfo c4(L"localhost", 4003);
+ ControllerInfo c1(ConnectionSetup::DEFAULT_HOST, 4000);
+ ControllerInfo c2(ConnectionSetup::DEFAULT_HOST, 4001);
+ ControllerInfo c3(ConnectionSetup::DEFAULT_HOST, 4002);
+ ControllerInfo c4(ConnectionSetup::DEFAULT_HOST, 4003);
std::vector<ControllerInfo> v;
v.push_back(c1);
@@ -117,10 +120,10 @@
std::wcerr<<L"Launch 4 servers on localhost:4000-4003 and press
<return>"<<std::endl;
std::cin.ignore(std::numeric_limits<std::streamsize>::max(), '\n');
- ControllerInfo c1(L"localhost", 4000);
- ControllerInfo c2(L"localhost", 4001);
- ControllerInfo c3(L"localhost", 4002);
- ControllerInfo c4(L"localhost", 4003);
+ ControllerInfo c1(ConnectionSetup::DEFAULT_HOST, 4000);
+ ControllerInfo c2(ConnectionSetup::DEFAULT_HOST, 4001);
+ ControllerInfo c3(ConnectionSetup::DEFAULT_HOST, 4002);
+ ControllerInfo c4(ConnectionSetup::DEFAULT_HOST, 4003);
std::vector<ControllerInfo> v;
v.push_back(c1);
Index: carob/test/10-Connection/TestFailOver.cpp
diff -u carob/test/10-Connection/TestFailOver.cpp:1.3
carob/test/10-Connection/TestFailOver.cpp:1.4
--- carob/test/10-Connection/TestFailOver.cpp:1.3 Fri May 5 19:00:56 2006
+++ carob/test/10-Connection/TestFailOver.cpp Wed Jun 21 18:43:21 2006
@@ -21,6 +21,9 @@
#include "TestFailOver.hpp"
+// not to derive: just to get default parameters
+#include "../ConnectionSetup.hpp"
+
#include "Statement.hpp"
#include "Connection.hpp"
@@ -48,7 +51,7 @@
void TestFailOver::testReconnectNoControllers()
{
// this is a dummy port
- ConnectionParameters connectionPrms(L"localhost",
+ ConnectionParameters connectionPrms(ConnectionSetup::DEFAULT_HOST,
12345,
L"myDB",
L"user",
@@ -67,8 +70,8 @@
+ ce.description());
}
// 2nd try with 2 (first one is now suspected of failure...
- connectionPrms.addController(L"localhost", 12346);
- connectionPrms.addController(L"localhost", 12347);
+ connectionPrms.addController(ConnectionSetup::DEFAULT_HOST, 12346);
+ connectionPrms.addController(ConnectionSetup::DEFAULT_HOST, 12347);
try
{
Connection* connectionPtr = new Connection(connectionPrms);
@@ -86,17 +89,17 @@
void TestFailOver::testConnectOnlyOneControllerUp()
{
// this is a dummy port
- ConnectionParameters connectionPrms(L"localhost",
+ ConnectionParameters connectionPrms(ConnectionSetup::DEFAULT_HOST,
12348,
L"myDB",
L"user",
L"");
// 2nd controller is down too
- connectionPrms.addController(L"localhost", 12349);
+ connectionPrms.addController(ConnectionSetup::DEFAULT_HOST, 12349);
// 3rd controller is ok
- connectionPrms.addController(L"localhost", 25322);
+ connectionPrms.addController(ConnectionSetup::DEFAULT_HOST, 25322);
// 4th is down
- connectionPrms.addController(L"localhost", 12350);
+ connectionPrms.addController(ConnectionSetup::DEFAULT_HOST, 12350);
Connection* connectionPtr = new Connection(connectionPrms);
//no exception.. good. clean the connection
delete connectionPtr;
@@ -105,15 +108,15 @@
void TestFailOver::testReconnect()
{
// this is a dummy controller
- ConnectionParameters connectionPrms(L"localhost",
+ ConnectionParameters connectionPrms(ConnectionSetup::DEFAULT_HOST,
25324,
L"myDB",
L"user",
L"");
// this one will work
- connectionPrms.addController(L"localhost", 25322);
+ connectionPrms.addController(ConnectionSetup::DEFAULT_HOST, 25322);
// this one too
- connectionPrms.addController(L"localhost", 25323);
+ connectionPrms.addController(ConnectionSetup::DEFAULT_HOST, 25323);
Connection* connectionPtr = new Connection(connectionPrms);
Statement* statementPtr = connectionPtr->createStatement();
Index: carob/test/ConnectionSetup.cpp
diff -u carob/test/ConnectionSetup.cpp:1.9 carob/test/ConnectionSetup.cpp:1.10
--- carob/test/ConnectionSetup.cpp:1.9 Wed Jun 21 16:20:40 2006
+++ carob/test/ConnectionSetup.cpp Wed Jun 21 18:43:21 2006
@@ -30,15 +30,17 @@
using namespace CarobNS;
+const std::wstring ConnectionSetup::DEFAULT_HOST = L"localhost";
+
void ConnectionSetup::setUp()
{
#if 1
- ConnectionParameters connectionPrms;
+ ConnectionParameters connectionPrms(DEFAULT_HOST);
#else
// Put your controller settings here.
// Check this constructor for more details.
// TODO: these should be run-time settings.
- ConnectionParameters connectionPrms(L"localhost",
+ ConnectionParameters connectionPrms(L"myhostname",
25322,
L"myDB",
L"user",
Index: carob/test/ConnectionSetup.hpp
diff -u carob/test/ConnectionSetup.hpp:1.5 carob/test/ConnectionSetup.hpp:1.6
--- carob/test/ConnectionSetup.hpp:1.5 Wed Jun 21 16:14:34 2006
+++ carob/test/ConnectionSetup.hpp Wed Jun 21 18:43:21 2006
@@ -34,15 +34,18 @@
* Test super class for running tests on a valid connection to a
* controller. Defines setUp() and tearDown() functions to connect to
* a controller (by default: host "localhost", db "myDB", user "user",
- * etc. Modify ConnectionSetup.cpp according to your needs.
+ * etc. Modify default ctor below or even ConnectionSetup.cpp
+ * according to your needs.
*
* Derive this class to get connected to a controller for free. No
- * testing is done here! A controller *MUST* run at the given address
- * for test success.
+ * testing is done here! A controller *MUST* be running at the given
+ * address for test success.
*/
class ConnectionSetup : CppUnit::TestFixture
{
public:
+ /** default controller host used for the tests */
+ const static std::wstring DEFAULT_HOST;
/** Creates the connection and connects to the running local controller. */
virtual void setUp();
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
