Fixing up some code in DoubleTests and SingleTests

Commit migrated from https://github.com/dotnet/corefx/commit/5ae188538976779b767194008d518fdaf773d24f

diff --git a/src/libraries/System.Runtime/tests/System/DoubleTests.cs b/src/libraries/System.Runtime/tests/System/DoubleTests.cs
index c9a8624..e7c0339 100644 (file)
--- a/src/libraries/System.Runtime/tests/System/DoubleTests.cs
+++ b/src/libraries/System.Runtime/tests/System/DoubleTests.cs
@@ -16,13 +16,13 @@ namespace System.Tests
 
         private static ulong DoubleToUInt64Bits(double value)
         {
-            return Unsafe.As<double, ulong>(ref value);
+            return (ulong)(BitConverter.DoubleToInt64Bits(value));
         }
 
         [Theory]
         [InlineData("a")]
         [InlineData(234.0f)]
-        public void CompareTo_ObjectNotDouble_ThrowsArgumentException(object value)
+        public static void CompareTo_ObjectNotDouble_ThrowsArgumentException(object value)
         {
             AssertExtensions.Throws<ArgumentException>(null, () => ((double)123).CompareTo(value));
         }
@@ -39,7 +39,7 @@ namespace System.Tests
         [InlineData(double.NaN, double.NaN, 0)]
         [InlineData(double.NaN, 0.0, -1)]
         [InlineData(234.0, null, 1)]
-        public void CompareTo_Other_ReturnsExpected(double d1, object value, int expected)
+        public static void CompareTo_Other_ReturnsExpected(double d1, object value, int expected)
         {
             if (value is double d2)
             {
@@ -134,7 +134,7 @@ namespace System.Tests
         }
 
         [Fact]
-        public void GetTypeCode_Invoke_ReturnsDouble()
+        public static void GetTypeCode_Invoke_ReturnsDouble()
         {
             Assert.Equal(TypeCode.Double, 0.0.GetTypeCode());
         }
@@ -405,7 +405,7 @@ namespace System.Tests
             yield return new object[] { 4567.89101, "G", null, "4567.89101" };
             yield return new object[] { double.MaxValue, "G", null, "1.79769313486232E+308" };
 
-            yield return new object[] { double.Epsilon, "G", null, "double.Epsilon" };
+            yield return new object[] { double.Epsilon, "G", null, "4.94065645841247E-324" };
             yield return new object[] { double.NaN, "G", null, "NaN" };
 
             yield return new object[] { 2468.0, "N", null, "2,468.00" };
@@ -432,7 +432,7 @@ namespace System.Tests
             yield return new object[] { -2468.0, "N", customNegativeSignGroupSeparatorNegativePattern, "(2*468.00)" };
 
             NumberFormatInfo invariantFormat = NumberFormatInfo.InvariantInfo;
-            yield return new object[] { double.Epsilon, "G", invariantFormat, "double.Epsilon" };
+            yield return new object[] { double.Epsilon, "G", invariantFormat, "4.94065645841247E-324" };
             yield return new object[] { double.NaN, "G", invariantFormat, "NaN" };
             yield return new object[] { double.PositiveInfinity, "G", invariantFormat, "Infinity" };
             yield return new object[] { double.NegativeInfinity, "G", invariantFormat, "-Infinity" };

diff --git a/src/libraries/System.Runtime/tests/System/SingleTests.cs b/src/libraries/System.Runtime/tests/System/SingleTests.cs
index 39ad62d..08e4e68 100644 (file)
--- a/src/libraries/System.Runtime/tests/System/SingleTests.cs
+++ b/src/libraries/System.Runtime/tests/System/SingleTests.cs
@@ -22,7 +22,7 @@ namespace System.Tests
         [Theory]
         [InlineData("a")]
         [InlineData(234.0)]
-        public void CompareTo_ObjectNotFloat_ThrowsArgumentException(object value)
+        public static void CompareTo_ObjectNotFloat_ThrowsArgumentException(object value)
         {
             AssertExtensions.Throws<ArgumentException>(null, () => ((float)123).CompareTo(value));
         }
@@ -39,7 +39,7 @@ namespace System.Tests
         [InlineData(float.NaN, float.NaN, 0)]
         [InlineData(float.NaN, 0.0f, -1)]
         [InlineData(234.0f, null, 1)]
-        public void CompareTo_Other_ReturnsExpected(float f1, object value, int expected)
+        public static void CompareTo_Other_ReturnsExpected(float f1, object value, int expected)
         {
             if (value is float f2)
             {
@@ -134,7 +134,7 @@ namespace System.Tests
         }
 
         [Fact]
-        public void GetTypeCode_Invoke_ReturnsSingle()
+        public static void GetTypeCode_Invoke_ReturnsSingle()
         {
             Assert.Equal(TypeCode.Single, 0.0f.GetTypeCode());
         }
@@ -219,14 +219,14 @@ namespace System.Tests
         public static void MaxValue()
         {
             Assert.Equal(3.40282347E+38f, float.MaxValue);
-            Assert.Equal(0x7FFFFFFFu,  SingleToUInt32Bits(float.MaxValue));
+            Assert.Equal(0x7F7FFFFFu,  SingleToUInt32Bits(float.MaxValue));
         }
 
         [Fact]
         public static void MinValue()
         {
             Assert.Equal(-3.40282347E+38f, float.MinValue);
-            Assert.Equal(0xFFFFFFFFu, SingleToUInt32Bits(float.MaxValue));
+            Assert.Equal(0xFF7FFFFFu, SingleToUInt32Bits(float.MinValue));
         }
 
         [Fact]
@@ -403,7 +403,7 @@ namespace System.Tests
             yield return new object[] { 4567.89101f, "G", null, "4567.891" };
             yield return new object[] { float.MaxValue, "G", null, "3.402823E+38" };
 
-            yield return new object[] { float.Epsilon, "G", null, "float.Epsilon" };
+            yield return new object[] { float.Epsilon, "G", null, "1.401298E-45" };
             yield return new object[] { float.NaN, "G", null, "NaN" };
 
             yield return new object[] { 2468.0f, "N", null, "2,468.00" };
@@ -430,7 +430,7 @@ namespace System.Tests
             yield return new object[] { -2468.0f, "N", customNegativeSignGroupSeparatorNegativePattern, "(2*468.00)" };
 
             NumberFormatInfo invariantFormat = NumberFormatInfo.InvariantInfo;
-            yield return new object[] { float.Epsilon, "G", invariantFormat, "float.Epsilon" };
+            yield return new object[] { float.Epsilon, "G", invariantFormat, "1.401298E-45" };
             yield return new object[] { float.NaN, "G", invariantFormat, "NaN" };
             yield return new object[] { float.PositiveInfinity, "G", invariantFormat, "Infinity" };
             yield return new object[] { float.NegativeInfinity, "G", invariantFormat, "-Infinity" };