cuberite/SQLiteCpp
1
0
Fork 0
mirror of https://github.com/cuberite/SQLiteCpp.git synced 2025-08-05 02:06:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add unit tests for the new Column getter and cast operator

Browse Source
This commit is contained in:
Sébastien Rombauts 2016-07-06 09:02:25 +02:00
parent 646d25ca95
commit b033abb3fd
3 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/SQLiteCpp/Column.h
View File

@ -46,7 +46,7 @@ public:
* @brief Encapsulation of a Column in a Row of the result. * @brief Encapsulation of a Column in a Row of the result.
* *
* @param[in] aStmtPtr Shared pointer to the prepared SQLite Statement Object. * @param[in] aStmtPtr Shared pointer to the prepared SQLite Statement Object.
* @param[in] aIndex Index of the column in the row of result * @param[in] aIndex Index of the column in the row of result, starting at 0
*/ */
Column(Statement::Ptr& aStmtPtr, int aIndex) noexcept; // nothrow Column(Statement::Ptr& aStmtPtr, int aIndex) noexcept; // nothrow
/// Simple destructor /// Simple destructor
@ -82,9 +82,11 @@ public:
/// Return the integer value of the column. /// Return the integer value of the column.
int getInt() const noexcept; // nothrow int getInt() const noexcept; // nothrow
/// Return the 64bits integer value of the column. /// Return the 32bits unsigned integer value of the column (note that SQLite3 does not support uint64_t).
uint32_t getUInt() const noexcept; // nothrow
/// Return the 64bits integer value of the column (note that SQLite3 does not support uint64_t).
int64_t getInt64() const noexcept; // nothrow int64_t getInt64() const noexcept; // nothrow
/// Return the double (64bits float) value of the column. /// Return the double (64bits float) value of the column
double getDouble() const noexcept; // nothrow double getDouble() const noexcept; // nothrow
/** /**
* @brief Return a pointer to the text value (NULL terminated string) of the column. * @brief Return a pointer to the text value (NULL terminated string) of the column.
@ -188,7 +190,7 @@ public:
/// Inline cast operator to 32bits unsigned integer /// Inline cast operator to 32bits unsigned integer
inline operator uint32_t() const inline operator uint32_t() const
{ {
return static_cast<uint32_t>(getInt64()); return getUInt();
} }
/// Inline cast operator to double /// Inline cast operator to double
inline operator double() const inline operator double() const
@ -240,7 +242,7 @@ public:
} }
private: private:
Statement::Ptr mStmtPtr; //!< Shared Pointer to the prepared SQLite Statement Object Statement::Ptr mStmtPtr; //!< Shared Pointer to the prepared SQLite Statement Object
int mIndex; //!< Index of the column in the row of result int mIndex; //!< Index of the column in the row of result, starting at 0
}; };
/** /**

6
src/Column.cpp
View File

@ -49,6 +49,12 @@ int Column::getInt() const noexcept // nothrow
return sqlite3_column_int(mStmtPtr, mIndex); return sqlite3_column_int(mStmtPtr, mIndex);
} }
// Return the unsigned integer value of the column specified by its index starting at 0
uint32_t Column::getUInt() const noexcept // nothrow
{
return static_cast<uint32_t>(getInt64());
}
// Return the 64bits integer value of the column specified by its index starting at 0 // Return the 64bits integer value of the column specified by its index starting at 0
int64_t Column::getInt64() const noexcept // nothrow int64_t Column::getInt64() const noexcept // nothrow
{ {

24
tests/Column_test.cpp
View File

@ -31,7 +31,7 @@ TEST(Column, basis) {
EXPECT_EQ(0, db.getLastInsertRowid()); EXPECT_EQ(0, db.getLastInsertRowid());
// Create a first row (autoid: 1) with all kind of data and a null value // Create a first row (autoid: 1) with all kind of data and a null value
SQLite::Statement insert(db, "INSERT INTO test VALUES (NULL, \"first\", 123, 0.123, ?, NULL)"); SQLite::Statement insert(db, "INSERT INTO test VALUES (NULL, \"first\", -123, 0.123, ?, NULL)");
// Bind the blob value to the first parameter of the SQL query // Bind the blob value to the first parameter of the SQL query
char buffer[] = "blob"; char buffer[] = "blob";
void* blob = &buffer; void* blob = &buffer;
@ -58,6 +58,8 @@ TEST(Column, basis) {
const int64_t id2 = query.getColumn(0); // operator int64_t() const int64_t id2 = query.getColumn(0); // operator int64_t()
const long long id3 = query.getColumn(0); // operator int64_t() const long long id3 = query.getColumn(0); // operator int64_t()
const long id4 = query.getColumn(0); // operator int64_t() or long() depending on compiler/architecture const long id4 = query.getColumn(0); // operator int64_t() or long() depending on compiler/architecture
const unsigned int uint1 = query.getColumn(0); // operator uint32_t()
const uint32_t uint2 = query.getColumn(0); // operator uint32_t()
const char* ptxt = query.getColumn(1); // operator const char*() const char* ptxt = query.getColumn(1); // operator const char*()
const std::string msg = query.getColumn(1); // operator std::string() (or const char* with MSVC) const std::string msg = query.getColumn(1); // operator std::string() (or const char* with MSVC)
const int integer = query.getColumn(2); // operator int() const int integer = query.getColumn(2); // operator int()
@ -68,9 +70,11 @@ TEST(Column, basis) {
EXPECT_EQ(1, id2); EXPECT_EQ(1, id2);
EXPECT_EQ(1, id3); EXPECT_EQ(1, id3);
EXPECT_EQ(1, id4); EXPECT_EQ(1, id4);
EXPECT_EQ(1, uint1);
EXPECT_EQ(1, uint2);
EXPECT_STREQ("first", ptxt); EXPECT_STREQ("first", ptxt);
EXPECT_EQ("first", msg); EXPECT_EQ("first", msg);
EXPECT_EQ(123, integer); EXPECT_EQ(-123, integer);
EXPECT_EQ(0.123, real); EXPECT_EQ(0.123, real);
EXPECT_EQ(0, memcmp("blob", pblob, size)); EXPECT_EQ(0, memcmp("blob", pblob, size));
EXPECT_EQ(NULL, pempty); EXPECT_EQ(NULL, pempty);
@ -79,15 +83,21 @@ TEST(Column, basis) {
// validates every variant of explicit getters // validates every variant of explicit getters
{ {
int64_t id = query.getColumn(0).getInt64(); int64_t id = query.getColumn(0).getInt64();
const unsigned int uint1 = query.getColumn(0).getUInt();
const uint32_t uint2 = query.getColumn(0).getUInt();
const char* ptxt = query.getColumn(1).getText(); const char* ptxt = query.getColumn(1).getText();
const std::string msg = query.getColumn(1).getText(); const std::string msg1 = query.getColumn(1).getText();
const std::string msg2 = query.getColumn(1).getString();
const int integer = query.getColumn(2).getInt(); const int integer = query.getColumn(2).getInt();
const double real = query.getColumn(3).getDouble(); const double real = query.getColumn(3).getDouble();
const void* pblob = query.getColumn(1).getBlob(); const void* pblob = query.getColumn(1).getBlob();
EXPECT_EQ(1, id); EXPECT_EQ(1, id);
EXPECT_EQ(1, uint1);
EXPECT_EQ(1, uint2);
EXPECT_STREQ("first", ptxt); EXPECT_STREQ("first", ptxt);
EXPECT_EQ("first", msg); EXPECT_EQ("first", msg1);
EXPECT_EQ(123, integer); EXPECT_EQ("first", msg2);
EXPECT_EQ(-123, integer);
EXPECT_EQ(0.123, real); EXPECT_EQ(0.123, real);
EXPECT_EQ(0, memcmp("first", pblob, 5)); EXPECT_EQ(0, memcmp("first", pblob, 5));
} }
@ -115,8 +125,8 @@ TEST(Column, basis) {
EXPECT_EQ(false, query.getColumn(2).isText()); EXPECT_EQ(false, query.getColumn(2).isText());
EXPECT_EQ(false, query.getColumn(2).isBlob()); EXPECT_EQ(false, query.getColumn(2).isBlob());
EXPECT_EQ(false, query.getColumn(2).isNull()); EXPECT_EQ(false, query.getColumn(2).isNull());
EXPECT_STREQ("123", query.getColumn(2).getText()); // convert to string EXPECT_STREQ("-123", query.getColumn(2).getText()); // convert to string
EXPECT_EQ(3, query.getColumn(2).getBytes()); // size of the string "123" EXPECT_EQ(4, query.getColumn(2).getBytes()); // size of the string "-123"
EXPECT_EQ(SQLITE_FLOAT, query.getColumn(3).getType()); EXPECT_EQ(SQLITE_FLOAT, query.getColumn(3).getType());
EXPECT_EQ(false, query.getColumn(3).isInteger()); EXPECT_EQ(false, query.getColumn(3).isInteger());
EXPECT_EQ(true, query.getColumn(3).isFloat()); EXPECT_EQ(true, query.getColumn(3).isFloat());