DevWiki/calculator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DateDiff: Optimize how we build the string used when we calculate the difference between 2 dates (#195)

Browse Source 
Optimize how we build the result of GetDateDiffString and GetDateDiffStringInDays, using std::wstring (mutuable) instead of Platform::String (immutable)
This commit is contained in:
Rudy Huyn
2019-03-15 17:20:33 -07:00
committed by Daniel Belcher
parent 244fd8deee
commit ca15f05227
3 changed files with 68 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/CalculatorUnitTests/DateCalculatorUnitTests.cpp
View File

@@ -1,4 +1,4 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
#include "pch.h"
@@ -494,6 +494,26 @@ namespace DateCalculationUnitTests
}
}
TEST_METHOD(DateCalcViewModelDateDiffIgnoreSignTest)
{
auto viewModel = ref new DateCalculatorViewModel();
viewModel->IsDateDiffMode = true;
VERIFY_IS_TRUE(viewModel->IsDateDiffMode);
viewModel->FromDate = DateUtils::SystemTimeToDateTime(date[10]);
viewModel->ToDate = DateUtils::SystemTimeToDateTime(date[6]);
VERIFY_IS_FALSE(viewModel->IsDiffInDays);
VERIFY_ARE_EQUAL(StringReference(L"305 days"), viewModel->StrDateDiffResultInDays);
VERIFY_ARE_EQUAL(StringReference(L"10 months"), viewModel->StrDateDiffResult);
viewModel->FromDate = DateUtils::SystemTimeToDateTime(date[6]);
viewModel->ToDate = DateUtils::SystemTimeToDateTime(date[10]);
VERIFY_IS_FALSE(viewModel->IsDiffInDays);
VERIFY_ARE_EQUAL(StringReference(L"305 days"), viewModel->StrDateDiffResultInDays);
VERIFY_ARE_EQUAL(StringReference(L"10 months"), viewModel->StrDateDiffResult);
}
TEST_METHOD(DateCalcViewModelDateDiffTest)
{
// TODO - MSFT 10331900, fix this test
@@ -516,7 +536,23 @@ namespace DateCalculationUnitTests
//VERIFY_ARE_EQUAL(StringReference(L"8398 years, 11 months, 4 weeks, 2 days"), viewModel->StrDateDiffResult);
}
TEST_METHOD(DateCalcViewModelDateDiffResultInDaysTest)
TEST_METHOD(DateCalcViewModelDateDiffResultInPositiveDaysTest)
{
auto viewModel = ref new DateCalculatorViewModel();
viewModel->IsDateDiffMode = true;
VERIFY_IS_TRUE(viewModel->IsDateDiffMode);
viewModel->FromDate = DateUtils::SystemTimeToDateTime(date[1]);
viewModel->ToDate = DateUtils::SystemTimeToDateTime(date[0]);
// Assert for the result
VERIFY_IS_TRUE(viewModel->IsDiffInDays);
VERIFY_ARE_EQUAL(StringReference(L"1 day"), viewModel->StrDateDiffResult);
VERIFY_IS_NULL(viewModel->StrDateDiffResultInDays);
}
TEST_METHOD(DateCalcViewModelDateDiffFromDateHigherThanToDate)
{
auto viewModel = ref new DateCalculatorViewModel();