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

Fixed merge conflicts

Browse source
This commit is contained in:
Brett Waldbaum 2019-03-08 16:21:31 -08:00
commit 0ba3c9b746
2 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/CalcViewModel/Common/LocalizationSettings.h
View file

@ -179,7 +179,7 @@ namespace CalculatorApp
Platform::String^ GetEnglishValueFromLocalizedDigits(const std::wstring& localizedString) const Platform::String^ GetEnglishValueFromLocalizedDigits(const std::wstring& localizedString) const
{ {
if (!wcscmp((PCWSTR)m_resolvedName, L"en-US")) if (m_resolvedName == L"en-US")
{ {
return ref new Platform::String(localizedString.c_str()); return ref new Platform::String(localizedString.c_str());
} }

28
src/CalculatorUnitTests/HistoryTests.cpp
View file

@ -79,7 +79,7 @@ namespace CalculatorFunctionalTests
m_standardViewModel->IsFToEEnabled = false; m_standardViewModel->IsFToEEnabled = false;
} }
void AddSingleHistoryItem(unsigned int windowId = 0) void AddSingleHistoryItem()
{ {
Initialize(); Initialize();
int initialSize = m_historyViewModel->ItemSize; int initialSize = m_historyViewModel->ItemSize;
@ -97,7 +97,7 @@ namespace CalculatorFunctionalTests
Cleanup(); Cleanup();
} }
void AddMaxHistoryItems(unsigned int windowId = 0) void AddMaxHistoryItems()
{ {
Initialize(); Initialize();
m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::Command1); m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::Command1);
@ -132,7 +132,7 @@ namespace CalculatorFunctionalTests
Cleanup(); Cleanup();
} }
void ReloadHistory(unsigned int windowId = 0) void ReloadHistory()
{ {
Initialize(); Initialize();
@ -189,7 +189,7 @@ namespace CalculatorFunctionalTests
Cleanup(); Cleanup();
} }
void ClearHistory(unsigned int windowId = 0) void ClearHistory()
{ {
Initialize(); Initialize();
m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::ModeScientific); m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::ModeScientific);
@ -209,7 +209,7 @@ namespace CalculatorFunctionalTests
Cleanup(); Cleanup();
} }
void SerializeDeSerializeHistoryItem(unsigned int windowId = 0) void SerializeDeSerializeHistoryItem()
{ {
Initialize(); Initialize();
m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::ModeScientific); m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::ModeScientific);
@ -225,7 +225,7 @@ namespace CalculatorFunctionalTests
Cleanup(); Cleanup();
} }
void SaveAndReloadHistory(unsigned int windowid = 0) void SaveAndReloadHistory()
{ {
Initialize(); Initialize();
m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::ModeScientific); m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::ModeScientific);
@ -260,7 +260,7 @@ namespace CalculatorFunctionalTests
Cleanup(); Cleanup();
} }
void HistoryItemWithPrettyExpressions(unsigned int windowId = 0) void HistoryItemWithPrettyExpressions()
{ {
Initialize(); Initialize();
Command commands[] = { Command::CommandSIN, Command::CommandCOS, Command::CommandTAN, Command::CommandASIN, Command::CommandACOS, Command::CommandATAN }; Command commands[] = { Command::CommandSIN, Command::CommandCOS, Command::CommandTAN, Command::CommandASIN, Command::CommandACOS, Command::CommandATAN };
@ -292,7 +292,7 @@ namespace CalculatorFunctionalTests
Cleanup(); Cleanup();
} }
void HistoryItemWithPrettyExpressionsMixedRadix(unsigned int windowId = 0) void HistoryItemWithPrettyExpressionsMixedRadix()
{ {
Initialize(); Initialize();
ResourceLoader^ m_uiResourceLoader = ResourceLoader::GetForViewIndependentUse(L"CEngineStrings"); ResourceLoader^ m_uiResourceLoader = ResourceLoader::GetForViewIndependentUse(L"CEngineStrings");
@ -323,7 +323,7 @@ namespace CalculatorFunctionalTests
Cleanup(); Cleanup();
} }
void HistoryItemClicked(unsigned int windowId = 0) void HistoryItemClicked()
{ {
Initialize(); Initialize();
m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::ModeScientific); m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::ModeScientific);
@ -350,7 +350,7 @@ namespace CalculatorFunctionalTests
Cleanup(); Cleanup();
} }
void HistoryItemLoadAndContinueCalculation(unsigned int windowId = 0) void HistoryItemLoadAndContinueCalculation()
{ {
Initialize(); Initialize();
m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::ModeBasic); m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::ModeBasic);
@ -387,7 +387,7 @@ namespace CalculatorFunctionalTests
Cleanup(); Cleanup();
} }
void DisplayValueAutomationNames(unsigned int windowId = 0) void DisplayValueAutomationNames()
{ {
Initialize(); Initialize();
m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::Command1); m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::Command1);
@ -416,7 +416,7 @@ namespace CalculatorFunctionalTests
Cleanup(); Cleanup();
} }
void RadixAutomationName(unsigned int windowId = 0) void RadixAutomationName()
{ {
Initialize(); Initialize();
m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::ModeProgrammer); m_standardViewModel->m_standardCalculatorManager.SendCommand(Command::ModeProgrammer);
@ -437,7 +437,7 @@ namespace CalculatorFunctionalTests
Cleanup(); Cleanup();
} }
void HistoryEmpty(unsigned int windowId = 0) void HistoryEmpty()
{ {
Initialize(); Initialize();
VERIFY_ARE_EQUAL(0, m_historyViewModel->ItemSize); VERIFY_ARE_EQUAL(0, m_historyViewModel->ItemSize);
@ -446,7 +446,7 @@ namespace CalculatorFunctionalTests
Cleanup(); Cleanup();
} }
void HistoryClearCommandWithEmptyHistory(unsigned int windowId = 0) void HistoryClearCommandWithEmptyHistory()
{ {
Initialize(); Initialize();
VERIFY_ARE_EQUAL(0, m_historyViewModel->ItemSize); VERIFY_ARE_EQUAL(0, m_historyViewModel->ItemSize);