Skip to content

Commit c7c2f2d

Browse files
committed
Fix getColumnDisplaySize UT.
Fix isSigned UT.
1 parent e52405d commit c7c2f2d

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

test/unit/classes/resultsetmetadata.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,6 @@ void resultsetmetadata::doGetColumnCount(bool is_ps)
174174
void resultsetmetadata::getColumnDisplaySize()
175175
{
176176
logMsg("resultsetmetadata::getColumnDisplaySize() - MySQL_ResultSetMetaData::getColumnDisplaySize()");
177-
SKIP("Untill Bug #33357146 is fixed");
178177
try
179178
{
180179
/* This is a dull test, its about code coverage not achieved with the JDBC tests */
@@ -202,7 +201,8 @@ void resultsetmetadata::doGetColumnDisplaySize(bool is_ps)
202201
ASSERT_EQUALS((unsigned int) 1, meta->getColumnDisplaySize(2));
203202
ASSERT_EQUALS((unsigned int) 5, meta->getColumnDisplaySize(3));
204203
ASSERT_EQUALS((unsigned int) 1, meta->getColumnDisplaySize(4));
205-
ASSERT_EQUALS((unsigned int) 3, meta->getColumnDisplaySize(5));
204+
// Integer now adds +1 for sign
205+
ASSERT_EQUALS((unsigned int) 4, meta->getColumnDisplaySize(5));
206206

207207
try
208208
{
@@ -1287,9 +1287,6 @@ void resultsetmetadata::isSigned()
12871287
{
12881288
logMsg("resultsetmetadata::isSigned() - MySQL_ResultSetMetaData::isSigned");
12891289

1290-
//TODO: Enable it after fixing
1291-
SKIP("Removed untill fixed");
1292-
12931290
std::stringstream sql;
12941291
std::vector<columndefinition>::iterator it;
12951292
ResultSetMetaData * meta_st;

test/unit/unit_fixture.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ void unit_fixture::init()
130130
columns.push_back(columndefinition("DATETIME", "DATETIME NOT NULL DEFAULT '2009-02-12 21:36:54'", sql::DataType::TIMESTAMP, "2009-02-12 17:49:21", true, 19, 0, false, "2009-02-12 21:36:54", 0, "NO", false));
131131
// TODO this might be server dependent!
132132

133-
columns.push_back(columndefinition("TIMESTAMP", "TIMESTAMP", sql::DataType::TIMESTAMP, "2038-01-09 03:14:07", false, 19, 0, true, "", 0, "NO", false));
133+
columns.push_back(columndefinition("TIMESTAMP", "TIMESTAMP", sql::DataType::TIMESTAMP, "2038-01-09 03:14:07", true, 19, 0, true, "", 0, "NO", false));
134134
columns.push_back(columndefinition("TIME", "TIME", sql::DataType::TIME, "-838:59:59", true, 8, 0, true, "", 0, "NO", true));
135135
columns.push_back(columndefinition("TIME", "TIME NOT NULL", sql::DataType::TIME, "838:59:59", true, 8, 0, false, "", 0, "NO", false));
136136
columns.push_back(columndefinition("TIME", "TIME DEFAULT '12:39:41'", sql::DataType::TIME, "-838:59:59", true, 8, 0, true, "12:39:41", 0, "NO", true));

0 commit comments

Comments
 (0)