From cddb22d0860007bb1befc8a2bd4de925021f0486 Mon Sep 17 00:00:00 2001 From: Eric Tian Date: Sat, 12 Sep 2020 14:41:48 -0700 Subject: [PATCH] Unit tests --- .../NavCategoryUnitTests.cpp | 39 ++++++++++++------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/src/CalculatorUnitTests/NavCategoryUnitTests.cpp b/src/CalculatorUnitTests/NavCategoryUnitTests.cpp index 170acf6a..5683a9ce 100644 --- a/src/CalculatorUnitTests/NavCategoryUnitTests.cpp +++ b/src/CalculatorUnitTests/NavCategoryUnitTests.cpp @@ -97,7 +97,7 @@ namespace CalculatorUnitTests // Boundary testing VERIFY_ARE_EQUAL(ViewMode::None, NavCategory::Deserialize(ref new Box(-1))); - VERIFY_ARE_EQUAL(ViewMode::None, NavCategory::Deserialize(ref new Box(18))); + VERIFY_ARE_EQUAL(ViewMode::None, NavCategory::Deserialize(ref new Box(19))); } void NavCategoryUnitTests::IsValidViewMode_AllValid() @@ -123,6 +123,7 @@ namespace CalculatorUnitTests VERIFY_IS_TRUE(NavCategory::IsValidViewMode(ViewMode::Data)); VERIFY_IS_TRUE(NavCategory::IsValidViewMode(ViewMode::Pressure)); VERIFY_IS_TRUE(NavCategory::IsValidViewMode(ViewMode::Angle)); + VERIFY_IS_TRUE(NavCategory::IsValidViewMode(ViewMode::Settings)); } void NavCategoryUnitTests::IsValidViewMode_AllInvalid() @@ -131,15 +132,15 @@ namespace CalculatorUnitTests if (Windows::Foundation::Metadata::ApiInformation::IsMethodPresent("Windows.UI.Text.RichEditTextDocument", "GetMath")) { - // There are 18 total options so int 18 should be the first invalid - VERIFY_IS_TRUE(NavCategory::IsValidViewMode(static_cast(17))); - VERIFY_IS_FALSE(NavCategory::IsValidViewMode(static_cast(18))); + // There are 19 total options so int 19 should be the first invalid + VERIFY_IS_TRUE(NavCategory::IsValidViewMode(static_cast(18))); + VERIFY_IS_FALSE(NavCategory::IsValidViewMode(static_cast(19))); } else { - // There are 17 total options when graphing calculator is not present, so int 17 should be the first invalid - VERIFY_IS_TRUE(NavCategory::IsValidViewMode(static_cast(16))); - VERIFY_IS_FALSE(NavCategory::IsValidViewMode(static_cast(17))); + // There are 18 total options when graphing calculator is not present, so int 18 should be the first invalid + VERIFY_IS_TRUE(NavCategory::IsValidViewMode(static_cast(17))); + VERIFY_IS_FALSE(NavCategory::IsValidViewMode(static_cast(18))); } // Also verify the lower bound @@ -172,6 +173,7 @@ namespace CalculatorUnitTests VERIFY_IS_FALSE(NavCategory::IsCalculatorViewMode(ViewMode::Data)); VERIFY_IS_FALSE(NavCategory::IsCalculatorViewMode(ViewMode::Pressure)); VERIFY_IS_FALSE(NavCategory::IsCalculatorViewMode(ViewMode::Angle)); + VERIFY_IS_FALSE(NavCategory::IsCalculatorViewMode(ViewMode::Settings)); } void NavCategoryUnitTests::IsDateCalculatorViewMode() @@ -199,6 +201,7 @@ namespace CalculatorUnitTests VERIFY_IS_FALSE(NavCategory::IsDateCalculatorViewMode(ViewMode::Data)); VERIFY_IS_FALSE(NavCategory::IsDateCalculatorViewMode(ViewMode::Pressure)); VERIFY_IS_FALSE(NavCategory::IsDateCalculatorViewMode(ViewMode::Angle)); + VERIFY_IS_FALSE(NavCategory::IsDateCalculatorViewMode(ViewMode::Settings)); } void NavCategoryUnitTests::IsConverterViewMode() @@ -225,6 +228,7 @@ namespace CalculatorUnitTests VERIFY_IS_TRUE(NavCategory::IsConverterViewMode(ViewMode::Data)); VERIFY_IS_TRUE(NavCategory::IsConverterViewMode(ViewMode::Pressure)); VERIFY_IS_TRUE(NavCategory::IsConverterViewMode(ViewMode::Angle)); + VERIFY_IS_TRUE(NavCategory::IsConverterViewMode(ViewMode::Settings)); } void NavCategoryUnitTests::GetFriendlyName() @@ -250,6 +254,7 @@ namespace CalculatorUnitTests VERIFY_ARE_EQUAL(StringReference(L"Data"), NavCategory::GetFriendlyName(ViewMode::Data)); VERIFY_ARE_EQUAL(StringReference(L"Pressure"), NavCategory::GetFriendlyName(ViewMode::Pressure)); VERIFY_ARE_EQUAL(StringReference(L"Angle"), NavCategory::GetFriendlyName(ViewMode::Angle)); + VERIFY_ARE_EQUAL(StringReference(L"Settings"), NavCategory::GetFriendlyName(ViewMode::Settings)); VERIFY_ARE_EQUAL(StringReference(L"None"), NavCategory::GetFriendlyName(ViewMode::None)); } @@ -278,6 +283,7 @@ namespace CalculatorUnitTests VERIFY_ARE_EQUAL(CategoryGroupType::Converter, NavCategory::GetGroupType(ViewMode::Data)); VERIFY_ARE_EQUAL(CategoryGroupType::Converter, NavCategory::GetGroupType(ViewMode::Pressure)); VERIFY_ARE_EQUAL(CategoryGroupType::Converter, NavCategory::GetGroupType(ViewMode::Angle)); + VERIFY_ARE_EQUAL(CategoryGroupType::None, NavCategory::GetGroupType(ViewMode::Settings)); } void NavCategoryUnitTests::GetIndex() @@ -287,15 +293,16 @@ namespace CalculatorUnitTests if (Windows::Foundation::Metadata::ApiInformation::IsMethodPresent("Windows.UI.Text.RichEditTextDocument", "GetMath")) { - 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 }; + 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::Settings }; } else { orderedModes = { ViewMode::Standard, ViewMode::Scientific, 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::Time, ViewMode::Power, ViewMode::Data, ViewMode::Pressure, ViewMode::Angle, ViewMode::Settings }; } auto orderedModesSize = size(orderedModes); @@ -315,15 +322,16 @@ namespace CalculatorUnitTests if (Windows::Foundation::Metadata::ApiInformation::IsMethodPresent("Windows.UI.Text.RichEditTextDocument", "GetMath")) { - 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 }; + 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::Settings }; } else { orderedModes = { ViewMode::Standard, ViewMode::Scientific, 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::Time, ViewMode::Power, ViewMode::Data, ViewMode::Pressure, ViewMode::Angle, ViewMode::Settings }; } auto orderedModesSize = size(orderedModes); @@ -373,6 +381,7 @@ namespace CalculatorUnitTests VERIFY_ARE_EQUAL(10, NavCategory::GetIndexInGroup(ViewMode::Data, CategoryGroupType::Converter)); VERIFY_ARE_EQUAL(11, NavCategory::GetIndexInGroup(ViewMode::Pressure, CategoryGroupType::Converter)); VERIFY_ARE_EQUAL(12, NavCategory::GetIndexInGroup(ViewMode::Angle, CategoryGroupType::Converter)); + VERIFY_ARE_EQUAL(0, NavCategory::GetIndexInGroup(ViewMode::Settings, CategoryGroupType::None)); VERIFY_ARE_EQUAL(-1, NavCategory::GetIndexInGroup(ViewMode::None, CategoryGroupType::Calculator)); VERIFY_ARE_EQUAL(-1, NavCategory::GetIndexInGroup(ViewMode::None, CategoryGroupType::Converter));