Buildfix: disable Fibonacci tests where not available (pcl, 3.5).

cdrnet · cdrnet · commit 14ec5a392be7 · 2015-03-21T21:36:39.000+01:00
diff --git a/build.fsx b/build.fsx
@@ -380,7 +380,7 @@ let test target =
     NUnit (fun p ->
         { p with
             DisableShadowCopy = true
-            TimeOut = TimeSpan.FromMinutes 30.
+            TimeOut = TimeSpan.FromMinutes 60.
             OutputFile = "TestResults.xml" } |> quick) target
 
 Target "Test" (fun _ -> test !! "out/test/**/*UnitTests*.dll")
@@ -392,7 +392,7 @@ Target "MklWin32Test" (fun _ ->
         { p with
             ToolName = "nunit-console-x86.exe"
             DisableShadowCopy = true
-            TimeOut = TimeSpan.FromMinutes 30.
+            TimeOut = TimeSpan.FromMinutes 60.
             OutputFile = "TestResults.xml" }))
 Target "MklWin64Test" (fun _ ->
     ActivateFinalTarget "CloseTestRunner"
@@ -401,7 +401,7 @@ Target "MklWin64Test" (fun _ ->
         { p with
             ToolName = "nunit-console.exe"
             DisableShadowCopy = true
-            TimeOut = TimeSpan.FromMinutes 30.
+            TimeOut = TimeSpan.FromMinutes 60.
             OutputFile = "TestResults.xml" }))
 Target "MklWinTest" DoNothing
 
diff --git a/src/UnitTests/GenerateTests.cs b/src/UnitTests/GenerateTests.cs
@@ -30,11 +30,14 @@
 
 using System;
 using System.Linq;
-using System.Numerics;
 using NUnit.Framework;
 
 namespace MathNet.Numerics.UnitTests
 {
+#if !NOSYSNUMERICS
+    using System.Numerics;
+#endif
+
     [TestFixture]
     public class GenerateTests
     {
@@ -223,10 +226,12 @@ public void ImpulseConsistentWithSequence()
         public void UnfoldConsistentWithSequence()
         {
             Assert.That(
-                Generate.UnfoldSequence((s => Tuple.Create(s + 1, s + 1)), 0).Take(250).ToArray(),
-                Is.EqualTo(Generate.Unfold(250, (s => Tuple.Create(s + 1, s + 1)), 0)).AsCollection);
+                Generate.UnfoldSequence((s => new Tuple<int, int>(s + 1, s + 1)), 0).Take(250).ToArray(),
+                Is.EqualTo(Generate.Unfold(250, (s => new Tuple<int, int>(s + 1, s + 1)), 0)).AsCollection);
         }
 
+#if !NOSYSNUMERICS
+
         [Test]
         public void FibonacciConsistentWithSequence()
         {
@@ -243,8 +248,11 @@ public void FibonacciConsistentWithUnfold()
                 Is.EqualTo(new[] { BigInteger.Zero, BigInteger.One }.Concat(Generate.Unfold(248, (s =>
                 {
                     var z = s.Item1 + s.Item2;
-                    return Tuple.Create(z, Tuple.Create(s.Item2, z));
-                }), Tuple.Create(BigInteger.Zero, BigInteger.One)))).AsCollection);
+                    return new Tuple<BigInteger, Tuple<BigInteger, BigInteger>>(z, new Tuple<BigInteger, BigInteger>(s.Item2, z));
+                }), new Tuple<BigInteger, BigInteger>(BigInteger.Zero, BigInteger.One)))).AsCollection);
         }
+
+#endif
+
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -30,11 +30,14 @@`
`30`	`30`
`31`	`31`	`using System;`
`32`	`32`	`using System.Linq;`
`33`		`-using System.Numerics;`
`34`	`33`	`using NUnit.Framework;`
`35`	`34`
`36`	`35`	`namespace MathNet.Numerics.UnitTests`
`37`	`36`	`{`
	`37`	`+#if !NOSYSNUMERICS`
	`38`	`+ using System.Numerics;`
	`39`	`+#endif`
	`40`	`+`
`38`	`41`	`[TestFixture]`
`39`	`42`	`public class GenerateTests`
`40`	`43`	`{`
`@@ -223,10 +226,12 @@ public void ImpulseConsistentWithSequence()`
`223`	`226`	`public void UnfoldConsistentWithSequence()`
`224`	`227`	`{`
`225`	`228`	`Assert.That(`
`226`		`- Generate.UnfoldSequence((s => Tuple.Create(s + 1, s + 1)), 0).Take(250).ToArray(),`
`227`		`- Is.EqualTo(Generate.Unfold(250, (s => Tuple.Create(s + 1, s + 1)), 0)).AsCollection);`
	`229`	`+ Generate.UnfoldSequence((s => new Tuple<int, int>(s + 1, s + 1)), 0).Take(250).ToArray(),`
	`230`	`+ Is.EqualTo(Generate.Unfold(250, (s => new Tuple<int, int>(s + 1, s + 1)), 0)).AsCollection);`
`228`	`231`	`}`
`229`	`232`
	`233`	`+#if !NOSYSNUMERICS`
	`234`	`+`
`230`	`235`	`[Test]`
`231`	`236`	`public void FibonacciConsistentWithSequence()`
`232`	`237`	`{`
`@@ -243,8 +248,11 @@ public void FibonacciConsistentWithUnfold()`
`243`	`248`	`Is.EqualTo(new[] { BigInteger.Zero, BigInteger.One }.Concat(Generate.Unfold(248, (s =>`
`244`	`249`	`{`
`245`	`250`	`var z = s.Item1 + s.Item2;`
`246`		`- return Tuple.Create(z, Tuple.Create(s.Item2, z));`
`247`		`- }), Tuple.Create(BigInteger.Zero, BigInteger.One)))).AsCollection);`
	`251`	`+ return new Tuple<BigInteger, Tuple<BigInteger, BigInteger>>(z, new Tuple<BigInteger, BigInteger>(s.Item2, z));`
	`252`	`+ }), new Tuple<BigInteger, BigInteger>(BigInteger.Zero, BigInteger.One)))).AsCollection);`
`248`	`253`	`}`
	`254`	`+`
	`255`	`+#endif`
	`256`	`+`
`249`	`257`	`}`
`250`	`258`	`}`