Skip to content

Commit 063b8d4

Browse files
bpinteabpintea
committed
fix: use test name as "SQL query"
this allows for faster log lines related to one test
1 parent 6a4e523 commit 063b8d4

5 files changed

+68
-138
lines changed

‎test/test_conversion_sql2c_boolean.cc

Lines changed: 40 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -16,31 +16,6 @@
1616
namespace test {
1717

1818
class ConvertSQL2C_Boolean : public ::testing::Test, public ConnectedDBC {
19-
20-
protected:
21-
SQLRETURN ret;
22-
SQLLEN ind_len = SQL_NULL_DATA;
23-
24-
ConvertSQL2C_Boolean() {
25-
}
26-
27-
virtual ~ConvertSQL2C_Boolean() {
28-
}
29-
30-
virtual void SetUp() {
31-
}
32-
33-
virtual void TearDown() {
34-
}
35-
36-
void prepareStatement(const SQLWCHAR *sql, const char *json_answer) {
37-
char *answer = STRDUP(json_answer);
38-
ASSERT_TRUE(answer != NULL);
39-
ret = ATTACH_ANSWER(stmt, answer, strlen(answer));
40-
ASSERT_TRUE(SQL_SUCCEEDED(ret));
41-
ret = ATTACH_SQL(stmt, sql, wcslen(sql));
42-
ASSERT_TRUE(SQL_SUCCEEDED(ret));
43-
}
4419
};
4520

4621

@@ -61,7 +36,7 @@ TEST_F(ConvertSQL2C_Boolean, Boolean2Numeric) {
6136
]\
6237
}\
6338
";
64-
prepareStatement(MK_WPTR(SQL), json_answer);
39+
prepareStatement(json_answer);
6540

