tests: Remove UWP specific test code

We no longer run tests for WindowsRuntimeComponent, so removing
obsolete #if WINDOWS_UWP pragma regions.

Author: angularsen

UnitsNet.Tests/Extensions/NumberToTimeSpan/NumberToTimeSpanExtensionsTest.cs

@@ -19,7 +19,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if !WINDOWS_UWP
 using System;
 using Xunit;
 using UnitsNet.Extensions.NumberToTimeSpan;
@@ -63,4 +62,3 @@ public void ExtensionMethodsReturnTimeSpanOfSameValue()
         }
     }
 }
-#endif

UnitsNet.Tests/NumberExtensionsTest.cs

@@ -19,7 +19,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if !WINDOWS_UWP
 using Xunit;
 using UnitsNet.Extensions.NumberToAngle;
 using UnitsNet.Extensions.NumberToForce;
@@ -40,4 +39,3 @@ public void SomeArbitraryExtensionMethods_CreatesCorrectValue()
         }
     }
 }
-#endif

UnitsNet.Tests/UnitSystemTests.cs

@@ -25,12 +25,7 @@
 using Xunit;
 using UnitsNet.Units;
 using Xunit.Abstractions;
-#if WINDOWS_UWP
-using Culture=System.String;
-#else
 using System.Globalization;
