Showing the changes to Source/Libraries/TimeSeriesPlatformLibrary/Samples/FilterExpressionTests.cpp (1 of 28 files). Show all
Unified · Split
| @@ -1177,42 +1177,42 @@ int main(int argc, char* argv[]) · 1176 unmodified lines | ||
| 1177 | 1177 | valueExpression = FilterExpressionParser::Evaluate(dataRow, "DateAdd('2019-02-04', 2, 'Month')"); |
| 1178 | 1178 | |
| 1179 | 1179 | assert(valueExpression->ValueType == ExpressionValueType::DateTime); |
| 1180 | − assert(valueExpression->ValueAsDateTime() == DateTime(date(2019, 4, 4))); | |
| 1180 | + assert(valueExpression->ValueAsDateTime() == datetime_t(date(2019, 4, 4))); | |
| 1181 | 1181 | cout << "Test " << ++test << " succeeded..." << endl; |
| 1182 | 1182 | |
| 1183 | 1183 | // Test 119 |
| 1184 | 1184 | valueExpression = FilterExpressionParser::Evaluate(dataRow, "DateAdd(#1/31/2019#, 1, 'Day')"); |
| 1185 | 1185 | |
| 1186 | 1186 | assert(valueExpression->ValueType == ExpressionValueType::DateTime); |
| 1187 | − assert(valueExpression->ValueAsDateTime() == DateTime(date(2019, 2, 1))); | |
| 1187 | + assert(valueExpression->ValueAsDateTime() == datetime_t(date(2019, 2, 1))); | |
| 1188 | 1188 | cout << "Test " << ++test << " succeeded..." << endl; |
| 1189 | 1189 | |
| 1190 | 1190 | // Test 120 |
| 1191 | 1191 | valueExpression = FilterExpressionParser::Evaluate(dataRow, "DateAdd(#2019-01-31#, 2, 'Week')"); |
| 1192 | 1192 | |
| 1193 | 1193 | assert(valueExpression->ValueType == ExpressionValueType::DateTime); |
| 1194 | − assert(valueExpression->ValueAsDateTime() == DateTime(date(2019, 2, 14))); | |
| 1194 | + assert(valueExpression->ValueAsDateTime() == datetime_t(date(2019, 2, 14))); | |
| 1195 | 1195 | cout << "Test " << ++test << " succeeded..." << endl; |
| 1196 | 1196 | |
| 1197 | 1197 | // Test 121 |
| 1198 | 1198 | valueExpression = FilterExpressionParser::Evaluate(dataRow, "DateAdd(#2019-01-31#, 25, 'Hour')"); |
| 1199 | 1199 | |
| 1200 | 1200 | assert(valueExpression->ValueType == ExpressionValueType::DateTime); |
| 1201 | − assert(valueExpression->ValueAsDateTime() == DateTime(date(2019, 2, 1), time_duration(1, 0, 0))); | |
| 1201 | + assert(valueExpression->ValueAsDateTime() == datetime_t(date(2019, 2, 1), time_duration(1, 0, 0))); | |
| 1202 | 1202 | cout << "Test " << ++test << " succeeded..." << endl; |
| 1203 | 1203 | |
| 1204 | 1204 | // Test 122 |
| 1205 | 1205 | valueExpression = FilterExpressionParser::Evaluate(dataRow, "DateAdd(#2018-12-31 23:58#, 3, 'Minute')"); |
| 1206 | 1206 | |
| 1207 | 1207 | assert(valueExpression->ValueType == ExpressionValueType::DateTime); |
| 1208 | − assert(valueExpression->ValueAsDateTime() == DateTime(date(2019, 1, 1), time_duration(0, 1, 0))); | |
| 1208 | + assert(valueExpression->ValueAsDateTime() == datetime_t(date(2019, 1, 1), time_duration(0, 1, 0))); | |
| 1209 | 1209 | cout << "Test " << ++test << " succeeded..." << endl; |
| 1210 | 1210 | |
| 1211 | 1211 | // Test 123 |
| 1212 | 1212 | valueExpression = FilterExpressionParser::Evaluate(dataRow, "DateAdd('2019-01-1 00:59', 61, 'Second')"); |
| 1213 | 1213 | |
| 1214 | 1214 | assert(valueExpression->ValueType == ExpressionValueType::DateTime); |
| 1215 | − assert(valueExpression->ValueAsDateTime() == DateTime(date(2019, 1, 1), time_duration(1, 0, 1))); | |
| 1215 | + assert(valueExpression->ValueAsDateTime() == datetime_t(date(2019, 1, 1), time_duration(1, 0, 1))); | |
| 1216 | 1216 | cout << "Test " << ++test << " succeeded..." << endl; |
| 1217 | 1217 | |
| 1218 | 1218 | const float64_t baseFraction = pow(10.0, time_duration::num_fractional_digits()); |
| @@ -1222,14 +1222,14 @@ int main(int argc, char* argv[]) · 3 unmodified lines | ||
| 1222 | 1222 | valueExpression = FilterExpressionParser::Evaluate(dataRow, "DateAdd('2019-01-1 00:00:59.999', 2, 'Millisecond')"); |
| 1223 | 1223 | |
| 1224 | 1224 | assert(valueExpression->ValueType == ExpressionValueType::DateTime); |
| 1225 | − assert(valueExpression->ValueAsDateTime() == DateTime(date(2019, 1, 1), time_duration(0, 1, 0, fracSecond(1)))); | |
| 1225 | + assert(valueExpression->ValueAsDateTime() == datetime_t(date(2019, 1, 1), time_duration(0, 1, 0, fracSecond(1)))); | |
| 1226 | 1226 | cout << "Test " << ++test << " succeeded..." << endl; |
| 1227 | 1227 | |
| 1228 | 1228 | // Test 125 |
| 1229 | 1229 | valueExpression = FilterExpressionParser::Evaluate(dataRow, "DateAdd(#1/1/2019 0:0:1.029#, -FramesPerSecond, 'Millisecond')"); |
| 1230 | 1230 | |
| 1231 | 1231 | assert(valueExpression->ValueType == ExpressionValueType::DateTime); |
| 1232 | − assert(valueExpression->ValueAsDateTime() == DateTime(date(2019, 1, 1), time_duration(0, 0, 0, fracSecond(999)))); | |
| 1232 | + assert(valueExpression->ValueAsDateTime() == datetime_t(date(2019, 1, 1), time_duration(0, 0, 0, fracSecond(999)))); | |
| 1233 | 1233 | cout << "Test " << ++test << " succeeded..." << endl; |
| 1234 | 1234 | |
| 1235 | 1235 | // Test 126 |
| @@ -1429,7 +1429,7 @@ int main(int argc, char* argv[]) · 193 unmodified lines | ||
| 1429 | 1429 | cout << "Test " << ++test << " succeeded..." << endl; |
| 1430 | 1430 | |
| 1431 | 1431 | // Test 150 |
| 1432 | − const DateTime time = ParseTimestamp("2019-02-10T15:55:25.090477Z"); | |
| 1432 | + const datetime_t time = ParseTimestamp("2019-02-10T15:55:25.090477Z"); | |
| 1433 | 1433 | const int64_t ticks = ToTicks(time); |
| 1434 | 1434 | |
| 1435 | 1435 | assert(ticks == 636854109250904770L); |