github/msft-calculator
1
0
Fork 0
mirror of https://github.com/Microsoft/calculator.git synced 2025-07-11 15:56:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove LRE/LRO characters from results and error messages (#1161)

Browse source 
* Remove LRE/LRO characters and rely on Xaml to correctly displayed the numbers and error messages RtL

* unit tests
This commit is contained in:
Rudy Huyn 2020-04-30 12:04:33 -07:00 • committed by GitHub
parent 2cafb0dc88
commit 6e521d8f29
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 127 additions and 188 deletions
Download patch file Download diff file Expand all files Collapse all files

62
src/CalculatorUnitTests/UnitConverterViewModelUnitTests.cpp
View file

@ -27,13 +27,6 @@ using namespace Microsoft::VisualStudio::CppUnitTestFramework;
namespace CalculatorUnitTests
{
String^ AddUnicodeLTRMarkers(wstring str)
{
str.insert(str.begin(), L'\u202a');
str.push_back(L'\u202c');
return ref new String(str.c_str());
}
TEST_CLASS(CategoryViewModelTests)
{
public:
@ -298,7 +291,7 @@ for (unsigned int k = 0; k < categoryList->Size; k++)
wstring expResult = expectedResult->Data();
double expectedConversion = GetDoubleFromWstring(expResult);
double actualConversion = GetDoubleFromWstring(GetStringValue(vm->Value1)->Data());
double actualConversion = GetDoubleFromWstring(vm->Value1->Data());
double diff = abs(expectedConversion - actualConversion);
// Assert for diff less than epsilonth fraction of expected conversion result
@ -422,10 +415,9 @@ TEST_METHOD(TestDisplayCallbackUpdatesDisplayValues)
{
shared_ptr<UnitConverterMock> mock = make_shared<UnitConverterMock>();
VM::UnitConverterViewModel vm(mock);
const WCHAR *vFrom = L"1234", *vTo = L"56.78";
vm.UpdateDisplay(vFrom, vTo);
VERIFY_IS_TRUE(vm.Value1 == AddUnicodeLTRMarkers(L"1,234"));
VERIFY_IS_TRUE(vm.Value2 == AddUnicodeLTRMarkers(vTo));
vm.UpdateDisplay(L"1234", L"56.78");
VERIFY_IS_TRUE(vm.Value1 == L"1,234");
VERIFY_IS_TRUE(vm.Value2 == L"56.78");
}
// Test that the calculator button command correctly fires
@ -570,10 +562,9 @@ TEST_METHOD(TestDisplayValueUpdatesAfterSwitchingActiveUpdateTheRightDisplay)
const WCHAR *vFrom = L"1", *vTo = L"234";
vm.UpdateDisplay(vFrom, vTo);
vm.Value2Active = true;
const WCHAR *newvFrom = L"3", *newvTo = L"57";
vm.UpdateDisplay(newvFrom, newvTo);
VERIFY_IS_TRUE(vm.Value2 == AddUnicodeLTRMarkers(newvFrom));
VERIFY_IS_TRUE(vm.Value1 == AddUnicodeLTRMarkers(newvTo));
vm.UpdateDisplay(L"3", L"57");
VERIFY_IS_TRUE(vm.Value2 == L"3");
VERIFY_IS_TRUE(vm.Value1 == L"57");
}
// Tests that when we switch the active field and get change units,
@ -637,10 +628,9 @@ TEST_METHOD(TestCategoryChangeAfterSwitchingActiveUpdatesDisplayCorrectly)
VERIFY_IS_TRUE(UNIT9 == mock->m_curFrom);
VERIFY_IS_TRUE(UNIT7 == mock->m_curTo);
VERIFY_ARE_EQUAL((UINT)1, mock->m_switchActiveCallCount);
const wchar_t *newvFrom = L"5", *newvTo = L"7";
vm.UpdateDisplay(newvFrom, newvTo);
VERIFY_IS_TRUE(vm.Value2 == AddUnicodeLTRMarkers(newvFrom));
VERIFY_IS_TRUE(vm.Value1 == AddUnicodeLTRMarkers(newvTo));
vm.UpdateDisplay(L"5", L"7");
VERIFY_IS_TRUE(vm.Value2 == L"5");
VERIFY_IS_TRUE(vm.Value1 == L"7");
}
// Repeat above active switch tests but with a second switch to ensure
@ -682,10 +672,9 @@ TEST_METHOD(TestDisplayValueUpdatesAfterSwitchingActiveTwiceUpdateTheRightDispla
vm.UpdateDisplay(vFrom, vTo);
vm.Value2Active = true;
vm.Value1Active = true;
const WCHAR *newvFrom = L"3", *newvTo = L"57";
vm.UpdateDisplay(newvFrom, newvTo);
VERIFY_IS_TRUE(vm.Value1 == AddUnicodeLTRMarkers(newvFrom));
VERIFY_IS_TRUE(vm.Value2 == AddUnicodeLTRMarkers(newvTo));
vm.UpdateDisplay(L"3", L"57");
VERIFY_IS_TRUE(vm.Value1 == L"3");
VERIFY_IS_TRUE(vm.Value2 == L"57");
}
TEST_METHOD(TestUnitChangeAfterSwitchingActiveTwiceUpdateUnitsCorrectly)
@ -716,10 +705,9 @@ TEST_METHOD(TestCategoryChangeAfterSwitchingActiveTwiceUpdatesDisplayCorrectly)
VERIFY_IS_TRUE(UNIT9 == mock->m_curFrom);
VERIFY_IS_TRUE(UNIT7 == mock->m_curTo);
VERIFY_ARE_EQUAL((UINT)2, mock->m_switchActiveCallCount);
const wchar_t *newvFrom = L"5", *newvTo = L"7";
vm.UpdateDisplay(newvFrom, newvTo);
VERIFY_IS_TRUE(vm.Value1 == AddUnicodeLTRMarkers(newvFrom));
VERIFY_IS_TRUE(vm.Value2 == AddUnicodeLTRMarkers(newvTo));
vm.UpdateDisplay(L"5", L"7");
VERIFY_IS_TRUE(vm.Value1 == L"5");
VERIFY_IS_TRUE(vm.Value2 == L"7");
}
// There is a 100 ms fudge time for the time based tests below
@ -739,11 +727,11 @@ TEST_METHOD(TestSuggestedValuesCallbackUpdatesSupplementaryResults)
WaitForSingleObjectEx(GetCurrentThread(), 200, FALSE);
// Now we should see it
VERIFY_ARE_EQUAL((UINT)3, vm.SupplementaryResults->Size);
VERIFY_IS_TRUE((AddUnicodeLTRMarkers(L"1")) == vm.SupplementaryResults->GetAt(0)->Value);
VERIFY_IS_TRUE(L"1" == vm.SupplementaryResults->GetAt(0)->Value);
VERIFY_IS_TRUE(UNIT1 == vm.SupplementaryResults->GetAt(0)->Unit->GetModelUnit());
VERIFY_IS_TRUE((AddUnicodeLTRMarkers(L"2")) == vm.SupplementaryResults->GetAt(1)->Value);
VERIFY_IS_TRUE(L"2" == vm.SupplementaryResults->GetAt(1)->Value);
VERIFY_IS_TRUE(UNIT2 == vm.SupplementaryResults->GetAt(1)->Unit->GetModelUnit());
VERIFY_IS_TRUE((AddUnicodeLTRMarkers(L"3")) == vm.SupplementaryResults->GetAt(2)->Value);
VERIFY_IS_TRUE(L"3" == vm.SupplementaryResults->GetAt(2)->Value);
VERIFY_IS_TRUE(UNIT3 == vm.SupplementaryResults->GetAt(2)->Unit->GetModelUnit());
}
@ -938,14 +926,14 @@ TEST_METHOD(TestDecimalFormattingLogic)
const WCHAR *vFrom = L"3.", *vTo = L"2.50";
vm.UpdateDisplay(vFrom, vTo);
// Establish base condition
VERIFY_IS_TRUE(vm.Value1 == AddUnicodeLTRMarkers(L"3."));
VERIFY_IS_TRUE(vm.Value2 == AddUnicodeLTRMarkers(L"2.50"));
VERIFY_IS_TRUE(vm.Value1 == L"3.");
VERIFY_IS_TRUE(vm.Value2 == L"2.50");
vm.SwitchActive->Execute(nullptr);
VERIFY_IS_TRUE(vm.Value1 == AddUnicodeLTRMarkers(L"3")); // dangling decimal now removed
VERIFY_IS_TRUE(vm.Value2 == AddUnicodeLTRMarkers(L"2.50"));
VERIFY_IS_TRUE(vm.Value1 == L"3"); // dangling decimal now removed
VERIFY_IS_TRUE(vm.Value2 == L"2.50");
vm.SwitchActive->Execute(nullptr);
VERIFY_IS_TRUE(vm.Value1 == AddUnicodeLTRMarkers(L"3"));
VERIFY_IS_TRUE(vm.Value2 == AddUnicodeLTRMarkers(L"2.50"));
VERIFY_IS_TRUE(vm.Value1 == L"3");
VERIFY_IS_TRUE(vm.Value2 == L"2.50");
}
// Tests that when we switch the active field and get display
// updates, the correct automation names are are being updated.