6641
SQL_NUMERIC_STRUCT ns;
6742
ret = SQLBindCol(stmt, /*col#*/1, SQL_C_NUMERIC, &ns, sizeof(ns), &ind_len);
@@ -83,7 +58,7 @@ TEST_F(ConvertSQL2C_Boolean, Boolean2STinyInt) {
8358
#undef SQL_VAL
8459
#undef SQL
8560
#define SQL_VAL "true"
86-
#define SQL "CAST(" SQL_VAL " AS SQLNUMERIC)"
61+
#define SQL "CAST(" SQL_VAL " AS BYTE)"
8762

8863
const char json_answer[] = "\
8964
{\
@@ -95,7 +70,7 @@ TEST_F(ConvertSQL2C_Boolean, Boolean2STinyInt) {
9570
]\
9671
}\
9772
";
98-
prepareStatement(MK_WPTR(SQL), json_answer);
73+
prepareStatement(json_answer);
9974

10075
SQLCHAR c;
10176
ret = SQLBindCol(stmt, /*col#*/1, SQL_C_STINYINT, &c, sizeof(c), &ind_len);
@@ -113,7 +88,7 @@ TEST_F(ConvertSQL2C_Boolean, Boolean2UShort) {
11388
#undef SQL_VAL
11489
#undef SQL
11590
#define SQL_VAL "false"
116-
#define SQL "CAST(" SQL_VAL " AS SQLNUMERIC)"
91+
#define SQL "CAST(" SQL_VAL " AS SHORT)"
11792

11893
const char json_answer[] = "\
11994
{\
@@ -125,7 +100,7 @@ TEST_F(ConvertSQL2C_Boolean, Boolean2UShort) {
125100
]\
126101
}\
127102
";
128-
prepareStatement(MK_WPTR(SQL), json_answer);
103+
prepareStatement(json_answer);
129104

130105
SQLUSMALLINT si;
131106
ret = SQLBindCol(stmt, /*col#*/1, SQL_C_USHORT, &si, sizeof(si), &ind_len);
@@ -143,7 +118,7 @@ TEST_F(ConvertSQL2C_Boolean, Boolean2SBigInt) {
143118
#undef SQL_VAL
144119
#undef SQL
145120
#define SQL_VAL "true"
146-
#define SQL "CAST(" SQL_VAL " AS SQLNUMERIC)"
121+
#define SQL "CAST(" SQL_VAL " AS LONG)"
147122

148123
const char json_answer[] = "\
149124
{\
@@ -155,7 +130,7 @@ TEST_F(ConvertSQL2C_Boolean, Boolean2SBigInt) {
155130
]\
156131
}\
157132
";
158-
prepareStatement(MK_WPTR(SQL), json_answer);
133+
prepareStatement(json_answer);
159134

160135
SQLBIGINT bi;
161136
ret = SQLBindCol(stmt, /*col#*/1, SQL_C_SBIGINT, &bi, sizeof(bi), &ind_len);
@@ -173,7 +148,7 @@ TEST_F(ConvertSQL2C_Boolean, Boolean2Double) {
173148
#undef SQL_VAL
174149
#undef SQL
175150
#define SQL_VAL "true"
176-
#define SQL "CAST(" SQL_VAL " AS SQLNUMERIC)"
151+
#define SQL "CAST(" SQL_VAL " AS DOUBLE)"
177152

178153
const char json_answer[] = "\
179154
{\
@@ -185,7 +160,7 @@ TEST_F(ConvertSQL2C_Boolean, Boolean2Double) {
185160
]\
186161
}\
187162
";
188-
prepareStatement(MK_WPTR(SQL), json_answer);
163+
prepareStatement(json_answer);
189164

190165
SQLDOUBLE dbl;
191166
ret = SQLBindCol(stmt, /*col#*/1, SQL_C_DOUBLE, &dbl, sizeof(dbl), &ind_len);
@@ -198,5 +173,36 @@ TEST_F(ConvertSQL2C_Boolean, Boolean2Double) {
198173
EXPECT_EQ(dbl, 1.0);
199174
}
200175

176+
TEST_F(ConvertSQL2C_Boolean, Boolean2WString) {
177+
178+
#undef SQL_VAL
179+
#undef SQL
180+
#define SQL_VAL "true"
181+
#define SQL "CAST(" SQL_VAL " AS W-TEXT)"
182+
183+
const char json_answer[] = "\
184+
{\
185+
\"columns\": [\
186+
{\"name\": \"" SQL "\", \"type\": \"boolean\"}\
187+
],\
188+
\"rows\": [\
189+
[" SQL_VAL "]\
190+
]\
191+
}\
192+
";
193+
prepareStatement(json_answer);
194+
195+
SQLWCHAR wbuff[sizeof(SQL_VAL)];
196+
ret = SQLBindCol(stmt, /*col#*/1, SQL_C_WCHAR, &wbuff, sizeof(wbuff),
197+
&ind_len);
198+
ASSERT_TRUE(SQL_SUCCEEDED(ret));
199+
200+
ret = SQLFetch(stmt);
201+
ASSERT_TRUE(SQL_SUCCEEDED(ret));
202+
203+
EXPECT_EQ(ind_len, sizeof(SQLWCHAR) * (sizeof(SQL_VAL) - /*\0*/1));
204+
EXPECT_STREQ(wbuff, MK_WPTR(SQL_VAL));
205+
}
206+
201207
} // test namespace
202208

‎test/test_conversion_sql2c_date.cc

Lines changed: 7 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -18,29 +18,10 @@ namespace test {
1818
class ConvertSQL2C_Date : public ::testing::Test, public ConnectedDBC {
1919

2020
protected:
21-
SQLRETURN ret;
2221
DATE_STRUCT ds;
23-
SQLLEN ind_len = SQL_NULL_DATA;
2422

25-
ConvertSQL2C_Date() {
26-
}
27-
28-
virtual ~ConvertSQL2C_Date() {
29-
}
30-
31-
virtual void SetUp() {
32-
}
33-
34-
virtual void TearDown() {
35-
}
36-
37-
void prepareStatement(const SQLWCHAR *sql, const char *json_answer) {
38-
char *answer = STRDUP(json_answer);
39-
ASSERT_TRUE(answer != NULL);
40-
ret = ATTACH_ANSWER(stmt, answer, strlen(answer));
41-
ASSERT_TRUE(SQL_SUCCEEDED(ret));
42-
ret = ATTACH_SQL(stmt, sql, wcslen(sql));
43-
ASSERT_TRUE(SQL_SUCCEEDED(ret));
23+
void prepareAndBind(const char *json_answer) {
24+
prepareStatement(json_answer);
4425

4526
ret = SQLBindCol(stmt, /*col#*/1, SQL_C_TYPE_DATE, &ds, sizeof(ds),
4627
&ind_len);
@@ -67,7 +48,7 @@ TEST_F(ConvertSQL2C_Date, Timestamp2Date) {
6748
]\
6849
}\
6950
";
70-
prepareStatement(MK_WPTR(SQL), json_answer);
51+
prepareAndBind(json_answer);
7152

7253
ret = SQLFetch(stmt);
7354
ASSERT_TRUE(SQL_SUCCEEDED(ret));
@@ -95,7 +76,7 @@ TEST_F(ConvertSQL2C_Date, Timestamp2Date_truncate) {
9576
]\
9677
}\
9778
";
98-
prepareStatement(MK_WPTR(SQL), json_answer);
79+
prepareAndBind(json_answer);
9980

10081
ret = SQLFetch(stmt);
10182
ASSERT_TRUE(SQL_SUCCEEDED(ret));
@@ -125,7 +106,7 @@ TEST_F(ConvertSQL2C_Date, Date2Date) {
125106
]\
126107
}\
127108
";
128-
prepareStatement(MK_WPTR(SQL), json_answer);
109+
prepareAndBind(json_answer);
129110

130111
ret = SQLFetch(stmt);
131112
ASSERT_TRUE(SQL_SUCCEEDED(ret));
@@ -154,7 +135,7 @@ TEST_F(ConvertSQL2C_Date, Time2Date_22018) {
154135
]\
155136
}\
156137
";
157-
prepareStatement(MK_WPTR(SQL), json_answer);
138+
prepareAndBind(json_answer);
158139

159140
ret = SQLFetch(stmt);
160141
ASSERT_FALSE(SQL_SUCCEEDED(ret));
@@ -179,7 +160,7 @@ TEST_F(ConvertSQL2C_Date, Integer2Date_violation_07006) {
179160
]\
180161
}\
181162
";
182-
prepareStatement(MK_WPTR(SQL_VAL), json_answer);
163+
prepareAndBind(json_answer);
183164

184165
ret = SQLFetch(stmt);
185166
ASSERT_FALSE(SQL_SUCCEEDED(ret));

‎test/test_conversion_sql2c_interval.cc

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,29 +18,10 @@ namespace test {
1818
class ConvertSQL2C_Interval : public ::testing::Test, public ConnectedDBC {
1919

2020
protected:
21-
SQLRETURN ret;
2221
SQL_INTERVAL_STRUCT is;
23-
SQLLEN ind_len = SQL_NULL_DATA;
2422

25-
ConvertSQL2C_Interval() {
26-
}
27-
28-
virtual ~ConvertSQL2C_Interval() {
29-
}
30-
31-
virtual void SetUp() {
32-
}
33-
34-
virtual void TearDown() {
35-
}
36-
37-
void prepareStatement(const SQLWCHAR *sql, const char *json_answer) {
38-
char *answer = STRDUP(json_answer);
39-
ASSERT_TRUE(answer != NULL);
40-
ret = ATTACH_ANSWER(stmt, answer, strlen(answer));
41-
ASSERT_TRUE(SQL_SUCCEEDED(ret));
42-
ret = ATTACH_SQL(stmt, sql, wcslen(sql));
43-
ASSERT_TRUE(SQL_SUCCEEDED(ret));
23+
void prepareAndBind(const char *jsonAnswer) {
24+
prepareStatement(jsonAnswer);
4425

4526
ret = SQLBindCol(stmt, /*col#*/1, SQL_C_INTERVAL_HOUR, &is, sizeof(is),
4627
&ind_len);
@@ -67,7 +48,7 @@ TEST_F(ConvertSQL2C_Interval, Integer2Interval_unsupported_HYC00) {
6748
]\
6849
}\
6950
";
70-
prepareStatement(MK_WPTR(SQL), json_answer);
51+
prepareAndBind(json_answer);
7152

7253
ret = SQLFetch(stmt);
7354
ASSERT_FALSE(SQL_SUCCEEDED(ret));
@@ -92,7 +73,7 @@ TEST_F(ConvertSQL2C_Interval, Integer2Interval_violation_07006) {
9273
]\
9374
}\
9475
";
95-
prepareStatement(MK_WPTR(SQL), json_answer);
76+
prepareAndBind(json_answer);
9677

9778
ret = SQLFetch(stmt);
9879
ASSERT_FALSE(SQL_SUCCEEDED(ret));

‎test/test_conversion_sql2c_time.cc

Lines changed: 8 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -18,29 +18,10 @@ namespace test {
1818
class ConvertSQL2C_Time : public ::testing::Test, public ConnectedDBC {
1919

2020
protected:
21-
SQLRETURN ret;
2221
TIME_STRUCT ts;
23-
SQLLEN ind_len = SQL_NULL_DATA;
2422

25-
ConvertSQL2C_Time() {
26-
}
27-
28-
virtual ~ConvertSQL2C_Time() {
29-
}
30-
31-
virtual void SetUp() {
32-
}
33-
34-
virtual void TearDown() {
35-
}
36-
37-
void prepareStatement(const SQLWCHAR *sql, const char *json_answer) {
38-
char *answer = STRDUP(json_answer);
39-
ASSERT_TRUE(answer != NULL);
40-
ret = ATTACH_ANSWER(stmt, answer, strlen(answer));
41-
ASSERT_TRUE(SQL_SUCCEEDED(ret));
42-
ret = ATTACH_SQL(stmt, sql, wcslen(sql));
43-
ASSERT_TRUE(SQL_SUCCEEDED(ret));
23+
void prepareAndBind(const char *jsonAnswer) {
24+
prepareStatement(jsonAnswer);
4425

4526
ret = SQLBindCol(stmt, /*col#*/1, SQL_C_TYPE_TIME, &ts, sizeof(ts),
4627
&ind_len);
@@ -67,7 +48,7 @@ TEST_F(ConvertSQL2C_Time, Timestamp2Time) {
6748
]\
6849
}\
6950
";
70-
prepareStatement(MK_WPTR(SQL), json_answer);
51+
prepareAndBind(json_answer);
7152

7253
ret = SQLFetch(stmt);
7354
ASSERT_TRUE(SQL_SUCCEEDED(ret));
@@ -95,7 +76,7 @@ TEST_F(ConvertSQL2C_Time, Timestamp2Time_truncate) {
9576
]\
9677
}\
9778
";
98-
prepareStatement(MK_WPTR(SQL), json_answer);
79+
prepareAndBind(json_answer);
9980

10081
ret = SQLFetch(stmt);
10182
ASSERT_TRUE(SQL_SUCCEEDED(ret));
@@ -125,7 +106,7 @@ TEST_F(ConvertSQL2C_Time, Time2Time) {
125106
]\
126107
}\
127108
";
128-
prepareStatement(MK_WPTR(SQL), json_answer);
109+
prepareAndBind(json_answer);
129110

130111
ret = SQLFetch(stmt);
131112
ASSERT_TRUE(SQL_SUCCEEDED(ret));
@@ -154,7 +135,7 @@ TEST_F(ConvertSQL2C_Time, Time2Time_truncate) {
154135
]\
155136
}\
156137
";
157-
prepareStatement(MK_WPTR(SQL), json_answer);
138+
prepareAndBind(json_answer);
158139

159140
ret = SQLFetch(stmt);
160141
ASSERT_TRUE(SQL_SUCCEEDED(ret));
@@ -185,7 +166,7 @@ TEST_F(ConvertSQL2C_Time, Date2Time_22018) {
185166
]\
186167
}\
187168
";
188-
prepareStatement(MK_WPTR(SQL_VAL), json_answer);
169+
prepareAndBind(json_answer);
189170

190171
ret = SQLFetch(stmt);
191172
ASSERT_FALSE(SQL_SUCCEEDED(ret));
@@ -210,7 +191,7 @@ TEST_F(ConvertSQL2C_Time, Integer2Date_violation_07006) {
210191
]\
211192
}\
212193
";
213-
prepareStatement(MK_WPTR(SQL), json_answer);
194+
prepareAndBind(json_answer);
214195

215196
ret = SQLFetch(stmt);
216197
ASSERT_FALSE(SQL_SUCCEEDED(ret));

0 commit comments

Comments
 (0)