Skip to content

Commit

Permalink
Fix Statement unit tests still using long
Browse files Browse the repository at this point in the history 
long & long long api have been replaced by int32_t and int64_t types

TODO: we need to continue cleanup APIs to remove all long from the codebase before we can release a new version
  • Loading branch information
@SRombauts
SRombauts committed Jul 24, 2022
1 parent 6c2a3d1 commit 091726a
Showing 1 changed file with 20 additions and 35 deletions.
55 changes: 20 additions & 35 deletions tests/Statement_test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ TEST(Statement, executeStep)
const int64_t id = query.getColumn(0);
const std::string msg = query.getColumn(1);
const int integer = query.getColumn(2);
const long integer2= query.getColumn(2);
const int64_t integer2= query.getColumn(2);
const double real = query.getColumn(3);
EXPECT_EQ(1, id);
EXPECT_EQ("first", msg);
Expand Down Expand Up @@ -220,7 +220,7 @@ TEST(Statement, tryExecuteStep)
const int64_t id = query.getColumn(0);
const std::string msg = query.getColumn(1);
const int integer = query.getColumn(2);
const long integer2= query.getColumn(2);
const int64_t integer2= query.getColumn(2);
const double real = query.getColumn(3);
EXPECT_EQ(1, id);
EXPECT_EQ("first", msg);
Expand Down Expand Up @@ -327,7 +327,7 @@ TEST(Statement, bindings)
// Fourth row with string/int64/float
{
const std::string fourth("fourth");
const long long int64 = 12345678900000LL;
const int64_t int64 = 12345678900000LL;
const float float32 = 0.234f;
insert.bind(1, fourth);
insert.bind(2, int64);
Expand Down Expand Up @@ -370,10 +370,10 @@ TEST(Statement, bindings)
// reset() without clearbindings()
insert.reset();

// Sixth row with uint32_t unsigned value and a long value (which is either a 32b int or a 64b long long)
// Sixth row with uint32_t unsigned value and a long value (which is either a 32b int or a 64b int64_t)
{
const uint32_t uint32 = 4294967295U;
const long integer = -123;
const int64_t integer = -123;
insert.bind(2, uint32);
insert.bind(3, integer);
EXPECT_EQ(1, insert.exec());
Expand Down Expand Up @@ -455,11 +455,11 @@ TEST(Statement, bindByName)
EXPECT_EQ(SQLite::OK, db.getErrorCode());

// Create a new table
EXPECT_EQ(0, db.exec("CREATE TABLE test (id INTEGER PRIMARY KEY, msg TEXT, int INTEGER, double REAL, long INTEGER)"));
EXPECT_EQ(0, db.exec("CREATE TABLE test (id INTEGER PRIMARY KEY, msg TEXT, int INTEGER, long INTEGER, double REAL)"));
EXPECT_EQ(SQLite::OK, db.getErrorCode());

// Insertion with bindable parameters
SQLite::Statement insert(db, "INSERT INTO test VALUES (NULL, @msg, @int, @double, @long)");
SQLite::Statement insert(db, "INSERT INTO test VALUES (NULL, @msg, @int, @long, @double)");

// First row with text/int/double
insert.bind("@msg", "first");
Expand All @@ -481,8 +481,8 @@ TEST(Statement, bindByName)
EXPECT_EQ (1, query.getColumn(0).getInt64());
EXPECT_STREQ("first", query.getColumn(1).getText());
EXPECT_EQ (123, query.getColumn(2).getInt());
EXPECT_EQ (0.123, query.getColumn(3).getDouble());
EXPECT_EQ (-123, query.getColumn(4).getInt());
EXPECT_EQ (-123, query.getColumn(3).getInt());
EXPECT_EQ (0.123, query.getColumn(4).getDouble());

// reset() with clearbindings() and new bindings
insert.reset();
Expand All @@ -491,13 +491,13 @@ TEST(Statement, bindByName)
// Second row with string/int64/float
{
const std::string second("second");
const long long int64 = 12345678900000LL;
const long integer = -123;
const int32_t int32 = -123;
const int64_t int64 = 12345678900000LL;
const float float32 = 0.234f;
insert.bind("@msg", second);
insert.bind("@int", int64);
insert.bind("@int", int32);
insert.bind("@long", int64);
insert.bind("@double", float32);
insert.bind("@long", integer);
EXPECT_EQ(1, insert.exec());
EXPECT_EQ(SQLITE_DONE, db.getErrorCode());

Expand All @@ -507,9 +507,9 @@ TEST(Statement, bindByName)
EXPECT_FALSE(query.isDone());
EXPECT_EQ(2, query.getColumn(0).getInt64());
EXPECT_EQ(second, query.getColumn(1).getText());
EXPECT_EQ(12345678900000LL, query.getColumn(2).getInt64());
EXPECT_EQ(0.234f, query.getColumn(3).getDouble());
EXPECT_EQ(-123, query.getColumn(4).getInt());
EXPECT_EQ(-123, query.getColumn(2).getInt());
EXPECT_EQ(12345678900000LL, query.getColumn(3).getInt64());
EXPECT_EQ(0.234f, query.getColumn(4).getDouble());
}

// reset() without clearbindings()
Expand All @@ -530,7 +530,7 @@ TEST(Statement, bindByName)
EXPECT_STREQ(buffer, query.getColumn(1).getText());
EXPECT_TRUE (query.isColumnNull(2));
EXPECT_EQ(0, query.getColumn(2).getInt());
EXPECT_EQ(0.234f, query.getColumn(3).getDouble());
EXPECT_EQ(0.234f, query.getColumn(4).getDouble());
}

// reset() without clearbindings()
Expand All @@ -551,7 +551,7 @@ TEST(Statement, bindByName)
EXPECT_FALSE(query.isDone());
EXPECT_EQ(4, query.getColumn(0).getInt64());
EXPECT_EQ(4294967295U, query.getColumn(2).getUInt());
EXPECT_EQ(12345678900000LL, query.getColumn(4).getInt64());
EXPECT_EQ(12345678900000LL, query.getColumn(3).getInt64());
}
}

Expand Down Expand Up @@ -604,8 +604,8 @@ TEST(Statement, bindByNameString)
// Second row with string/int64/float
{
const std::string second("second");
const long long int64 = 12345678900000LL;
const long integer = -123;
const int64_t int64 = 12345678900000LL;
const int64_t integer = -123;
const float float32 = 0.234f;
insert.bind(amsg, second);
insert.bind(aint, int64);
Expand Down Expand Up @@ -1010,21 +1010,6 @@ TEST(Statement, getColumns)
}
#endif

#if (LONG_MAX > INT_MAX) // sizeof(long)==8 means the data model of the system is LP64 (64bits Linux)
TEST(Statement, bind64bitsLong)
{
// Create a new database
SQLite::Database db(":memory:", SQLite::OPEN_READWRITE|SQLite::OPEN_CREATE);
EXPECT_EQ(SQLite::OK, db.getErrorCode());
EXPECT_EQ(SQLite::OK, db.getExtendedErrorCode());

SQLite::Statement query(db, "SELECT ?");
query.bind(1, 4294967297L);
query.executeStep();
EXPECT_EQ(4294967297L, query.getColumn(0).getInt64());
}
#endif

TEST(Statement, getBindParameterCount)
{
// Create a new database
Expand Down

0 comments on commit 091726a

Please sign in to comment.