github/msft-calculator
1
0
Fork 0
mirror of https://github.com/Microsoft/calculator.git synced 2025-08-22 22:23:29 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update HistoryTests.cpp

Browse source
This commit is contained in:
greedyAI 2021-01-06 19:25:27 -08:00
commit 8359164fee
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/CalculatorUnitTests/HistoryTests.cpp
View file

@ -411,7 +411,7 @@ namespace CalculatorFunctionalTests
Cleanup(); Cleanup();
} }
void HistoryStandardOrderOfOperationsHelperMultiple(int numResults, Command testCommands[]) void HistoryStandardOrderOfOperationsHelperMultiple(String ^ expectedResults[], String ^ expectedExpressions[], int numResults, Command testCommands[])
{ {
Initialize(); Initialize();
int initialSize = m_historyViewModel->ItemsCount; int initialSize = m_historyViewModel->ItemsCount;
@ -422,6 +422,9 @@ namespace CalculatorFunctionalTests
} }
int sizeAfterCommandsAdd = m_historyViewModel->ItemsCount; int sizeAfterCommandsAdd = m_historyViewModel->ItemsCount;
VERIFY_ARE_EQUAL(initialSize + numResults, sizeAfterCommandsAdd); VERIFY_ARE_EQUAL(initialSize + numResults, sizeAfterCommandsAdd);
auto historyItem = static_cast<HistoryItemViewModel ^>(m_historyViewModel->Items->GetAt(0));
VERIFY_ARE_EQUAL(historyItem->Expression, expectedExpressions[0]);
VERIFY_ARE_EQUAL(historyItem->Result, expectedResults[0]);
//for (int i = 0; i < numResults; i++) //for (int i = 0; i < numResults; i++)
//{ //{
// auto historyItem = static_cast<HistoryItemViewModel ^>(m_historyViewModel->Items->GetAt(i)); // auto historyItem = static_cast<HistoryItemViewModel ^>(m_historyViewModel->Items->GetAt(i));
@ -548,9 +551,9 @@ namespace CalculatorFunctionalTests
void HistoryStandardOrderOfOperations_24() { void HistoryStandardOrderOfOperations_24() {
Command commands[] = { Command::Command1, Command::CommandMUL, Command::Command2, Command::CommandMUL, Command::Command3, Command::CommandMUL, Command::Command4, Command::CommandMUL, Command::Command5, Command::CommandMUL }; Command commands[] = { Command::Command1, Command::CommandMUL, Command::Command2, Command::CommandMUL, Command::Command3, Command::CommandMUL, Command::Command4, Command::CommandMUL, Command::Command5, Command::CommandMUL };
/*String ^ expectedResults[] = { L"120", L"24", L"6", L"2" }; String ^ expectedResults[] = { L"120", L"24", L"6", L"2" };
String ^ expectedExpressions[] = { L"24 \x00D7 5 =", L"6 \x00D7 4 =", L"2 \x00D7 3 =", L"1 \x00D7 2 =" };*/ String ^ expectedExpressions[] = { L"24 \x00D7 5 =", L"6 \x00D7 4 =", L"2 \x00D7 3 =", L"1 \x00D7 2 =" };
HistoryStandardOrderOfOperationsHelperMultiple(4, commands); HistoryStandardOrderOfOperationsHelperMultiple(expectedResults, expectedExpressions, 4, commands);
} }
}; };