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

Clang-format most of the sources (#1467)

Browse source
This commit is contained in:
Michał Janiszewski 2021-05-10 19:18:39 +02:00 • committed by GitHub
parent f7d0118064
commit f30e9494ce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
54 changed files with 826 additions and 896 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/CalcManager/CEngine/Rational.cpp
View file

@ -52,8 +52,8 @@ namespace CalcEngine
Rational::Rational(uint64_t ui) Rational::Rational(uint64_t ui)
{ {
uint32_t hi = (uint32_t) (((ui) >> 32) & 0xffffffff); uint32_t hi = (uint32_t)(((ui) >> 32) & 0xffffffff);
uint32_t lo = (uint32_t) ui; uint32_t lo = (uint32_t)ui;
Rational temp = (Rational{ hi } << 32) | lo; Rational temp = (Rational{ hi } << 32) | lo;

43
src/CalcManager/CEngine/scicomm.cpp
View file

@ -31,13 +31,8 @@ namespace
// 0 is returned. Higher the number, higher the precedence of the operator. // 0 is returned. Higher the number, higher the precedence of the operator.
int NPrecedenceOfOp(int nopCode) int NPrecedenceOfOp(int nopCode)
{ {
static uint16_t rgbPrec[] = { static uint16_t rgbPrec[] = { 0, 0, IDC_OR, 0, IDC_XOR, 0, IDC_AND, 1, IDC_NAND, 1, IDC_NOR, 1, IDC_ADD, 2, IDC_SUB, 2, IDC_RSHF, 3,
0,0, IDC_OR,0, IDC_XOR,0, IDC_LSHF, 3, IDC_RSHFL, 3, IDC_MOD, 3, IDC_DIV, 3, IDC_MUL, 3, IDC_PWR, 4, IDC_ROOT, 4, IDC_LOGBASEY, 4 };
IDC_AND,1, IDC_NAND,1, IDC_NOR,1,
IDC_ADD,2, IDC_SUB,2,
IDC_RSHF,3, IDC_LSHF,3, IDC_RSHFL,3,
IDC_MOD,3, IDC_DIV,3, IDC_MUL,3,
IDC_PWR,4, IDC_ROOT,4, IDC_LOGBASEY,4 };
for (unsigned int iPrec = 0; iPrec < size(rgbPrec); iPrec += 2) for (unsigned int iPrec = 0; iPrec < size(rgbPrec); iPrec += 2)
{ {
@ -85,8 +80,7 @@ void CCalcEngine::ClearDisplay()
{ {
if (nullptr != m_pCalcDisplay) if (nullptr != m_pCalcDisplay)
{ {
m_pCalcDisplay->SetExpressionDisplay( m_pCalcDisplay->SetExpressionDisplay(make_shared<vector<pair<wstring, int>>>(), make_shared<vector<shared_ptr<IExpressionCommand>>>());
make_shared<vector<pair<wstring, int>>>(), make_shared<vector<shared_ptr<IExpressionCommand>>>());
} }
} }
@ -142,18 +136,10 @@ void CCalcEngine::ProcessCommandWorker(OpCode wParam)
// Toggle Record/Display mode if appropriate. // Toggle Record/Display mode if appropriate.
if (m_bRecord) if (m_bRecord)
{ {
if (IsBinOpCode(wParam) || if (IsBinOpCode(wParam) || IsUnaryOpCode(wParam) || IsOpInRange(wParam, IDC_FE, IDC_MMINUS) || IsOpInRange(wParam, IDC_OPENP, IDC_CLOSEP)
IsUnaryOpCode(wParam) || || IsOpInRange(wParam, IDM_HEX, IDM_BIN) || IsOpInRange(wParam, IDM_QWORD, IDM_BYTE) || IsOpInRange(wParam, IDM_DEG, IDM_GRAD)
IsOpInRange(wParam, IDC_FE, IDC_MMINUS) || || IsOpInRange(wParam, IDC_BINEDITSTART, IDC_BINEDITEND) || (IDC_INV == wParam) || (IDC_SIGN == wParam && 10 != m_radix) || (IDC_RAND == wParam)
IsOpInRange(wParam, IDC_OPENP, IDC_CLOSEP) || || (IDC_EULER == wParam))
IsOpInRange(wParam, IDM_HEX, IDM_BIN) ||
IsOpInRange(wParam, IDM_QWORD, IDM_BYTE) ||
IsOpInRange(wParam, IDM_DEG, IDM_GRAD) ||
IsOpInRange(wParam, IDC_BINEDITSTART, IDC_BINEDITEND) ||
(IDC_INV == wParam) ||
(IDC_SIGN == wParam && 10 != m_radix) ||
(IDC_RAND == wParam) ||
(IDC_EULER == wParam))
{ {
m_bRecord = false; m_bRecord = false;
m_currentVal = m_input.ToRational(m_radix, m_precision); m_currentVal = m_input.ToRational(m_radix, m_precision);
@ -269,7 +255,6 @@ void CCalcEngine::ProcessCommandWorker(OpCode wParam)
DisplayNum(); DisplayNum();
if (!m_fPrecedence) if (!m_fPrecedence)
{ {
wstring groupedString = GroupDigitsPerRadix(m_numberString, m_radix); wstring groupedString = GroupDigitsPerRadix(m_numberString, m_radix);
m_HistoryCollector.CompleteEquation(groupedString); m_HistoryCollector.CompleteEquation(groupedString);
m_HistoryCollector.AddOpndToHistory(m_numberString, m_currentVal); m_HistoryCollector.AddOpndToHistory(m_numberString, m_currentVal);
@ -360,13 +345,10 @@ void CCalcEngine::ProcessCommandWorker(OpCode wParam)
/* reset the m_bInv flag and indicators if it is set /* reset the m_bInv flag and indicators if it is set
and have been used */ and have been used */
if (m_bInv && if (m_bInv
((wParam == IDC_CHOP) || (wParam == IDC_SIN) || (wParam == IDC_COS) || && ((wParam == IDC_CHOP) || (wParam == IDC_SIN) || (wParam == IDC_COS) || (wParam == IDC_TAN) || (wParam == IDC_LN) || (wParam == IDC_DMS)
(wParam == IDC_TAN) || (wParam == IDC_LN) || (wParam == IDC_DMS) || || (wParam == IDC_DEGREES) || (wParam == IDC_SINH) || (wParam == IDC_COSH) || (wParam == IDC_TANH) || (wParam == IDC_SEC) || (wParam == IDC_CSC)
(wParam == IDC_DEGREES) || (wParam == IDC_SINH) || (wParam == IDC_COSH) || || (wParam == IDC_COT) || (wParam == IDC_SECH) || (wParam == IDC_CSCH) || (wParam == IDC_COTH)))
(wParam == IDC_TANH) || (wParam == IDC_SEC) || (wParam == IDC_CSC) ||
(wParam == IDC_COT) || (wParam == IDC_SECH) || (wParam == IDC_CSCH) ||
(wParam == IDC_COTH)))
{ {
m_bInv = false; m_bInv = false;
} }
@ -928,8 +910,7 @@ struct FunctionNameElement
}; };
// Table for each unary operator // Table for each unary operator
static const std::unordered_map<int, FunctionNameElement> operatorStringTable = static const std::unordered_map<int, FunctionNameElement> operatorStringTable = {
{
{ IDC_CHOP, { L"", SIDS_FRAC } }, { IDC_CHOP, { L"", SIDS_FRAC } },
{ IDC_SIN, { SIDS_SIND, SIDS_ASIND, SIDS_SINR, SIDS_ASINR, SIDS_SING, SIDS_ASING } }, { IDC_SIN, { SIDS_SIND, SIDS_ASIND, SIDS_SINR, SIDS_ASINR, SIDS_SING, SIDS_ASING } },

6
src/CalcManager/CEngine/scifunc.cpp
View file

@ -55,7 +55,7 @@ CalcEngine::Rational CCalcEngine::SciCalcFunctions(CalcEngine::Rational const& r
uint64_t w64Bits = result.ToUInt64_t(); uint64_t w64Bits = result.ToUInt64_t();
uint64_t msb = (w64Bits >> (m_dwWordBitWidth - 1)) & 1; uint64_t msb = (w64Bits >> (m_dwWordBitWidth - 1)) & 1;
w64Bits <<= 1; // LShift by 1 w64Bits <<= 1; // LShift by 1
if (op == IDC_ROL) if (op == IDC_ROL)
{ {
@ -64,7 +64,7 @@ CalcEngine::Rational CCalcEngine::SciCalcFunctions(CalcEngine::Rational const& r
else else
{ {
w64Bits |= m_carryBit; // Set the carry bit as the LSB w64Bits |= m_carryBit; // Set the carry bit as the LSB
m_carryBit = msb; // Store the msb as the next carry bit m_carryBit = msb; // Store the msb as the next carry bit
} }
result = w64Bits; result = w64Bits;
@ -272,7 +272,7 @@ CalcEngine::Rational CCalcEngine::SciCalcFunctions(CalcEngine::Rational const& r
break; break;
case IDC_FLOOR: case IDC_FLOOR:
result = (Frac(rat) < 0) ? Integer(rat - 1 ) : Integer(rat); result = (Frac(rat) < 0) ? Integer(rat - 1) : Integer(rat);
break; break;
case IDC_ABS: case IDC_ABS:

5
src/CalcManager/CalculatorVector.h
View file

@ -7,8 +7,8 @@
#include <vector> #include <vector>
#include "winerror_cross_platform.h" #include "winerror_cross_platform.h"
#include "Ratpack/CalcErr.h" #include "Ratpack/CalcErr.h"
#include <stdexcept> // for std::out_of_range #include <stdexcept> // for std::out_of_range
#include "sal_cross_platform.h" // for SAL #include "sal_cross_platform.h" // for SAL
template <typename TType> template <typename TType>
class CalculatorVector class CalculatorVector
@ -118,7 +118,6 @@ public:
ResultCode hr = this->GetSize(&nTokens); ResultCode hr = this->GetSize(&nTokens);
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
{ {
std::pair<std::wstring, int> currentPair; std::pair<std::wstring, int> currentPair;
for (unsigned int i = 0; i < nTokens; i++) for (unsigned int i = 0; i < nTokens; i++)
{ {

2
src/CalcManager/Command.h
View file

@ -162,7 +162,7 @@ namespace CalculationManager
CommandCOTH = 410, CommandCOTH = 410,
CommandACOTH = 411, CommandACOTH = 411,
CommandPOW2 = 412, // 2 ^ x CommandPOW2 = 412, // 2 ^ x
CommandAbs = 413, CommandAbs = 413,
CommandFloor = 414, CommandFloor = 414,
CommandCeil = 415, CommandCeil = 415,

44
src/CalcManager/Header Files/CCommand.h
View file

@ -137,44 +137,44 @@
#define IDC_INV 146 #define IDC_INV 146
#define IDC_SET_RESULT 147 #define IDC_SET_RESULT 147
#define IDC_STRING_MAPPED_VALUES 400 #define IDC_STRING_MAPPED_VALUES 400
#define IDC_UNARYEXTENDEDFIRST IDC_STRING_MAPPED_VALUES #define IDC_UNARYEXTENDEDFIRST IDC_STRING_MAPPED_VALUES
#define IDC_SEC 400 // Secant #define IDC_SEC 400 // Secant
// 401 reserved for inverse // 401 reserved for inverse
#define IDC_CSC 402 // Cosecant #define IDC_CSC 402 // Cosecant
// 403 reserved for inverse // 403 reserved for inverse
#define IDC_COT 404 // Cotangent #define IDC_COT 404 // Cotangent
// 405 reserved for inverse // 405 reserved for inverse
#define IDC_SECH 406 //Hyperbolic Secant #define IDC_SECH 406 // Hyperbolic Secant
// 407 reserved for inverse // 407 reserved for inverse
#define IDC_CSCH 408 //Hyperbolic Cosecant #define IDC_CSCH 408 // Hyperbolic Cosecant
// 409 reserved for inverse // 409 reserved for inverse
#define IDC_COTH 410 //Hyperbolic Cotangent #define IDC_COTH 410 // Hyperbolic Cotangent
// 411 reserved for inverse // 411 reserved for inverse
#define IDC_POW2 412 // 2 ^ x #define IDC_POW2 412 // 2 ^ x
#define IDC_ABS 413 // Absolute Value #define IDC_ABS 413 // Absolute Value
#define IDC_FLOOR 414 // Floor #define IDC_FLOOR 414 // Floor
#define IDC_CEIL 415 // Ceiling #define IDC_CEIL 415 // Ceiling
#define IDC_ROLC 416 // Rotate Left Circular #define IDC_ROLC 416 // Rotate Left Circular
#define IDC_RORC 417 // Rotate Right Circular #define IDC_RORC 417 // Rotate Right Circular
#define IDC_UNARYEXTENDEDLAST IDC_RORC #define IDC_UNARYEXTENDEDLAST IDC_RORC
#define IDC_LASTCONTROL IDC_CEIL #define IDC_LASTCONTROL IDC_CEIL
#define IDC_BINARYEXTENDEDFIRST 500 #define IDC_BINARYEXTENDEDFIRST 500
#define IDC_LOGBASEY 500 // logy(x) #define IDC_LOGBASEY 500 // logy(x)
#define IDC_NAND 501 // Nand #define IDC_NAND 501 // Nand
#define IDC_NOR 502 // Nor #define IDC_NOR 502 // Nor
#define IDC_RSHFL 505 //Right Shift Logical #define IDC_RSHFL 505 // Right Shift Logical
#define IDC_BINARYEXTENDEDLAST IDC_RSHFL #define IDC_BINARYEXTENDEDLAST IDC_RSHFL
#define IDC_RAND 600 // Random #define IDC_RAND 600 // Random
#define IDC_EULER 601 // e Constant #define IDC_EULER 601 // e Constant
#define IDC_BINEDITSTART 700 #define IDC_BINEDITSTART 700
#define IDC_BINPOS0 700 #define IDC_BINPOS0 700

8
src/CalcManager/Header Files/CalcEngine.h
View file

@ -120,7 +120,7 @@ private:
bool m_bRecord; // Global mode: recording or displaying bool m_bRecord; // Global mode: recording or displaying
bool m_bSetCalcState; // Flag for setting the engine result state bool m_bSetCalcState; // Flag for setting the engine result state
CalcEngine::CalcInput m_input; // Global calc input object for decimal strings CalcEngine::CalcInput m_input; // Global calc input object for decimal strings
NumberFormat m_nFE; // Scientific notation conversion flag NumberFormat m_nFE; // Scientific notation conversion flag
CalcEngine::Rational m_maxTrigonometricNum; CalcEngine::Rational m_maxTrigonometricNum;
std::unique_ptr<CalcEngine::Rational> m_memoryValue; // Current memory value. std::unique_ptr<CalcEngine::Rational> m_memoryValue; // Current memory value.
@ -147,7 +147,7 @@ private:
std::array<int, MAXPRECDEPTH> m_nPrecOp; /* Holding array for precedence operations. */ std::array<int, MAXPRECDEPTH> m_nPrecOp; /* Holding array for precedence operations. */
size_t m_precedenceOpCount; /* Current number of precedence ops in holding. */ size_t m_precedenceOpCount; /* Current number of precedence ops in holding. */
int m_nLastCom; // Last command entered. int m_nLastCom; // Last command entered.
AngleType m_angletype; // Current Angle type when in dec mode. one of deg, rad or grad AngleType m_angletype; // Current Angle type when in dec mode. one of deg, rad or grad
NUM_WIDTH m_numwidth; // one of qword, dword, word or byte mode. NUM_WIDTH m_numwidth; // one of qword, dword, word or byte mode.
int32_t m_dwWordBitWidth; // # of bits in currently selected word size int32_t m_dwWordBitWidth; // # of bits in currently selected word size
@ -158,8 +158,8 @@ private:
CHistoryCollector m_HistoryCollector; // Accumulator of each line of history as various commands are processed CHistoryCollector m_HistoryCollector; // Accumulator of each line of history as various commands are processed
std::array<CalcEngine::Rational, NUM_WIDTH_LENGTH> m_chopNumbers; // word size enforcement std::array<CalcEngine::Rational, NUM_WIDTH_LENGTH> m_chopNumbers; // word size enforcement
std::array<std::wstring, NUM_WIDTH_LENGTH> m_maxDecimalValueStrings; // maximum values represented by a given word width based off m_chopNumbers std::array<std::wstring, NUM_WIDTH_LENGTH> m_maxDecimalValueStrings; // maximum values represented by a given word width based off m_chopNumbers
static std::unordered_map<std::wstring_view, std::wstring> s_engineStrings; // the string table shared across all instances static std::unordered_map<std::wstring_view, std::wstring> s_engineStrings; // the string table shared across all instances
wchar_t m_decimalSeparator; wchar_t m_decimalSeparator;
wchar_t m_groupSeparator; wchar_t m_groupSeparator;

3
src/CalcManager/Header Files/EngineStrings.h
View file

@ -206,8 +206,7 @@ inline constexpr auto SIDS_CUBEROOT = L"CubeRoot";
inline constexpr auto SIDS_PROGRAMMER_MOD = L"ProgrammerMod"; inline constexpr auto SIDS_PROGRAMMER_MOD = L"ProgrammerMod";
// Include the resource key ID from above into this vector to load it into memory for the engine to use // Include the resource key ID from above into this vector to load it into memory for the engine to use
inline constexpr std::array<std::wstring_view, 152> g_sids = inline constexpr std::array<std::wstring_view, 152> g_sids = {
{
SIDS_PLUS_MINUS, SIDS_PLUS_MINUS,
SIDS_C, SIDS_C,
SIDS_CE, SIDS_CE,

4
src/CalcManager/Ratpack/ratpak.h
View file

@ -20,8 +20,8 @@
#include <algorithm> #include <algorithm>
#include <string> #include <string>
#include "CalcErr.h" #include "CalcErr.h"
#include <cstring> // for memmove #include <cstring> // for memmove
#include "sal_cross_platform.h" // for SAL #include "sal_cross_platform.h" // for SAL
static constexpr uint32_t BASEXPWR = 31L; // Internal log2(BASEX) static constexpr uint32_t BASEXPWR = 31L; // Internal log2(BASEX)
static constexpr uint32_t BASEX = 0x80000000; // Internal radix used in calculations, hope to raise static constexpr uint32_t BASEX = 0x80000000; // Internal radix used in calculations, hope to raise

3
src/CalcManager/UnitConverter.h
View file

@ -162,8 +162,7 @@ namespace UnitConversionManager
std::unordered_map<UnitConversionManager::Unit, UnitConversionManager::ConversionData, UnitConversionManager::UnitHash>, std::unordered_map<UnitConversionManager::Unit, UnitConversionManager::ConversionData, UnitConversionManager::UnitHash>,
UnitConversionManager::UnitHash> UnitConversionManager::UnitHash>
UnitToUnitToConversionDataMap; UnitToUnitToConversionDataMap;
typedef std::unordered_map<int, std::vector<UnitConversionManager::Unit>> typedef std::unordered_map<int, std::vector<UnitConversionManager::Unit>> CategoryToUnitVectorMap;
CategoryToUnitVectorMap;
class IViewModelCurrencyCallback class IViewModelCurrencyCallback
{ {

2
src/CalcManager/winerror_cross_platform.h
View file

@ -20,6 +20,6 @@
#define SUCCEEDED(hr) (((ResultCode)(hr)) >= 0) #define SUCCEEDED(hr) (((ResultCode)(hr)) >= 0)
#define FAILED(hr) (((ResultCode)(hr)) < 0) #define FAILED(hr) (((ResultCode)(hr)) < 0)
#define SCODE_CODE(sc) ((sc) & 0xFFFF) #define SCODE_CODE(sc) ((sc)&0xFFFF)
#endif #endif

2
src/CalcViewModel/ApplicationViewModel.cpp
View file

@ -43,7 +43,7 @@ namespace
ApplicationViewModel::ApplicationViewModel() ApplicationViewModel::ApplicationViewModel()
: m_CalculatorViewModel(nullptr) : m_CalculatorViewModel(nullptr)
, m_DateCalcViewModel(nullptr) , m_DateCalcViewModel(nullptr)
, m_GraphingCalcViewModel(nullptr) , m_GraphingCalcViewModel(nullptr)
, m_ConverterViewModel(nullptr) , m_ConverterViewModel(nullptr)
, m_PreviousMode(ViewMode::None) , m_PreviousMode(ViewMode::None)
, m_mode(ViewMode::None) , m_mode(ViewMode::None)

1
src/CalcViewModel/Common/Automation/NarratorAnnouncement.h
View file

@ -77,6 +77,5 @@ public
static NarratorAnnouncement ^ GetAlwaysOnTopChangedAnnouncement(Platform::String ^ announcement); static NarratorAnnouncement ^ GetAlwaysOnTopChangedAnnouncement(Platform::String ^ announcement);
static NarratorAnnouncement ^ GetBitShiftRadioButtonCheckedAnnouncement(Platform::String ^ announcement); static NarratorAnnouncement ^ GetBitShiftRadioButtonCheckedAnnouncement(Platform::String ^ announcement);
}; };
} }

46
src/CalcViewModel/Common/CalculatorButtonUser.h
View file

@ -94,29 +94,29 @@ public
Byte = (int)CM::Command::CommandByte, Byte = (int)CM::Command::CommandByte,
Cube = (int)CM::Command::CommandCUB, Cube = (int)CM::Command::CommandCUB,
DMS = (int)CM::Command::CommandDMS, DMS = (int)CM::Command::CommandDMS,
Hyp = (int) CM::Command::CommandHYP, Hyp = (int)CM::Command::CommandHYP,
Sec = (int) CM::Command::CommandSEC, Sec = (int)CM::Command::CommandSEC,
Csc = (int) CM::Command::CommandCSC, Csc = (int)CM::Command::CommandCSC,
Cot = (int) CM::Command::CommandCOT, Cot = (int)CM::Command::CommandCOT,
InvSec = (int) CM::Command::CommandASEC, InvSec = (int)CM::Command::CommandASEC,
InvCsc = (int) CM::Command::CommandACSC, InvCsc = (int)CM::Command::CommandACSC,
InvCot = (int) CM::Command::CommandACOT, InvCot = (int)CM::Command::CommandACOT,
Sech = (int) CM::Command::CommandSECH, Sech = (int)CM::Command::CommandSECH,
Csch = (int) CM::Command::CommandCSCH, Csch = (int)CM::Command::CommandCSCH,
Coth = (int) CM::Command::CommandCOTH, Coth = (int)CM::Command::CommandCOTH,
InvSech = (int) CM::Command::CommandASECH, InvSech = (int)CM::Command::CommandASECH,
InvCsch = (int) CM::Command::CommandACSCH, InvCsch = (int)CM::Command::CommandACSCH,
InvCoth = (int) CM::Command::CommandACOTH, InvCoth = (int)CM::Command::CommandACOTH,
CubeRoot = (int) CM::Command::CommandCUBEROOT, CubeRoot = (int)CM::Command::CommandCUBEROOT,
TwoPowerX = (int) CM::Command::CommandPOW2, TwoPowerX = (int)CM::Command::CommandPOW2,
LogBaseY = (int) CM::Command::CommandLogBaseY, LogBaseY = (int)CM::Command::CommandLogBaseY,
Nand = (int) CM::Command::CommandNand, Nand = (int)CM::Command::CommandNand,
Nor = (int) CM::Command::CommandNor, Nor = (int)CM::Command::CommandNor,
Abs = (int) CM::Command::CommandAbs, Abs = (int)CM::Command::CommandAbs,
Floor = (int) CM::Command::CommandFloor, Floor = (int)CM::Command::CommandFloor,
Ceil = (int) CM::Command::CommandCeil, Ceil = (int)CM::Command::CommandCeil,
Rand = (int) CM::Command::CommandRand, Rand = (int)CM::Command::CommandRand,
Euler = (int) CM::Command::CommandEuler, Euler = (int)CM::Command::CommandEuler,
RshL = (int)CM::Command::CommandRSHFL, RshL = (int)CM::Command::CommandRSHFL,
RolC = (int)CM::Command::CommandROLC, RolC = (int)CM::Command::CommandROLC,
RorC = (int)CM::Command::CommandRORC, RorC = (int)CM::Command::CommandRORC,

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

@ -118,7 +118,7 @@ public
Platform::String ^ operand, Platform::String ^ operand,
CalculatorApp::Common::ViewMode mode, CalculatorApp::Common::ViewMode mode,
CalculatorApp::Common::CategoryGroupType modeType, CalculatorApp::Common::CategoryGroupType modeType,
CalculatorApp::Common::NumberBase programmerNumberBase); CalculatorApp::Common::NumberBase programmerNumberBase);
static ULONG32 ProgrammerOperandLength(Platform::String ^ operand, CalculatorApp::Common::NumberBase numberBase); static ULONG32 ProgrammerOperandLength(Platform::String ^ operand, CalculatorApp::Common::NumberBase numberBase);
private: private:

2
src/CalcViewModel/Common/LocalizationService.cpp
View file

@ -62,7 +62,7 @@ LocalizationService ^ LocalizationService::GetInstance()
/// <remarks> /// <remarks>
/// Should only be used for test purpose /// Should only be used for test purpose
/// </remarks> /// </remarks>
void LocalizationService::OverrideWithLanguage(_In_ const wchar_t * const language) void LocalizationService::OverrideWithLanguage(_In_ const wchar_t* const language)
{ {
s_singletonInstance = ref new LocalizationService(language); s_singletonInstance = ref new LocalizationService(language);
} }

7
src/CalcViewModel/Common/NavCategory.cpp
View file

@ -295,7 +295,7 @@ void NavCategory::InitializeCategoryManifest(User ^ user)
i++; i++;
} }
} }
} }
// This function should only be used when storing the mode to app data. // This function should only be used when storing the mode to app data.
int NavCategory::Serialize(ViewMode mode) int NavCategory::Serialize(ViewMode mode)
@ -347,8 +347,9 @@ bool NavCategory::IsValidViewMode(ViewMode mode)
bool NavCategory::IsViewModeEnabled(ViewMode mode) bool NavCategory::IsViewModeEnabled(ViewMode mode)
{ {
auto iter = auto iter = find_if(begin(s_categoryManifest), end(s_categoryManifest), [mode](const NavCategoryInitializer& initializer) {
find_if(begin(s_categoryManifest), end(s_categoryManifest), [mode](const NavCategoryInitializer& initializer) { return initializer.viewMode == mode && initializer.isEnabled; }); return initializer.viewMode == mode && initializer.isEnabled;
});
return iter != s_categoryManifest.end(); return iter != s_categoryManifest.end();
} }

1
src/CalcViewModel/Common/Utils.h
View file

@ -241,7 +241,6 @@ namespace Utils
}; };
} }
// Regular DependencyProperty // Regular DependencyProperty
template <typename TOwner, typename TType> template <typename TOwner, typename TType>
Windows::UI::Xaml::DependencyProperty^ RegisterDependencyProperty( Windows::UI::Xaml::DependencyProperty^ RegisterDependencyProperty(

2
src/CalcViewModel/DataLoaders/CurrencyDataLoader.cpp
View file

@ -89,7 +89,7 @@ namespace CalculatorApp
} }
} }
CurrencyDataLoader::CurrencyDataLoader(_In_ unique_ptr<ICurrencyHttpClient> client, const wchar_t * forcedResponseLanguage) CurrencyDataLoader::CurrencyDataLoader(_In_ unique_ptr<ICurrencyHttpClient> client, const wchar_t* forcedResponseLanguage)
: m_client(move(client)) : m_client(move(client))
, m_loadStatus(CurrencyLoadStatus::NotLoaded) , m_loadStatus(CurrencyLoadStatus::NotLoaded)
, m_responseLanguage(L"en-US") , m_responseLanguage(L"en-US")

3
src/Calculator/App.xaml.cpp
View file

@ -437,6 +437,3 @@ void App::DismissedEventHandler(SplashScreen ^ sender, Object ^ e)
{ {
SetupJumpList(); SetupJumpList();
} }

6
src/Calculator/Common/AppLifecycleLogger.cpp
View file

@ -18,10 +18,10 @@ namespace CalculatorApp
#ifdef SEND_DIAGNOSTICS #ifdef SEND_DIAGNOSTICS
// c.f. WINEVENT_KEYWORD_RESERVED_63-56 0xFF00000000000000 // Bits 63-56 - channel keywords // c.f. WINEVENT_KEYWORD_RESERVED_63-56 0xFF00000000000000 // Bits 63-56 - channel keywords
// c.f. WINEVENT_KEYWORD_* 0x00FF000000000000 // Bits 55-48 - system-reserved keywords // c.f. WINEVENT_KEYWORD_* 0x00FF000000000000 // Bits 55-48 - system-reserved keywords
constexpr int64_t MICROSOFT_KEYWORD_LEVEL_1 = 0x0000800000000000; // Bit 47 constexpr int64_t MICROSOFT_KEYWORD_LEVEL_1 = 0x0000800000000000; // Bit 47
constexpr int64_t MICROSOFT_KEYWORD_LEVEL_2 = 0x0000400000000000; // Bit 46 constexpr int64_t MICROSOFT_KEYWORD_LEVEL_2 = 0x0000400000000000; // Bit 46
constexpr int64_t MICROSOFT_KEYWORD_LEVEL_3 = 0x0000200000000000; // Bit 45 constexpr int64_t MICROSOFT_KEYWORD_LEVEL_3 = 0x0000200000000000; // Bit 45
constexpr int64_t MICROSOFT_KEYWORD_RESERVED_44 = 0x0000100000000000; // Bit 44 (reserved for future assignment) constexpr int64_t MICROSOFT_KEYWORD_RESERVED_44 = 0x0000100000000000; // Bit 44 (reserved for future assignment)
#else #else
// define all Keyword options as 0 when we do not want to upload app diagnostics // define all Keyword options as 0 when we do not want to upload app diagnostics
constexpr int64_t MICROSOFT_KEYWORD_LEVEL_1 = 0; constexpr int64_t MICROSOFT_KEYWORD_LEVEL_1 = 0;

3
src/Calculator/Common/KeyboardShortcutManager.cpp
View file

@ -528,7 +528,8 @@ void KeyboardShortcutManager::OnAcceleratorKeyActivated(CoreDispatcher ^, Accele
return; return;
} }
const bool controlKeyPressed = (Window::Current->CoreWindow->GetKeyState(VirtualKey::Control) & CoreVirtualKeyStates::Down) == CoreVirtualKeyStates::Down; const bool controlKeyPressed =
(Window::Current->CoreWindow->GetKeyState(VirtualKey::Control) & CoreVirtualKeyStates::Down) == CoreVirtualKeyStates::Down;
// Ctrl is pressed in addition to alt, this means Alt Gr is intended. do not navigate. // Ctrl is pressed in addition to alt, this means Alt Gr is intended. do not navigate.
if (controlKeyPressed) if (controlKeyPressed)
{ {

2
src/Calculator/Views/MainPage.xaml.h
View file

@ -81,7 +81,7 @@ public
void AnnounceCategoryName(); void AnnounceCategoryName();
CalculatorApp::Calculator ^ m_calculator; CalculatorApp::Calculator ^ m_calculator;
GraphingCalculator^ m_graphingCalculator; GraphingCalculator ^ m_graphingCalculator;
CalculatorApp::UnitConverter ^ m_converter; CalculatorApp::UnitConverter ^ m_converter;
CalculatorApp::DateCalculator ^ m_dateCalculator; CalculatorApp::DateCalculator ^ m_dateCalculator;
Windows::Foundation::EventRegistrationToken m_windowSizeEventToken; Windows::Foundation::EventRegistrationToken m_windowSizeEventToken;

222
src/CalculatorUnitTests/CalculatorManagerTest.cpp
View file

@ -718,24 +718,26 @@ namespace CalculatorManagerTest
void CalculatorManagerTest::CalculatorManagerTestProgrammer() void CalculatorManagerTest::CalculatorManagerTestProgrammer()
{ {
Command commands1[] = { Command::ModeProgrammer, Command::Command5, Command::Command3, Command::CommandNand, Command commands1[] = { Command::ModeProgrammer, Command::Command5, Command::Command3, Command::CommandNand,
Command::Command8, Command::Command3, Command::CommandAnd, Command::CommandNULL }; Command::Command8, Command::Command3, Command::CommandAnd, Command::CommandNULL };
TestDriver::Test(L"-18", L"53 NAND 83 AND ", commands1, true, false); TestDriver::Test(L"-18", L"53 NAND 83 AND ", commands1, true, false);
Command commands2[] = { Command::ModeProgrammer, Command::Command5, Command::Command3, Command::CommandNor, Command commands2[] = { Command::ModeProgrammer, Command::Command5, Command::Command3, Command::CommandNor,
Command::Command8, Command::Command3, Command::CommandAnd, Command::CommandNULL }; Command::Command8, Command::Command3, Command::CommandAnd, Command::CommandNULL };
TestDriver::Test(L"-120", L"53 NOR 83 AND ", commands2, true, false); TestDriver::Test(L"-120", L"53 NOR 83 AND ", commands2, true, false);
Command commands3[] = { Command::ModeProgrammer, Command::Command5, Command::CommandLSHF, Command commands3[] = {
Command::Command1, Command::CommandAnd, Command::CommandNULL }; Command::ModeProgrammer, Command::Command5, Command::CommandLSHF, Command::Command1, Command::CommandAnd, Command::CommandNULL
};
TestDriver::Test(L"10", L"5 Lsh 1 AND ", commands3, true, false); TestDriver::Test(L"10", L"5 Lsh 1 AND ", commands3, true, false);
Command commands5[] = { Command::ModeProgrammer, Command::Command5, Command::CommandRSHFL, Command commands5[] = {
Command::Command1, Command::CommandAnd, Command::CommandNULL }; Command::ModeProgrammer, Command::Command5, Command::CommandRSHFL, Command::Command1, Command::CommandAnd, Command::CommandNULL
};
TestDriver::Test(L"2", L"5 Rsh 1 AND ", commands5, true, false); TestDriver::Test(L"2", L"5 Rsh 1 AND ", commands5, true, false);
Command commands6[] = { Command::ModeProgrammer, Command::CommandBINPOS63, Command::CommandRSHF, Command commands6[] = { Command::ModeProgrammer, Command::CommandBINPOS63, Command::CommandRSHF, Command::Command5,
Command::Command5, Command::Command6, Command::CommandAnd, Command::CommandNULL }; Command::Command6, Command::CommandAnd, Command::CommandNULL };
TestDriver::Test(L"-128", L"-9223372036854775808 Rsh 56 AND ", commands6, true, false); TestDriver::Test(L"-128", L"-9223372036854775808 Rsh 56 AND ", commands6, true, false);
Command commands7[] = { Command::ModeProgrammer, Command::Command1, Command::CommandROL, Command::CommandNULL }; Command commands7[] = { Command::ModeProgrammer, Command::Command1, Command::CommandROL, Command::CommandNULL };
@ -1014,147 +1016,139 @@ namespace CalculatorManagerTest
VERIFY_ARE_EQUAL(result, L"-3.432432e-09"); VERIFY_ARE_EQUAL(result, L"-3.432432e-09");
} }
void CalculatorManagerTest::CalculatorManagerTestBinaryOperatorReceived() void CalculatorManagerTest::CalculatorManagerTestBinaryOperatorReceived()
{ {
CalculatorManagerDisplayTester* pCalculatorDisplay = (CalculatorManagerDisplayTester *)m_calculatorDisplayTester.get(); CalculatorManagerDisplayTester* pCalculatorDisplay = (CalculatorManagerDisplayTester*)m_calculatorDisplayTester.get();
VERIFY_ARE_EQUAL(0, pCalculatorDisplay->GetBinaryOperatorReceivedCallCount()); VERIFY_ARE_EQUAL(0, pCalculatorDisplay->GetBinaryOperatorReceivedCallCount());
m_calculatorManager->SetStandardMode(); m_calculatorManager->SetStandardMode();
ExecuteCommands({ ExecuteCommands({ Command::Command1, Command::CommandADD });
Command::Command1,
Command::CommandADD
});
wstring display = pCalculatorDisplay->GetPrimaryDisplay(); wstring display = pCalculatorDisplay->GetPrimaryDisplay();
VERIFY_ARE_EQUAL(L"1", display); VERIFY_ARE_EQUAL(L"1", display);
// Verify BinaryOperatorReceived // Verify BinaryOperatorReceived
VERIFY_ARE_EQUAL(1, pCalculatorDisplay->GetBinaryOperatorReceivedCallCount()); VERIFY_ARE_EQUAL(1, pCalculatorDisplay->GetBinaryOperatorReceivedCallCount());
} }
void CalculatorManagerTest::CalculatorManagerTestBinaryOperatorReceived_Multiple() void CalculatorManagerTest::CalculatorManagerTestBinaryOperatorReceived_Multiple()
{ {
CalculatorManagerDisplayTester* pCalculatorDisplay = (CalculatorManagerDisplayTester *)m_calculatorDisplayTester.get(); CalculatorManagerDisplayTester* pCalculatorDisplay = (CalculatorManagerDisplayTester*)m_calculatorDisplayTester.get();
VERIFY_ARE_EQUAL(0, pCalculatorDisplay->GetBinaryOperatorReceivedCallCount()); VERIFY_ARE_EQUAL(0, pCalculatorDisplay->GetBinaryOperatorReceivedCallCount());
m_calculatorManager->SetStandardMode(); m_calculatorManager->SetStandardMode();
ExecuteCommands({ ExecuteCommands({ Command::Command1, Command::CommandADD, Command::CommandSUB, Command::CommandMUL });
Command::Command1,
Command::CommandADD,
Command::CommandSUB,
Command::CommandMUL
});
wstring display = pCalculatorDisplay->GetPrimaryDisplay(); wstring display = pCalculatorDisplay->GetPrimaryDisplay();
VERIFY_ARE_EQUAL(L"1", display); VERIFY_ARE_EQUAL(L"1", display);
// Verify BinaryOperatorReceived // Verify BinaryOperatorReceived
VERIFY_ARE_EQUAL(3, pCalculatorDisplay->GetBinaryOperatorReceivedCallCount()); VERIFY_ARE_EQUAL(3, pCalculatorDisplay->GetBinaryOperatorReceivedCallCount());
} }
void CalculatorManagerTest::CalculatorManagerTestBinaryOperatorReceived_LongInput() void CalculatorManagerTest::CalculatorManagerTestBinaryOperatorReceived_LongInput()
{ {
CalculatorManagerDisplayTester* pCalculatorDisplay = (CalculatorManagerDisplayTester *)m_calculatorDisplayTester.get(); CalculatorManagerDisplayTester* pCalculatorDisplay = (CalculatorManagerDisplayTester*)m_calculatorDisplayTester.get();
VERIFY_ARE_EQUAL(0, pCalculatorDisplay->GetBinaryOperatorReceivedCallCount()); VERIFY_ARE_EQUAL(0, pCalculatorDisplay->GetBinaryOperatorReceivedCallCount());
m_calculatorManager->SetStandardMode(); m_calculatorManager->SetStandardMode();
ExecuteCommands({ ExecuteCommands({ Command::Command1,
Command::Command1, Command::CommandADD,
Command::CommandADD, Command::Command2,
Command::Command2, Command::CommandMUL,
Command::CommandMUL, Command::Command1,
Command::Command1, Command::Command0,
Command::Command0, Command::CommandSUB,
Command::CommandSUB, Command::Command5,
Command::Command5, Command::CommandDIV,
Command::CommandDIV, Command::Command5,
Command::Command5, Command::CommandEQU });
Command::CommandEQU
});
wstring display = pCalculatorDisplay->GetPrimaryDisplay(); wstring display = pCalculatorDisplay->GetPrimaryDisplay();
VERIFY_ARE_EQUAL(L"5", display); VERIFY_ARE_EQUAL(L"5", display);
// Verify BinaryOperatorReceived // Verify BinaryOperatorReceived
VERIFY_ARE_EQUAL(4, pCalculatorDisplay->GetBinaryOperatorReceivedCallCount()); VERIFY_ARE_EQUAL(4, pCalculatorDisplay->GetBinaryOperatorReceivedCallCount());
} }
void CalculatorManagerTest::CalculatorManagerTestStandardOrderOfOperations() void CalculatorManagerTest::CalculatorManagerTestStandardOrderOfOperations()
{ {
Command commands1[] = { Command::Command1, Command::CommandREC, Command::CommandNULL }; Command commands1[] = { Command::Command1, Command::CommandREC, Command::CommandNULL };
TestDriver::Test(L"1", L"1/(1)", commands1); TestDriver::Test(L"1", L"1/(1)", commands1);
Command commands2[] = { Command::Command4, Command::CommandSQRT, Command::CommandNULL }; Command commands2[] = { Command::Command4, Command::CommandSQRT, Command::CommandNULL };
TestDriver::Test(L"2", L"\x221A(4)", commands2); TestDriver::Test(L"2", L"\x221A(4)", commands2);
Command commands3[] = { Command::Command1, Command::CommandADD, Command::Command4, Command::CommandSQRT, Command::CommandNULL }; Command commands3[] = { Command::Command1, Command::CommandADD, Command::Command4, Command::CommandSQRT, Command::CommandNULL };
TestDriver::Test(L"2", L"1 + \x221A(4)", commands3); TestDriver::Test(L"2", L"1 + \x221A(4)", commands3);
Command commands4[] = { Command::Command1, Command::CommandADD, Command::Command4, Command::CommandSQRT, Command::CommandSUB, Command::CommandNULL }; Command commands4[] = { Command::Command1, Command::CommandADD, Command::Command4, Command::CommandSQRT, Command::CommandSUB, Command::CommandNULL };
TestDriver::Test(L"3", L"3 - ", commands4); TestDriver::Test(L"3", L"3 - ", commands4);
Command commands5[] = { Command::Command2, Command::CommandMUL, Command::Command4, Command::CommandREC, Command::CommandNULL }; Command commands5[] = { Command::Command2, Command::CommandMUL, Command::Command4, Command::CommandREC, Command::CommandNULL };
TestDriver::Test(L"0.25", L"2 \x00D7 1/(4)", commands5); TestDriver::Test(L"0.25", L"2 \x00D7 1/(4)", commands5);
Command commands6[] = { Command::Command5, Command::CommandDIV, Command::Command6, Command::CommandPERCENT, Command::CommandNULL}; Command commands6[] = { Command::Command5, Command::CommandDIV, Command::Command6, Command::CommandPERCENT, Command::CommandNULL };
TestDriver::Test(L"0.06", L"5 \x00F7 0.06", commands6); TestDriver::Test(L"0.06", L"5 \x00F7 0.06", commands6);
Command commands7[] = { Command::Command4, Command::CommandSQRT, Command::CommandSUB, Command::CommandNULL }; Command commands7[] = { Command::Command4, Command::CommandSQRT, Command::CommandSUB, Command::CommandNULL };
TestDriver::Test(L"2", L"\x221A(4) - ", commands7); TestDriver::Test(L"2", L"\x221A(4) - ", commands7);
Command commands8[] = { Command::Command7, Command::CommandSQR, Command::CommandDIV, Command::CommandNULL }; Command commands8[] = { Command::Command7, Command::CommandSQR, Command::CommandDIV, Command::CommandNULL };
TestDriver::Test(L"49", L"sqr(7) \x00F7 ", commands8); TestDriver::Test(L"49", L"sqr(7) \x00F7 ", commands8);
Command commands9[] = { Command::Command8, Command::CommandSQR, Command::CommandSQRT, Command::CommandNULL }; Command commands9[] = { Command::Command8, Command::CommandSQR, Command::CommandSQRT, Command::CommandNULL };
TestDriver::Test(L"8", L"\x221A(sqr(8))", commands9); TestDriver::Test(L"8", L"\x221A(sqr(8))", commands9);
Command commands10[] = { Command::Command1, Command::Command0, Command::CommandADD, Command::Command2, Command::CommandSUB, Command::CommandNULL }; Command commands10[] = { Command::Command1, Command::Command0, Command::CommandADD, Command::Command2, Command::CommandSUB, Command::CommandNULL };
TestDriver::Test(L"12", L"12 - ", commands10); TestDriver::Test(L"12", L"12 - ", commands10);
Command commands11[] = { Command::Command3, Command::CommandMUL, Command::Command4, Command::CommandDIV, Command::CommandNULL }; Command commands11[] = { Command::Command3, Command::CommandMUL, Command::Command4, Command::CommandDIV, Command::CommandNULL };
TestDriver::Test(L"12", L"12 \x00F7 ", commands11); TestDriver::Test(L"12", L"12 \x00F7 ", commands11);
Command commands12[] = { Command::Command6, Command::CommandDIV, Command::Command3, Command::CommandSUB, Command::CommandADD, Command::CommandNULL }; Command commands12[] = { Command::Command6, Command::CommandDIV, Command::Command3, Command::CommandSUB, Command::CommandADD, Command::CommandNULL };
TestDriver::Test(L"2", L"2 + ", commands12); TestDriver::Test(L"2", L"2 + ", commands12);
Command commands13[] = { Command::Command7, Command::CommandSUB, Command::Command4, Command::CommandDIV, Command::CommandMUL, Command::CommandNULL }; Command commands13[] = { Command::Command7, Command::CommandSUB, Command::Command4, Command::CommandDIV, Command::CommandMUL, Command::CommandNULL };
TestDriver::Test(L"3", L"3 \x00D7 ", commands13); TestDriver::Test(L"3", L"3 \x00D7 ", commands13);
Command commands14[] = { Command::Command8, Command::CommandMUL, Command::Command2, Command::CommandADD, Command::CommandSQRT, Command::CommandNULL }; Command commands14[] = { Command::Command8, Command::CommandMUL, Command::Command2, Command::CommandADD, Command::CommandSQRT, Command::CommandNULL };
TestDriver::Test(L"4", L"16 + \x221A(16)", commands14); TestDriver::Test(L"4", L"16 + \x221A(16)", commands14);
Command commands15[] = { Command::Command9, Command::CommandADD, Command::Command0, Command::CommandMUL, Command::CommandSIGN, Command::CommandNULL }; Command commands15[] = { Command::Command9, Command::CommandADD, Command::Command0, Command::CommandMUL, Command::CommandSIGN, Command::CommandNULL };
TestDriver::Test(L"-9", L"9 \x00D7 negate(9)", commands15); TestDriver::Test(L"-9", L"9 \x00D7 negate(9)", commands15);
Command commands16[] = { Command::Command9, Command::CommandSIGN, Command::Command0, Command::CommandADD, Command::CommandMUL, Command::CommandNULL }; Command commands16[] = { Command::Command9, Command::CommandSIGN, Command::Command0, Command::CommandADD, Command::CommandMUL, Command::CommandNULL };
TestDriver::Test(L"-90", L"-90 \x00D7 ", commands16); TestDriver::Test(L"-90", L"-90 \x00D7 ", commands16);
Command commands17[] = { Command::Command1, Command::CommandADD, Command::Command2, Command::CommandEQU, Command::CommandNULL }; Command commands17[] = { Command::Command1, Command::CommandADD, Command::Command2, Command::CommandEQU, Command::CommandNULL };
TestDriver::Test(L"3", L"1 + 2=", commands17); TestDriver::Test(L"3", L"1 + 2=", commands17);
Command commands18[] = { Command::Command2, Command::Command0, Command::CommandMUL, Command::Command0, Command::Command2, Command::CommandEQU, Command::CommandNULL }; Command commands18[] = { Command::Command2, Command::Command0, Command::CommandMUL, Command::Command0,
TestDriver::Test(L"40", L"20 \x00D7 2=", commands18); Command::Command2, Command::CommandEQU, Command::CommandNULL };
TestDriver::Test(L"40", L"20 \x00D7 2=", commands18);
Command commands19[] = { Command::Command1, Command::CommandADD, Command::Command2, Command::CommandADD, Command::CommandBACK, Command::CommandNULL }; Command commands19[] = { Command::Command1, Command::CommandADD, Command::Command2, Command::CommandADD, Command::CommandBACK, Command::CommandNULL };
TestDriver::Test(L"3", L"3 + ", commands19); TestDriver::Test(L"3", L"3 + ", commands19);
Command commands20[] = { Command::Command1, Command::CommandADD, Command::Command2, Command::CommandADD, Command::CommandCLEAR, Command::CommandNULL }; Command commands20[] = { Command::Command1, Command::CommandADD, Command::Command2, Command::CommandADD, Command::CommandCLEAR, Command::CommandNULL };
TestDriver::Test(L"0", L"", commands20); TestDriver::Test(L"0", L"", commands20);
Command commands21[] = { Command::Command1, Command::CommandADD, Command::Command2, Command::CommandADD, Command::CommandCENTR, Command::CommandNULL }; Command commands21[] = { Command::Command1, Command::CommandADD, Command::Command2, Command::CommandADD, Command::CommandCENTR, Command::CommandNULL };
TestDriver::Test(L"0", L"3 + ", commands21); TestDriver::Test(L"0", L"3 + ", commands21);
Command commands22[] = { Command::Command1, Command::CommandADD, Command::Command2, Command::CommandCLEAR, Command::CommandNULL }; Command commands22[] = { Command::Command1, Command::CommandADD, Command::Command2, Command::CommandCLEAR, Command::CommandNULL };
TestDriver::Test(L"0", L"", commands22); TestDriver::Test(L"0", L"", commands22);
Command commands23[] = { Command::Command1, Command::CommandADD, Command::Command2, Command::CommandCENTR, Command::CommandNULL }; Command commands23[] = { Command::Command1, Command::CommandADD, Command::Command2, Command::CommandCENTR, Command::CommandNULL };
TestDriver::Test(L"0", L"1 + ", commands23); TestDriver::Test(L"0", L"1 + ", commands23);
Command commands24[] = { Command::Command1, Command::CommandMUL, Command::Command2, Command::CommandMUL, Command::Command3, Command::CommandMUL, Command::Command4, Command::CommandMUL, Command::Command5, Command::CommandMUL, Command::CommandNULL }; Command commands24[] = { Command::Command1, Command::CommandMUL, Command::Command2, Command::CommandMUL, Command::Command3, Command::CommandMUL,
TestDriver::Test(L"120", L"120 \x00D7 ", commands24); Command::Command4, Command::CommandMUL, Command::Command5, Command::CommandMUL, Command::CommandNULL };
} TestDriver::Test(L"120", L"120 \x00D7 ", commands24);
}
} /* namespace CalculationManagerUnitTests */ } /* namespace CalculationManagerUnitTests */

109
src/CalculatorUnitTests/CopyPasteManagerTest.cpp
View file

@ -73,21 +73,13 @@ namespace CalculatorUnitTests
} }
VERIFY_ARE_EQUAL( VERIFY_ARE_EQUAL(
m_CopyPasteManager->ValidatePasteExpression( m_CopyPasteManager->ValidatePasteExpression(
StringReference(exp_TooLong.c_str()), StringReference(exp_TooLong.c_str()), ViewMode::Standard, CategoryGroupType::Calculator, NumberBase::Unknown, BitLength::BitLengthUnknown),
ViewMode::Standard,
CategoryGroupType::Calculator,
NumberBase::Unknown,
BitLength::BitLengthUnknown),
StringReference(exp_TooLong.c_str()), StringReference(exp_TooLong.c_str()),
L"Verify ValidatePasteExpression handles expressions up to max length"); L"Verify ValidatePasteExpression handles expressions up to max length");
exp_TooLong += L"1"; exp_TooLong += L"1";
VERIFY_ARE_EQUAL( VERIFY_ARE_EQUAL(
m_CopyPasteManager->ValidatePasteExpression( m_CopyPasteManager->ValidatePasteExpression(
StringReference(exp_TooLong.c_str()), StringReference(exp_TooLong.c_str()), ViewMode::Standard, CategoryGroupType::Calculator, NumberBase::Unknown, BitLength::BitLengthUnknown),
ViewMode::Standard,
CategoryGroupType::Calculator,
NumberBase::Unknown,
BitLength::BitLengthUnknown),
StringReference(L"NoOp"), StringReference(L"NoOp"),
L"Verify ValidatePasteExpression returns NoOp for strings over max length"); L"Verify ValidatePasteExpression returns NoOp for strings over max length");
@ -333,8 +325,7 @@ namespace CalculatorUnitTests
0, 0,
L"Verify Scientific mode maximum values"); L"Verify Scientific mode maximum values");
VERIFY_MAXOPERANDLENGTHANDVALUE_ARE_EQUALS( VERIFY_MAXOPERANDLENGTHANDVALUE_ARE_EQUALS(
m_CopyPasteManager->GetMaxOperandLengthAndValue( m_CopyPasteManager->GetMaxOperandLengthAndValue(ViewMode::None, CategoryGroupType::Converter, NumberBase::Unknown, BitLength::BitLengthUnknown),
ViewMode::None, CategoryGroupType::Converter, NumberBase::Unknown, BitLength::BitLengthUnknown),
m_CopyPasteManager->MaxConverterInputLength, m_CopyPasteManager->MaxConverterInputLength,
0, 0,
L"Verify Converter mode maximum values"); L"Verify Converter mode maximum values");
@ -345,96 +336,79 @@ namespace CalculatorUnitTests
unsigned long long int ullByteMax = UINT8_MAX; unsigned long long int ullByteMax = UINT8_MAX;
Logger::WriteMessage(L"Verify Programmer Mode NumberBase::HexBase maximum values"); Logger::WriteMessage(L"Verify Programmer Mode NumberBase::HexBase maximum values");
VERIFY_MAXOPERANDLENGTHANDVALUE_ARE_EQUALS( VERIFY_MAXOPERANDLENGTHANDVALUE_ARE_EQUALS(
m_CopyPasteManager->GetMaxOperandLengthAndValue( m_CopyPasteManager->GetMaxOperandLengthAndValue(ViewMode::Programmer, CategoryGroupType::None, NumberBase::HexBase, BitLength::BitLengthQWord),
ViewMode::Programmer, CategoryGroupType::None, NumberBase::HexBase, BitLength::BitLengthQWord),
16u, 16u,
ullQwordMax); ullQwordMax);
VERIFY_MAXOPERANDLENGTHANDVALUE_ARE_EQUALS( VERIFY_MAXOPERANDLENGTHANDVALUE_ARE_EQUALS(
m_CopyPasteManager->GetMaxOperandLengthAndValue( m_CopyPasteManager->GetMaxOperandLengthAndValue(ViewMode::Programmer, CategoryGroupType::None, NumberBase::HexBase, BitLength::BitLengthDWord),
ViewMode::Programmer, CategoryGroupType::None, NumberBase::HexBase, BitLength::BitLengthDWord),
8u, 8u,
ullDwordMax); ullDwordMax);
VERIFY_MAXOPERANDLENGTHANDVALUE_ARE_EQUALS( VERIFY_MAXOPERANDLENGTHANDVALUE_ARE_EQUALS(
m_CopyPasteManager->GetMaxOperandLengthAndValue( m_CopyPasteManager->GetMaxOperandLengthAndValue(ViewMode::Programmer, CategoryGroupType::None, NumberBase::HexBase, BitLength::BitLengthWord),
ViewMode::Programmer, CategoryGroupType::None, NumberBase::HexBase, BitLength::BitLengthWord),
4u, 4u,
ullWordMax); ullWordMax);
VERIFY_MAXOPERANDLENGTHANDVALUE_ARE_EQUALS( VERIFY_MAXOPERANDLENGTHANDVALUE_ARE_EQUALS(
m_CopyPasteManager->GetMaxOperandLengthAndValue( m_CopyPasteManager->GetMaxOperandLengthAndValue(ViewMode::Programmer, CategoryGroupType::None, NumberBase::HexBase, BitLength::BitLengthByte),
ViewMode::Programmer, CategoryGroupType::None, NumberBase::HexBase, BitLength::BitLengthByte),
2u, 2u,
ullByteMax); ullByteMax);
Logger::WriteMessage(L"Verify Programmer Mode NumberBase::DecBase maximum values"); Logger::WriteMessage(L"Verify Programmer Mode NumberBase::DecBase maximum values");
VERIFY_MAXOPERANDLENGTHANDVALUE_ARE_EQUALS( VERIFY_MAXOPERANDLENGTHANDVALUE_ARE_EQUALS(
m_CopyPasteManager->GetMaxOperandLengthAndValue( m_CopyPasteManager->GetMaxOperandLengthAndValue(ViewMode::Programmer, CategoryGroupType::None, NumberBase::DecBase, BitLength::BitLengthQWord),
ViewMode::Programmer, CategoryGroupType::None, NumberBase::DecBase, BitLength::BitLengthQWord),
19u, 19u,
ullQwordMax >> 1); ullQwordMax >> 1);
VERIFY_MAXOPERANDLENGTHANDVALUE_ARE_EQUALS( VERIFY_MAXOPERANDLENGTHANDVALUE_ARE_EQUALS(
m_CopyPasteManager->GetMaxOperandLengthAndValue( m_CopyPasteManager->GetMaxOperandLengthAndValue(ViewMode::Programmer, CategoryGroupType::None, NumberBase::DecBase, BitLength::BitLengthDWord),
ViewMode::Programmer, CategoryGroupType::None, NumberBase::DecBase, BitLength::BitLengthDWord),
10u, 10u,
ullDwordMax >> 1); ullDwordMax >> 1);
VERIFY_MAXOPERANDLENGTHANDVALUE_ARE_EQUALS( VERIFY_MAXOPERANDLENGTHANDVALUE_ARE_EQUALS(
m_CopyPasteManager->GetMaxOperandLengthAndValue( m_CopyPasteManager->GetMaxOperandLengthAndValue(ViewMode::Programmer, CategoryGroupType::None, NumberBase::DecBase, BitLength::BitLengthWord),
ViewMode::Programmer, CategoryGroupType::None, NumberBase::DecBase, BitLength::BitLengthWord),
5u, 5u,
ullWordMax >> 1); ullWordMax >> 1);
VERIFY_MAXOPERANDLENGTHANDVALUE_ARE_EQUALS( VERIFY_MAXOPERANDLENGTHANDVALUE_ARE_EQUALS(
m_CopyPasteManager->GetMaxOperandLengthAndValue( m_CopyPasteManager->GetMaxOperandLengthAndValue(ViewMode::Programmer, CategoryGroupType::None, NumberBase::DecBase, BitLength::BitLengthByte),
ViewMode::Programmer, CategoryGroupType::None, NumberBase::DecBase, BitLength::BitLengthByte),
3u, 3u,
ullByteMax >> 1); ullByteMax >> 1);
Logger::WriteMessage(L"Verify Programmer Mode NumberBase::OctBase maximum values"); Logger::WriteMessage(L"Verify Programmer Mode NumberBase::OctBase maximum values");
VERIFY_MAXOPERANDLENGTHANDVALUE_ARE_EQUALS( VERIFY_MAXOPERANDLENGTHANDVALUE_ARE_EQUALS(
m_CopyPasteManager->GetMaxOperandLengthAndValue( m_CopyPasteManager->GetMaxOperandLengthAndValue(ViewMode::Programmer, CategoryGroupType::None, NumberBase::OctBase, BitLength::BitLengthQWord),
ViewMode::Programmer, CategoryGroupType::None, NumberBase::OctBase, BitLength::BitLengthQWord),
22u, 22u,
ullQwordMax); ullQwordMax);
VERIFY_MAXOPERANDLENGTHANDVALUE_ARE_EQUALS( VERIFY_MAXOPERANDLENGTHANDVALUE_ARE_EQUALS(
m_CopyPasteManager->GetMaxOperandLengthAndValue( m_CopyPasteManager->GetMaxOperandLengthAndValue(ViewMode::Programmer, CategoryGroupType::None, NumberBase::OctBase, BitLength::BitLengthDWord),
ViewMode::Programmer, CategoryGroupType::None, NumberBase::OctBase, BitLength::BitLengthDWord),
11u, 11u,
ullDwordMax); ullDwordMax);
VERIFY_MAXOPERANDLENGTHANDVALUE_ARE_EQUALS( VERIFY_MAXOPERANDLENGTHANDVALUE_ARE_EQUALS(
m_CopyPasteManager->GetMaxOperandLengthAndValue( m_CopyPasteManager->GetMaxOperandLengthAndValue(ViewMode::Programmer, CategoryGroupType::None, NumberBase::OctBase, BitLength::BitLengthWord),
ViewMode::Programmer, CategoryGroupType::None, NumberBase::OctBase, BitLength::BitLengthWord),
6u, 6u,
ullWordMax); ullWordMax);
VERIFY_MAXOPERANDLENGTHANDVALUE_ARE_EQUALS( VERIFY_MAXOPERANDLENGTHANDVALUE_ARE_EQUALS(
m_CopyPasteManager->GetMaxOperandLengthAndValue( m_CopyPasteManager->GetMaxOperandLengthAndValue(ViewMode::Programmer, CategoryGroupType::None, NumberBase::OctBase, BitLength::BitLengthByte),
ViewMode::Programmer, CategoryGroupType::None, NumberBase::OctBase, BitLength::BitLengthByte),
3u, 3u,
ullByteMax); ullByteMax);
Logger::WriteMessage(L"Verify Programmer Mode NumberBase::BinBase maximum values"); Logger::WriteMessage(L"Verify Programmer Mode NumberBase::BinBase maximum values");
VERIFY_MAXOPERANDLENGTHANDVALUE_ARE_EQUALS( VERIFY_MAXOPERANDLENGTHANDVALUE_ARE_EQUALS(
m_CopyPasteManager->GetMaxOperandLengthAndValue( m_CopyPasteManager->GetMaxOperandLengthAndValue(ViewMode::Programmer, CategoryGroupType::None, NumberBase::BinBase, BitLength::BitLengthQWord),
ViewMode::Programmer, CategoryGroupType::None, NumberBase::BinBase, BitLength::BitLengthQWord),
64u, 64u,
ullQwordMax); ullQwordMax);
VERIFY_MAXOPERANDLENGTHANDVALUE_ARE_EQUALS( VERIFY_MAXOPERANDLENGTHANDVALUE_ARE_EQUALS(
m_CopyPasteManager->GetMaxOperandLengthAndValue( m_CopyPasteManager->GetMaxOperandLengthAndValue(ViewMode::Programmer, CategoryGroupType::None, NumberBase::BinBase, BitLength::BitLengthDWord),
ViewMode::Programmer, CategoryGroupType::None, NumberBase::BinBase, BitLength::BitLengthDWord),
32u, 32u,
ullDwordMax); ullDwordMax);
VERIFY_MAXOPERANDLENGTHANDVALUE_ARE_EQUALS( VERIFY_MAXOPERANDLENGTHANDVALUE_ARE_EQUALS(
m_CopyPasteManager->GetMaxOperandLengthAndValue( m_CopyPasteManager->GetMaxOperandLengthAndValue(ViewMode::Programmer, CategoryGroupType::None, NumberBase::BinBase, BitLength::BitLengthWord),
ViewMode::Programmer, CategoryGroupType::None, NumberBase::BinBase, BitLength::BitLengthWord),
16u, 16u,
ullWordMax); ullWordMax);
VERIFY_MAXOPERANDLENGTHANDVALUE_ARE_EQUALS( VERIFY_MAXOPERANDLENGTHANDVALUE_ARE_EQUALS(
m_CopyPasteManager->GetMaxOperandLengthAndValue( m_CopyPasteManager->GetMaxOperandLengthAndValue(ViewMode::Programmer, CategoryGroupType::None, NumberBase::BinBase, BitLength::BitLengthByte),
ViewMode::Programmer, CategoryGroupType::None, NumberBase::BinBase, BitLength::BitLengthByte),
8u, 8u,
ullByteMax); ullByteMax);
Logger::WriteMessage(L"Verify invalid ViewModes/Categories return 0 for max values"); Logger::WriteMessage(L"Verify invalid ViewModes/Categories return 0 for max values");
VERIFY_MAXOPERANDLENGTHANDVALUE_ARE_EQUALS( VERIFY_MAXOPERANDLENGTHANDVALUE_ARE_EQUALS(
m_CopyPasteManager->GetMaxOperandLengthAndValue( m_CopyPasteManager->GetMaxOperandLengthAndValue(ViewMode::None, CategoryGroupType::None, NumberBase::Unknown, BitLength::BitLengthUnknown),
ViewMode::None, CategoryGroupType::None, NumberBase::Unknown, BitLength::BitLengthUnknown),
0u, 0u,
0ull); 0ull);
}; };
@ -551,8 +525,7 @@ namespace CalculatorUnitTests
VERIFY_IS_NULL(CopyPasteManager::TryOperandToULL(L"0xFFFFFFFFFFFFFFFFF1", NumberBase::HexBase)); VERIFY_IS_NULL(CopyPasteManager::TryOperandToULL(L"0xFFFFFFFFFFFFFFFFF1", NumberBase::HexBase));
VERIFY_IS_NULL(CopyPasteManager::TryOperandToULL(L"18446744073709551616", NumberBase::DecBase)); VERIFY_IS_NULL(CopyPasteManager::TryOperandToULL(L"18446744073709551616", NumberBase::DecBase));
VERIFY_IS_NULL(CopyPasteManager::TryOperandToULL(L"2000000000000000000000", NumberBase::OctBase)); VERIFY_IS_NULL(CopyPasteManager::TryOperandToULL(L"2000000000000000000000", NumberBase::OctBase));
VERIFY_IS_NULL( VERIFY_IS_NULL(CopyPasteManager::TryOperandToULL(L"11111111111111111111111111111111111111111111111111111111111111111", NumberBase::BinBase));
CopyPasteManager::TryOperandToULL(L"11111111111111111111111111111111111111111111111111111111111111111", NumberBase::BinBase));
// Invalid values/characters // Invalid values/characters
VERIFY_IS_NULL(CopyPasteManager::TryOperandToULL(L"-1", NumberBase::DecBase)); VERIFY_IS_NULL(CopyPasteManager::TryOperandToULL(L"-1", NumberBase::DecBase));
VERIFY_IS_NULL(CopyPasteManager::TryOperandToULL(L"5555", NumberBase::BinBase)); VERIFY_IS_NULL(CopyPasteManager::TryOperandToULL(L"5555", NumberBase::BinBase));
@ -827,12 +800,17 @@ namespace CalculatorUnitTests
L"61%99" L"61%99"
L"-6.1%99", L"-6.1%99",
L"1.1111111111111111111111111111111e+1142" }; L"1.1111111111111111111111111111111e+1142" };
String String ^ negativeInput[] = { L"abcdef",
^ negativeInput[] = { L"abcdef", L"xyz", L"ABab", L"e+234", L"123456789123456781234567890123456" /*boundary condition: greater than 32 digits*/, L"xyz",
L"11.1111111111111111111111111111111e+1142", L"ABab",
L"1.1e+10001", /*boundary condition: exponent greater than 5 digits*/ L"e+234",
L"0.11111111111111111111111111111111111e+111111" /*boundary condition: both exponent and non exponent exceed limits*/ L"123456789123456781234567890123456" /*boundary condition: greater than 32 digits*/,
L"SIN(2)", L"2+2==", L"2=+2" }; L"11.1111111111111111111111111111111e+1142",
L"1.1e+10001", /*boundary condition: exponent greater than 5 digits*/
L"0.11111111111111111111111111111111111e+111111" /*boundary condition: both exponent and non exponent exceed limits*/
L"SIN(2)",
L"2+2==",
L"2=+2" };
ASSERT_POSITIVE_TESTCASES(ValidateScientificPasteExpression, positiveInput); ASSERT_POSITIVE_TESTCASES(ValidateScientificPasteExpression, positiveInput);
ASSERT_NEGATIVE_TESTCASES(ValidateScientificPasteExpression, negativeInput); ASSERT_NEGATIVE_TESTCASES(ValidateScientificPasteExpression, negativeInput);
@ -1221,10 +1199,17 @@ namespace CalculatorUnitTests
void CopyPasteManagerTest::ValidateProgrammerOctPasteExpressionTest() void CopyPasteManagerTest::ValidateProgrammerOctPasteExpressionTest()
{ {
String ^ qwordPositiveInput[] = { L"123", L"123+456", L"1,234", L"1 2 3", L"1'2'3'4", L"1_2_3_4", L"\n\r1,234\n", L"\f\n1+2\t\r\v\x85", String ^ qwordPositiveInput[] = { L"123", L"123+456",
L"\n 1+\n2 ", L"1\"2", L"(123)+(456)", L"0t1234", L"0T1234", L"0o1234", L"0O1234", L"1234u", L"1,234", L"1 2 3",
L"1234ul", L"1234ULL", L"2+2=", L"2+2= ", L"1'2'3'4", L"1_2_3_4",
L"127%71", L"1777777777777777777777" /*boundary condition: the max allowed number*/ }; L"\n\r1,234\n", L"\f\n1+2\t\r\v\x85",
L"\n 1+\n2 ", L"1\"2",
L"(123)+(456)", L"0t1234",
L"0T1234", L"0o1234",
L"0O1234", L"1234u",
L"1234ul", L"1234ULL",
L"2+2=", L"2+2= ",
L"127%71", L"1777777777777777777777" /*boundary condition: the max allowed number*/ };
String ^ qwordNegativeInput[] = { L"+123", String ^ qwordNegativeInput[] = { L"+123",
L"1.23", L"1.23",
L"1''2", L"1''2",
@ -1514,11 +1499,9 @@ namespace CalculatorUnitTests
ASSERT_POSITIVE_TESTCASES(ValidateProgrammerBinWordPasteExpression, wordPositiveInput); ASSERT_POSITIVE_TESTCASES(ValidateProgrammerBinWordPasteExpression, wordPositiveInput);
ASSERT_NEGATIVE_TESTCASES(ValidateProgrammerBinWordPasteExpression, wordNegativeInput); ASSERT_NEGATIVE_TESTCASES(ValidateProgrammerBinWordPasteExpression, wordNegativeInput);
String String ^ bytePositiveInput[] = { L"100", L"100+101", L"1,001", L"1 0 1", L"1'0'0'1", L"1_0_0_1", L"\n\r1,010\n", L"\n 1+\n1 ",
^ bytePositiveInput[] = { L"100", L"100+101", L"1,001", L"1 0 1", L"1'0'0'1", L"1_0_0_1", L"\n\r1,010\n", L"1\"1", L"(101)+(10)", L"0b1001", L"0B1111", L"0y1001", L"0Y1001", L"1100b", L"1101B",
L"\n 1+\n1 ", L"1\"1", L"(101)+(10)", L"0b1001", L"0B1111", L"0y1001", L"0Y1001", L"1111u", L"1111ul", L"1111ULL", L"10100010", L"11111111" /*boundary condition: max allowed number*/ };
L"1100b", L"1101B", L"1111u", L"1111ul", L"1111ULL", L"10100010",
L"11111111" /*boundary condition: max allowed number*/ };
String ^ byteNegativeInput[] = { L"+10101", String ^ byteNegativeInput[] = { L"+10101",
L"1.01", L"1.01",
L"1''0", L"1''0",

486
src/CalculatorUnitTests/CurrencyConverterUnitTests.cpp
View file

@ -380,250 +380,250 @@ TEST_METHOD(Load_Success_LoadedFromWeb)
} }
; ;
TEST_CLASS(CurrencyConverterUnitTests){ TEST_CLASS(CurrencyConverterUnitTests)
{
const UCM::Category CURRENCY_CATEGORY = { NavCategory::Serialize(ViewMode::Currency), L"Currency", false /*supportsNegative*/ }; const UCM::Category CURRENCY_CATEGORY = { NavCategory::Serialize(ViewMode::Currency), L"Currency", false /*supportsNegative*/ };
const UCM::Unit GetUnit(const vector<UCM::Unit>& unitList, const wstring& target){ const UCM::Unit GetUnit(const vector<UCM::Unit>& unitList, const wstring& target)
{
return *find_if(begin(unitList), end(unitList), [&target](const UCM::Unit& u) { return u.abbreviation == target; }); return *find_if(begin(unitList), end(unitList), [&target](const UCM::Unit& u) { return u.abbreviation == target; });
} }
TEST_METHOD(Loaded_LoadOrderedUnits) TEST_METHOD(Loaded_LoadOrderedUnits)
{ {
StandardCacheSetup(); StandardCacheSetup();
CurrencyDataLoader loader(nullptr, L"en-US"); CurrencyDataLoader loader(nullptr, L"en-US");
auto data_loaded_event = task_completion_event<void>(); auto data_loaded_event = task_completion_event<void>();
loader.SetViewModelCallback(make_shared<DataLoadedCallback>(data_loaded_event)); loader.SetViewModelCallback(make_shared<DataLoadedCallback>(data_loaded_event));
auto data_loaded_task = create_task(data_loaded_event); auto data_loaded_task = create_task(data_loaded_event);
loader.LoadData(); loader.LoadData();
data_loaded_task.wait(); data_loaded_task.wait();
VERIFY_IS_TRUE(loader.LoadFinished()); VERIFY_IS_TRUE(loader.LoadFinished());
VERIFY_IS_TRUE(loader.LoadedFromCache()); VERIFY_IS_TRUE(loader.LoadedFromCache());
VERIFY_IS_FALSE(loader.LoadedFromWeb()); VERIFY_IS_FALSE(loader.LoadedFromWeb());
vector<UCM::Unit> unitList = loader.GetOrderedUnits(CURRENCY_CATEGORY); vector<UCM::Unit> unitList = loader.GetOrderedUnits(CURRENCY_CATEGORY);
VERIFY_ARE_EQUAL(size_t{ 2 }, unitList.size()); VERIFY_ARE_EQUAL(size_t{ 2 }, unitList.size());
const UCM::Unit usdUnit = GetUnit(unitList, L"USD"); const UCM::Unit usdUnit = GetUnit(unitList, L"USD");
const UCM::Unit eurUnit = GetUnit(unitList, L"EUR"); const UCM::Unit eurUnit = GetUnit(unitList, L"EUR");
VERIFY_ARE_EQUAL(wstring(L"United States - Dollar"), usdUnit.name); VERIFY_ARE_EQUAL(wstring(L"United States - Dollar"), usdUnit.name);
VERIFY_ARE_EQUAL(wstring(L"USD"), usdUnit.abbreviation); VERIFY_ARE_EQUAL(wstring(L"USD"), usdUnit.abbreviation);
VERIFY_ARE_EQUAL(wstring(L"Europe - Euro"), eurUnit.name); VERIFY_ARE_EQUAL(wstring(L"Europe - Euro"), eurUnit.name);
VERIFY_ARE_EQUAL(wstring(L"EUR"), eurUnit.abbreviation); VERIFY_ARE_EQUAL(wstring(L"EUR"), eurUnit.abbreviation);
} }
TEST_METHOD(Loaded_LoadOrderedRatios) TEST_METHOD(Loaded_LoadOrderedRatios)
{ {
StandardCacheSetup(); StandardCacheSetup();
CurrencyDataLoader loader(nullptr, L"en-US"); CurrencyDataLoader loader(nullptr, L"en-US");
auto data_loaded_event = task_completion_event<void>(); auto data_loaded_event = task_completion_event<void>();
loader.SetViewModelCallback(make_shared<DataLoadedCallback>(data_loaded_event)); loader.SetViewModelCallback(make_shared<DataLoadedCallback>(data_loaded_event));
auto data_loaded_task = create_task(data_loaded_event); auto data_loaded_task = create_task(data_loaded_event);
loader.LoadData(); loader.LoadData();
data_loaded_task.wait(); data_loaded_task.wait();
VERIFY_IS_TRUE(loader.LoadFinished()); VERIFY_IS_TRUE(loader.LoadFinished());
VERIFY_IS_TRUE(loader.LoadedFromCache()); VERIFY_IS_TRUE(loader.LoadedFromCache());
VERIFY_IS_FALSE(loader.LoadedFromWeb()); VERIFY_IS_FALSE(loader.LoadedFromWeb());
vector<UCM::Unit> unitList = loader.GetOrderedUnits(CURRENCY_CATEGORY); vector<UCM::Unit> unitList = loader.GetOrderedUnits(CURRENCY_CATEGORY);
VERIFY_ARE_EQUAL(size_t{ 2 }, unitList.size()); VERIFY_ARE_EQUAL(size_t{ 2 }, unitList.size());
const UCM::Unit usdUnit = GetUnit(unitList, L"USD"); const UCM::Unit usdUnit = GetUnit(unitList, L"USD");
const UCM::Unit eurUnit = GetUnit(unitList, L"EUR"); const UCM::Unit eurUnit = GetUnit(unitList, L"EUR");
unordered_map<UCM::Unit, UCM::ConversionData, UCM::UnitHash> ratios = loader.LoadOrderedRatios(usdUnit); unordered_map<UCM::Unit, UCM::ConversionData, UCM::UnitHash> ratios = loader.LoadOrderedRatios(usdUnit);
VERIFY_ARE_EQUAL(size_t{ 2 }, ratios.size()); VERIFY_ARE_EQUAL(size_t{ 2 }, ratios.size());
UCM::ConversionData usdRatioData = ratios[usdUnit]; UCM::ConversionData usdRatioData = ratios[usdUnit];
VERIFY_IS_TRUE((std::abs(1.0 - usdRatioData.ratio) < 1e-1)); VERIFY_IS_TRUE((std::abs(1.0 - usdRatioData.ratio) < 1e-1));
UCM::ConversionData eurRatioData = ratios[eurUnit]; UCM::ConversionData eurRatioData = ratios[eurUnit];
VERIFY_IS_TRUE((std::abs(0.920503 - eurRatioData.ratio) < 1e-6)); VERIFY_IS_TRUE((std::abs(0.920503 - eurRatioData.ratio) < 1e-6));
} }
TEST_METHOD(Loaded_GetCurrencySymbols_Valid) TEST_METHOD(Loaded_GetCurrencySymbols_Valid)
{ {
StandardCacheSetup(); StandardCacheSetup();
CurrencyDataLoader loader(nullptr, L"en-US"); CurrencyDataLoader loader(nullptr, L"en-US");
auto data_loaded_event = task_completion_event<void>(); auto data_loaded_event = task_completion_event<void>();
loader.SetViewModelCallback(make_shared<DataLoadedCallback>(data_loaded_event)); loader.SetViewModelCallback(make_shared<DataLoadedCallback>(data_loaded_event));
auto data_loaded_task = create_task(data_loaded_event); auto data_loaded_task = create_task(data_loaded_event);
loader.LoadData(); loader.LoadData();
data_loaded_task.wait(); data_loaded_task.wait();
VERIFY_IS_TRUE(loader.LoadFinished()); VERIFY_IS_TRUE(loader.LoadFinished());
VERIFY_IS_TRUE(loader.LoadedFromCache()); VERIFY_IS_TRUE(loader.LoadedFromCache());
VERIFY_IS_FALSE(loader.LoadedFromWeb()); VERIFY_IS_FALSE(loader.LoadedFromWeb());
vector<UCM::Unit> unitList = loader.GetOrderedUnits(CURRENCY_CATEGORY); vector<UCM::Unit> unitList = loader.GetOrderedUnits(CURRENCY_CATEGORY);
VERIFY_ARE_EQUAL(size_t{ 2 }, unitList.size()); VERIFY_ARE_EQUAL(size_t{ 2 }, unitList.size());
const UCM::Unit usdUnit = GetUnit(unitList, L"USD"); const UCM::Unit usdUnit = GetUnit(unitList, L"USD");
const UCM::Unit eurUnit = GetUnit(unitList, L"EUR"); const UCM::Unit eurUnit = GetUnit(unitList, L"EUR");
const pair<wstring, wstring> symbols = loader.GetCurrencySymbols(usdUnit, eurUnit); const pair<wstring, wstring> symbols = loader.GetCurrencySymbols(usdUnit, eurUnit);
VERIFY_ARE_EQUAL(wstring(L"$"), symbols.first); VERIFY_ARE_EQUAL(wstring(L"$"), symbols.first);
VERIFY_ARE_EQUAL(wstring(L"\x20ac"), symbols.second); // € VERIFY_ARE_EQUAL(wstring(L"\x20ac"), symbols.second); // €
} }
TEST_METHOD(Loaded_GetCurrencySymbols_Invalid) TEST_METHOD(Loaded_GetCurrencySymbols_Invalid)
{ {
StandardCacheSetup(); StandardCacheSetup();
CurrencyDataLoader loader(nullptr, L"en-US"); CurrencyDataLoader loader(nullptr, L"en-US");
auto data_loaded_event = task_completion_event<void>(); auto data_loaded_event = task_completion_event<void>();
loader.SetViewModelCallback(make_shared<DataLoadedCallback>(data_loaded_event)); loader.SetViewModelCallback(make_shared<DataLoadedCallback>(data_loaded_event));
auto data_loaded_task = create_task(data_loaded_event); auto data_loaded_task = create_task(data_loaded_event);
loader.LoadData(); loader.LoadData();
data_loaded_task.wait(); data_loaded_task.wait();
VERIFY_IS_TRUE(loader.LoadFinished()); VERIFY_IS_TRUE(loader.LoadFinished());
VERIFY_IS_TRUE(loader.LoadedFromCache()); VERIFY_IS_TRUE(loader.LoadedFromCache());
VERIFY_IS_FALSE(loader.LoadedFromWeb()); VERIFY_IS_FALSE(loader.LoadedFromWeb());
const UCM::Unit fakeUnit1 = { 1, L"fakeUnit1", L"FUD1", false, false, false }; const UCM::Unit fakeUnit1 = { 1, L"fakeUnit1", L"FUD1", false, false, false };
const UCM::Unit fakeUnit2 = { 2, L"fakeUnit2", L"FUD2", false, false, false }; const UCM::Unit fakeUnit2 = { 2, L"fakeUnit2", L"FUD2", false, false, false };
pair<wstring, wstring> symbols = loader.GetCurrencySymbols(fakeUnit1, fakeUnit2); pair<wstring, wstring> symbols = loader.GetCurrencySymbols(fakeUnit1, fakeUnit2);
VERIFY_ARE_EQUAL(wstring(L""), wstring(symbols.first.c_str())); VERIFY_ARE_EQUAL(wstring(L""), wstring(symbols.first.c_str()));
VERIFY_ARE_EQUAL(wstring(L""), wstring(symbols.second.c_str())); VERIFY_ARE_EQUAL(wstring(L""), wstring(symbols.second.c_str()));
// Verify that when only one unit is valid, both symbols return as empty string. // Verify that when only one unit is valid, both symbols return as empty string.
vector<UCM::Unit> unitList = loader.GetOrderedUnits(CURRENCY_CATEGORY); vector<UCM::Unit> unitList = loader.GetOrderedUnits(CURRENCY_CATEGORY);
VERIFY_ARE_EQUAL(size_t{ 2 }, unitList.size()); VERIFY_ARE_EQUAL(size_t{ 2 }, unitList.size());
const UCM::Unit usdUnit = GetUnit(unitList, L"USD"); const UCM::Unit usdUnit = GetUnit(unitList, L"USD");
symbols = loader.GetCurrencySymbols(fakeUnit1, usdUnit); symbols = loader.GetCurrencySymbols(fakeUnit1, usdUnit);
VERIFY_ARE_EQUAL(wstring(L""), symbols.first); VERIFY_ARE_EQUAL(wstring(L""), symbols.first);
VERIFY_ARE_EQUAL(wstring(L""), symbols.second); VERIFY_ARE_EQUAL(wstring(L""), symbols.second);
symbols = loader.GetCurrencySymbols(usdUnit, fakeUnit1); symbols = loader.GetCurrencySymbols(usdUnit, fakeUnit1);
VERIFY_ARE_EQUAL(wstring(L""), symbols.first); VERIFY_ARE_EQUAL(wstring(L""), symbols.first);
VERIFY_ARE_EQUAL(wstring(L""), symbols.second); VERIFY_ARE_EQUAL(wstring(L""), symbols.second);
} }
TEST_METHOD(Loaded_GetCurrencyRatioEquality_Valid) TEST_METHOD(Loaded_GetCurrencyRatioEquality_Valid)
{ {
StandardCacheSetup(); StandardCacheSetup();
CurrencyDataLoader loader(nullptr, L"en-US"); CurrencyDataLoader loader(nullptr, L"en-US");
auto data_loaded_event = task_completion_event<void>(); auto data_loaded_event = task_completion_event<void>();
loader.SetViewModelCallback(make_shared<DataLoadedCallback>(data_loaded_event)); loader.SetViewModelCallback(make_shared<DataLoadedCallback>(data_loaded_event));
auto data_loaded_task = create_task(data_loaded_event); auto data_loaded_task = create_task(data_loaded_event);
loader.LoadData(); loader.LoadData();
data_loaded_task.wait(); data_loaded_task.wait();
VERIFY_IS_TRUE(loader.LoadFinished()); VERIFY_IS_TRUE(loader.LoadFinished());
VERIFY_IS_TRUE(loader.LoadedFromCache()); VERIFY_IS_TRUE(loader.LoadedFromCache());
VERIFY_IS_FALSE(loader.LoadedFromWeb()); VERIFY_IS_FALSE(loader.LoadedFromWeb());
vector<UCM::Unit> unitList = loader.GetOrderedUnits(CURRENCY_CATEGORY); vector<UCM::Unit> unitList = loader.GetOrderedUnits(CURRENCY_CATEGORY);
VERIFY_ARE_EQUAL(size_t{ 2 }, unitList.size()); VERIFY_ARE_EQUAL(size_t{ 2 }, unitList.size());
const UCM::Unit usdUnit = GetUnit(unitList, L"USD"); const UCM::Unit usdUnit = GetUnit(unitList, L"USD");
const UCM::Unit eurUnit = GetUnit(unitList, L"EUR"); const UCM::Unit eurUnit = GetUnit(unitList, L"EUR");
const pair<wstring, wstring> ratio = loader.GetCurrencyRatioEquality(usdUnit, eurUnit); const pair<wstring, wstring> ratio = loader.GetCurrencyRatioEquality(usdUnit, eurUnit);
VERIFY_ARE_EQUAL(wstring(L"1 USD = 0.9205 EUR"), ratio.first); VERIFY_ARE_EQUAL(wstring(L"1 USD = 0.9205 EUR"), ratio.first);
VERIFY_ARE_EQUAL(wstring(L"1 United States Dollar = 0.9205 Europe Euro"), ratio.second); VERIFY_ARE_EQUAL(wstring(L"1 United States Dollar = 0.9205 Europe Euro"), ratio.second);
} }
TEST_METHOD(Loaded_GetCurrencyRatioEquality_Invalid) TEST_METHOD(Loaded_GetCurrencyRatioEquality_Invalid)
{ {
StandardCacheSetup(); StandardCacheSetup();
CurrencyDataLoader loader(nullptr, L"en-US"); CurrencyDataLoader loader(nullptr, L"en-US");
auto data_loaded_event = task_completion_event<void>(); auto data_loaded_event = task_completion_event<void>();
loader.SetViewModelCallback(make_shared<DataLoadedCallback>(data_loaded_event)); loader.SetViewModelCallback(make_shared<DataLoadedCallback>(data_loaded_event));
auto data_loaded_task = create_task(data_loaded_event); auto data_loaded_task = create_task(data_loaded_event);
loader.LoadData(); loader.LoadData();
data_loaded_task.wait(); data_loaded_task.wait();
VERIFY_IS_TRUE(loader.LoadFinished()); VERIFY_IS_TRUE(loader.LoadFinished());
VERIFY_IS_TRUE(loader.LoadedFromCache()); VERIFY_IS_TRUE(loader.LoadedFromCache());
VERIFY_IS_FALSE(loader.LoadedFromWeb()); VERIFY_IS_FALSE(loader.LoadedFromWeb());
const UCM::Unit fakeUnit1 = { 1, L"fakeUnit1", L"fakeCountry1", L"FUD1", false, false, false }; const UCM::Unit fakeUnit1 = { 1, L"fakeUnit1", L"fakeCountry1", L"FUD1", false, false, false };
const UCM::Unit fakeUnit2 = { 2, L"fakeUnit2", L"fakeCountry2", L"FUD2", false, false, false }; const UCM::Unit fakeUnit2 = { 2, L"fakeUnit2", L"fakeCountry2", L"FUD2", false, false, false };
pair<wstring, wstring> ratio = loader.GetCurrencyRatioEquality(fakeUnit1, fakeUnit2); pair<wstring, wstring> ratio = loader.GetCurrencyRatioEquality(fakeUnit1, fakeUnit2);
VERIFY_ARE_EQUAL(wstring(L""), ratio.first); VERIFY_ARE_EQUAL(wstring(L""), ratio.first);
VERIFY_ARE_EQUAL(wstring(L""), ratio.second); VERIFY_ARE_EQUAL(wstring(L""), ratio.second);
// Verify that when only one unit is valid, both symbols return as empty string. // Verify that when only one unit is valid, both symbols return as empty string.
vector<UCM::Unit> unitList = loader.GetOrderedUnits(CURRENCY_CATEGORY); vector<UCM::Unit> unitList = loader.GetOrderedUnits(CURRENCY_CATEGORY);
VERIFY_ARE_EQUAL(size_t{ 2 }, unitList.size()); VERIFY_ARE_EQUAL(size_t{ 2 }, unitList.size());
const UCM::Unit usdUnit = GetUnit(unitList, L"USD"); const UCM::Unit usdUnit = GetUnit(unitList, L"USD");
ratio = loader.GetCurrencyRatioEquality(fakeUnit1, usdUnit); ratio = loader.GetCurrencyRatioEquality(fakeUnit1, usdUnit);
VERIFY_ARE_EQUAL(wstring(L""), ratio.first); VERIFY_ARE_EQUAL(wstring(L""), ratio.first);
VERIFY_ARE_EQUAL(wstring(L""), ratio.second); VERIFY_ARE_EQUAL(wstring(L""), ratio.second);
ratio = loader.GetCurrencyRatioEquality(usdUnit, fakeUnit1); ratio = loader.GetCurrencyRatioEquality(usdUnit, fakeUnit1);
VERIFY_ARE_EQUAL(wstring(L""), ratio.first); VERIFY_ARE_EQUAL(wstring(L""), ratio.first);
VERIFY_ARE_EQUAL(wstring(L""), ratio.second); VERIFY_ARE_EQUAL(wstring(L""), ratio.second);
} }
TEST_METHOD(Test_RoundCurrencyRatio) TEST_METHOD(Test_RoundCurrencyRatio)
{ {
CurrencyDataLoader loader{ nullptr }; CurrencyDataLoader loader{ nullptr };
VERIFY_ARE_EQUAL(CurrencyDataLoader::RoundCurrencyRatio(1234567), 1234567); VERIFY_ARE_EQUAL(CurrencyDataLoader::RoundCurrencyRatio(1234567), 1234567);
VERIFY_ARE_EQUAL(CurrencyDataLoader::RoundCurrencyRatio(0), 0); VERIFY_ARE_EQUAL(CurrencyDataLoader::RoundCurrencyRatio(0), 0);
VERIFY_ARE_EQUAL(CurrencyDataLoader::RoundCurrencyRatio(9999.999), 9999.999); VERIFY_ARE_EQUAL(CurrencyDataLoader::RoundCurrencyRatio(9999.999), 9999.999);
VERIFY_ARE_EQUAL(CurrencyDataLoader::RoundCurrencyRatio(8765.4321), 8765.4321); VERIFY_ARE_EQUAL(CurrencyDataLoader::RoundCurrencyRatio(8765.4321), 8765.4321);
VERIFY_ARE_EQUAL(CurrencyDataLoader::RoundCurrencyRatio(4815.162342), 4815.1623); VERIFY_ARE_EQUAL(CurrencyDataLoader::RoundCurrencyRatio(4815.162342), 4815.1623);
VERIFY_ARE_EQUAL(CurrencyDataLoader::RoundCurrencyRatio(4815.162358), 4815.1624); VERIFY_ARE_EQUAL(CurrencyDataLoader::RoundCurrencyRatio(4815.162358), 4815.1624);
VERIFY_ARE_EQUAL(CurrencyDataLoader::RoundCurrencyRatio(4815.162388934723), 4815.1624); VERIFY_ARE_EQUAL(CurrencyDataLoader::RoundCurrencyRatio(4815.162388934723), 4815.1624);
VERIFY_ARE_EQUAL(CurrencyDataLoader::RoundCurrencyRatio(0.12), 0.12); VERIFY_ARE_EQUAL(CurrencyDataLoader::RoundCurrencyRatio(0.12), 0.12);
VERIFY_ARE_EQUAL(CurrencyDataLoader::RoundCurrencyRatio(0.123), 0.123); VERIFY_ARE_EQUAL(CurrencyDataLoader::RoundCurrencyRatio(0.123), 0.123);
VERIFY_ARE_EQUAL(CurrencyDataLoader::RoundCurrencyRatio(0.1234), 0.1234); VERIFY_ARE_EQUAL(CurrencyDataLoader::RoundCurrencyRatio(0.1234), 0.1234);
VERIFY_ARE_EQUAL(CurrencyDataLoader::RoundCurrencyRatio(0.12343), 0.1234); VERIFY_ARE_EQUAL(CurrencyDataLoader::RoundCurrencyRatio(0.12343), 0.1234);
VERIFY_ARE_EQUAL(CurrencyDataLoader::RoundCurrencyRatio(0.0321), 0.0321); VERIFY_ARE_EQUAL(CurrencyDataLoader::RoundCurrencyRatio(0.0321), 0.0321);
VERIFY_ARE_EQUAL(CurrencyDataLoader::RoundCurrencyRatio(0.03211), 0.03211); VERIFY_ARE_EQUAL(CurrencyDataLoader::RoundCurrencyRatio(0.03211), 0.03211);
VERIFY_ARE_EQUAL(CurrencyDataLoader::RoundCurrencyRatio(0.032119), 0.03212); VERIFY_ARE_EQUAL(CurrencyDataLoader::RoundCurrencyRatio(0.032119), 0.03212);
VERIFY_ARE_EQUAL(CurrencyDataLoader::RoundCurrencyRatio(0.00322119), 0.003221); VERIFY_ARE_EQUAL(CurrencyDataLoader::RoundCurrencyRatio(0.00322119), 0.003221);
VERIFY_ARE_EQUAL(CurrencyDataLoader::RoundCurrencyRatio(0.00123269), 0.001233); VERIFY_ARE_EQUAL(CurrencyDataLoader::RoundCurrencyRatio(0.00123269), 0.001233);
VERIFY_ARE_EQUAL(CurrencyDataLoader::RoundCurrencyRatio(0.00076269), 0.0007627); VERIFY_ARE_EQUAL(CurrencyDataLoader::RoundCurrencyRatio(0.00076269), 0.0007627);
VERIFY_ARE_EQUAL(CurrencyDataLoader::RoundCurrencyRatio(0.000069), 0.000069); VERIFY_ARE_EQUAL(CurrencyDataLoader::RoundCurrencyRatio(0.000069), 0.000069);
VERIFY_ARE_EQUAL(CurrencyDataLoader::RoundCurrencyRatio(0.000061), 0.000061); VERIFY_ARE_EQUAL(CurrencyDataLoader::RoundCurrencyRatio(0.000061), 0.000061);
VERIFY_ARE_EQUAL(CurrencyDataLoader::RoundCurrencyRatio(0.000054612), 0.00005461); VERIFY_ARE_EQUAL(CurrencyDataLoader::RoundCurrencyRatio(0.000054612), 0.00005461);
VERIFY_ARE_EQUAL(CurrencyDataLoader::RoundCurrencyRatio(0.000054616), 0.00005462); VERIFY_ARE_EQUAL(CurrencyDataLoader::RoundCurrencyRatio(0.000054616), 0.00005462);
VERIFY_ARE_EQUAL(CurrencyDataLoader::RoundCurrencyRatio(0.000005416), 0.000005416); VERIFY_ARE_EQUAL(CurrencyDataLoader::RoundCurrencyRatio(0.000005416), 0.000005416);
VERIFY_ARE_EQUAL(CurrencyDataLoader::RoundCurrencyRatio(0.0000016134324), 0.000001613); VERIFY_ARE_EQUAL(CurrencyDataLoader::RoundCurrencyRatio(0.0000016134324), 0.000001613);
VERIFY_ARE_EQUAL(CurrencyDataLoader::RoundCurrencyRatio(0.0000096134324), 0.000009613); VERIFY_ARE_EQUAL(CurrencyDataLoader::RoundCurrencyRatio(0.0000096134324), 0.000009613);
VERIFY_ARE_EQUAL(CurrencyDataLoader::RoundCurrencyRatio(0.0000032169348392), 0.000003217); VERIFY_ARE_EQUAL(CurrencyDataLoader::RoundCurrencyRatio(0.0000032169348392), 0.000003217);
VERIFY_ARE_EQUAL(CurrencyDataLoader::RoundCurrencyRatio(0.000000002134987218), 0.000000002135); VERIFY_ARE_EQUAL(CurrencyDataLoader::RoundCurrencyRatio(0.000000002134987218), 0.000000002135);
VERIFY_ARE_EQUAL(CurrencyDataLoader::RoundCurrencyRatio(0.000000000000087231445), 0.00000000000008723); VERIFY_ARE_EQUAL(CurrencyDataLoader::RoundCurrencyRatio(0.000000000000087231445), 0.00000000000008723);
} }
} };
;
} }

147
src/CalculatorUnitTests/HistoryTests.cpp
View file

@ -411,124 +411,149 @@ namespace CalculatorFunctionalTests
Cleanup(); Cleanup();
} }
void HistoryStandardOrderOfOperations_1() { void HistoryStandardOrderOfOperations_1()
{
Command commands[] = { Command::Command1, Command::CommandREC }; Command commands[] = { Command::Command1, Command::CommandREC };
HistoryStandardOrderOfOperationsHelper(L"", L"", commands); HistoryStandardOrderOfOperationsHelper(L"", L"", commands);
} }
void HistoryStandardOrderOfOperations_2() { void HistoryStandardOrderOfOperations_2()
{
Command commands[] = { Command::Command4, Command::CommandSQRT }; Command commands[] = { Command::Command4, Command::CommandSQRT };
HistoryStandardOrderOfOperationsHelper(L"", L"", commands); HistoryStandardOrderOfOperationsHelper(L"", L"", commands);
} }
void HistoryStandardOrderOfOperations_3() { void HistoryStandardOrderOfOperations_3()
{
Command commands[] = { Command::Command1, Command::CommandADD, Command::Command4, Command::CommandSQRT }; Command commands[] = { Command::Command1, Command::CommandADD, Command::Command4, Command::CommandSQRT };
HistoryStandardOrderOfOperationsHelper(L"", L"", commands); HistoryStandardOrderOfOperationsHelper(L"", L"", commands);
} }
void HistoryStandardOrderOfOperations_4() { void HistoryStandardOrderOfOperations_4()
{
Command commands[] = { Command::Command1, Command::CommandADD, Command::Command4, Command::CommandSQRT, Command::CommandSUB }; Command commands[] = { Command::Command1, Command::CommandADD, Command::Command4, Command::CommandSQRT, Command::CommandSUB };
HistoryStandardOrderOfOperationsHelper(L"3", L"1 + \x221A( 4 ) =", commands); HistoryStandardOrderOfOperationsHelper(L"3", L"1 + \x221A( 4 ) =", commands);
} }
void HistoryStandardOrderOfOperations_5() { void HistoryStandardOrderOfOperations_5()
{
Command commands[] = { Command::Command2, Command::CommandMUL, Command::Command4, Command::CommandREC }; Command commands[] = { Command::Command2, Command::CommandMUL, Command::Command4, Command::CommandREC };
HistoryStandardOrderOfOperationsHelper(L"", L"", commands); HistoryStandardOrderOfOperationsHelper(L"", L"", commands);
} }
void HistoryStandardOrderOfOperations_6() { void HistoryStandardOrderOfOperations_6()
{
Command commands[] = { Command::Command5, Command::CommandDIV, Command::Command6, Command::CommandPERCENT }; Command commands[] = { Command::Command5, Command::CommandDIV, Command::Command6, Command::CommandPERCENT };
HistoryStandardOrderOfOperationsHelper(L"", L"", commands); HistoryStandardOrderOfOperationsHelper(L"", L"", commands);
} }
void HistoryStandardOrderOfOperations_7() { void HistoryStandardOrderOfOperations_7()
{
Command commands[] = { Command::Command4, Command::CommandSQRT, Command::CommandSUB }; Command commands[] = { Command::Command4, Command::CommandSQRT, Command::CommandSUB };
HistoryStandardOrderOfOperationsHelper(L"", L"", commands); HistoryStandardOrderOfOperationsHelper(L"", L"", commands);
} }
void HistoryStandardOrderOfOperations_8() { void HistoryStandardOrderOfOperations_8()
{
Command commands[] = { Command::Command7, Command::CommandSQR, Command::CommandDIV }; Command commands[] = { Command::Command7, Command::CommandSQR, Command::CommandDIV };
HistoryStandardOrderOfOperationsHelper(L"", L"", commands); HistoryStandardOrderOfOperationsHelper(L"", L"", commands);
} }
void HistoryStandardOrderOfOperations_9() { void HistoryStandardOrderOfOperations_9()
{
Command commands[] = { Command::Command8, Command::CommandSQR, Command::CommandSQRT }; Command commands[] = { Command::Command8, Command::CommandSQR, Command::CommandSQRT };
HistoryStandardOrderOfOperationsHelper(L"", L"", commands); HistoryStandardOrderOfOperationsHelper(L"", L"", commands);
} }
void HistoryStandardOrderOfOperations_10() { void HistoryStandardOrderOfOperations_10()
{
Command commands[] = { Command::Command1, Command::Command0, Command::CommandADD, Command::Command2, Command::CommandSUB }; Command commands[] = { Command::Command1, Command::Command0, Command::CommandADD, Command::Command2, Command::CommandSUB };
HistoryStandardOrderOfOperationsHelper(L"12", L"10 + 2 =", commands); HistoryStandardOrderOfOperationsHelper(L"12", L"10 + 2 =", commands);
} }
void HistoryStandardOrderOfOperations_11() { void HistoryStandardOrderOfOperations_11()
{
Command commands[] = { Command::Command3, Command::CommandMUL, Command::Command4, Command::CommandDIV }; Command commands[] = { Command::Command3, Command::CommandMUL, Command::Command4, Command::CommandDIV };
HistoryStandardOrderOfOperationsHelper(L"12", L"3 \x00D7 4 =", commands); HistoryStandardOrderOfOperationsHelper(L"12", L"3 \x00D7 4 =", commands);
} }
void HistoryStandardOrderOfOperations_12() { void HistoryStandardOrderOfOperations_12()
{
Command commands[] = { Command::Command6, Command::CommandDIV, Command::Command3, Command::CommandSUB, Command::CommandADD }; Command commands[] = { Command::Command6, Command::CommandDIV, Command::Command3, Command::CommandSUB, Command::CommandADD };
HistoryStandardOrderOfOperationsHelper(L"2", L"6 \x00F7 3 =", commands); HistoryStandardOrderOfOperationsHelper(L"2", L"6 \x00F7 3 =", commands);
} }
void HistoryStandardOrderOfOperations_13() { void HistoryStandardOrderOfOperations_13()
{
Command commands[] = { Command::Command7, Command::CommandSUB, Command::Command4, Command::CommandDIV, Command::CommandMUL }; Command commands[] = { Command::Command7, Command::CommandSUB, Command::Command4, Command::CommandDIV, Command::CommandMUL };
HistoryStandardOrderOfOperationsHelper(L"3", L"7 - 4 =", commands); HistoryStandardOrderOfOperationsHelper(L"3", L"7 - 4 =", commands);
} }
void HistoryStandardOrderOfOperations_14() { void HistoryStandardOrderOfOperations_14()
{
Command commands[] = { Command::Command8, Command::CommandMUL, Command::Command2, Command::CommandADD, Command::CommandSQRT }; Command commands[] = { Command::Command8, Command::CommandMUL, Command::Command2, Command::CommandADD, Command::CommandSQRT };
HistoryStandardOrderOfOperationsHelper(L"16", L"8 \x00D7 2 =", commands); HistoryStandardOrderOfOperationsHelper(L"16", L"8 \x00D7 2 =", commands);
} }
void HistoryStandardOrderOfOperations_15() { void HistoryStandardOrderOfOperations_15()
{
Command commands[] = { Command::Command9, Command::CommandADD, Command::Command0, Command::CommandMUL, Command::CommandSIGN }; Command commands[] = { Command::Command9, Command::CommandADD, Command::Command0, Command::CommandMUL, Command::CommandSIGN };
HistoryStandardOrderOfOperationsHelper(L"9", L"9 + 0 =", commands); HistoryStandardOrderOfOperationsHelper(L"9", L"9 + 0 =", commands);
} }
void HistoryStandardOrderOfOperations_16() { void HistoryStandardOrderOfOperations_16()
{
Command commands[] = { Command::Command9, Command::CommandSIGN, Command::Command0, Command::CommandADD, Command::CommandMUL }; Command commands[] = { Command::Command9, Command::CommandSIGN, Command::Command0, Command::CommandADD, Command::CommandMUL };
HistoryStandardOrderOfOperationsHelper(L"", L"", commands); HistoryStandardOrderOfOperationsHelper(L"", L"", commands);
} }
void HistoryStandardOrderOfOperations_17() { void HistoryStandardOrderOfOperations_17()
{
Command commands[] = { Command::Command1, Command::CommandADD, Command::Command2, Command::CommandEQU }; Command commands[] = { Command::Command1, Command::CommandADD, Command::Command2, Command::CommandEQU };
HistoryStandardOrderOfOperationsHelper(L"3", L"1 + 2 =", commands); HistoryStandardOrderOfOperationsHelper(L"3", L"1 + 2 =", commands);
} }
void HistoryStandardOrderOfOperations_18() { void HistoryStandardOrderOfOperations_18()
{
Command commands[] = { Command::Command2, Command::Command0, Command::CommandMUL, Command::Command0, Command::Command2, Command::CommandEQU }; Command commands[] = { Command::Command2, Command::Command0, Command::CommandMUL, Command::Command0, Command::Command2, Command::CommandEQU };
HistoryStandardOrderOfOperationsHelper(L"40", L"20 \x00D7 2 =", commands); HistoryStandardOrderOfOperationsHelper(L"40", L"20 \x00D7 2 =", commands);
} }
void HistoryStandardOrderOfOperations_19() { void HistoryStandardOrderOfOperations_19()
{
Command commands[] = { Command::Command1, Command::CommandADD, Command::Command2, Command::CommandADD, Command::CommandBACK }; Command commands[] = { Command::Command1, Command::CommandADD, Command::Command2, Command::CommandADD, Command::CommandBACK };
HistoryStandardOrderOfOperationsHelper(L"3", L"1 + 2 =", commands); HistoryStandardOrderOfOperationsHelper(L"3", L"1 + 2 =", commands);
} }
void HistoryStandardOrderOfOperations_20() { void HistoryStandardOrderOfOperations_20()
{
Command commands[] = { Command::Command1, Command::CommandADD, Command::Command2, Command::CommandADD, Command::CommandCLEAR }; Command commands[] = { Command::Command1, Command::CommandADD, Command::Command2, Command::CommandADD, Command::CommandCLEAR };
HistoryStandardOrderOfOperationsHelper(L"3", L"1 + 2 =", commands); HistoryStandardOrderOfOperationsHelper(L"3", L"1 + 2 =", commands);
} }
void HistoryStandardOrderOfOperations_21() { void HistoryStandardOrderOfOperations_21()
{
Command commands[] = { Command::Command1, Command::CommandADD, Command::Command2, Command::CommandADD, Command::CommandCENTR }; Command commands[] = { Command::Command1, Command::CommandADD, Command::Command2, Command::CommandADD, Command::CommandCENTR };
HistoryStandardOrderOfOperationsHelper(L"3", L"1 + 2 =", commands); HistoryStandardOrderOfOperationsHelper(L"3", L"1 + 2 =", commands);
} }
void HistoryStandardOrderOfOperations_22() { void HistoryStandardOrderOfOperations_22()
{
Command commands[] = { Command::Command1, Command::CommandADD, Command::Command2, Command::CommandCLEAR }; Command commands[] = { Command::Command1, Command::CommandADD, Command::Command2, Command::CommandCLEAR };
HistoryStandardOrderOfOperationsHelper(L"", L"", commands); HistoryStandardOrderOfOperationsHelper(L"", L"", commands);
} }
void HistoryStandardOrderOfOperations_23() { void HistoryStandardOrderOfOperations_23()
{
Command commands[] = { Command::Command1, Command::CommandADD, Command::Command2, Command::CommandCENTR }; Command commands[] = { Command::Command1, Command::CommandADD, Command::Command2, Command::CommandCENTR };
HistoryStandardOrderOfOperationsHelper(L"", L"", commands); HistoryStandardOrderOfOperationsHelper(L"", L"", commands);
} }
void HistoryStandardOrderOfOperationsMultiple() { void HistoryStandardOrderOfOperationsMultiple()
{
Initialize(); Initialize();
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 };
int initialSize = m_historyViewModel->ItemsCount; int initialSize = m_historyViewModel->ItemsCount;
Command* currentCommand = commands; Command* currentCommand = commands;
while (*currentCommand != Command::CommandNULL) while (*currentCommand != Command::CommandNULL)
@ -613,99 +638,123 @@ namespace CalculatorFunctionalTests
HistoryClearCommandWithEmptyHistory(); HistoryClearCommandWithEmptyHistory();
} }
void HistoryTests::TestHistoryStandardOrderOfOperations_1(){ void HistoryTests::TestHistoryStandardOrderOfOperations_1()
{
HistoryStandardOrderOfOperations_1(); HistoryStandardOrderOfOperations_1();
} }
void HistoryTests::TestHistoryStandardOrderOfOperations_2(){ void HistoryTests::TestHistoryStandardOrderOfOperations_2()
{
HistoryStandardOrderOfOperations_2(); HistoryStandardOrderOfOperations_2();
} }
void HistoryTests::TestHistoryStandardOrderOfOperations_3(){ void HistoryTests::TestHistoryStandardOrderOfOperations_3()
{
HistoryStandardOrderOfOperations_3(); HistoryStandardOrderOfOperations_3();
} }
void HistoryTests::TestHistoryStandardOrderOfOperations_4(){ void HistoryTests::TestHistoryStandardOrderOfOperations_4()
{
HistoryStandardOrderOfOperations_4(); HistoryStandardOrderOfOperations_4();
} }
void HistoryTests::TestHistoryStandardOrderOfOperations_5(){ void HistoryTests::TestHistoryStandardOrderOfOperations_5()
{
HistoryStandardOrderOfOperations_5(); HistoryStandardOrderOfOperations_5();
} }
void HistoryTests::TestHistoryStandardOrderOfOperations_6(){ void HistoryTests::TestHistoryStandardOrderOfOperations_6()
{
HistoryStandardOrderOfOperations_6(); HistoryStandardOrderOfOperations_6();
} }
void HistoryTests::TestHistoryStandardOrderOfOperations_7(){ void HistoryTests::TestHistoryStandardOrderOfOperations_7()
{
HistoryStandardOrderOfOperations_7(); HistoryStandardOrderOfOperations_7();
} }
void HistoryTests::TestHistoryStandardOrderOfOperations_8(){ void HistoryTests::TestHistoryStandardOrderOfOperations_8()
{
HistoryStandardOrderOfOperations_8(); HistoryStandardOrderOfOperations_8();
} }
void HistoryTests::TestHistoryStandardOrderOfOperations_9(){ void HistoryTests::TestHistoryStandardOrderOfOperations_9()
{
HistoryStandardOrderOfOperations_9(); HistoryStandardOrderOfOperations_9();
} }
void HistoryTests::TestHistoryStandardOrderOfOperations_10(){ void HistoryTests::TestHistoryStandardOrderOfOperations_10()
{
HistoryStandardOrderOfOperations_10(); HistoryStandardOrderOfOperations_10();
} }
void HistoryTests::TestHistoryStandardOrderOfOperations_11(){ void HistoryTests::TestHistoryStandardOrderOfOperations_11()
{
HistoryStandardOrderOfOperations_11(); HistoryStandardOrderOfOperations_11();
} }
void HistoryTests::TestHistoryStandardOrderOfOperations_12(){ void HistoryTests::TestHistoryStandardOrderOfOperations_12()
{
HistoryStandardOrderOfOperations_12(); HistoryStandardOrderOfOperations_12();
} }
void HistoryTests::TestHistoryStandardOrderOfOperations_13(){ void HistoryTests::TestHistoryStandardOrderOfOperations_13()
{
HistoryStandardOrderOfOperations_13(); HistoryStandardOrderOfOperations_13();
} }
void HistoryTests::TestHistoryStandardOrderOfOperations_14(){ void HistoryTests::TestHistoryStandardOrderOfOperations_14()
{
HistoryStandardOrderOfOperations_14(); HistoryStandardOrderOfOperations_14();
} }
void HistoryTests::TestHistoryStandardOrderOfOperations_15(){ void HistoryTests::TestHistoryStandardOrderOfOperations_15()
{
HistoryStandardOrderOfOperations_15(); HistoryStandardOrderOfOperations_15();
} }
void HistoryTests::TestHistoryStandardOrderOfOperations_16(){ void HistoryTests::TestHistoryStandardOrderOfOperations_16()
{
HistoryStandardOrderOfOperations_16(); HistoryStandardOrderOfOperations_16();
} }
void HistoryTests::TestHistoryStandardOrderOfOperations_17(){ void HistoryTests::TestHistoryStandardOrderOfOperations_17()
{
HistoryStandardOrderOfOperations_17(); HistoryStandardOrderOfOperations_17();
} }
void HistoryTests::TestHistoryStandardOrderOfOperations_18(){ void HistoryTests::TestHistoryStandardOrderOfOperations_18()
{
HistoryStandardOrderOfOperations_18(); HistoryStandardOrderOfOperations_18();
} }
void HistoryTests::TestHistoryStandardOrderOfOperations_19(){ void HistoryTests::TestHistoryStandardOrderOfOperations_19()
{
HistoryStandardOrderOfOperations_19(); HistoryStandardOrderOfOperations_19();
} }
void HistoryTests::TestHistoryStandardOrderOfOperations_20(){ void HistoryTests::TestHistoryStandardOrderOfOperations_20()
{
HistoryStandardOrderOfOperations_20(); HistoryStandardOrderOfOperations_20();
} }
void HistoryTests::TestHistoryStandardOrderOfOperations_21(){ void HistoryTests::TestHistoryStandardOrderOfOperations_21()
{
HistoryStandardOrderOfOperations_21(); HistoryStandardOrderOfOperations_21();
} }
void HistoryTests::TestHistoryStandardOrderOfOperations_22(){ void HistoryTests::TestHistoryStandardOrderOfOperations_22()
{
HistoryStandardOrderOfOperations_22(); HistoryStandardOrderOfOperations_22();
} }
void HistoryTests::TestHistoryStandardOrderOfOperations_23(){ void HistoryTests::TestHistoryStandardOrderOfOperations_23()
{
HistoryStandardOrderOfOperations_23(); HistoryStandardOrderOfOperations_23();
} }
void HistoryTests::TestHistoryStandardOrderOfOperationsMultiple(){ void HistoryTests::TestHistoryStandardOrderOfOperationsMultiple()
{
HistoryStandardOrderOfOperationsMultiple(); HistoryStandardOrderOfOperationsMultiple();
} }
} }

