generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-30 21:50:47 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into pr/1113

Browse Source 
Conflicts:
	Foundation/testsuite/TestSuite_vs120.vcxproj
This commit is contained in:
Alex Fabijanic
2016-03-07 21:38:26 -08:00
parent 69960c9c92 7ec1cf4c2d
commit 3eb023132b
276 changed files with 28192 additions and 5316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Data/testsuite/src/DataTest.cpp
View File

@@ -904,6 +904,11 @@ void DataTest::testRow()
assert (row[3] == 3);
assert (row[4] == 4);
const Row& cr = row;
assert(cr["field0"] == 0);
assert(cr[0] == 0);
assert(cr.get(0) == 0);
try
{
int i; i = row[5].convert<int>(); // to silence gcc
@@ -1260,7 +1265,7 @@ void DataTest::testDateAndTime()
assert (dt.second() == t.second());
Date d1(2007, 6, 15);
d1.assign(d.year() - 1, d.month(), d.day());
d1.assign(d.year() - 1, d.month(), (d.month() == 2 && d.day() == 29) ? 28 : d.day());
assert (d1 < d); assert (d1 != d);
d1.assign(d.year() - 1, 12, d.day());
@@ -1272,7 +1277,7 @@ void DataTest::testDateAndTime()
assert (d1 < d); assert (d1 != d);
}
d1.assign(d.year() + 1, d.month(), d.day());
d1.assign(d.year() + 1, d.month(), (d.month() == 2 && d.day() == 29) ? 28 : d.day());
assert (d1 > d); assert (d1 != d);
d1.assign(d.year() + 1, 1, d.day());