From e5ccb30a0c10a26e98c53348514192f116b1b506 Mon Sep 17 00:00:00 2001 From: Alexander Kyte Date: Thu, 2 Jun 2016 19:27:57 -0400 Subject: [PATCH] [mobile_status] Fix nullable type ambiguity that nunit-lite complains about --- mcs/class/System.Data/Test/System.Data/ConstraintCollectionTest2.cs | 2 +- mcs/class/corlib/Test/System.Collections/SortedListTest.cs | 2 +- mcs/class/corlib/Test/System/ConvertTest.cs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mcs/class/System.Data/Test/System.Data/ConstraintCollectionTest2.cs b/mcs/class/System.Data/Test/System.Data/ConstraintCollectionTest2.cs index 8673fc48022..66c126fd520 100644 --- a/mcs/class/System.Data/Test/System.Data/ConstraintCollectionTest2.cs +++ b/mcs/class/System.Data/Test/System.Data/ConstraintCollectionTest2.cs @@ -447,7 +447,7 @@ namespace MonoTests.System.Data { DataTable dt = DataProvider.CreateParentDataTable(); dt.Constraints.Add("UniqueConstraint",dt.Columns["ParentId"],true); - Assert.AreEqual(1,dt.Constraints.Count,1); + Assert.AreEqual(1,(double) dt.Constraints.Count,1); Assert.AreEqual("UniqueConstraint",dt.Constraints[0].ConstraintName,"CN34"); } diff --git a/mcs/class/corlib/Test/System.Collections/SortedListTest.cs b/mcs/class/corlib/Test/System.Collections/SortedListTest.cs index 4b4b3b3a805..ce4f22174b1 100644 --- a/mcs/class/corlib/Test/System.Collections/SortedListTest.cs +++ b/mcs/class/corlib/Test/System.Collections/SortedListTest.cs @@ -770,7 +770,7 @@ namespace MonoTests.System.Collections for (int i = 0; i < 20; i++) sl1.RemoveAt (9); - Assert.AreEqual (30, sl1.Count, 30, "#C1"); + Assert.AreEqual (30, (double) sl1.Count, 30, "#C1"); for (int i = 0; i < 9; i++) Assert.AreEqual (i, sl1 ["kala " + string.Format ("{0:D2}", i)], "#C2:" + i); for (int i = 9; i < 29; i++) diff --git a/mcs/class/corlib/Test/System/ConvertTest.cs b/mcs/class/corlib/Test/System/ConvertTest.cs index 2124aa85733..2391dbb6507 100644 --- a/mcs/class/corlib/Test/System/ConvertTest.cs +++ b/mcs/class/corlib/Test/System/ConvertTest.cs @@ -1876,7 +1876,7 @@ namespace MonoTests.System { iTest++; Assert.AreEqual ((float)0, Convert.ToSingle(tryByte), "#N03"); iTest++; - Assert.AreEqual ((float)1234, 234, Convert.ToSingle(tryDec), "#N04"); + Assert.AreEqual ((float)1234, (double)234, Convert.ToSingle(tryDec), "#N04"); iTest++; Assert.AreEqual ((float)0, Convert.ToSingle(tryDbl), "#N05"); iTest++; @@ -1888,7 +1888,7 @@ namespace MonoTests.System { iTest++; Assert.AreEqual ((float)123, Convert.ToSingle(trySByte), "#N09"); iTest++; - Assert.AreEqual ((float)1234, 2345, Convert.ToSingle(tryFloat), "#N10"); + Assert.AreEqual ((float)1234, (double)2345, Convert.ToSingle(tryFloat), "#N10"); iTest++; Assert.AreEqual ((float)987, Convert.ToSingle("987"), "#N11"); iTest++; -- 2.11.4.GIT