Add condition to unit tests to handle cases where graphing calculator is hidden
This commit is contained in:
parent
78c6c2faff
commit
40cadcda13
@ -257,26 +257,9 @@ namespace CalculatorUnitTests
|
|||||||
void NavCategoryUnitTests::GetIndex()
|
void NavCategoryUnitTests::GetIndex()
|
||||||
{
|
{
|
||||||
// Index is the 0-based ordering of modes
|
// Index is the 0-based ordering of modes
|
||||||
ViewMode orderedModes[] = {
|
ViewMode orderedModes[] = { ViewMode::Standard, ViewMode::Scientific, ViewMode::Graphing, ViewMode::Programmer, ViewMode::Date, ViewMode::Currency,
|
||||||
ViewMode::Standard,
|
ViewMode::Volume, ViewMode::Length, ViewMode::Weight, ViewMode::Temperature, ViewMode::Energy, ViewMode::Area,
|
||||||
ViewMode::Scientific,
|
ViewMode::Speed, ViewMode::Time, ViewMode::Power, ViewMode::Data, ViewMode::Pressure, ViewMode::Angle };
|
||||||
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);
|
auto orderedModesSize = size(orderedModes);
|
||||||
for (size_t index = 0; index < orderedModesSize; index++)
|
for (size_t index = 0; index < orderedModesSize; index++)
|
||||||
@ -292,9 +275,9 @@ namespace CalculatorUnitTests
|
|||||||
{
|
{
|
||||||
// Position is the 1-based ordering of modes
|
// Position is the 1-based ordering of modes
|
||||||
vector<ViewMode> orderedModes = { ViewMode::Standard, ViewMode::Scientific, ViewMode::Graphing, ViewMode::Programmer, ViewMode::Date,
|
vector<ViewMode> orderedModes = { ViewMode::Standard, ViewMode::Scientific, ViewMode::Graphing, ViewMode::Programmer, ViewMode::Date,
|
||||||
ViewMode::Currency, ViewMode::Volume, ViewMode::Length, ViewMode::Weight, ViewMode::Temperature,
|
ViewMode::Currency, ViewMode::Volume, ViewMode::Length, ViewMode::Weight, ViewMode::Temperature,
|
||||||
ViewMode::Energy, ViewMode::Area, ViewMode::Speed, ViewMode::Time, ViewMode::Power,
|
ViewMode::Energy, ViewMode::Area, ViewMode::Speed, ViewMode::Time, ViewMode::Power,
|
||||||
ViewMode::Data, ViewMode::Pressure, ViewMode::Angle };
|
ViewMode::Data, ViewMode::Pressure, ViewMode::Angle };
|
||||||
|
|
||||||
auto orderedModesSize = size(orderedModes);
|
auto orderedModesSize = size(orderedModes);
|
||||||
for (size_t pos = 1; pos <= orderedModesSize; pos++)
|
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(0, NavCategory::GetIndexInGroup(ViewMode::Standard, CategoryGroupType::Calculator));
|
||||||
VERIFY_ARE_EQUAL(1, NavCategory::GetIndexInGroup(ViewMode::Scientific, CategoryGroupType::Calculator));
|
VERIFY_ARE_EQUAL(1, NavCategory::GetIndexInGroup(ViewMode::Scientific, CategoryGroupType::Calculator));
|
||||||
VERIFY_ARE_EQUAL(2, NavCategory::GetIndexInGroup(ViewMode::Graphing, CategoryGroupType::Calculator));
|
if (Windows::Foundation::Metadata::ApiInformation::IsMethodPresent("Windows.UI.Text.RichEditTextDocument", "GetMath"))
|
||||||
VERIFY_ARE_EQUAL(3, NavCategory::GetIndexInGroup(ViewMode::Programmer, CategoryGroupType::Calculator));
|
{
|
||||||
VERIFY_ARE_EQUAL(4, NavCategory::GetIndexInGroup(ViewMode::Date, 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));
|
||||||
|
}
|
||||||
|
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(0, NavCategory::GetIndexInGroup(ViewMode::Currency, CategoryGroupType::Converter));
|
||||||
VERIFY_ARE_EQUAL(1, NavCategory::GetIndexInGroup(ViewMode::Volume, CategoryGroupType::Converter));
|
VERIFY_ARE_EQUAL(1, NavCategory::GetIndexInGroup(ViewMode::Volume, CategoryGroupType::Converter));
|
||||||
VERIFY_ARE_EQUAL(2, NavCategory::GetIndexInGroup(ViewMode::Length, CategoryGroupType::Converter));
|
VERIFY_ARE_EQUAL(2, NavCategory::GetIndexInGroup(ViewMode::Length, CategoryGroupType::Converter));
|
||||||
@ -383,21 +373,21 @@ namespace CalculatorUnitTests
|
|||||||
NavCategoryGroup ^ calculatorGroup = menuOptions->GetAt(0);
|
NavCategoryGroup ^ calculatorGroup = menuOptions->GetAt(0);
|
||||||
VERIFY_ARE_EQUAL(CategoryGroupType::Calculator, calculatorGroup->GroupType);
|
VERIFY_ARE_EQUAL(CategoryGroupType::Calculator, calculatorGroup->GroupType);
|
||||||
|
|
||||||
IObservableVector<NavCategory^>^ calculatorCategories = calculatorGroup->Categories;
|
IObservableVector<NavCategory ^> ^ calculatorCategories = calculatorGroup->Categories;
|
||||||
VERIFY_ARE_EQUAL(5, calculatorCategories->Size);
|
VERIFY_ARE_EQUAL(5, calculatorCategories->Size);
|
||||||
ValidateNavCategory(calculatorCategories, 0u, ViewMode::Standard);
|
ValidateNavCategory(calculatorCategories, 0u, ViewMode::Standard);
|
||||||
ValidateNavCategory(calculatorCategories, 1u, ViewMode::Scientific);
|
ValidateNavCategory(calculatorCategories, 1u, ViewMode::Scientific);
|
||||||
if (Windows::Foundation::Metadata::ApiInformation::IsMethodPresent("Windows.UI.Text.RichEditTextDocument", "GetMath"))
|
if (Windows::Foundation::Metadata::ApiInformation::IsMethodPresent("Windows.UI.Text.RichEditTextDocument", "GetMath"))
|
||||||
{
|
{
|
||||||
ValidateNavCategory(calculatorCategories, 2u, ViewMode::Graphing);
|
ValidateNavCategory(calculatorCategories, 2u, ViewMode::Graphing);
|
||||||
ValidateNavCategory(calculatorCategories, 3u, ViewMode::Programmer);
|
ValidateNavCategory(calculatorCategories, 3u, ViewMode::Programmer);
|
||||||
ValidateNavCategory(calculatorCategories, 4u, ViewMode::Date);
|
ValidateNavCategory(calculatorCategories, 4u, ViewMode::Date);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
ValidateNavCategory(calculatorCategories, 2u, ViewMode::Programmer);
|
ValidateNavCategory(calculatorCategories, 2u, ViewMode::Programmer);
|
||||||
ValidateNavCategory(calculatorCategories, 3u, ViewMode::Date);
|
ValidateNavCategory(calculatorCategories, 3u, ViewMode::Date);
|
||||||
}
|
}
|
||||||
|
|
||||||
NavCategoryGroup ^ converterGroup = menuOptions->GetAt(1);
|
NavCategoryGroup ^ converterGroup = menuOptions->GetAt(1);
|
||||||
VERIFY_ARE_EQUAL(CategoryGroupType::Converter, converterGroup->GroupType);
|
VERIFY_ARE_EQUAL(CategoryGroupType::Converter, converterGroup->GroupType);
|
||||||
|
Loading…
Reference in New Issue
Block a user