188
src/CalculatorUnitTests/LocalizationServiceUnitTests.cpp
View file

@ -14,130 +14,70 @@ using namespace Microsoft::VisualStudio::CppUnitTestFramework;
namespace CalculatorUnitTests namespace CalculatorUnitTests
{ {
TEST_CLASS(LocalizationServiceUnitTests) TEST_CLASS(LocalizationServiceUnitTests){ public:
{
public:
TEST_METHOD(TestSortStrings) TEST_METHOD(TestSortStrings){ auto localizationService = LocalizationService::GetInstance();
{ vector<String ^> stringsToSort = {
auto localizationService = LocalizationService::GetInstance(); L"Zebra", L"Alpha", L"beta1", L"Gamma", L"Beta", L"alpha1", L"États-Unis", L"Epsilon", L"Etude",
vector<String^> stringsToSort =
{
L"Zebra",
L"Alpha",
L"beta1",
L"Gamma",
L"Beta",
L"alpha1",
L"États-Unis",
L"Epsilon",
L"Etude",
};
vector<String^> expectedResult =
{
L"Alpha",
L"alpha1",
L"Beta",
L"beta1",
L"Epsilon",
L"États-Unis",
L"Etude",
L"Gamma",
L"Zebra",
};
VERIFY_ARE_EQUAL(stringsToSort.size(), expectedResult.size());
VERIFY_IS_FALSE(equal(stringsToSort.begin(), stringsToSort.end(), expectedResult.begin()));
localizationService->Sort(stringsToSort);
VERIFY_IS_TRUE(equal(stringsToSort.begin(), stringsToSort.end(), expectedResult.begin()));
}
TEST_METHOD(TestSortEmptyStrings)
{
//Verify if LocalizationService::Sort doesn't crash when the vector is empty or null
auto localizationService = LocalizationService::GetInstance();
vector<String^> stringsToSort = {};
localizationService->Sort(stringsToSort);
stringsToSort = { L"" };
localizationService->Sort(stringsToSort);
stringsToSort = { L"",L"",L"" };
localizationService->Sort(stringsToSort);
stringsToSort = { nullptr,L"",L"" };
localizationService->Sort(stringsToSort);
}
TEST_METHOD(TestSortGeneric)
{
vector<String^> stringsToSort =
{
L"fermentum",
L"fringilla",
L"Curabitur",
L"rhoncus",
L"Aenean",
L"Fusce",
L"sollicitudin",
L"empor",
L"edapibus",
L"édapibas",
L"édapîbos",
L"édapîbÉs",
};
vector<String^> expectedResult =
{
L"Aenean",
L"Curabitur",
L"édapibas",
L"édapîbÉs",
L"édapîbos",
L"edapibus",
L"empor",
L"fermentum",
L"fringilla",
L"Fusce",
L"rhoncus",
L"sollicitudin",
};
auto sortFunction = [](String^ s) {
return ref new String(L"CAL:") + s + L"TEST";
};
VERIFY_ARE_EQUAL(stringsToSort.size(), expectedResult.size());
VERIFY_IS_FALSE(equal(stringsToSort.begin(), stringsToSort.end(), expectedResult.begin()));
auto localizationService = LocalizationService::GetInstance();
localizationService->Sort<String^>(stringsToSort, sortFunction);
VERIFY_IS_TRUE(equal(stringsToSort.begin(), stringsToSort.end(), expectedResult.begin()));
vector<String^> expected2Result =
{
L"édapibas",
L"édapîbÉs",
L"édapîbos",
L"edapibus",
L"Aenean",
L"fermentum",
L"rhoncus",
L"empor",
L"sollicitudin",
L"fringilla",
L"Curabitur",
L"Fusce",
};
auto sort2Function = [](String^ s) {
return ref new String(s->Begin()+1);
};
VERIFY_ARE_EQUAL(stringsToSort.size(), expected2Result.size());
VERIFY_IS_FALSE(equal(stringsToSort.begin(), stringsToSort.end(), expected2Result.begin()));
localizationService->Sort<String^>(stringsToSort, sort2Function);
VERIFY_IS_TRUE(equal(stringsToSort.begin(), stringsToSort.end(), expected2Result.begin()));
}
}; };
vector<String ^> expectedResult = {
L"Alpha", L"alpha1", L"Beta", L"beta1", L"Epsilon", L"États-Unis", L"Etude", L"Gamma", L"Zebra",
};
VERIFY_ARE_EQUAL(stringsToSort.size(), expectedResult.size());
VERIFY_IS_FALSE(equal(stringsToSort.begin(), stringsToSort.end(), expectedResult.begin()));
localizationService->Sort(stringsToSort);
VERIFY_IS_TRUE(equal(stringsToSort.begin(), stringsToSort.end(), expectedResult.begin()));
}
TEST_METHOD(TestSortEmptyStrings)
{
// Verify if LocalizationService::Sort doesn't crash when the vector is empty or null
auto localizationService = LocalizationService::GetInstance();
vector<String ^> stringsToSort = {};
localizationService->Sort(stringsToSort);
stringsToSort = { L"" };
localizationService->Sort(stringsToSort);
stringsToSort = { L"", L"", L"" };
localizationService->Sort(stringsToSort);
stringsToSort = { nullptr, L"", L"" };
localizationService->Sort(stringsToSort);
}
TEST_METHOD(TestSortGeneric)
{
vector<String ^> stringsToSort = {
L"fermentum", L"fringilla", L"Curabitur", L"rhoncus", L"Aenean", L"Fusce",
L"sollicitudin", L"empor", L"edapibus", L"édapibas", L"édapîbos", L"édapîbÉs",
};
vector<String ^> expectedResult = {
L"Aenean", L"Curabitur", L"édapibas", L"édapîbÉs", L"édapîbos", L"edapibus",
L"empor", L"fermentum", L"fringilla", L"Fusce", L"rhoncus", L"sollicitudin",
};
auto sortFunction = [](String ^ s) { return ref new String(L"CAL:") + s + L"TEST"; };
VERIFY_ARE_EQUAL(stringsToSort.size(), expectedResult.size());
VERIFY_IS_FALSE(equal(stringsToSort.begin(), stringsToSort.end(), expectedResult.begin()));
auto localizationService = LocalizationService::GetInstance();
localizationService->Sort<String ^>(stringsToSort, sortFunction);
VERIFY_IS_TRUE(equal(stringsToSort.begin(), stringsToSort.end(), expectedResult.begin()));
vector<String ^> expected2Result = {
L"édapibas", L"édapîbÉs", L"édapîbos", L"edapibus", L"Aenean", L"fermentum",
L"rhoncus", L"empor", L"sollicitudin", L"fringilla", L"Curabitur", L"Fusce",
};
auto sort2Function = [](String ^ s) { return ref new String(s->Begin() + 1); };
VERIFY_ARE_EQUAL(stringsToSort.size(), expected2Result.size());
VERIFY_IS_FALSE(equal(stringsToSort.begin(), stringsToSort.end(), expected2Result.begin()));
localizationService->Sort<String ^>(stringsToSort, sort2Function);
VERIFY_IS_TRUE(equal(stringsToSort.begin(), stringsToSort.end(), expected2Result.begin()));
}
}
;
} }

