diff options
Diffstat (limited to 'ndb/test/include/NDBT_Test.hpp')
| -rw-r--r-- | ndb/test/include/NDBT_Test.hpp | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/ndb/test/include/NDBT_Test.hpp b/ndb/test/include/NDBT_Test.hpp index 8b69faebde8..53f75db723f 100644 --- a/ndb/test/include/NDBT_Test.hpp +++ b/ndb/test/include/NDBT_Test.hpp @@ -25,6 +25,7 @@ #include <NdbCondition.h> #include <NdbTimer.hpp> #include <Vector.hpp> +#include <NdbApi.hpp> #include <NdbDictionary.hpp> class NDBT_Step; @@ -34,7 +35,9 @@ class NDBT_TestCaseImpl1; class NDBT_Context { public: - NDBT_Context(); + Ndb_cluster_connection& m_cluster_connection; + + NDBT_Context(Ndb_cluster_connection&); ~NDBT_Context(); const NdbDictionary::Table* getTab(); NDBT_TestSuite* getSuite(); @@ -120,7 +123,7 @@ public: NDBT_TESTFUNC* pfunc); virtual ~NDBT_Step() {} int execute(NDBT_Context*); - virtual int setUp() = 0; + virtual int setUp(Ndb_cluster_connection&) = 0; virtual void tearDown() = 0; void setContext(NDBT_Context*); NDBT_Context* getContext(); @@ -142,7 +145,7 @@ public: const char* pname, NDBT_TESTFUNC* pfunc); virtual ~NDBT_NdbApiStep() {} - virtual int setUp(); + virtual int setUp(Ndb_cluster_connection&); virtual void tearDown(); Ndb* getNdb(); @@ -347,10 +350,13 @@ public: int addTest(NDBT_TestCase* pTest); private: - int executeOne(const char* _tabname, const char* testname = NULL); - int executeAll(const char* testname = NULL); - - void execute(Ndb*, const NdbDictionary::Table*, const char* testname = NULL); + int executeOne(Ndb_cluster_connection&, + const char* _tabname, const char* testname = NULL); + int executeAll(Ndb_cluster_connection&, + const char* testname = NULL); + void execute(Ndb_cluster_connection&, + Ndb*, const NdbDictionary::Table*, const char* testname = NULL); + int report(const char* _tcname = NULL); int reportAllTables(const char* ); const char* name; |