-using Culture=System.IFormatProvider;
-#endif
 
 namespace UnitsNet.Tests
 {
@@ -41,6 +36,9 @@ namespace UnitsNet.Tests
     public class UnitSystemTests
     {
         private readonly ITestOutputHelper _output;
+        private static CultureInfo CultureAmerican => new CultureInfo("en-US");
+        private static CultureInfo CultureRussian => new CultureInfo("ru-RU");
+        private static CultureInfo CultureNorwegian => new CultureInfo("nb-NO");
 
         public UnitSystemTests(ITestOutputHelper output)
         {
@@ -56,12 +54,7 @@ public UnitSystemTests(ITestOutputHelper output)
         [InlineData(0.115, "0.12 m")]
         public void DefaultToStringFormatting(double value, string expected)
         {
-#if WINDOWS_UWP
-            Culture cultureEnUs = "en-US";
-#else
-            Culture cultureEnUs = new CultureInfo("en-US");
-#endif
-            string actual = Length.FromMeters(value).ToString(LengthUnit.Meter, cultureEnUs);
+            string actual = Length.FromMeters(value).ToString(LengthUnit.Meter, CultureAmerican);
             Assert.Equal(expected, actual);
         }
 
@@ -85,11 +78,7 @@ private static IEnumerable<object> GetUnitTypesWithMissingAbbreviations<TUnitTyp
             {
                 try
                 {
-#if WINDOWS_UWP
-                    unitSystem.GetDefaultAbbreviation(unit.GetType(), Convert.ToInt32(unit));
-#else
                     unitSystem.GetDefaultAbbreviation(unit);
-#endif
                 }
                 catch
                 {
@@ -133,7 +122,7 @@ public void DecimalRadixPointCultureFormatting(string culture)
         [InlineData("es-MX")]
         public void CommaDigitGroupingCultureFormatting(string cultureName)
         {
-            Culture culture = GetCulture(cultureName);
+            CultureInfo culture = GetCulture(cultureName);
             Assert.Equal("1,111 m", Length.FromMeters(1111).ToString(LengthUnit.Meter, culture));
 
             // Feet/Inch and Stone/Pound combinations are only used (customarily) in the US, UK and maybe Ireland - all English speaking countries.
@@ -154,14 +143,6 @@ public void SpaceDigitGroupingCultureFormatting(string culture)
             Assert.Equal("1 111 m", Length.FromMeters(1111).ToString(LengthUnit.Meter, GetCulture(culture)));
         }
 
-        // Switzerland uses an apostrophe for digit grouping
-//        [Ignore("Fails on Win 8.1 and Win10 due to a bug in .NET framework.")]
-//        [InlineData("fr-CH")]
-//        public void ApostropheDigitGroupingCultureFormatting(string culture)
-//        {
-//            Assert.Equal("1'111 m", Length.FromMeters(1111).ToString(LengthUnit.Meter, new CultureInfo(culture)));
-//        }
-
         // These cultures all use a decimal point in digit grouping
         [Theory]
         [InlineData("de-DE")]
@@ -174,7 +155,6 @@ public void DecimalPointDigitGroupingCultureFormatting(string culture)
             Assert.Equal("1.111 m", Length.FromMeters(1111).ToString(LengthUnit.Meter, GetCulture(culture)));
         }
 
-#if !WINDOWS_UWP
         [Theory]
         [InlineData("m^^2", AreaUnit.SquareMeter)]
         [InlineData("cm^^2", AreaUnit.SquareCentimeter)]
@@ -191,7 +171,6 @@ public void Parse_UnknownAbbreviationThrowsUnitNotFoundException()
         {
             Assert.Throws<UnitNotFoundException>(() => UnitSystem.Default.Parse<AreaUnit>("nonexistingunit"));
         }
-#endif
 
         [Theory]
         [InlineData(1, "1.1 m")]
@@ -202,12 +181,7 @@ public void Parse_UnknownAbbreviationThrowsUnitNotFoundException()
         [InlineData(6, "1.123457 m")]
         public void CustomNumberOfSignificantDigitsAfterRadixFormatting(int significantDigitsAfterRadix, string expected)
         {
-#if WINDOWS_UWP
-            Culture cultureEnUs = "en-US";
-#else
-            Culture cultureEnUs = new CultureInfo("en-US");
-#endif
-            string actual = Length.FromMeters(1.123456789).ToString(LengthUnit.Meter, cultureEnUs, significantDigitsAfterRadix);
+            string actual = Length.FromMeters(1.123456789).ToString(LengthUnit.Meter, CultureAmerican, significantDigitsAfterRadix);
             Assert.Equal(expected, actual);
         }
 
@@ -222,12 +196,7 @@ public void CustomNumberOfSignificantDigitsAfterRadixFormatting(int significantD
         public void RoundingErrorsWithSignificantDigitsAfterRadixFormatting(double value,
             int maxSignificantDigitsAfterRadix, string expected)
         {
-#if WINDOWS_UWP
-            Culture cultureEnUs = "en-US";
-#else
-            Culture cultureEnUs = new CultureInfo("en-US");
-#endif
-            string actual = Length.FromMeters(value).ToString(LengthUnit.Meter, cultureEnUs, maxSignificantDigitsAfterRadix);
+            string actual = Length.FromMeters(value).ToString(LengthUnit.Meter, CultureAmerican, maxSignificantDigitsAfterRadix);
             Assert.Equal(expected, actual);
         }
 
@@ -239,12 +208,7 @@ public void RoundingErrorsWithSignificantDigitsAfterRadixFormatting(double value
         [InlineData(1.99e-4, "1.99e-04 m")]
         public void ScientificNotationLowerInterval(double value, string expected)
         {
-#if WINDOWS_UWP
-            Culture cultureEnUs = "en-US";
-#else
-            Culture cultureEnUs = new CultureInfo("en-US");
-#endif
-            string actual = Length.FromMeters(value).ToString(LengthUnit.Meter, cultureEnUs);
+            string actual = Length.FromMeters(value).ToString(LengthUnit.Meter, CultureAmerican);
             Assert.Equal(expected, actual);
         }
 
@@ -255,12 +219,7 @@ public void ScientificNotationLowerInterval(double value, string expected)
         [InlineData(999.99, "999.99 m")]
         public void FixedPointNotationIntervalFormatting(double value, string expected)
         {
-#if WINDOWS_UWP
-            Culture cultureEnUs = "en-US";
-#else
-            Culture cultureEnUs = new CultureInfo("en-US");
-#endif
-            string actual = Length.FromMeters(value).ToString(LengthUnit.Meter, cultureEnUs);
+            string actual = Length.FromMeters(value).ToString(LengthUnit.Meter, CultureAmerican);
             Assert.Equal(expected, actual);
         }
 
@@ -272,12 +231,7 @@ public void FixedPointNotationIntervalFormatting(double value, string expected)
         [InlineData(999999.99, "999,999.99 m")]
         public void FixedPointNotationWithDigitGroupingIntervalFormatting(double value, string expected)
         {
-#if WINDOWS_UWP
-            Culture cultureEnUs = "en-US";
-#else
-            Culture cultureEnUs = new CultureInfo("en-US");
-#endif
-            string actual = Length.FromMeters(value).ToString(LengthUnit.Meter, cultureEnUs);
+            string actual = Length.FromMeters(value).ToString(LengthUnit.Meter, CultureAmerican);
             Assert.Equal(expected, actual);
         }
 
@@ -288,12 +242,7 @@ public void FixedPointNotationWithDigitGroupingIntervalFormatting(double value,
         [InlineData(double.MaxValue, "1.8e+308 m")]
         public void ScientificNotationUpperIntervalFormatting(double value, string expected)
         {
-#if WINDOWS_UWP
-            Culture cultureEnUs = "en-US";
-#else
-            Culture cultureEnUs = new CultureInfo("en-US");
-#endif
-            string actual = Length.FromMeters(value).ToString(LengthUnit.Meter, cultureEnUs);
+            string actual = Length.FromMeters(value).ToString(LengthUnit.Meter, CultureAmerican);
             Assert.Equal(expected, actual);
         }
 
@@ -417,73 +366,56 @@ public void AllUnitsImplementToStringForInvariantCulture()
         [Fact]
         public void ToString_WithNorwegianCulture()
         {
-#if WINDOWS_UWP
-            Culture norwegian = "nb-NO";
-#else
-            Culture norwegian = new CultureInfo("nb-NO");
-#endif
-            Assert.Equal("1 °", Angle.FromDegrees(1).ToString(AngleUnit.Degree, norwegian));
-            Assert.Equal("1 m²", Area.FromSquareMeters(1).ToString(AreaUnit.SquareMeter, norwegian));
-            Assert.Equal("1 V", ElectricPotential.FromVolts(1).ToString(ElectricPotentialUnit.Volt, norwegian));
-            Assert.Equal("1 m³/s", Flow.FromCubicMetersPerSecond(1).ToString(FlowUnit.CubicMeterPerSecond, norwegian));
-            Assert.Equal("1 N", Force.FromNewtons(1).ToString(ForceUnit.Newton, norwegian));
-            Assert.Equal("1 m", Length.FromMeters(1).ToString(LengthUnit.Meter, norwegian));
-            Assert.Equal("1 kg", Mass.FromKilograms(1).ToString(MassUnit.Kilogram, norwegian));
-            Assert.Equal("1 Pa", Pressure.FromPascals(1).ToString(PressureUnit.Pascal, norwegian));
-            Assert.Equal("1 rad/s", RotationalSpeed.FromRadiansPerSecond(1).ToString(RotationalSpeedUnit.RadianPerSecond, norwegian));
-            Assert.Equal("1 K", Temperature.FromKelvins(1).ToString(TemperatureUnit.Kelvin, norwegian));
-            Assert.Equal("1 N·m", Torque.FromNewtonMeters(1).ToString(TorqueUnit.NewtonMeter, norwegian));
-            Assert.Equal("1 m³", Volume.FromCubicMeters(1).ToString(VolumeUnit.CubicMeter, norwegian));
+            Assert.Equal("1 °", Angle.FromDegrees(1).ToString(AngleUnit.Degree, CultureNorwegian));
+            Assert.Equal("1 m²", Area.FromSquareMeters(1).ToString(AreaUnit.SquareMeter, CultureNorwegian));
+            Assert.Equal("1 V", ElectricPotential.FromVolts(1).ToString(ElectricPotentialUnit.Volt, CultureNorwegian));
+            Assert.Equal("1 m³/s", Flow.FromCubicMetersPerSecond(1).ToString(FlowUnit.CubicMeterPerSecond, CultureNorwegian));
+            Assert.Equal("1 N", Force.FromNewtons(1).ToString(ForceUnit.Newton, CultureNorwegian));
+            Assert.Equal("1 m", Length.FromMeters(1).ToString(LengthUnit.Meter, CultureNorwegian));
+            Assert.Equal("1 kg", Mass.FromKilograms(1).ToString(MassUnit.Kilogram, CultureNorwegian));
+            Assert.Equal("1 Pa", Pressure.FromPascals(1).ToString(PressureUnit.Pascal, CultureNorwegian));
+            Assert.Equal("1 rad/s", RotationalSpeed.FromRadiansPerSecond(1).ToString(RotationalSpeedUnit.RadianPerSecond, CultureNorwegian));
+            Assert.Equal("1 K", Temperature.FromKelvins(1).ToString(TemperatureUnit.Kelvin, CultureNorwegian));
+            Assert.Equal("1 N·m", Torque.FromNewtonMeters(1).ToString(TorqueUnit.NewtonMeter, CultureNorwegian));
+            Assert.Equal("1 m³", Volume.FromCubicMeters(1).ToString(VolumeUnit.CubicMeter, CultureNorwegian));
         }
 
         [Fact]
         public void ToString_WithRussianCulture()
         {
-#if WINDOWS_UWP
-            Culture russian = "ru-RU";
-#else
-            Culture russian = new CultureInfo( "ru-RU");
-#endif
-            Assert.Equal("1 °", Angle.FromDegrees(1).ToString(AngleUnit.Degree, russian));
-            Assert.Equal("1 м²", Area.FromSquareMeters(1).ToString(AreaUnit.SquareMeter, russian));
-            Assert.Equal("1 В", ElectricPotential.FromVolts(1).ToString(ElectricPotentialUnit.Volt, russian));
-            Assert.Equal("1 м³/с", Flow.FromCubicMetersPerSecond(1).ToString(FlowUnit.CubicMeterPerSecond, russian));
-            Assert.Equal("1 Н", Force.FromNewtons(1).ToString(ForceUnit.Newton, russian));
-            Assert.Equal("1 м", Length.FromMeters(1).ToString(LengthUnit.Meter, russian));
-            Assert.Equal("1 кг", Mass.FromKilograms(1).ToString(MassUnit.Kilogram, russian));
-            Assert.Equal("1 Па", Pressure.FromPascals(1).ToString(PressureUnit.Pascal, russian));
-            Assert.Equal("1 рад/с", RotationalSpeed.FromRadiansPerSecond(1).ToString(RotationalSpeedUnit.RadianPerSecond, russian));
-            Assert.Equal("1 K", Temperature.FromKelvins(1).ToString(TemperatureUnit.Kelvin, russian));
-            Assert.Equal("1 Н·м", Torque.FromNewtonMeters(1).ToString(TorqueUnit.NewtonMeter, russian));
-            Assert.Equal("1 м³", Volume.FromCubicMeters(1).ToString(VolumeUnit.CubicMeter, russian));
+            Assert.Equal("1 °", Angle.FromDegrees(1).ToString(AngleUnit.Degree, CultureRussian));
+            Assert.Equal("1 м²", Area.FromSquareMeters(1).ToString(AreaUnit.SquareMeter, CultureRussian));
+            Assert.Equal("1 В", ElectricPotential.FromVolts(1).ToString(ElectricPotentialUnit.Volt, CultureRussian));
+            Assert.Equal("1 м³/с", Flow.FromCubicMetersPerSecond(1).ToString(FlowUnit.CubicMeterPerSecond, CultureRussian));
+            Assert.Equal("1 Н", Force.FromNewtons(1).ToString(ForceUnit.Newton, CultureRussian));
+            Assert.Equal("1 м", Length.FromMeters(1).ToString(LengthUnit.Meter, CultureRussian));
+            Assert.Equal("1 кг", Mass.FromKilograms(1).ToString(MassUnit.Kilogram, CultureRussian));
+            Assert.Equal("1 Па", Pressure.FromPascals(1).ToString(PressureUnit.Pascal, CultureRussian));
+            Assert.Equal("1 рад/с", RotationalSpeed.FromRadiansPerSecond(1).ToString(RotationalSpeedUnit.RadianPerSecond, CultureRussian));
+            Assert.Equal("1 K", Temperature.FromKelvins(1).ToString(TemperatureUnit.Kelvin, CultureRussian));
+            Assert.Equal("1 Н·м", Torque.FromNewtonMeters(1).ToString(TorqueUnit.NewtonMeter, CultureRussian));
+            Assert.Equal("1 м³", Volume.FromCubicMeters(1).ToString(VolumeUnit.CubicMeter, CultureRussian));
         }
 
         [Fact]
         public void GetDefaultAbbreviationFallsBackToDefaultStringIfNotSpecified()
         {
-            UnitSystem usUnits = UnitSystem.GetCached(GetCulture("en-US"));
-
-#if WINDOWS_UWP
-            string abbreviation = usUnits.GetDefaultAbbreviation(typeof(CustomUnit), (int)CustomUnit.Unit1);
-            Assert.Equal("(no abbreviation for CustomUnit with numeric value 1)", abbreviation);
-#else
+            UnitSystem usUnits = UnitSystem.GetCached(CultureAmerican);
             string abbreviation = usUnits.GetDefaultAbbreviation(CustomUnit.Unit1);
             Assert.Equal("(no abbreviation for CustomUnit.Unit1)", abbreviation);
-#endif
         }
 
-#if !WINDOWS_UWP
         [Fact]
         public void GetDefaultAbbreviationFallsBackToUsEnglishCulture()
         {
             // CurrentCulture affects number formatting, such as comma or dot as decimal separator.
             // CurrentUICulture affects localization, in this case the abbreviation.
             // Zulu (South Africa)
-            CultureInfo zuluCulture = new CultureInfo("zu-ZA");
+            var zuluCulture = new CultureInfo("zu-ZA");
             UnitSystem zuluUnits = UnitSystem.GetCached(zuluCulture);
             CultureInfo.CurrentCulture = CultureInfo.CurrentUICulture = zuluCulture;
 
-            UnitSystem usUnits = UnitSystem.GetCached(new CultureInfo("en-US"));
+            UnitSystem usUnits = UnitSystem.GetCached(CultureAmerican);
             usUnits.MapUnitToAbbreviation(CustomUnit.Unit1, "US english abbreviation for Unit1");
 
             // Act
@@ -492,19 +424,15 @@ public void GetDefaultAbbreviationFallsBackToUsEnglishCulture()
             // Assert
             Assert.Equal("US english abbreviation for Unit1", abbreviation);
         }
-#endif
 
-#if !WINDOWS_UWP
         [Fact]
         public void MapUnitToAbbreviation_AddCustomUnit_DoesNotOverrideDefaultAbbreviationForAlreadyMappedUnits()
         {
-            CultureInfo cultureInfo = new CultureInfo("en-US");
-            UnitSystem unitSystem = UnitSystem.GetCached(cultureInfo);
+            UnitSystem unitSystem = UnitSystem.GetCached(CultureAmerican);
             unitSystem.MapUnitToAbbreviation(AreaUnit.SquareMeter, "m^2");
 
             Assert.Equal("m²", unitSystem.GetDefaultAbbreviation(AreaUnit.SquareMeter));
         }
-#endif
 
         [Fact]
         public void NegativeInfinityFormatting()
@@ -518,7 +446,6 @@ public void NotANumberFormatting()
             Assert.Equal("NaN m", Length.FromMeters(double.NaN).ToString());
         }
 
-#if !WINDOWS_UWP
         [Fact]
         public void Parse_AmbiguousUnitsThrowsException()
         {
@@ -530,7 +457,6 @@ public void Parse_AmbiguousUnitsThrowsException()
             // Act 2
             Assert.Throws<AmbiguousUnitParseException>(() => Volume.Parse("1 tsp"));
         }
-#endif
 
         [Fact]
         public void Parse_UnambiguousUnitsDoesNotThrow()
@@ -547,16 +473,11 @@ public void PositiveInfinityFormatting()
         }
 
         /// <summary>
-        ///     Convenience method to use the proper culture parameter type.
-        ///     The UWP lib uses culture name string instead of CultureInfo.
+        ///     Convenience method to the proper culture parameter type.
         /// </summary>
-        private static Culture GetCulture(string cultureName)
+        private static CultureInfo GetCulture(string cultureName)
         {
-#if WINDOWS_UWP
-            return cultureName;
-#else
             return new CultureInfo(cultureName);
-#endif
         }
     }
-}
+}