140
src/CalculatorUnitTests/LocalizationSettingsUnitTests.cpp
View file

@ -18,76 +18,72 @@ static Windows::Globalization::NumberFormatting::DecimalFormatter ^ CreateDecima
namespace CalculatorUnitTests namespace CalculatorUnitTests
{ {
TEST_CLASS(LocalizationSettingsUnitTests) TEST_CLASS(LocalizationSettingsUnitTests){ public: TEST_METHOD(TestLocaleName){ auto formatter = CreateDecimalFormatter(L"en-US", L"US");
{ LocalizationSettings settings(formatter);
public: VERIFY_ARE_EQUAL(L"en-US", settings.GetLocaleName());
TEST_METHOD(TestLocaleName) }
{
auto formatter = CreateDecimalFormatter(L"en-US", L"US"); TEST_METHOD(TestIsDigitEnUsSetting)
LocalizationSettings settings(formatter); {
VERIFY_ARE_EQUAL(L"en-US", settings.GetLocaleName()); auto arabicFormatter = CreateDecimalFormatter(L"ar-AE", L"AE");
} LocalizationSettings arabicSettings(arabicFormatter);
VERIFY_IS_FALSE(arabicSettings.IsDigitEnUsSetting());
TEST_METHOD(TestIsDigitEnUsSetting)
{ auto englishFormatter = CreateDecimalFormatter(L"en-US", L"US");
auto arabicFormatter = CreateDecimalFormatter(L"ar-AE", L"AE"); LocalizationSettings englishSettings(englishFormatter);
LocalizationSettings arabicSettings(arabicFormatter); VERIFY_IS_TRUE(englishSettings.IsDigitEnUsSetting());
VERIFY_IS_FALSE(arabicSettings.IsDigitEnUsSetting()); }
auto englishFormatter = CreateDecimalFormatter(L"en-US", L"US"); TEST_METHOD(TestLocalizeDisplayValue)
LocalizationSettings englishSettings(englishFormatter); {
VERIFY_IS_TRUE(englishSettings.IsDigitEnUsSetting()); auto formatter = CreateDecimalFormatter(L"ar-AE", L"AE");
} LocalizationSettings settings(formatter);
std::wstring input(L"A123");
TEST_METHOD(TestLocalizeDisplayValue) settings.LocalizeDisplayValue(&input);
{ VERIFY_ARE_EQUAL(L"A١٢٣", input);
auto formatter = CreateDecimalFormatter(L"ar-AE", L"AE"); }
LocalizationSettings settings(formatter);
std::wstring input(L"A123"); TEST_METHOD(TestGetEnglishValueFromLocalizedDigits)
settings.LocalizeDisplayValue(&input); {
VERIFY_ARE_EQUAL(L"A١٢٣", input); auto formatter = CreateDecimalFormatter(L"ar-AE", L"AE");
} LocalizationSettings settings(formatter);
VERIFY_ARE_EQUAL(L"A123", settings.GetEnglishValueFromLocalizedDigits(L"A١٢٣"));
TEST_METHOD(TestGetEnglishValueFromLocalizedDigits) }
{
auto formatter = CreateDecimalFormatter(L"ar-AE", L"AE"); TEST_METHOD(TestIsEnUsDigit)
LocalizationSettings settings(formatter); {
VERIFY_ARE_EQUAL(L"A123", settings.GetEnglishValueFromLocalizedDigits(L"A١٢٣")); auto& settings = LocalizationSettings::GetInstance();
} VERIFY_IS_FALSE(settings.IsEnUsDigit(L'/'));
VERIFY_IS_TRUE(settings.IsEnUsDigit(L'0'));
TEST_METHOD(TestIsEnUsDigit) VERIFY_IS_TRUE(settings.IsEnUsDigit(L'1'));
{ VERIFY_IS_TRUE(settings.IsEnUsDigit(L'8'));
auto& settings = LocalizationSettings::GetInstance(); VERIFY_IS_TRUE(settings.IsEnUsDigit(L'9'));
VERIFY_IS_FALSE(settings.IsEnUsDigit(L'/')); VERIFY_IS_FALSE(settings.IsEnUsDigit(L':'));
VERIFY_IS_TRUE(settings.IsEnUsDigit(L'0')); }
VERIFY_IS_TRUE(settings.IsEnUsDigit(L'1'));
VERIFY_IS_TRUE(settings.IsEnUsDigit(L'8')); TEST_METHOD(TestIsLocalizedDigit)
VERIFY_IS_TRUE(settings.IsEnUsDigit(L'9')); {
VERIFY_IS_FALSE(settings.IsEnUsDigit(L':')); auto formatter = CreateDecimalFormatter(L"en-US", L"US");
} LocalizationSettings settings(formatter);
VERIFY_IS_TRUE(settings.IsLocalizedDigit(L'0'));
TEST_METHOD(TestIsLocalizedDigit) VERIFY_IS_FALSE(settings.IsLocalizedDigit(L'A'));
{ }
auto formatter = CreateDecimalFormatter(L"en-US", L"US");
LocalizationSettings settings(formatter); TEST_METHOD(TestIsLocalizedHexDigit)
VERIFY_IS_TRUE(settings.IsLocalizedDigit(L'0')); {
VERIFY_IS_FALSE(settings.IsLocalizedDigit(L'A')); auto formatter = CreateDecimalFormatter(L"en-US", L"US");
} LocalizationSettings settings(formatter);
VERIFY_IS_TRUE(settings.IsLocalizedHexDigit(L'0'));
TEST_METHOD(TestIsLocalizedHexDigit) VERIFY_IS_TRUE(settings.IsLocalizedHexDigit(L'A'));
{ VERIFY_IS_FALSE(settings.IsLocalizedHexDigit(L'G'));
auto formatter = CreateDecimalFormatter(L"en-US", L"US"); }
LocalizationSettings settings(formatter);
VERIFY_IS_TRUE(settings.IsLocalizedHexDigit(L'0')); TEST_METHOD(TestRemoveGroupSeparators)
VERIFY_IS_TRUE(settings.IsLocalizedHexDigit(L'A')); {
VERIFY_IS_FALSE(settings.IsLocalizedHexDigit(L'G')); auto formatter = CreateDecimalFormatter(L"en-US", L"US");
} LocalizationSettings settings(formatter);
VERIFY_ARE_EQUAL(L"1000000", settings.RemoveGroupSeparators(L"1,000 000"));
TEST_METHOD(TestRemoveGroupSeparators) }
{ }
auto formatter = CreateDecimalFormatter(L"en-US", L"US"); ;
LocalizationSettings settings(formatter);
VERIFY_ARE_EQUAL(L"1000000", settings.RemoveGroupSeparators(L"1,000 000"));
}
};
} }

