Date: Friday, December 16, 2005 @ 17:41:08
Author: marc
Path: /cvsroot/carob/carob/test
Added: ConnectionSetup.cpp (1.1) ConnectionSetup.hpp (1.1)
Modified: GNUmakefile (1.14 -> 1.15) TestBeginCommitRollback.hpp (1.4 ->
1.5) TestDriverResultSet.hpp (1.3 -> 1.4)
TestExecReadRequest.hpp (1.6 -> 1.7) TestExecWriteRequest.hpp
(1.6 -> 1.7) TestStatement.hpp (1.5 -> 1.6)
Removed: TestOnValidConnection.cpp (1.6) TestOnValidConnection.hpp (1.5)
Renamed files TestOnValidConnection.?pp to ConnectionSetup.?pp
-----------------------------+
ConnectionSetup.cpp | 49 ++++++++++++++++++++++++++++++++++++++
ConnectionSetup.hpp | 54 ++++++++++++++++++++++++++++++++++++++++++
GNUmakefile | 2 -
TestBeginCommitRollback.hpp | 2 -
TestDriverResultSet.hpp | 2 -
TestExecReadRequest.hpp | 2 -
TestExecWriteRequest.hpp | 2 -
TestOnValidConnection.cpp | 49 --------------------------------------
TestOnValidConnection.hpp | 54 ------------------------------------------
TestStatement.hpp | 2 -
10 files changed, 109 insertions(+), 109 deletions(-)
Index: carob/test/ConnectionSetup.cpp
diff -u /dev/null carob/test/ConnectionSetup.cpp:1.1
--- /dev/null Fri Dec 16 17:41:08 2005
+++ carob/test/ConnectionSetup.cpp Fri Dec 16 17:41:08 2005
@@ -0,0 +1,49 @@
+/*
+ * Sequoia: Database clustering technology.
+ * Copyright (C) 2005 Emic Networks
+ * Contact: [EMAIL PROTECTED]
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Initial developer(s): Gilles Rayrat
+ * Contributor(s):
+ */
+
+#include "Common.hpp"
+#include "ConnectionParameters.hpp"
+#include "ConnectionPool.hpp"
+#include "CarobException.hpp"
+#include "ConnectionSetup.hpp"
+
+using std::wstring;
+
+using namespace CarobNS;
+
+void ConnectionSetup::setUp()
+{
+ wstring fctName(L"TestExecReadRequest::setUp");
+ ConnectionPool& connectionPool = ConnectionPool::getInstance();
+ ConnectionParameters connectionPrms(L"localhost",
+ 25322,
+ L"myDB",
+ L"user",
+ L"",
+ DEBUG_LEVEL_DEBUG);
+ connectionPtr = connectionPool.connectToController(connectionPrms);
+}
+
+void ConnectionSetup::tearDown()
+{
+ if (connectionPtr)
+ delete connectionPtr;
+}
Index: carob/test/ConnectionSetup.hpp
diff -u /dev/null carob/test/ConnectionSetup.hpp:1.1
--- /dev/null Fri Dec 16 17:41:08 2005
+++ carob/test/ConnectionSetup.hpp Fri Dec 16 17:41:08 2005
@@ -0,0 +1,54 @@
+/*
+ * Sequoia: Database clustering technology.
+ * Copyright (C) 2005 Emic Networks
+ * Contact: [EMAIL PROTECTED]
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Initial developer(s): Gilles Rayrat
+ * Contributor(s):
+ */
+
+#ifndef TESTONVALIDCONNECTION_H_
+#define TESTONVALIDCONNECTION_H_
+
+
+#include <cppunit/TestFixture.h>
+#include <cppunit/TestCase.h>
+#include <cppunit/TestSuite.h>
+#include <cppunit/TestCaller.h>
+
+
+/**
+ * Test super class for running tests on a valid connection to a local
+ * controller.
+ * Defines setUp() and tearDown() functions to connect to localhost:25322,
+ * db "myDB" user "user" pass "". Inherit from this class to launch tests and
+ * get rid of connection aspects. No testing is done here !
+ * A controller *MUST* run locally for test success !!!
+ */
+class ConnectionSetup : CppUnit::TestFixture
+{
+public:
+
+ /** Creates the connection and connects to the running local controller. */
+ void setUp();
+ /** Destroys the connection if applicable */
+ void tearDown();
+
+protected:
+ /** Valid connection on which data transferts are to be done */
+ CarobNS::Connection* connectionPtr;
+};
+
+#endif /*TESTONVALIDCONNECTION_H_*/
Index: carob/test/GNUmakefile
diff -u carob/test/GNUmakefile:1.14 carob/test/GNUmakefile:1.15
--- carob/test/GNUmakefile:1.14 Fri Dec 16 16:28:39 2005
+++ carob/test/GNUmakefile Fri Dec 16 17:41:08 2005
@@ -54,7 +54,7 @@
${RM} ${TESTOBJS} CarobTestLauncher.o ${EXE}
testslist:
- { printf "# To update me, delete me.\nTESTSRCS = \\\\\n" ; for i in
Test*cpp 01-Unit/Test*cpp ; do printf "$$i \\\\\n"; done ; } > $@
+ { printf "# To update me, delete me.\nTESTSRCS = \\\\\n" ; for i in
*cpp 01-Unit/Test*cpp ; do printf "$$i \\\\\n"; done ; } > $@
distclean: clean
${RM} testslist
Index: carob/test/TestBeginCommitRollback.hpp
diff -u carob/test/TestBeginCommitRollback.hpp:1.4
carob/test/TestBeginCommitRollback.hpp:1.5
--- carob/test/TestBeginCommitRollback.hpp:1.4 Fri Dec 16 17:31:16 2005
+++ carob/test/TestBeginCommitRollback.hpp Fri Dec 16 17:41:08 2005
@@ -23,7 +23,7 @@
#define TESTBEGINCOMMITROLLBACK_H_
#include "Connection.hpp"
-#include "TestOnValidConnection.hpp"
+#include "ConnectionSetup.hpp"
/**
* Test class for Begin/Commit/Rollback commands.
Index: carob/test/TestDriverResultSet.hpp
diff -u carob/test/TestDriverResultSet.hpp:1.3
carob/test/TestDriverResultSet.hpp:1.4
--- carob/test/TestDriverResultSet.hpp:1.3 Fri Dec 16 17:31:16 2005
+++ carob/test/TestDriverResultSet.hpp Fri Dec 16 17:41:08 2005
@@ -22,7 +22,7 @@
#ifndef TESTDRIVERRESULTSET_H_
#define TESTDRIVERRESULTSET_H_
-#include "TestOnValidConnection.hpp"
+#include "ConnectionSetup.hpp"
/**
* Test class for Statement class.
Index: carob/test/TestExecReadRequest.hpp
diff -u carob/test/TestExecReadRequest.hpp:1.6
carob/test/TestExecReadRequest.hpp:1.7
--- carob/test/TestExecReadRequest.hpp:1.6 Fri Dec 16 17:31:16 2005
+++ carob/test/TestExecReadRequest.hpp Fri Dec 16 17:41:08 2005
@@ -22,7 +22,7 @@
#ifndef TESTEXECREADREQUEST_H_
#define TESTEXECREADREQUEST_H_
-#include "TestOnValidConnection.hpp"
+#include "ConnectionSetup.hpp"
/**
* Test class for ExecReadRequest command.
Index: carob/test/TestExecWriteRequest.hpp
diff -u carob/test/TestExecWriteRequest.hpp:1.6
carob/test/TestExecWriteRequest.hpp:1.7
--- carob/test/TestExecWriteRequest.hpp:1.6 Fri Dec 16 17:31:16 2005
+++ carob/test/TestExecWriteRequest.hpp Fri Dec 16 17:41:08 2005
@@ -22,7 +22,7 @@
#ifndef TESTEXECWRITEREQUEST_H_
#define TESTEXECWRITEREQUEST_H_
-#include "TestOnValidConnection.hpp"
+#include "ConnectionSetup.hpp"
/**
* Test class for ExecWriteRequest command.
Index: carob/test/TestOnValidConnection.cpp
diff -u carob/test/TestOnValidConnection.cpp:1.6
carob/test/TestOnValidConnection.cpp:removed
--- carob/test/TestOnValidConnection.cpp:1.6 Fri Dec 16 17:31:16 2005
+++ carob/test/TestOnValidConnection.cpp Fri Dec 16 17:41:09 2005
@@ -1,49 +0,0 @@
-/*
- * Sequoia: Database clustering technology.
- * Copyright (C) 2005 Emic Networks
- * Contact: [EMAIL PROTECTED]
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Initial developer(s): Gilles Rayrat
- * Contributor(s):
- */
-
-#include "Common.hpp"
-#include "ConnectionParameters.hpp"
-#include "ConnectionPool.hpp"
-#include "CarobException.hpp"
-#include "TestOnValidConnection.hpp"
-
-using std::wstring;
-
-using namespace CarobNS;
-
-void ConnectionSetup::setUp()
-{
- wstring fctName(L"TestExecReadRequest::setUp");
- ConnectionPool& connectionPool = ConnectionPool::getInstance();
- ConnectionParameters connectionPrms(L"localhost",
- 25322,
- L"myDB",
- L"user",
- L"",
- DEBUG_LEVEL_DEBUG);
- connectionPtr = connectionPool.connectToController(connectionPrms);
-}
-
-void ConnectionSetup::tearDown()
-{
- if (connectionPtr)
- delete connectionPtr;
-}
Index: carob/test/TestOnValidConnection.hpp
diff -u carob/test/TestOnValidConnection.hpp:1.5
carob/test/TestOnValidConnection.hpp:removed
--- carob/test/TestOnValidConnection.hpp:1.5 Fri Dec 16 17:31:16 2005
+++ carob/test/TestOnValidConnection.hpp Fri Dec 16 17:41:09 2005
@@ -1,54 +0,0 @@
-/*
- * Sequoia: Database clustering technology.
- * Copyright (C) 2005 Emic Networks
- * Contact: [EMAIL PROTECTED]
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Initial developer(s): Gilles Rayrat
- * Contributor(s):
- */
-
-#ifndef TESTONVALIDCONNECTION_H_
-#define TESTONVALIDCONNECTION_H_
-
-
-#include <cppunit/TestFixture.h>
-#include <cppunit/TestCase.h>
-#include <cppunit/TestSuite.h>
-#include <cppunit/TestCaller.h>
-
-
-/**
- * Test super class for running tests on a valid connection to a local
- * controller.
- * Defines setUp() and tearDown() functions to connect to localhost:25322,
- * db "myDB" user "user" pass "". Inherit from this class to launch tests and
- * get rid of connection aspects. No testing is done here !
- * A controller *MUST* run locally for test success !!!
- */
-class ConnectionSetup : CppUnit::TestFixture
-{
-public:
-
- /** Creates the connection and connects to the running local controller. */
- void setUp();
- /** Destroys the connection if applicable */
- void tearDown();
-
-protected:
- /** Valid connection on which data transferts are to be done */
- CarobNS::Connection* connectionPtr;
-};
-
-#endif /*TESTONVALIDCONNECTION_H_*/
Index: carob/test/TestStatement.hpp
diff -u carob/test/TestStatement.hpp:1.5 carob/test/TestStatement.hpp:1.6
--- carob/test/TestStatement.hpp:1.5 Fri Dec 16 17:31:16 2005
+++ carob/test/TestStatement.hpp Fri Dec 16 17:41:08 2005
@@ -22,7 +22,7 @@
#ifndef TESTSTATEMENT_H_
#define TESTSTATEMENT_H_
-#include "TestOnValidConnection.hpp"
+#include "ConnectionSetup.hpp"
/**
* Test class for Statement class.
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
