diff --git a/src/CalculatorUnitTests/NavCategoryUnitTests.cpp b/src/CalculatorUnitTests/NavCategoryUnitTests.cpp index 90b5af9..fd93633 100644 --- a/src/CalculatorUnitTests/NavCategoryUnitTests.cpp +++ b/src/CalculatorUnitTests/NavCategoryUnitTests.cpp @@ -257,26 +257,9 @@ namespace CalculatorUnitTests void NavCategoryUnitTests::GetIndex() { // Index is the 0-based ordering of modes - ViewMode orderedModes[] = { - ViewMode::Standard, - ViewMode::Scientific, - ViewMode::Graphing, - ViewMode::Programmer, - ViewMode::Date, - ViewMode::Currency, - ViewMode::Volume, - ViewMode::Length, - ViewMode::Weight, - ViewMode::Temperature, - ViewMode::Energy, - ViewMode::Area, - ViewMode::Speed, - ViewMode::Time, - ViewMode::Power, - ViewMode::Data, - ViewMode::Pressure, - ViewMode::Angle - }; + ViewMode orderedModes[] = { ViewMode::Standard, ViewMode::Scientific, ViewMode::Graphing, ViewMode::Programmer, ViewMode::Date, ViewMode::Currency, + ViewMode::Volume, ViewMode::Length, ViewMode::Weight, ViewMode::Temperature, ViewMode::Energy, ViewMode::Area, + ViewMode::Speed, ViewMode::Time, ViewMode::Power, ViewMode::Data, ViewMode::Pressure, ViewMode::Angle }; auto orderedModesSize = size(orderedModes); for (size_t index = 0; index < orderedModesSize; index++) @@ -292,9 +275,9 @@ namespace CalculatorUnitTests { // Position is the 1-based ordering of modes vector orderedModes = { ViewMode::Standard, ViewMode::Scientific, ViewMode::Graphing, ViewMode::Programmer, ViewMode::Date, - ViewMode::Currency, ViewMode::Volume, ViewMode::Length, ViewMode::Weight, ViewMode::Temperature, - ViewMode::Energy, ViewMode::Area, ViewMode::Speed, ViewMode::Time, ViewMode::Power, - ViewMode::Data, ViewMode::Pressure, ViewMode::Angle }; + ViewMode::Currency, ViewMode::Volume, ViewMode::Length, ViewMode::Weight, ViewMode::Temperature, + ViewMode::Energy, ViewMode::Area, ViewMode::Speed, ViewMode::Time, ViewMode::Power, + ViewMode::Data, ViewMode::Pressure, ViewMode::Angle }; auto orderedModesSize = size(orderedModes); for (size_t pos = 1; pos <= orderedModesSize; pos++) @@ -319,10 +302,17 @@ namespace CalculatorUnitTests { VERIFY_ARE_EQUAL(0, NavCategory::GetIndexInGroup(ViewMode::Standard, CategoryGroupType::Calculator)); VERIFY_ARE_EQUAL(1, NavCategory::GetIndexInGroup(ViewMode::Scientific, CategoryGroupType::Calculator)); - VERIFY_ARE_EQUAL(2, NavCategory::GetIndexInGroup(ViewMode::Graphing, CategoryGroupType::Calculator)); - VERIFY_ARE_EQUAL(3, NavCategory::GetIndexInGroup(ViewMode::Programmer, CategoryGroupType::Calculator)); - VERIFY_ARE_EQUAL(4, NavCategory::GetIndexInGroup(ViewMode::Date, CategoryGroupType::Calculator)); - + if (Windows::Foundation::Metadata::ApiInformation::IsMethodPresent("Windows.UI.Text.RichEditTextDocument", "GetMath")) + { + VERIFY_ARE_EQUAL(2, NavCategory::GetIndexInGroup(ViewMode::Graphing, CategoryGroupType::Calculator)); + VERIFY_ARE_EQUAL(3, NavCategory::GetIndexInGroup(ViewMode::Programmer, CategoryGroupType::Calculator)); + VERIFY_ARE_EQUAL(4, NavCategory::GetIndexInGroup(ViewMode::Date, CategoryGroupType::Calculator)); + } + else + { + VERIFY_ARE_EQUAL(2, NavCategory::GetIndexInGroup(ViewMode::Programmer, CategoryGroupType::Calculator)); + VERIFY_ARE_EQUAL(3, NavCategory::GetIndexInGroup(ViewMode::Date, CategoryGroupType::Calculator)); + } VERIFY_ARE_EQUAL(0, NavCategory::GetIndexInGroup(ViewMode::Currency, CategoryGroupType::Converter)); VERIFY_ARE_EQUAL(1, NavCategory::GetIndexInGroup(ViewMode::Volume, CategoryGroupType::Converter)); VERIFY_ARE_EQUAL(2, NavCategory::GetIndexInGroup(ViewMode::Length, CategoryGroupType::Converter)); @@ -383,21 +373,21 @@ namespace CalculatorUnitTests NavCategoryGroup ^ calculatorGroup = menuOptions->GetAt(0); VERIFY_ARE_EQUAL(CategoryGroupType::Calculator, calculatorGroup->GroupType); - IObservableVector^ calculatorCategories = calculatorGroup->Categories; + IObservableVector ^ calculatorCategories = calculatorGroup->Categories; VERIFY_ARE_EQUAL(5, calculatorCategories->Size); - ValidateNavCategory(calculatorCategories, 0u, ViewMode::Standard); - ValidateNavCategory(calculatorCategories, 1u, ViewMode::Scientific); - if (Windows::Foundation::Metadata::ApiInformation::IsMethodPresent("Windows.UI.Text.RichEditTextDocument", "GetMath")) - { - ValidateNavCategory(calculatorCategories, 2u, ViewMode::Graphing); - ValidateNavCategory(calculatorCategories, 3u, ViewMode::Programmer); - ValidateNavCategory(calculatorCategories, 4u, ViewMode::Date); - } - else - { - ValidateNavCategory(calculatorCategories, 2u, ViewMode::Programmer); - ValidateNavCategory(calculatorCategories, 3u, ViewMode::Date); - } + ValidateNavCategory(calculatorCategories, 0u, ViewMode::Standard); + ValidateNavCategory(calculatorCategories, 1u, ViewMode::Scientific); + if (Windows::Foundation::Metadata::ApiInformation::IsMethodPresent("Windows.UI.Text.RichEditTextDocument", "GetMath")) + { + ValidateNavCategory(calculatorCategories, 2u, ViewMode::Graphing); + ValidateNavCategory(calculatorCategories, 3u, ViewMode::Programmer); + ValidateNavCategory(calculatorCategories, 4u, ViewMode::Date); + } + else + { + ValidateNavCategory(calculatorCategories, 2u, ViewMode::Programmer); + ValidateNavCategory(calculatorCategories, 3u, ViewMode::Date); + } NavCategoryGroup ^ converterGroup = menuOptions->GetAt(1); VERIFY_ARE_EQUAL(CategoryGroupType::Converter, converterGroup->GroupType);