Date: Monday, December 4, 2006 @ 15:14:35
Author: gilles
Path: /cvsroot/carob/carob/test/10-Connection
Modified: TestConnect.cpp (1.10 -> 1.11) TestConnect.hpp (1.3 -> 1.4)
Removed testPinger useless test
-----------------+
TestConnect.cpp | 23 +----------------------
TestConnect.hpp | 5 -----
2 files changed, 1 insertion(+), 27 deletions(-)
Index: carob/test/10-Connection/TestConnect.cpp
diff -u carob/test/10-Connection/TestConnect.cpp:1.10
carob/test/10-Connection/TestConnect.cpp:1.11
--- carob/test/10-Connection/TestConnect.cpp:1.10 Tue Nov 28 17:07:55 2006
+++ carob/test/10-Connection/TestConnect.cpp Mon Dec 4 15:14:35 2006
@@ -39,8 +39,6 @@
void TestConnect::tearDown()
{
- if (connectionPtr)
- delete connectionPtr;
}
void TestConnect::testConnectBadAddress()
@@ -166,23 +164,7 @@
logInfo(fctName, L"Connecting to controller - this should succeed");
connectionPtr = new Connection(connectionPrms);
logInfo(fctName, L"Connection succeeded");
-}
-
-#include "ControllerPingSender.hpp"
-#include "ControllerStateChangedCallback.hpp"
-#include "WatchedControllers.hpp"
-#include "ControllerWatcher.hpp"
-
-void TestConnect::testPinger()
-{
-
- wstring fctName(L"TestConnect::testPinger");
- std::vector<ControllerInfo> ctrls;
- ctrls.push_back(ControllerInfo(ConnectionSetup::DEFAULT_HOST,
ConnectionSetup::DEFAULT_PORT));
- ctrls.push_back(ControllerInfo(ConnectionSetup::DEFAULT_HOST,
ConnectionSetup::DEFAULT_PORT+1));
- RoundRobinControllerPool rrcp(ctrls, 1000, 3000);
- sleep(10);
- logInfo(fctName, L"ping ok");
+ delete connectionPtr;
}
CppUnit::Test* TestConnect::suite()
@@ -206,9 +188,6 @@
suiteOfTests->addTest(new CppUnit::TestCaller<TestConnect>(
"TestConnect::testConnectGood",
&TestConnect::testConnectGood));
- suiteOfTests->addTest(new CppUnit::TestCaller<TestConnect>(
- "TestConnect::testPinger",
- &TestConnect::testPinger));
return suiteOfTests;
}
Index: carob/test/10-Connection/TestConnect.hpp
diff -u carob/test/10-Connection/TestConnect.hpp:1.3
carob/test/10-Connection/TestConnect.hpp:1.4
--- carob/test/10-Connection/TestConnect.hpp:1.3 Tue Nov 28 17:07:55 2006
+++ carob/test/10-Connection/TestConnect.hpp Mon Dec 4 15:14:35 2006
@@ -76,11 +76,6 @@
* the default port and checks everything went good.
*/
void testConnectGood();
- /**
- * Connects to a controller on a local machine (that must be running !) with
- * the default port and checks everything went good.
- */
- void testPinger();
private:
CarobNS::Connection* connectionPtr;
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
