Skip to content

Commit 3a824c2

Browse files
marcin1980marcin1980
committed
unittest fix on linux
1 parent c2b118c commit 3a824c2

File tree

13 files changed

+51
-6
lines changed

13 files changed

+51
-6
lines changed

‎library/cdbc/src/driver_manager.cpp‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ namespace sql {
144144
return dm;
145145
}
146146

147-
DriverManager::DriverManager() : _driver_path("."), _cacheTime(0) {
147+
DriverManager::DriverManager() : _driver_path("."), _cacheTime(0), _testing(false) {
148148
}
149149

150150
void DriverManager::setTunnelFactoryFunction(TunnelFactoryFunction function) {
@@ -203,6 +203,10 @@ namespace sql {
203203
it.second();
204204
}
205205

206+
void DriverManager::set_testing() {
207+
_testing = true;
208+
}
209+
206210
//--------------------------------------------------------------------------------------------------
207211

208212
unsigned int DriverManager::getClientLibVersionNumeric(Driver *driver) {
@@ -325,7 +329,9 @@ namespace sql {
325329
auto nativePasswordDir = base::dirname(mforms::App::get()->get_executable_path("mysql_native_password.so"));
326330
properties["pluginDir"] = nativePasswordDir + "/../Frameworks";
327331
#else
328-
properties["pluginDir"] = base::dirname(mforms::App::get()->get_executable_path("mysql_native_password.so"));
332+
if (!_testing) {
333+
properties["pluginDir"] = base::dirname(mforms::App::get()->get_executable_path("mysql_native_password.so"));
334+
}
329335
#endif
330336
properties["OPT_AUTHENTICATION_KERBEROS_CLIENT_MODE"] = "";
331337
std::string krb5 = parameter_values.get_string("krb5");

‎library/cdbc/src/driver_manager.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ namespace sql {
146146
ConnectionInitSlot connection_init_slot = ConnectionInitSlot());
147147

148148
void thread_cleanup();
149+
void set_testing();
149150

150151
std::shared_ptr<wb::SSHTunnel> getTunnel(const db_mgmt_ConnectionRef &connectionProperties);
151152

@@ -182,6 +183,7 @@ namespace sql {
182183
std::string _cacheKey;
183184
time_t _cacheTime;
184185
std::string _versionInfo;
186+
bool _testing;
185187
};
186188

187189
class Dbc_connection_handler {

‎testing/test-suite/CMakeLists.txt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ cmake_minimum_required(VERSION 3.8)
33

44
project(WORKBENCH_UNIT_TESTS)
55

6-
76
set(workbench_dir "${CMAKE_SOURCE_DIR}/../..") # This must come from the parent
87
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${workbench_dir}/build/cmake/Modules/")
98

@@ -224,9 +223,9 @@ target_include_directories(wbtests-bin
224223
)
225224

226225
target_compile_definitions(wbtests-bin
227-
PRIVATE
228-
ENABLE_TESTING
229-
RAPIDJSON_HAS_STDSTRING
226+
PRIVATE
227+
RAPIDJSON_HAS_STDSTRING
228+
ENABLE_TESTING
230229
)
231230

232231
target_link_libraries(wbtests-bin

‎testing/test-suite/tests/backend/wbprivate/sqlide/wb_sql_editor_form_specs.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,7 @@ namespace {
249249
connectionProperties->driver(driverProperties);
250250

251251
sql::DriverManager *dm = sql::DriverManager::getDriverManager();
252+
dm->set_testing();
252253

253254
data->connection = dm->getConnection(connectionProperties);
254255

‎testing/test-suite/tests/backend/wbprivate/workbench/ssh_specs.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@ namespace {
214214
uint16_t port = std::get<1>(retVal);
215215

216216
sql::DriverManager *dm = sql::DriverManager::getDriverManager();
217+
dm->set_testing();
217218
$expect(dm).Not.toBe(nullptr, "dm is NULL");
218219

219220
db_mgmt_ConnectionRef connectionProperties = db_mgmt_ConnectionRef(grt::Initialized);

‎testing/test-suite/tests/backend/wbpublic/sqlide/recordset_specs.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ static void dummy() {
4949
data->tester->initializeRuntime();
5050

5151
sql::DriverManager *manager = sql::DriverManager::getDriverManager();
52+
manager->set_testing();
5253
sql::Authentication::Ref auth;
5354

5455
data->connection = sql::Dbc_connection_handler::Ref(new sql::Dbc_connection_handler());

‎testing/test-suite/tests/library/cdbc/dbc_connection_specs.cpp‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,14 @@ namespace {
6060

6161
$it("Test initialization of a connection and it's destruction", [&]() {
6262
sql::DriverManager *dm = sql::DriverManager::getDriverManager();
63+
dm->set_testing();
6364
$expect(dm).Not.toBe(nullptr, "dm is NULL");
6465

6566
});
6667

6768
$it("Test initialization of a statement and it's destruction.", [&]() {
6869
sql::DriverManager *dm = sql::DriverManager::getDriverManager();
70+
dm->set_testing();
6971
$expect(dm).Not.toBe(nullptr, "dm is NULL");
7072

7173
sql::ConnectionWrapper wrapper = dm->getConnection(data->connectionProperties);
@@ -79,6 +81,7 @@ namespace {
7981

8082
$it("Test construction of a metadata object.", [&]() {
8183
sql::DriverManager *dm = sql::DriverManager::getDriverManager();
84+
dm->set_testing();
8285
$expect(dm).Not.toBe(nullptr, "dm is NULL");
8386

8487
sql::ConnectionWrapper wrapper = dm->getConnection(data->connectionProperties);
@@ -92,6 +95,7 @@ namespace {
9295

9396
$it("Test autocommit.", [&]() {
9497
sql::DriverManager *dm = sql::DriverManager::getDriverManager();
98+
dm->set_testing();
9599
$expect(dm).Not.toBe(nullptr, "dm is NULL");
96100

97101

@@ -138,6 +142,7 @@ namespace {
138142
// setupConnectionEnvironment(connectionProperties);
139143

140144
sql::DriverManager *dm = sql::DriverManager::getDriverManager();
145+
dm->set_testing();
141146
$expect(dm).Not.toBe(nullptr, "dm is NULL");
142147

143148
sql::ConnectionWrapper wrapper = dm->getConnection(data->connectionProperties);
@@ -155,6 +160,7 @@ namespace {
155160
$it("Test 2 connections.", [&]() {
156161
try {
157162
sql::DriverManager *dm = sql::DriverManager::getDriverManager();
163+
dm->set_testing();
158164
$expect(dm).Not.toBe(nullptr, "dm is NULL");
159165

160166
sql::ConnectionWrapper wrapper1 = dm->getConnection(data->connectionProperties);
@@ -193,6 +199,7 @@ namespace {
193199
$it("Test kill ourselves 1.", [&]() {
194200
try {
195201
sql::DriverManager *dm = sql::DriverManager::getDriverManager();
202+
dm->set_testing();
196203
$expect(dm).Not.toBe(nullptr, "dm is NULL");
197204

198205
sql::ConnectionWrapper wrapper1 = dm->getConnection(data->connectionProperties);
@@ -226,6 +233,7 @@ namespace {
226233
$it("Test kill ourselves 2 - kill and query thereafter.", [&]() {
227234
try {
228235
sql::DriverManager *dm = sql::DriverManager::getDriverManager();
236+
dm->set_testing();
229237
$expect(dm).Not.toBe(nullptr, "dm is NULL");
230238

231239
sql::ConnectionWrapper wrapper1 = dm->getConnection(data->connectionProperties);

‎testing/test-suite/tests/library/cdbc/dbc_general_specs.cpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ namespace {
5656
setupConnectionEnvironment(connectionProperties);
5757

5858
sql::DriverManager *dm = sql::DriverManager::getDriverManager();
59+
dm->set_testing();
5960
sql::ConnectionWrapper wrapper = dm->getConnection(connectionProperties);
6061
sql::Connection *connection = wrapper.get();
6162

@@ -72,6 +73,7 @@ namespace {
7273
setupConnectionEnvironment(connectionProperties);
7374

7475
sql::DriverManager *dm = sql::DriverManager::getDriverManager();
76+
dm->set_testing();
7577
sql::ConnectionWrapper wrapper = dm->getConnection(connectionProperties);
7678
sql::Connection *connection = wrapper.get();
7779

@@ -93,6 +95,7 @@ namespace {
9395
setupConnectionEnvironment(connectionProperties);
9496

9597
sql::DriverManager *dm = sql::DriverManager::getDriverManager();
98+
dm->set_testing();
9699
sql::ConnectionWrapper wrapper = dm->getConnection(connectionProperties);
97100
sql::Connection *connection = wrapper.get();
98101
sql::DatabaseMetaData *meta(connection->getMetaData());
@@ -119,6 +122,7 @@ namespace {
119122
setupConnectionEnvironment(connectionProperties);
120123

121124
sql::DriverManager *dm = sql::DriverManager::getDriverManager();
125+
dm->set_testing();
122126
sql::ConnectionWrapper wrapper = dm->getConnection(connectionProperties);
123127
sql::Connection *connection = wrapper.get();
124128

‎testing/test-suite/tests/library/cdbc/dbc_metadata_specs.cpp‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ namespace {
6161

6262
try {
6363
sql::DriverManager *dm = sql::DriverManager::getDriverManager();
64+
dm->set_testing();
6465
$expect(dm).Not.toBe(nullptr, "dm is NULL");
6566

6667
sql::ConnectionWrapper wrapper = dm->getConnection(connectionProperties);
@@ -90,6 +91,7 @@ namespace {
9091

9192
try {
9293
sql::DriverManager *dm = sql::DriverManager::getDriverManager();
94+
dm->set_testing();
9395
$expect(dm).Not.toBe(nullptr, "dm is NULL");
9496

9597
sql::ConnectionWrapper wrapper = dm->getConnection(connectionProperties);
@@ -112,6 +114,7 @@ namespace {
112114

113115
try {
114116
sql::DriverManager *dm = sql::DriverManager::getDriverManager();
117+
dm->set_testing();
115118
$expect(dm).Not.toBe(nullptr, "dm is NULL");
116119

117120
sql::ConnectionWrapper wrapper = dm->getConnection(connectionProperties);
@@ -135,6 +138,7 @@ namespace {
135138

136139
try {
137140
sql::DriverManager *dm = sql::DriverManager::getDriverManager();
141+
dm->set_testing();
138142
$expect(dm).Not.toBe(nullptr, "dm is NULL");
139143

140144
sql::ConnectionWrapper wrapper = dm->getConnection(connectionProperties);
@@ -158,6 +162,7 @@ namespace {
158162

159163
try {
160164
sql::DriverManager *dm = sql::DriverManager::getDriverManager();
165+
dm->set_testing();
161166
$expect(dm).Not.toBe(nullptr, "dm is NULL");
162167

163168
sql::ConnectionWrapper wrapper = dm->getConnection(connectionProperties);
@@ -181,6 +186,7 @@ namespace {
181186

182187
try {
183188
sql::DriverManager *dm = sql::DriverManager::getDriverManager();
189+
dm->set_testing();
184190
$expect(dm).Not.toBe(nullptr, "dm is NULL");
185191

186192
sql::ConnectionWrapper wrapper = dm->getConnection(connectionProperties);

‎testing/test-suite/tests/library/cdbc/dbc_result_set_specs.cpp‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ namespace {
8282
db_mgmt_ConnectionRef connectionProperties(grt::Initialized);
8383
setupConnectionEnvironment(connectionProperties);
8484
sql::DriverManager *dm = sql::DriverManager::getDriverManager();
85+
dm->set_testing();
8586

8687
sql::ConnectionWrapper wrapper1 = dm->getConnection(connectionProperties);
8788
sql::Connection *connection = wrapper1.get();
@@ -96,6 +97,7 @@ namespace {
9697

9798
setupConnectionEnvironment(connectionProperties);
9899
sql::DriverManager *dm = sql::DriverManager::getDriverManager();
100+
dm->set_testing();
99101
$expect(dm).Not.toBeNull("dm is NULL");
100102

101103
sql::ConnectionWrapper wrapper1 = dm->getConnection(connectionProperties);
@@ -117,6 +119,7 @@ namespace {
117119

118120
try {
119121
sql::DriverManager *dm = sql::DriverManager::getDriverManager();
122+
dm->set_testing();
120123
$expect(dm).Not.toBe(nullptr, "dm is NULL");
121124

122125
sql::ConnectionWrapper wrapper1 = dm->getConnection(connectionProperties);
@@ -156,6 +159,7 @@ namespace {
156159

157160
try {
158161
sql::DriverManager *dm = sql::DriverManager::getDriverManager();
162+
dm->set_testing();
159163
$expect(dm).Not.toBe(nullptr, "dm is NULL");
160164

161165
sql::ConnectionWrapper wrapper1 = dm->getConnection(connectionProperties);
@@ -187,6 +191,7 @@ namespace {
187191

188192
try {
189193
sql::DriverManager *dm = sql::DriverManager::getDriverManager();
194+
dm->set_testing();
190195
$expect(dm).Not.toBe(nullptr, "dm is NULL");
191196

192197
sql::ConnectionWrapper wrapper1 = dm->getConnection(connectionProperties);
@@ -220,6 +225,7 @@ namespace {
220225

221226
try {
222227
sql::DriverManager *dm = sql::DriverManager::getDriverManager();
228+
dm->set_testing();
223229
$expect(dm).Not.toBe(nullptr, "dm is NULL");
224230

225231
sql::ConnectionWrapper wrapper1 = dm->getConnection(connectionProperties);
@@ -289,6 +295,7 @@ namespace {
289295

290296
try {
291297
sql::DriverManager *dm = sql::DriverManager::getDriverManager();
298+
dm->set_testing();
292299
$expect(dm).Not.toBe(nullptr, "dm is NULL");
293300

294301
sql::ConnectionWrapper wrapper1 = dm->getConnection(connectionProperties);
@@ -358,6 +365,7 @@ namespace {
358365

359366
try {
360367
sql::DriverManager *dm = sql::DriverManager::getDriverManager();
368+
dm->set_testing();
361369
$expect(dm).Not.toBe(nullptr, "dm is NULL");
362370

363371
sql::ConnectionWrapper wrapper1 = dm->getConnection(connectionProperties);
@@ -387,6 +395,7 @@ namespace {
387395

388396
try {
389397
sql::DriverManager *dm = sql::DriverManager::getDriverManager();
398+
dm->set_testing();
390399
$expect(dm).Not.toBe(nullptr, "dm is NULL");
391400

392401
sql::ConnectionWrapper wrapper1 = dm->getConnection(connectionProperties);

0 commit comments

Comments
 (0)