generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-29 20:59:45 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1882 from Burgch/uint64-dynamic-var

Browse Source 
Add support for (unsigned) long long when long is 64bit
This commit is contained in:
Günter Obiltschnig
2017-11-07 15:18:48 +01:00
committed by GitHub
parent 7e5984a76c fe693de41d
commit b96b07a9ad
6 changed files with 1211 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

330
Foundation/testsuite/src/VarTest.cpp
View File

@@ -101,10 +101,16 @@ void VarTest::testInt8()
a1.convert(s13);
long s14;
unsigned long s15;
long long s16;
unsigned long long s17;
a1.convert(s14);
a1.convert(s15);
a1.convert(s16);
a1.convert(s17);
assert (s14 == 32);
assert (s15 == 32);
assert (s16 == 32);
assert (s17 == 32);
assert (s1 == "32");
assert (s2 == 32);
assert (s3 == 32);
@@ -189,10 +195,16 @@ void VarTest::testInt16()
a1.convert(s13);
long s14;
unsigned long s15;
long long s16;
unsigned long long s17;
a1.convert(s14);
a1.convert(s15);
a1.convert(s16);
a1.convert(s17);
assert (s14 == 32);
assert (s15 == 32);
assert (s16 == 32);
assert (s17 == 32);
assert (s1 == "32");
assert (s2 == 32);
assert (s3 == 32);
@@ -277,10 +289,16 @@ void VarTest::testInt32()
a1.convert(s13);
long s14;
unsigned long s15;
long long s16;
unsigned long long s17;
a1.convert(s14);
a1.convert(s15);
a1.convert(s16);
a1.convert(s17);
assert (s14 == 32);
assert (s15 == 32);
assert (s16 == 32);
assert (s17 == 32);
assert (s1 == "32");
assert (s2 == 32);
assert (s3 == 32);
@@ -365,10 +383,16 @@ void VarTest::testInt64()
a1.convert(s13);
long s14;
unsigned long s15;
long long s16;
unsigned long long s17;
a1.convert(s14);
a1.convert(s15);
a1.convert(s16);
a1.convert(s17);
assert (s14 == 32);
assert (s15 == 32);
assert (s16 == 32);
assert (s17 == 32);
assert (s1 == "32");
assert (s2 == 32);
assert (s3 == 32);
@@ -453,10 +477,16 @@ void VarTest::testUInt8()
a1.convert(s13);
long s14;
unsigned long s15;
long long s16;
unsigned long long s17;
a1.convert(s14);
a1.convert(s15);
a1.convert(s16);
a1.convert(s17);
assert (s14 == 32);
assert (s15 == 32);
assert (s16 == 32);
assert (s17 == 32);
assert (s1 == "32");
assert (s2 == 32);
assert (s3 == 32);
@@ -541,10 +571,16 @@ void VarTest::testUInt16()
a1.convert(s13);
long s14;
unsigned long s15;
long long s16;
unsigned long long s17;
a1.convert(s14);
a1.convert(s15);
a1.convert(s16);
a1.convert(s17);
assert (s14 == 32);
assert (s15 == 32);
assert (s16 == 32);
assert (s17 == 32);
assert (s1 == "32");
assert (s2 == 32);
assert (s3 == 32);
@@ -629,10 +665,16 @@ void VarTest::testUInt32()
a1.convert(s13);
long s14;
unsigned long s15;
long long s16;
unsigned long long s17;
a1.convert(s14);
a1.convert(s15);
a1.convert(s16);
a1.convert(s17);
assert (s14 == 32);
assert (s15 == 32);
assert (s16 == 32);
assert (s17 == 32);
assert (s1 == "32");
assert (s2 == 32);
assert (s3 == 32);
@@ -717,10 +759,16 @@ void VarTest::testUInt64()
a1.convert(s13);
long s14;
unsigned long s15;
long long s16;
unsigned long long s17;
a1.convert(s14);
a1.convert(s15);
a1.convert(s16);
a1.convert(s17);
assert (s14 == 32);
assert (s15 == 32);
assert (s16 == 32);
assert (s17 == 32);
assert (s1 == "32");
assert (s2 == 32);
assert (s3 == 32);
@@ -805,10 +853,16 @@ void VarTest::testBool()
a1.convert(s13);
long s14;
unsigned long s15;
long long s16;
unsigned long long s17;
a1.convert(s14);
a1.convert(s15);
a1.convert(s16);
a1.convert(s17);
assert (s14 == 1);
assert (s15 == 1);
assert (s16 == 1);
assert (s17 == 1);
assert (s1 == "true");
assert (s2 == 1);
assert (s3 == 1);
@@ -876,10 +930,16 @@ void VarTest::testChar()
a1.convert(s13);
long s14;
unsigned long s15;
long long s16;
unsigned long long s17;
a1.convert(s14);
a1.convert(s15);
a1.convert(s16);
a1.convert(s17);
assert (s14 == 32);
assert (s15 == 32);
assert (s16 == 32);
assert (s17 == 32);
assert (s1 == " ");
assert (s2 == 32);
assert (s3 == 32);
@@ -950,10 +1010,16 @@ void VarTest::testFloat()
a1.convert(s13);
long s14;
unsigned long s15;
long long s16;
unsigned long long s17;
a1.convert(s14);
a1.convert(s15);
a1.convert(s16);
a1.convert(s17);
assert (s14 == 32);
assert (s15 == 32);
assert (s16 == 32);
assert (s17 == 32);
assert (s1 == "32");
assert (s2 == 32);
assert (s3 == 32);
@@ -1042,10 +1108,16 @@ void VarTest::testDouble()
a1.convert(s13);
long s14;
unsigned long s15;
long long s16;
unsigned long long s17;
a1.convert(s14);
a1.convert(s15);
a1.convert(s16);
a1.convert(s17);
assert (s14 == 32);
assert (s15 == 32);
assert (s16 == 32);
assert (s17 == 32);
assert (s1 == "32");
assert (s2 == 32);
assert (s3 == 32);
@@ -1130,10 +1202,16 @@ void VarTest::testString()
a1.convert(s13);
long s14;
unsigned long s15;
long long s16;
unsigned long long s17;
a1.convert(s14);
a1.convert(s15);
a1.convert(s16);
a1.convert(s17);
assert (s14 == 32);
assert (s15 == 32);
assert (s16 == 32);
assert (s17 == 32);
assert (s1 == "32");
assert (s2 == 32);
assert (s3 == 32);
@@ -1215,10 +1293,16 @@ void VarTest::testLong()
a1.convert(s13);
long s14;
unsigned long s15;
long long s16;
unsigned long long s17;
a1.convert(s14);
a1.convert(s15);
a1.convert(s16);
a1.convert(s17);
assert (s14 == 32);
assert (s15 == 32);
assert (s16 == 32);
assert (s17 == 32);
assert (s1 == "32");
assert (s2 == 32);
assert (s3 == 32);
@@ -1303,10 +1387,16 @@ void VarTest::testULong()
a1.convert(s13);
long s14;
unsigned long s15;
long long s16;
unsigned long long s17;
a1.convert(s14);
a1.convert(s15);
a1.convert(s16);
a1.convert(s17);
assert (s14 == 32);
assert (s15 == 32);
assert (s16 == 32);
assert (s17 == 32);
assert (s1 == "32");
assert (s2 == 32);
assert (s3 == 32);
@@ -1355,6 +1445,193 @@ void VarTest::testULong()
assert (a3 == 64);
}
void VarTest::testLongLong()
{
long long src = 32;
Var a1 = src;
assert (a1.type() == typeid(long long));
std::string s1;
Poco::Int8 s2;
Poco::Int16 s3;
Poco::Int32 s4;
Poco::Int64 s5;
Poco::UInt8 s6;
Poco::UInt16 s7;
Poco::UInt32 s8;
Poco::UInt64 s9;
float s10;
double s11;
bool s12;
char s13;
a1.convert(s1);
a1.convert(s2);
a1.convert(s3);
a1.convert(s4);
a1.convert(s5);
a1.convert(s6);
a1.convert(s7);
a1.convert(s8);
a1.convert(s9);
a1.convert(s10);
a1.convert(s11);
a1.convert(s12);
a1.convert(s13);
long s14;
unsigned long s15;
long long s16;
unsigned long long s17;
a1.convert(s14);
a1.convert(s15);
a1.convert(s16);
a1.convert(s17);
assert (s14 == 32);
assert (s15 == 32);
assert (s16 == 32);
assert (s17 == 32);
assert (s1 == "32");
assert (s2 == 32);
assert (s3 == 32);
assert (s4 == 32);
assert (s5 == 32);
assert (s6 == 32);
assert (s7 == 32);
assert (s8 == 32);
assert (s9 == 32);
assert (s10 == 32.0f);
assert (s11 == 32.0);
assert (s12);
assert (s13 == ' ');
Var a2(a1);
std::string t2;
a2.convert(t2);
assert (s1 == t2);
long long value = a1.extract<long long>();
assert (value == 32);
try
{
Int16 value2; value2 = a1.extract<Int16>();
fail("bad cast - must throw");
}
catch (Poco::BadCastException&)
{
}
Var a3 = a1 + 1;
assert (a3 == 33);
a3 = a1 - 1;
assert (a3 == 31);
a3 += 1;
assert (a3 == 32);
a3 -= 1;
assert (a3 == 31);
a3 = a1 / 2;
assert (a3 == 16);
a3 = a1 * 2;
assert (a3 == 64);
a3 /= 2;
assert (a3 == 32);
a3 *= 2;
assert (a3 == 64);
}
void VarTest::testULongLong()
{
unsigned long long src = 32;
Var a1 = src;
assert (a1.type() == typeid(unsigned long long));
std::string s1;
Poco::Int8 s2;
Poco::Int16 s3;
Poco::Int32 s4;
Poco::Int64 s5;
Poco::UInt8 s6;
Poco::UInt16 s7;
Poco::UInt32 s8;
Poco::UInt64 s9;
float s10;
double s11;
bool s12;
char s13;
a1.convert(s1);
a1.convert(s2);
a1.convert(s3);
a1.convert(s4);
a1.convert(s5);
a1.convert(s6);
a1.convert(s7);
a1.convert(s8);
a1.convert(s9);
a1.convert(s10);
a1.convert(s11);
a1.convert(s12);
a1.convert(s13);
long s14;
unsigned long s15;
long long s16;
unsigned long long s17;
a1.convert(s14);
a1.convert(s15);
a1.convert(s16);
a1.convert(s17);
assert (s14 == 32);
assert (s15 == 32);
assert (s16 == 32);
assert (s17 == 32);
assert (s1 == "32");
assert (s2 == 32);
assert (s3 == 32);
assert (s4 == 32);
assert (s5 == 32);
assert (s6 == 32);
assert (s7 == 32);
assert (s8 == 32);
assert (s9 == 32);
assert (s10 == 32.0f);
assert (s11 == 32.0);
assert (s12);
assert (s13 == ' ');
Var a2(a1);
std::string t2;
a2.convert(t2);
assert (s1 == t2);
unsigned long long value = a1.extract<unsigned long long>();
assert (value == 32);
try
{
Int16 value2; value2 = a1.extract<Int16>();
fail("bad cast - must throw");
}
catch (Poco::BadCastException&)
{
}
Var a3 = a1 + 1;
assert (a3 == 33);
a3 = a1 - 1;
assert (a3 == 31);
a3 += 1;
assert (a3 == 32);
a3 -= 1;
assert (a3 == 31);
a3 = a1 / 2;
assert (a3 == 16);
a3 = a1 * 2;
assert (a3 == 64);
a3 /= 2;
assert (a3 == 32);
a3 *= 2;
assert (a3 == 64);
}
void VarTest::testUDT()
{
@@ -1756,9 +2033,11 @@ void VarTest::testIsStruct()
char s13('c');
long s14(232323);
unsigned long s15(21233232u);
std::vector<Var> s16;
Struct<std::string> s17;
Struct<int> s18;
long long s16(-23823838);
unsigned long s17(2328328382u);
std::vector<Var> s18;
Struct<std::string> s19;
Struct<int> s20;
Var d1(s1);
Var d2(s2);
@@ -1778,6 +2057,8 @@ void VarTest::testIsStruct()
Var d16(s16);
Var d17(s17);
Var d18(s18);
Var d19(s19);
Var d20(s20);
assert (!d1.isStruct());
assert (!d2.isStruct());
@@ -1795,8 +2076,10 @@ void VarTest::testIsStruct()
assert (!d14.isStruct());
assert (!d15.isStruct());
assert (!d16.isStruct());
assert (d17.isStruct());
assert (d18.isStruct());
assert (!d17.isStruct());
assert (!d18.isStruct());
assert (d19.isStruct());
assert (d20.isStruct());
}
@@ -1817,8 +2100,10 @@ void VarTest::testIsArray()
char s13('c');
long s14(232323);
unsigned long s15(21233232u);
std::vector<Var> s16;
DynamicStruct s17;
long long s16(-23823838);
unsigned long long s17(2328328382u);
std::vector<Var> s18;
DynamicStruct s19;
Var d0;
Var d1(s1);
@@ -1838,6 +2123,8 @@ void VarTest::testIsArray()
Var d15(s15);
Var d16(s16);
Var d17(s17);
Var d18(s18);
Var d19(s19);
assert (!d0.isArray());
assert (!d1.isArray());
@@ -1855,8 +2142,10 @@ void VarTest::testIsArray()
assert (!d13.isArray());
assert (!d14.isArray());
assert (!d15.isArray());
assert (d16.isArray());
assert (!d16.isArray());
assert (!d17.isArray());
assert (d18.isArray());
assert (!d19.isArray());
}
@@ -1877,10 +2166,12 @@ void VarTest::testArrayIdxOperator()
char s13('c');
long s14(232323);
unsigned long s15(21233232u);
std::vector<Var> s16;
s16.push_back(s1);
s16.push_back(s2);
DynamicStruct s17;
long long s16(-23823838);
unsigned long long s17(2328328382u);
std::vector<Var> s18;
s18.push_back(s1);
s18.push_back(s2);
DynamicStruct s19;
Var d1(s1);
Var d2(s2);
@@ -1899,6 +2190,8 @@ void VarTest::testArrayIdxOperator()
Var d15(s15);
Var d16(s16);
Var d17(s17);
Var d18(s18);
Var d19(s19);
testGetIdxMustThrow(d1, 0);
testGetIdxNoThrow(d2, 0);
@@ -1915,8 +2208,10 @@ void VarTest::testArrayIdxOperator()
testGetIdxNoThrow(d13, 0);
testGetIdxNoThrow(d14, 0);
testGetIdxNoThrow(d15, 0);
testGetIdx(d16, 0, s1);
testGetIdx(d16, 1, s2);
testGetIdxNoThrow(d16, 0);
testGetIdxNoThrow(d17, 0);
testGetIdx(d18, 0, s1);
testGetIdx(d18, 1, s2);
testGetIdxMustThrow(d1, 1);
testGetIdxMustThrow(d2, 1);
@@ -1933,7 +2228,9 @@ void VarTest::testArrayIdxOperator()
testGetIdxMustThrow(d13, 1);
testGetIdxMustThrow(d14, 1);
testGetIdxMustThrow(d15, 1);
testGetIdxMustThrow(d16, 1);
testGetIdxMustThrow(d17, 1);
testGetIdxMustThrow(d19, 1);
}
@@ -2533,6 +2830,9 @@ void VarTest::testEmpty()
#ifdef POCO_LONG_IS_64_BIT
testEmptyComparisons<unsigned long>();
testEmptyComparisons<long>();
#else
testEmptyComparisons<unsigned long long>();
testEmptyComparisons<long long>();
#endif
testEmptyComparisons<float>();
testEmptyComparisons<double>();
@@ -2644,6 +2944,8 @@ CppUnit::Test* VarTest::suite()
CppUnit_addTest(pSuite, VarTest, testDouble);
CppUnit_addTest(pSuite, VarTest, testLong);
CppUnit_addTest(pSuite, VarTest, testULong);
CppUnit_addTest(pSuite, VarTest, testLongLong);
CppUnit_addTest(pSuite, VarTest, testULongLong);
CppUnit_addTest(pSuite, VarTest, testString);
CppUnit_addTest(pSuite, VarTest, testUDT);
CppUnit_addTest(pSuite, VarTest, testConversionOperator);