@@ -257,26 +257,9 @@ namespace CalculatorUnitTests
257257 void NavCategoryUnitTests::GetIndex ()
258258 {
259259 // Index is the 0-based ordering of modes
260- ViewMode orderedModes[] = {
261- ViewMode::Standard,
262- ViewMode::Scientific,
263- ViewMode::Graphing,
264- ViewMode::Programmer,
265- ViewMode::Date,
266- ViewMode::Currency,
267- ViewMode::Volume,
268- ViewMode::Length,
269- ViewMode::Weight,
270- ViewMode::Temperature,
271- ViewMode::Energy,
272- ViewMode::Area,
273- ViewMode::Speed,
274- ViewMode::Time,
275- ViewMode::Power,
276- ViewMode::Data,
277- ViewMode::Pressure,
278- ViewMode::Angle
279- };
260+ ViewMode orderedModes[] = { ViewMode::Standard, ViewMode::Scientific, ViewMode::Graphing, ViewMode::Programmer, ViewMode::Date, ViewMode::Currency,
261+ ViewMode::Volume, ViewMode::Length, ViewMode::Weight, ViewMode::Temperature, ViewMode::Energy, ViewMode::Area,
262+ ViewMode::Speed, ViewMode::Time, ViewMode::Power, ViewMode::Data, ViewMode::Pressure, ViewMode::Angle };
280263
281264 auto orderedModesSize = size (orderedModes);
282265 for (size_t index = 0 ; index < orderedModesSize; index++)
@@ -292,9 +275,9 @@ namespace CalculatorUnitTests
292275 {
293276 // Position is the 1-based ordering of modes
294277 vector<ViewMode> orderedModes = { ViewMode::Standard, ViewMode::Scientific, ViewMode::Graphing, ViewMode::Programmer, ViewMode::Date,
295- ViewMode::Currency, ViewMode::Volume, ViewMode::Length, ViewMode::Weight, ViewMode::Temperature,
296- ViewMode::Energy, ViewMode::Area, ViewMode::Speed, ViewMode::Time, ViewMode::Power,
297- ViewMode::Data, ViewMode::Pressure, ViewMode::Angle };
278+ ViewMode::Currency, ViewMode::Volume, ViewMode::Length, ViewMode::Weight, ViewMode::Temperature,
279+ ViewMode::Energy, ViewMode::Area, ViewMode::Speed, ViewMode::Time, ViewMode::Power,
280+ ViewMode::Data, ViewMode::Pressure, ViewMode::Angle };
298281
299282 auto orderedModesSize = size (orderedModes);
300283 for (size_t pos = 1 ; pos <= orderedModesSize; pos++)
@@ -319,10 +302,17 @@ namespace CalculatorUnitTests
319302 {
320303 VERIFY_ARE_EQUAL (0 , NavCategory::GetIndexInGroup (ViewMode::Standard, CategoryGroupType::Calculator));
321304 VERIFY_ARE_EQUAL (1 , NavCategory::GetIndexInGroup (ViewMode::Scientific, CategoryGroupType::Calculator));
322- VERIFY_ARE_EQUAL (2 , NavCategory::GetIndexInGroup (ViewMode::Graphing, CategoryGroupType::Calculator));
323- VERIFY_ARE_EQUAL (3 , NavCategory::GetIndexInGroup (ViewMode::Programmer, CategoryGroupType::Calculator));
324- VERIFY_ARE_EQUAL (4 , NavCategory::GetIndexInGroup (ViewMode::Date, CategoryGroupType::Calculator));
325-
305+ if (Windows::Foundation::Metadata::ApiInformation::IsMethodPresent (" Windows.UI.Text.RichEditTextDocument" , " GetMath" ))
306+ {
307+ VERIFY_ARE_EQUAL (2 , NavCategory::GetIndexInGroup (ViewMode::Graphing, CategoryGroupType::Calculator));
308+ VERIFY_ARE_EQUAL (3 , NavCategory::GetIndexInGroup (ViewMode::Programmer, CategoryGroupType::Calculator));
309+ VERIFY_ARE_EQUAL (4 , NavCategory::GetIndexInGroup (ViewMode::Date, CategoryGroupType::Calculator));
310+ }
311+ else
312+ {
313+ VERIFY_ARE_EQUAL (2 , NavCategory::GetIndexInGroup (ViewMode::Programmer, CategoryGroupType::Calculator));
314+ VERIFY_ARE_EQUAL (3 , NavCategory::GetIndexInGroup (ViewMode::Date, CategoryGroupType::Calculator));
315+ }
326316 VERIFY_ARE_EQUAL (0 , NavCategory::GetIndexInGroup (ViewMode::Currency, CategoryGroupType::Converter));
327317 VERIFY_ARE_EQUAL (1 , NavCategory::GetIndexInGroup (ViewMode::Volume, CategoryGroupType::Converter));
328318 VERIFY_ARE_EQUAL (2 , NavCategory::GetIndexInGroup (ViewMode::Length, CategoryGroupType::Converter));
@@ -383,21 +373,21 @@ namespace CalculatorUnitTests
383373 NavCategoryGroup ^ calculatorGroup = menuOptions->GetAt (0 );
384374 VERIFY_ARE_EQUAL (CategoryGroupType::Calculator, calculatorGroup->GroupType );
385375
386- IObservableVector<NavCategory^> ^ calculatorCategories = calculatorGroup->Categories ;
376+ IObservableVector<NavCategory ^> ^ calculatorCategories = calculatorGroup->Categories ;
387377 VERIFY_ARE_EQUAL (5 , calculatorCategories->Size );
388- ValidateNavCategory (calculatorCategories, 0u , ViewMode::Standard);
389- ValidateNavCategory (calculatorCategories, 1u , ViewMode::Scientific);
390- if (Windows::Foundation::Metadata::ApiInformation::IsMethodPresent (" Windows.UI.Text.RichEditTextDocument" , " GetMath" ))
391- {
392- ValidateNavCategory (calculatorCategories, 2u , ViewMode::Graphing);
393- ValidateNavCategory (calculatorCategories, 3u , ViewMode::Programmer);
394- ValidateNavCategory (calculatorCategories, 4u , ViewMode::Date);
395- }
396- else
397- {
398- ValidateNavCategory (calculatorCategories, 2u , ViewMode::Programmer);
399- ValidateNavCategory (calculatorCategories, 3u , ViewMode::Date);
400- }
378+ ValidateNavCategory (calculatorCategories, 0u , ViewMode::Standard);
379+ ValidateNavCategory (calculatorCategories, 1u , ViewMode::Scientific);
380+ if (Windows::Foundation::Metadata::ApiInformation::IsMethodPresent (" Windows.UI.Text.RichEditTextDocument" , " GetMath" ))
381+ {
382+ ValidateNavCategory (calculatorCategories, 2u , ViewMode::Graphing);
383+ ValidateNavCategory (calculatorCategories, 3u , ViewMode::Programmer);
384+ ValidateNavCategory (calculatorCategories, 4u , ViewMode::Date);
385+ }
386+ else
387+ {
388+ ValidateNavCategory (calculatorCategories, 2u , ViewMode::Programmer);
389+ ValidateNavCategory (calculatorCategories, 3u , ViewMode::Date);
390+ }
401391
402392 NavCategoryGroup ^ converterGroup = menuOptions->GetAt (1 );
403393 VERIFY_ARE_EQUAL (CategoryGroupType::Converter, converterGroup->GroupType );
0 commit comments