Merge pull request dotnet/corefx#15050 from tarekgh/FixNumericTests

Fix System.Runtime.Numerics Tests to run against desktop

Commit migrated from dotnet/corefx@b434d42

Author: mellinoe

src/libraries/System.Runtime.Numerics/tests/BigInteger/Comparison.cs

@@ -359,12 +359,25 @@ private static void RunNegativeTests(Random random)
             Assert.Equal(false, BigInteger.Zero.Equals((Object)"0"));
         }
 
-        [Fact]
-        public static void IComparable_Invalid()
+        public static void IComparable_Invalid(string paramName)
         {
             IComparable comparable = new BigInteger();
             Assert.Equal(1, comparable.CompareTo(null));
-            Assert.Throws<ArgumentException>("obj", () => comparable.CompareTo(0)); // Obj is not a BigInteger
+            Assert.Throws<ArgumentException>(paramName, () => comparable.CompareTo(0)); // Obj is not a BigInteger
+        }
+
+        [Fact]
+        [SkipOnTargetFramework(TargetFrameworkMonikers.Netcoreapp | TargetFrameworkMonikers.NetcoreUwp)]
+        public static void IComparable_Invalid_net46()
+        {
+            IComparable_Invalid(null);
+        }
+
+        [Fact]
+        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)]
+        public static void IComparable_Invalid_netcore()
+        {
+            IComparable_Invalid("obj");
         }
 
         private static void VerifyComparison(BigInteger x, BigInteger y, int expectedResult)

src/libraries/System.Runtime.Numerics/tests/BigInteger/IsEven.cs

@@ -13,6 +13,7 @@ public class IsEvenTest
         private static int s_seed = 0;
 
         [Fact]
+        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)]
         public static void RunIsEvenTests()
         {
             Random random = new Random(s_seed);

src/libraries/System.Runtime.Numerics/tests/BigInteger/modpow.cs

@@ -140,6 +140,7 @@ public static void ModPow1Large2SmallInt()
         }
 
         [Fact]
+        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)]
         public static void ModPow1Large2SmallInt_Threshold()
         {
             // Again, with lower threshold
@@ -164,6 +165,7 @@ public static void ModPow2Large1SmallInt()
         }
 
         [Fact]
+        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)]
         public static void ModPow2Large1SmallInt_Threshold()
         {
             // Again, with lower threshold

src/libraries/System.Runtime.Numerics/tests/BigInteger/multiply.cs

@@ -35,6 +35,7 @@ public static void RunMultiply_TwoLargeBigIntegers()
         }
 
         [Fact]
+        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)]
         public static void RunMultiply_TwoLargeBigIntegers_Threshold()
         {
             // Again, with lower threshold

src/libraries/System.Runtime.Numerics/tests/BigInteger/pow.cs

@@ -169,6 +169,7 @@ public static void RunPowNegative()
         }
 
         [Fact]
+        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)]
         public static void RunOverflow()
         {
             var bytes = new byte[1000];

src/libraries/System.Runtime.Numerics/tests/ComplexTests.cs

@@ -292,6 +292,7 @@ public static IEnumerable<object[]> ACos_Advanced_TestData()
         }
 
         [Theory, MemberData("ACos_Advanced_TestData")]
+        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)]
         public static void ACos_Advanced(double real, double imaginary, double expectedReal, double expectedImaginary)
         {
             var complex = new Complex(real, imaginary);
@@ -373,6 +374,7 @@ public static IEnumerable<object[]> ASin_Advanced_TestData()
         }
 
         [Theory, MemberData("ASin_Advanced_TestData")]
+        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)]
         public static void ASin_Advanced(double real, double imaginary, double expectedReal, double expectedImaginary)
         {
             var complex = new Complex(real, imaginary);
@@ -596,6 +598,31 @@ public static void Divide(double realLeft, double imaginaryLeft, double realRigh
             VerifyRealImaginaryProperties(result, expectedReal, expectedImaginary);
         }
 
+        [Fact]
+        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)]
+        public static void Equals_netcore()
+        {
+            // Invalid values
+            Complex invalidComplex;
+            var complex = new Complex(2, 3);
+            foreach (double invalidReal in s_invalidDoubleValues)
+            {
+                invalidComplex = new Complex(invalidReal, 1);
+                Equals(invalidComplex, complex, false, false);
+                Equals(invalidComplex, invalidComplex, !double.IsNaN(invalidReal), true); // Handle double.NaN != double.NaN
+                foreach (double invalidImaginary in s_invalidDoubleValues)
+                {
+                    invalidComplex = new Complex(1, invalidImaginary);
+                    Equals(invalidComplex, complex, false, false);
+                    Equals(invalidComplex, invalidComplex, !double.IsNaN(invalidImaginary), true); // Handle double.NaN != double.NaN
+
+                    invalidComplex = new Complex(invalidReal, invalidImaginary);
+                    Equals(invalidComplex, complex, false, false);
+                    Equals(invalidComplex, invalidComplex, !double.IsNaN(invalidReal) && !double.IsNaN(invalidImaginary), true); // Handle double.NaN != double.NaN
+                }
+            }
+        }
+
         [Fact]
         public static void Equals()
         {
@@ -676,26 +703,6 @@ public static void Equals()
             Equals(new Complex(0, 100.5), 0, false, false);
             Equals(new Complex(0, 100.5), "0", false, false);
             Equals(new Complex(0, 100.5), null, false, false);
-
-            // Invalid values
-            Complex invalidComplex;
-            var complex = new Complex(2, 3);
-            foreach (double invalidReal in s_invalidDoubleValues)
-            {
-                invalidComplex = new Complex(invalidReal, 1);
-                Equals(invalidComplex, complex, false, false);
-                Equals(invalidComplex, invalidComplex, !double.IsNaN(invalidReal), true); // Handle double.NaN != double.NaN
-                foreach (double invalidImaginary in s_invalidDoubleValues)
-                {
-                    invalidComplex = new Complex(1, invalidImaginary);
-                    Equals(invalidComplex, complex, false, false);
-                    Equals(invalidComplex, invalidComplex, !double.IsNaN(invalidImaginary), true); // Handle double.NaN != double.NaN
-
-                    invalidComplex = new Complex(invalidReal, invalidImaginary);
-                    Equals(invalidComplex, complex, false, false);
-                    Equals(invalidComplex, invalidComplex, !double.IsNaN(invalidReal) && !double.IsNaN(invalidImaginary), true); // Handle double.NaN != double.NaN
-                }
-            }
         }
 
         private static void Equals(Complex complex1, object obj, bool expected, bool expectedEquals)