Fix conversion warnings in tests

Author: mrotteveel

src/common/tests/CvtTest.cpp

@@ -39,7 +39,7 @@ static void testCVTDatetimeToFormatString(T date, const string& format, const st
 
 		BOOST_TEST(result == expected, "\nRESULT: " << result.c_str() << "\nEXPECTED: " << expected.c_str());
 	}
-	catch(const Exception& ex)
+	catch(const Exception&)
 	{
 		BOOST_TEST_INFO("Exception was caught!");
 		BOOST_TEST(false);
@@ -269,11 +269,11 @@ static void testCVTStringToFormatDateTime(const string& date, const string& form
 	{
 		string varyingString = "xx";
 		varyingString += date;
-		*(USHORT*) varyingString.data() = varyingString.size() - sizeof(USHORT);
+		*(USHORT*) varyingString.data() = static_cast<USHORT>(date.size());
 
 		dsc desc;
 		desc.dsc_dtype = dtype_varying;
-		desc.dsc_length = varyingString.size() + sizeof(USHORT);
+		desc.dsc_length = static_cast<USHORT>(varyingString.size());
 		desc.dsc_address = (UCHAR*) varyingString.data();
 		desc.dsc_scale = 0;
 
@@ -302,7 +302,7 @@ static void testCVTStringToFormatDateTime(const string& date, const string& form
 		BOOST_TEST(isEqual, "\nRESULT: " << DECOMPOSE_TM_STRUCT(resultTimes, resultFractions, resultOffset)
 			<< "\nEXPECTED: " << DECOMPOSE_TM_STRUCT(expectedTimes, expectedFractions, expectedOffset));
 	}
-	catch(const Exception& ex)
+	catch(const Exception&)
 	{
 		BOOST_TEST_INFO("Exception was caught!");
 		BOOST_TEST(false);
@@ -331,11 +331,11 @@ static void testExceptionCvtStringToFormatDateTime(const string& date, const str
 {
 	string varyingString = "xx";
 	varyingString += date;
-	*(USHORT*) varyingString.data() = varyingString.size() - sizeof(USHORT);
+	*(USHORT*) varyingString.data() = static_cast<USHORT>(date.size());
 
 	dsc desc;
 	desc.dsc_dtype = dtype_varying;
-	desc.dsc_length = varyingString.size() + sizeof(USHORT);
+	desc.dsc_length = static_cast<USHORT>(varyingString.size());
 	desc.dsc_address = (UCHAR*) varyingString.data();
 	desc.dsc_scale = 0;
 

src/common/tests/StringTest.cpp

@@ -14,6 +14,11 @@ static constexpr char lbl[] = "0123456789";
 #define validate(A, B) BOOST_TEST(std::string_view(A.c_str(), A.length()) == std::string_view(B))
 #define check(A, B) BOOST_TEST(A == B)
 
+static constexpr string::size_type length(const std::string_view& str) noexcept
+{
+	return static_cast<string::size_type>(str.length());
+}
+
 BOOST_AUTO_TEST_CASE(StringInitializeTest)
 {
 	string a;
@@ -614,15 +619,15 @@ BOOST_AUTO_TEST_SUITE(MoveSematicsTests)
 // Move only big strings in the same pool
 BOOST_AUTO_TEST_CASE(DefaultPoolMoveTest)
 {
-	string sourceString(BigStringValue.data(), BigStringValue.length());
+	string sourceString(BigStringValue.data(), length(BigStringValue));
 
 	// Move c'tor
 	string newString(std::move(sourceString));
 	checkMovedString(sourceString);
 	testBigString(newString);
 
 	// Reuse
-	sourceString.assign(BigStringValue.data(), BigStringValue.length());
+	sourceString.assign(BigStringValue.data(), length(BigStringValue));
 	testBigString(sourceString);
 
 	// Move assignment
@@ -634,15 +639,15 @@ BOOST_AUTO_TEST_CASE(DefaultPoolMoveTest)
 BOOST_AUTO_TEST_CASE(NewPoolMoveTest)
 {
 	AutoMemoryPool pool(MemoryPool::createPool());
-	string sourceString(*pool, BigStringValue.data(), BigStringValue.length());
+	string sourceString(*pool, BigStringValue.data(), length(BigStringValue));
 
 	// Move c'tor
 	string newString(*pool, std::move(sourceString));
 	checkMovedString(sourceString);
 	testBigString(newString);
 
 	// Reuse
-	sourceString.assign(BigStringValue.data(), BigStringValue.length());
+	sourceString.assign(BigStringValue.data(), length(BigStringValue));
 	testBigString(sourceString);
 
 	// Move assignment
@@ -660,15 +665,15 @@ BOOST_AUTO_TEST_SUITE(CannotMoveTests)
 BOOST_AUTO_TEST_CASE(DifferentVsDefaultPoolMove)
 {
 	AutoMemoryPool pool(MemoryPool::createPool());
-	string sourceString(*pool, BigStringValue.data(), BigStringValue.length());
+	string sourceString(*pool, BigStringValue.data(), length(BigStringValue));
 
 	// Move c'tor
 	string newString(std::move(sourceString));
 	testBigString(sourceString);
 	testBigString(newString);
 
 	// Reuse
-	sourceString.assign(BigStringValue.data(), BigStringValue.length());
+	sourceString.assign(BigStringValue.data(), length(BigStringValue));
 	testBigString(sourceString);
 
 	// Move assignment
@@ -682,15 +687,15 @@ BOOST_AUTO_TEST_CASE(DifferentPoolsMove)
 {
 	AutoMemoryPool pool1(MemoryPool::createPool());
 	AutoMemoryPool pool2(MemoryPool::createPool());
-	string sourceString(*pool1, BigStringValue.data(), BigStringValue.length());
+	string sourceString(*pool1, BigStringValue.data(), length(BigStringValue));
 
 	// Move c'tor
 	string newString(*pool2, std::move(sourceString));
 	testBigString(sourceString);
 	testBigString(newString);
 
 	// Reuse
-	sourceString.assign(BigStringValue.data(), BigStringValue.length());
+	sourceString.assign(BigStringValue.data(), length(BigStringValue));
 	testBigString(sourceString);
 
 	// Move assignment
@@ -702,15 +707,15 @@ BOOST_AUTO_TEST_CASE(DifferentPoolsMove)
 // Do not move
 BOOST_AUTO_TEST_CASE(SmallStringMove)
 {
-	string sourceString(SmallStringValue.data(), SmallStringValue.length());
+	string sourceString(SmallStringValue.data(), length(SmallStringValue));
 
 	// Move c'tor
 	string newString(std::move(sourceString));
 	testSmallString(sourceString);
 	testSmallString(newString);
 
 	// Reuse
-	sourceString.assign(SmallStringValue.data(), SmallStringValue.length());
+	sourceString.assign(SmallStringValue.data(), length(SmallStringValue));
 	testSmallString(sourceString);
 
 	// Move assign