28
src/CalculatorUnitTests/MultiWindowUnitTests.cpp
View file

@ -460,7 +460,7 @@ TEST_METHOD(MultipleStandardModesHistoryAddItemTest)
{ {
VERIFY_IS_TRUE(2 == viewModels[i]->HistoryVM->ItemsCount); VERIFY_IS_TRUE(2 == viewModels[i]->HistoryVM->ItemsCount);
for (int j = 0; j < 2 ; j++) for (int j = 0; j < 2; j++)
{ {
auto item = static_cast<HistoryItemViewModel ^>(viewModels[i]->HistoryVM->Items->GetAt(j)); auto item = static_cast<HistoryItemViewModel ^>(viewModels[i]->HistoryVM->Items->GetAt(j));
@ -490,19 +490,19 @@ TEST_METHOD(MultipleScientificModesHistoryAddItemTest)
// Perform Calculations on both the instances and check that the History items work independently // Perform Calculations on both the instances and check that the History items work independently
TESTITEM scientificModeTestItems[2][8] = { { { NumbersAndOperatorsEnum::IsScientificMode, L"0", L"" }, TESTITEM scientificModeTestItems[2][8] = { { { NumbersAndOperatorsEnum::IsScientificMode, L"0", L"" },
{ NumbersAndOperatorsEnum::One, L"1", L"" }, { NumbersAndOperatorsEnum::One, L"1", L"" },
{ NumbersAndOperatorsEnum::Add, L"1", L"1 + " }, { NumbersAndOperatorsEnum::Add, L"1", L"1 + " },
{ NumbersAndOperatorsEnum::Two, L"2", L"1 + " }, { NumbersAndOperatorsEnum::Two, L"2", L"1 + " },
{ NumbersAndOperatorsEnum::Equals, L"3", L"" }, { NumbersAndOperatorsEnum::Equals, L"3", L"" },
{ NumbersAndOperatorsEnum::None, L"", L"" } }, { NumbersAndOperatorsEnum::None, L"", L"" } },
{ { NumbersAndOperatorsEnum::IsScientificMode, L"0", L"" }, { { NumbersAndOperatorsEnum::IsScientificMode, L"0", L"" },
{ NumbersAndOperatorsEnum::One, L"1", L"" }, { NumbersAndOperatorsEnum::One, L"1", L"" },
{ NumbersAndOperatorsEnum::Add, L"1", L"1 + " }, { NumbersAndOperatorsEnum::Add, L"1", L"1 + " },
{ NumbersAndOperatorsEnum::Two, L"2", L"1 + " }, { NumbersAndOperatorsEnum::Two, L"2", L"1 + " },
{ NumbersAndOperatorsEnum::Multiply, L"2", L"1 + 2 * " }, { NumbersAndOperatorsEnum::Multiply, L"2", L"1 + 2 * " },
{ NumbersAndOperatorsEnum::Three, L"3", L"1 + 2 * " }, { NumbersAndOperatorsEnum::Three, L"3", L"1 + 2 * " },
{ NumbersAndOperatorsEnum::Equals, L"7", L"" }, { NumbersAndOperatorsEnum::Equals, L"7", L"" },
{ NumbersAndOperatorsEnum::None, L"", L"" } } }; { NumbersAndOperatorsEnum::None, L"", L"" } } };
// Run the commands // Run the commands
for (int i = 0; i < 2; i++) for (int i = 0; i < 2; i++)

9
src/CalculatorUnitTests/NarratorAnnouncementUnitTests.cpp
View file

@ -4,12 +4,10 @@
#include <CppUnitTest.h> #include <CppUnitTest.h>
using namespace Windows::UI::Xaml::Automation::Peers; using namespace Windows::UI::Xaml::Automation::Peers;
using namespace Microsoft::VisualStudio::CppUnitTestFramework; using namespace Microsoft::VisualStudio::CppUnitTestFramework;
using namespace CalculatorApp::Common::Automation; using namespace CalculatorApp::Common::Automation;
namespace CalculatorUnitTests namespace CalculatorUnitTests
{ {
TEST_CLASS(NarratorAnnouncementUnitTests) TEST_CLASS(NarratorAnnouncementUnitTests)
@ -183,10 +181,3 @@ namespace CalculatorUnitTests
const Platform::StringReference NarratorAnnouncementUnitTests::m_testAnnouncement(L"TestAnnouncement"); const Platform::StringReference NarratorAnnouncementUnitTests::m_testAnnouncement(L"TestAnnouncement");
} }

3
src/CalculatorUnitTests/StandardViewModelUnitTests.cpp
View file

@ -586,8 +586,7 @@ namespace CalculatorUnitTests
VERIFY_ARE_EQUAL(m_viewModel->DecimalDisplayValue, StringReference(L"-2")); VERIFY_ARE_EQUAL(m_viewModel->DecimalDisplayValue, StringReference(L"-2"));
VERIFY_ARE_EQUAL(m_viewModel->OctalDisplayValue, StringReference(L"1 777 777 777 777 777 777 776")); VERIFY_ARE_EQUAL(m_viewModel->OctalDisplayValue, StringReference(L"1 777 777 777 777 777 777 776"));
VERIFY_ARE_EQUAL( VERIFY_ARE_EQUAL(
m_viewModel->BinaryDisplayValue, m_viewModel->BinaryDisplayValue, StringReference(L"1111 1111 1111 1111 1111 1111 1111 1111 1111 1111 1111 1111 1111 1111 1111 1110"));
StringReference(L"1111 1111 1111 1111 1111 1111 1111 1111 1111 1111 1111 1111 1111 1111 1111 1110"));
VERIFY_ARE_EQUAL(m_viewModel->DisplayValue, StringReference(L"-2")); VERIFY_ARE_EQUAL(m_viewModel->DisplayValue, StringReference(L"-2"));
auto val = ref new Platform::Collections::Vector<bool>(64, true); auto val = ref new Platform::Collections::Vector<bool>(64, true);
val->SetAt(0, false); val->SetAt(0, false);

2
src/CalculatorUnitTests/UnitConverterTest.cpp
View file

@ -293,7 +293,6 @@ namespace UnitConverterUnitTests
VERIFY_IS_TRUE(s_testVMCallback->CheckSuggestedValues(vector<tuple<wstring, Unit>>(begin(test2), end(test2)))); VERIFY_IS_TRUE(s_testVMCallback->CheckSuggestedValues(vector<tuple<wstring, Unit>>(begin(test2), end(test2))));
} }
// Verify a basic copy paste steam. '20.43' with backspace button pressed // Verify a basic copy paste steam. '20.43' with backspace button pressed
void UnitConverterTest::UnitConverterTestBackspaceBasic() void UnitConverterTest::UnitConverterTestBackspaceBasic()
{ {
@ -360,7 +359,6 @@ namespace UnitConverterUnitTests
VERIFY_IS_TRUE(s_testVMCallback->CheckSuggestedValues(vector<tuple<wstring, Unit>>())); VERIFY_IS_TRUE(s_testVMCallback->CheckSuggestedValues(vector<tuple<wstring, Unit>>()));
} }
// Test input escaping // Test input escaping
void UnitConverterTest::UnitConverterTestQuote() void UnitConverterTest::UnitConverterTestQuote()
{ {

7
src/GraphControl/Control/Grapher.cpp
View file

@ -123,8 +123,8 @@ namespace GraphControl
HRESULT hr; HRESULT hr;
// Reset the Grid using the m_initialDisplayRange properties when the user was last in Manual Adjustment mode and an equation was added. // Reset the Grid using the m_initialDisplayRange properties when the user was last in Manual Adjustment mode and an equation was added.
// Reset the Grid using the TryPlotGraph method when the range is updated via Graph Settings. Return out of this block so we don't render 2 times. // Reset the Grid using the TryPlotGraph method when the range is updated via Graph Settings. Return out of this block so we don't render 2
// Reset the Grid using the ResetRange() in all other cases. // times. Reset the Grid using the ResetRange() in all other cases.
if (m_resetUsingInitialDisplayRange) if (m_resetUsingInitialDisplayRange)
{ {
hr = renderer->SetDisplayRanges(m_initialDisplayRangeXMin, m_initialDisplayRangeXMax, m_initialDisplayRangeYMin, m_initialDisplayRangeYMax); hr = renderer->SetDisplayRanges(m_initialDisplayRangeXMin, m_initialDisplayRangeXMax, m_initialDisplayRangeYMin, m_initialDisplayRangeYMax);
@ -1123,7 +1123,8 @@ optional<vector<shared_ptr<Graphing::IEquation>>> Grapher::TryInitializeGraph(bo
{ {
if (IsKeepCurrentView) if (IsKeepCurrentView)
{ {
// PrepareGraph() populates the values of the graph after TryInitialize but before rendering. This allows us to get the range of the graph to be rendered. // PrepareGraph() populates the values of the graph after TryInitialize but before rendering. This allows us to get the range of the graph to be
// rendered.
if (SUCCEEDED(renderer->PrepareGraph())) if (SUCCEEDED(renderer->PrepareGraph()))
{ {
// Get the initial display ranges from the graph that was just initialized to be used in ResetGrid if they user clicks the GraphView button. // Get the initial display ranges from the graph that was just initialized to be used in ResetGrid if they user clicks the GraphView button.

1
src/GraphControl/Control/Grapher.h
View file

@ -82,7 +82,6 @@ public enum class GraphViewChangedReason
void ZoomFromCenter(double scale); void ZoomFromCenter(double scale);
void ResetGrid(); void ResetGrid();
property Windows::Foundation::Point TraceLocation property Windows::Foundation::Point TraceLocation
{ {
Windows::Foundation::Point get() Windows::Foundation::Point get()

6
src/GraphControl/DirectX/DeviceResources.cpp
View file

@ -254,8 +254,7 @@ namespace GraphControl::DX
lround(m_d3dRenderTargetSize.Width), lround(m_d3dRenderTargetSize.Width),
lround(m_d3dRenderTargetSize.Height), lround(m_d3dRenderTargetSize.Height),
DXGI_FORMAT_B8G8R8A8_UNORM, DXGI_FORMAT_B8G8R8A8_UNORM,
0 0);
);
if (hr == DXGI_ERROR_DEVICE_REMOVED || hr == DXGI_ERROR_DEVICE_RESET) if (hr == DXGI_ERROR_DEVICE_REMOVED || hr == DXGI_ERROR_DEVICE_RESET)
{ {
@ -533,8 +532,7 @@ namespace GraphControl::DX
// This method is called in the event handler for the CompositionScaleChanged event. // This method is called in the event handler for the CompositionScaleChanged event.
void DeviceResources::SetCompositionScale(float compositionScaleX, float compositionScaleY) void DeviceResources::SetCompositionScale(float compositionScaleX, float compositionScaleY)
{ {
if (m_compositionScaleX != compositionScaleX || if (m_compositionScaleX != compositionScaleX || m_compositionScaleY != compositionScaleY)
m_compositionScaleY != compositionScaleY)
{ {
m_compositionScaleX = compositionScaleX; m_compositionScaleX = compositionScaleX;
m_compositionScaleY = compositionScaleY; m_compositionScaleY = compositionScaleY;

8
src/GraphControl/DirectX/RenderMain.h
View file

@ -152,6 +152,7 @@ namespace GraphControl::DX
void OnSizeChanged(Platform::Object ^ sender, Windows::UI::Xaml::SizeChangedEventArgs ^ e); void OnSizeChanged(Platform::Object ^ sender, Windows::UI::Xaml::SizeChangedEventArgs ^ e);
double GetPrecision(const double maxAxis, const double minAxis); double GetPrecision(const double maxAxis, const double minAxis);
private: private:
DX::DeviceResources m_deviceResources; DX::DeviceResources m_deviceResources;
NearestPointRenderer m_nearestPointRenderer; NearestPointRenderer m_nearestPointRenderer;
@ -191,7 +192,6 @@ namespace GraphControl::DX
double m_XTraceValue; double m_XTraceValue;
double m_YTraceValue; double m_YTraceValue;
// And where is it located on screen // And where is it located on screen
Windows::Foundation::Point m_TraceLocation; Windows::Foundation::Point m_TraceLocation;
@ -200,10 +200,10 @@ namespace GraphControl::DX
Concurrency::critical_section m_criticalSection; Concurrency::critical_section m_criticalSection;
Windows::Foundation::IAsyncAction ^ m_renderPass = nullptr; Windows::Foundation::IAsyncAction ^ m_renderPass = nullptr;
bool m_isRenderPassSuccesful; bool m_isRenderPassSuccesful;
HRESULT m_HResult; HRESULT m_HResult;
}; };
} }

5
src/GraphControl/Models/EquationCollection.h
View file

@ -154,11 +154,12 @@ public
event EquationChangedEventHandler ^ EquationLineEnabledChanged; event EquationChangedEventHandler ^ EquationLineEnabledChanged;
private: private:
void OnEquationPropertyChanged(Object^ sender, Windows::UI::Xaml::Data::PropertyChangedEventArgs ^ args) void OnEquationPropertyChanged(Object ^ sender, Windows::UI::Xaml::Data::PropertyChangedEventArgs ^ args)
{ {
auto equation = static_cast<Equation ^>(sender); auto equation = static_cast<Equation ^>(sender);
auto propertyName = args->PropertyName; auto propertyName = args->PropertyName;
if (propertyName == GraphControl::Equation::LineColorPropertyName || propertyName == GraphControl::Equation::IsSelectedPropertyName || propertyName == GraphControl::Equation::EquationStylePropertyName) if (propertyName == GraphControl::Equation::LineColorPropertyName || propertyName == GraphControl::Equation::IsSelectedPropertyName
|| propertyName == GraphControl::Equation::EquationStylePropertyName)
{ {
EquationStyleChanged(equation); EquationStyleChanged(equation);
} }

2
src/GraphControl/Models/KeyGraphFeaturesInfo.h
View file

@ -4,7 +4,6 @@
#pragma once #pragma once
#include "Utils.h" #include "Utils.h"
namespace Graphing namespace Graphing
{ {
struct IGraphFunctionAnalysisData; struct IGraphFunctionAnalysisData;
@ -17,7 +16,6 @@ namespace CalculatorApp
namespace GraphControl namespace GraphControl
{ {
public public
ref class KeyGraphFeaturesInfo sealed ref class KeyGraphFeaturesInfo sealed
{ {

2
src/GraphControl/Utils.h
View file

@ -168,7 +168,7 @@ public:
Windows::UI::Xaml::Input::ICommand^ get() {\ Windows::UI::Xaml::Input::ICommand^ get() {\
if (!donotuse_##p) {\ if (!donotuse_##p) {\
donotuse_##p = CalculatorApp::Common::MakeDelegate(this, &m);\ donotuse_##p = CalculatorApp::Common::MakeDelegate(this, &m);\
} return donotuse_##p; }} private: Windows::UI::Xaml::Input::ICommand^ donotuse_##p; \ } return donotuse_##p; }} private: Windows::UI::Xaml::Input::ICommand^ donotuse_##p; \
\ \
public: public:

1
src/GraphControl/pch.h
View file

@ -25,7 +25,6 @@
#include <map> #include <map>
#include <type_traits> #include <type_traits>
// DirectX headers // DirectX headers
#include <d2d1_3.h> #include <d2d1_3.h>
#include <d3d11_4.h> #include <d3d11_4.h>

1
src/GraphingImpl/Mocks/GraphRenderer.h
View file

@ -109,7 +109,6 @@ namespace MockGraphingImpl
return S_OK; return S_OK;
} }
private: private:
double m_xMin; double m_xMin;
double m_xMax; double m_xMax;

2
src/GraphingInterfaces/Common.h
View file

@ -54,7 +54,7 @@ namespace Graphing
{ {
virtual ~IExpressible() = default; virtual ~IExpressible() = default;
virtual std::shared_ptr< IExpression > GetExpression() const = 0; virtual std::shared_ptr<IExpression> GetExpression() const = 0;
}; };
class Color class Color

8
src/GraphingInterfaces/IBitmap.h
View file

@ -7,8 +7,8 @@
namespace Graphing namespace Graphing
{ {
struct IBitmap struct IBitmap
{ {
virtual const std::vector<BYTE>& GetData() const = 0; virtual const std::vector<BYTE>& GetData() const = 0;
}; };
} }

2
src/GraphingInterfaces/IGraph.h
View file

@ -30,6 +30,6 @@ namespace Graphing
virtual bool TryResetSelection() = 0; virtual bool TryResetSelection() = 0;
virtual std::shared_ptr< Graphing::Analyzer::IGraphAnalyzer > GetAnalyzer() const = 0; virtual std::shared_ptr<Graphing::Analyzer::IGraphAnalyzer> GetAnalyzer() const = 0;
}; };
} }

8
src/GraphingInterfaces/IGraphAnalyzer.h
View file

@ -11,14 +11,14 @@
namespace Graphing::Analyzer namespace Graphing::Analyzer
{ {
typedef unsigned int NativeAnalysisType; // PerformAnalysisType typedef unsigned int NativeAnalysisType; // PerformAnalysisType
struct IGraphAnalyzer : public NonCopyable, public NonMoveable struct IGraphAnalyzer : public NonCopyable, public NonMoveable
{ {
virtual ~IGraphAnalyzer() = default; virtual ~IGraphAnalyzer() = default;
virtual bool CanFunctionAnalysisBePerformed(bool& variableIsNotX) = 0; virtual bool CanFunctionAnalysisBePerformed(bool& variableIsNotX) = 0;
virtual HRESULT PerformFunctionAnalysis(NativeAnalysisType analysisType) = 0; virtual HRESULT PerformFunctionAnalysis(NativeAnalysisType analysisType) = 0;
virtual HRESULT GetAnalysisTypeCaption(const AnalysisType type, std::wstring& captionOut) const = 0; virtual HRESULT GetAnalysisTypeCaption(const AnalysisType type, std::wstring& captionOut) const = 0;
virtual HRESULT GetMessage(const GraphAnalyzerMessage msg, std::wstring& msgOut) const = 0; virtual HRESULT GetMessage(const GraphAnalyzerMessage msg, std::wstring& msgOut) const = 0;
}; };
} }

45
src/GraphingInterfaces/IGraphRenderer.h
View file

@ -10,29 +10,40 @@ struct ID2D1RenderTarget;
namespace Graphing namespace Graphing
{ {
struct IBitmap; struct IBitmap;
} }
namespace Graphing::Renderer namespace Graphing::Renderer
{ {
struct IGraphRenderer : public NonCopyable, public NonMoveable struct IGraphRenderer : public NonCopyable, public NonMoveable
{ {
virtual ~IGraphRenderer() = default; virtual ~IGraphRenderer() = default;
virtual HRESULT SetGraphSize(unsigned int width, unsigned int height) = 0; virtual HRESULT SetGraphSize(unsigned int width, unsigned int height) = 0;
virtual HRESULT SetDpi(float dpiX, float dpiY) = 0; virtual HRESULT SetDpi(float dpiX, float dpiY) = 0;
virtual HRESULT DrawD2D1(ID2D1Factory* pDirect2dFactory, ID2D1RenderTarget* pRenderTarget, bool& hasSomeMissingDataOut) = 0; virtual HRESULT DrawD2D1(ID2D1Factory* pDirect2dFactory, ID2D1RenderTarget* pRenderTarget, bool& hasSomeMissingDataOut) = 0;
virtual HRESULT GetClosePointData(double inScreenPointX, double inScreenPointY, double precision, int& formulaIdOut, float& xScreenPointOut, float& yScreenPointOut, double& xValueOut, double& yValueOut, double& rhoValueOut, double& thetaValueOut, double& tValueOut) = 0; virtual HRESULT GetClosePointData(
double inScreenPointX,
double inScreenPointY,
double precision,
int& formulaIdOut,
float& xScreenPointOut,
float& yScreenPointOut,
double& xValueOut,
double& yValueOut,
double& rhoValueOut,
double& thetaValueOut,
double& tValueOut) = 0;
virtual HRESULT ScaleRange(double centerX, double centerY, double scale) = 0; virtual HRESULT ScaleRange(double centerX, double centerY, double scale) = 0;
virtual HRESULT ChangeRange(ChangeRangeAction action) = 0; virtual HRESULT ChangeRange(ChangeRangeAction action) = 0;
virtual HRESULT MoveRangeByRatio(double ratioX, double ratioY) = 0; virtual HRESULT MoveRangeByRatio(double ratioX, double ratioY) = 0;
virtual HRESULT ResetRange() = 0; virtual HRESULT ResetRange() = 0;
virtual HRESULT GetDisplayRanges(double& xMin, double& xMax, double& yMin, double& yMax) = 0; virtual HRESULT GetDisplayRanges(double& xMin, double& xMax, double& yMin, double& yMax) = 0;
virtual HRESULT SetDisplayRanges(double xMin, double xMax, double yMin, double yMax) = 0; virtual HRESULT SetDisplayRanges(double xMin, double xMax, double yMin, double yMax) = 0;
virtual HRESULT PrepareGraph() = 0; virtual HRESULT PrepareGraph() = 0;
virtual HRESULT GetBitmap(std::shared_ptr<Graphing::IBitmap>& bitmapOut, bool& hasSomeMissingDataOut) = 0; virtual HRESULT GetBitmap(std::shared_ptr<Graphing::IBitmap>& bitmapOut, bool& hasSomeMissingDataOut) = 0;
}; };
} }

38
src/GraphingInterfaces/IMathSolver.h
View file

@ -10,24 +10,24 @@
namespace Graphing namespace Graphing
{ {
struct IGraphFunctionAnalysisData struct IGraphFunctionAnalysisData
{ {
std::wstring Domain; std::wstring Domain;
std::wstring Range; std::wstring Range;
int Parity; int Parity;
int PeriodicityDirection; int PeriodicityDirection;
std::wstring PeriodicityExpression; std::wstring PeriodicityExpression;
std::wstring Zeros; std::wstring Zeros;
std::wstring YIntercept; std::wstring YIntercept;
std::vector<std::wstring> Minima; std::vector<std::wstring> Minima;
std::vector<std::wstring> Maxima; std::vector<std::wstring> Maxima;
std::vector<std::wstring> InflectionPoints; std::vector<std::wstring> InflectionPoints;
std::vector<std::wstring> VerticalAsymptotes; std::vector<std::wstring> VerticalAsymptotes;
std::vector<std::wstring> HorizontalAsymptotes; std::vector<std::wstring> HorizontalAsymptotes;
std::vector<std::wstring> ObliqueAsymptotes; std::vector<std::wstring> ObliqueAsymptotes;
std::map<std::wstring, int> MonotoneIntervals; std::map<std::wstring, int> MonotoneIntervals;
int TooComplexFeatures; // to-do: refactor to remove bitwise flag int TooComplexFeatures; // to-do: refactor to remove bitwise flag
}; };
struct IParsingOptions : public NonCopyable, public NonMoveable struct IParsingOptions : public NonCopyable, public NonMoveable
{ {
@ -73,6 +73,6 @@ namespace Graphing
virtual std::wstring Serialize(const IExpression* expression) = 0; virtual std::wstring Serialize(const IExpression* expression) = 0;
virtual Graphing::IGraphFunctionAnalysisData Analyze(const Graphing::Analyzer::IGraphAnalyzer* analyzer) = 0; virtual Graphing::IGraphFunctionAnalysisData Analyze(const Graphing::Analyzer::IGraphAnalyzer* analyzer) = 0;
}; };
} }

6
src/TraceLogging/TraceLoggingCommon.cpp
View file

@ -6,7 +6,7 @@
using namespace TraceLogging; using namespace TraceLogging;
using namespace std; using namespace std;
using namespace Platform;; using namespace Platform;
using namespace Windows::Foundation; using namespace Windows::Foundation;
using namespace Windows::Foundation::Diagnostics; using namespace Windows::Foundation::Diagnostics;
@ -39,9 +39,9 @@ TraceLoggingCommon::TraceLoggingCommon()
CoCreateGuid(&sessionGuid); CoCreateGuid(&sessionGuid);
} }
TraceLoggingCommon ^ TraceLoggingCommon::GetInstance() TraceLoggingCommon ^ TraceLoggingCommon::GetInstance()
{ {
static TraceLoggingCommon ^ s_selfInstance = ref new TraceLoggingCommon(); static TraceLoggingCommon ^ s_selfInstance = ref new TraceLoggingCommon();
return s_selfInstance; return s_selfInstance;
} }

1
src/TraceLogging/TraceLoggingCommon.h
View file

@ -23,7 +23,6 @@ namespace TraceLogging
private: private:
TraceLoggingCommon(); TraceLoggingCommon();
Windows::Foundation::Diagnostics::LoggingChannel ^ g_calculatorProvider; Windows::Foundation::Diagnostics::LoggingChannel ^ g_calculatorProvider;
Windows::Foundation::Diagnostics::LoggingActivity ^ m_appLaunchActivity; Windows::Foundation::Diagnostics::LoggingActivity ^ m_appLaunchActivity;
GUID sessionGuid; GUID sessionGuid;