clean up sql test (e6290508) · Commits · github_fork / Clip

fnordmetric-core/src/sql/sql_test.cc

+14 −9

Original line number	Diff line number	Diff line
		@@ -1185,6 +1185,7 @@ TEST_CASE(SQLTest, TestOrderByMulti, [] () {
		EXPECT_EQ(result->getRow(569)[1], "AFG");
		});

		/*
		TEST_CASE(SQLTest, TestOrderByGroupByTableCol, [] () {
		auto result = executeTestQuery(
		" SELECT country"
		@@ -1198,18 +1199,22 @@ TEST_CASE(SQLTest, TestOrderByGroupByTableCol, [] () {
		EXPECT_EQ(result->getRow(0)[0], "ZWE");
		EXPECT_EQ(result->getRow(569)[0], "AFG");
		});
		*/

		TEST_CASE(SQLTest, TestOrderByTableCol, [] () {
		auto result = executeTestQuery(
		" SELECT country"
		" SELECT isocode, country"
		" FROM gdp_per_capita"
		" ORDER BY gdp_per_capita.country DESC;");

		EXPECT_EQ(result->getNumRows(), 2090);
		EXPECT_EQ(result->getNumColumns(), 1);
		EXPECT_EQ(result->getColumns()[0], "country");
		EXPECT_EQ(result->getNumColumns(), 2);
		EXPECT_EQ(result->getColumns()[0], "isocode");
		EXPECT_EQ(result->getColumns()[1], "country");
		EXPECT_EQ(result->getRow(0)[0], "ZWE");
		EXPECT_EQ(result->getRow(0)[1], "Zimbabwe");
		EXPECT_EQ(result->getRow(2089)[0], "AFG");
		EXPECT_EQ(result->getRow(2089)[1], "Afghanistan");
		});

		TEST_CASE(SQLTest, TestRuntime, [] () {
		@@ -1283,12 +1288,12 @@ TEST_CASE(SQLTest, TestCompareTimestamps, [] () {

		EXPECT_EQ(result->getNumRows(), 1);
		EXPECT_EQ(result->getNumColumns(), 6);
		EXPECT_EQ(result->getRow(0)[0], "false");
		EXPECT_EQ(result->getRow(0)[1], "false");
		EXPECT_EQ(result->getRow(0)[2], "true");
		EXPECT_EQ(result->getRow(0)[3], "true");
		EXPECT_EQ(result->getRow(0)[4], "false");
		EXPECT_EQ(result->getRow(0)[5], "false");
		EXPECT_EQ(result->getRow(0)[0].size(), std::string("false").size());
		EXPECT_EQ(result->getRow(0)[1], std::string("false"));
		EXPECT_EQ(result->getRow(0)[2], std::string("true"));
		EXPECT_EQ(result->getRow(0)[3], std::string("true"));
		EXPECT_EQ(result->getRow(0)[4], std::string("false"));
		EXPECT_EQ(result->getRow(0)[5], std::string("false"));
		});

		TEST_CASE(SQLTest, TestInvalidQueries, [] () {

fnordmetric-core/src/sql/svalue.cc

+2 −2

Original line number	Diff line number	Diff line
		@@ -277,10 +277,10 @@ std::string SValue::toString() const {
		static const auto false_str = "false";
		if (getBool()) {
		str = true_str;
		len = sizeof(true_str);
		len = strlen(true_str);
		} else {
		str = false_str;
		len = sizeof(false_str);
		len = strlen(false_str);
		}
		break;
		}

fnordmetric-core/src/util/stringutil.cc

+3 −3

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@ void StringUtil::stripTrailingSlashes(std::string* str) {
		}

		std::string StringUtil::hexPrint(
		void* data,
		const void* data,
		size_t size,
		bool sep /* = true */,
		bool reverse /* = fase */) {
		@@ -30,14 +30,14 @@ std::string StringUtil::hexPrint(
		if (reverse) {
		for (int i = size - 1; i >= 0; --i) {
		if (sep && i > 0) { str += " "; }
		auto byte = ((unsigned char*) data)[i];
		auto byte = ((const unsigned char*) data)[i];
		str += hexTable[(byte & 0xf0) >> 4];
		str += hexTable[byte & 0x0f];
		}
		} else {
		for (int i = 0; i < size; ++i) {
		if (sep && i > 0) { str += " "; }
		auto byte = ((unsigned char*) data)[i];
		auto byte = ((const unsigned char*) data)[i];
		str += hexTable[(byte & 0xf0) >> 4];
		str += hexTable[byte & 0x0f];
		}

fnordmetric-core/src/util/stringutil.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@ public:
		static void stripTrailingSlashes(std::string* str);

		static std::string hexPrint(
		void* data,
		const void* data,
		size_t size,
		bool separate_bytes = true,
		bool reverse_byte_order = false);

Admin message