diff --git a/Tests/NFUnitTestAdpater/NFUnitTestAdapater.nfproj b/Tests/NFUnitTestAdpater/NFUnitTestAdapater.nfproj index 208ec9ed..a110c6a6 100644 --- a/Tests/NFUnitTestAdpater/NFUnitTestAdapater.nfproj +++ b/Tests/NFUnitTestAdpater/NFUnitTestAdapater.nfproj @@ -36,13 +36,13 @@ True True - - ..\..\packages\nanoFramework.TestFramework.1.0.80\lib\nanoFramework.TestFramework.dll + + ..\..\packages\nanoFramework.TestFramework.1.0.92\lib\nanoFramework.TestFramework.dll True True - ..\..\packages\nanoFramework.TestFramework.1.0.80\lib\nanoFramework.UnitTestLauncher.exe + ..\..\packages\nanoFramework.TestFramework.1.0.92\lib\nanoFramework.UnitTestLauncher.exe True True @@ -52,9 +52,17 @@ + + + + + Update the Import path in nfproj to the correct nanoFramework.TestFramework NuGet package folder. + + + \ No newline at end of file diff --git a/Tests/NFUnitTestAdpater/packages.config b/Tests/NFUnitTestAdpater/packages.config index ebbccb7e..7e0e1e84 100644 --- a/Tests/NFUnitTestAdpater/packages.config +++ b/Tests/NFUnitTestAdpater/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/Tests/NFUnitTestConversions/UnitTestConvertTests.cs b/Tests/NFUnitTestConversions/UnitTestConvertTests.cs index 39aee2d0..c279cb94 100644 --- a/Tests/NFUnitTestConversions/UnitTestConvertTests.cs +++ b/Tests/NFUnitTestConversions/UnitTestConvertTests.cs @@ -104,16 +104,16 @@ public void Convert_Negative() SByte value_sb = Convert.ToSByte(number); Assert.Equal(value_sb, (sbyte)actualNumber); - Assert.Trows(typeof(ArgumentOutOfRangeException), () => { Byte value_b = Convert.ToByte(number); }); + Assert.Throws(typeof(ArgumentOutOfRangeException), () => { Byte value_b = Convert.ToByte(number); }); Int16 value_s16 = Convert.ToInt16(number); Assert.Equal(value_s16, (short)actualNumber); - Assert.Trows(typeof(ArgumentOutOfRangeException), () => { UInt16 value_u16 = Convert.ToUInt16(number); }); + Assert.Throws(typeof(ArgumentOutOfRangeException), () => { UInt16 value_u16 = Convert.ToUInt16(number); }); Int32 value_s32 = Convert.ToInt32(number); Assert.Equal(value_s32, (int)actualNumber); - Assert.Trows(typeof(ArgumentOutOfRangeException), () => { UInt32 value_u32 = Convert.ToUInt32(number); }); + Assert.Throws(typeof(ArgumentOutOfRangeException), () => { UInt32 value_u32 = Convert.ToUInt32(number); }); Int64 value_s64 = Convert.ToInt32(number); Assert.Equal(value_s64, (long)actualNumber); - Assert.Trows(typeof(ArgumentOutOfRangeException), () => { UInt64 value_u64 = Convert.ToUInt64(number); }); + Assert.Throws(typeof(ArgumentOutOfRangeException), () => { UInt64 value_u64 = Convert.ToUInt64(number); }); } [TestMethod] diff --git a/Tests/NFUnitTestSystemLib/UnitTestDateTime.cs b/Tests/NFUnitTestSystemLib/UnitTestDateTime.cs index 80c1f0c7..4c8d538a 100644 --- a/Tests/NFUnitTestSystemLib/UnitTestDateTime.cs +++ b/Tests/NFUnitTestSystemLib/UnitTestDateTime.cs @@ -1028,7 +1028,7 @@ public void DateTime_BelowMinDateTime_ArgumentOutOfRangeExceptionTest58() { Debug.WriteLine("Creating a DateTime with -ve Ticks and,"); Debug.WriteLine("verifying ArgumentOutOfRangeException is thrown"); - Assert.Trows(typeof(ArgumentOutOfRangeException), () => { DateTime dt = new DateTime(-(new Random().Next(10) + 1)); }); + Assert.Throws(typeof(ArgumentOutOfRangeException), () => { DateTime dt = new DateTime(-(new Random().Next(10) + 1)); }); } [TestMethod] @@ -1036,8 +1036,8 @@ public void DateTime_AboveMaxDatTime_ArgumentOutOfRangeExceptionTest59() { Debug.WriteLine("Creating a DateTime later than DateTime.MaxValue and,"); Debug.WriteLine("verifying ArgumentOutOfRangeException is thrown"); - Assert.Trows(typeof(ArgumentOutOfRangeException), () => { DateTime dt1 = new DateTime(DateTime.MaxValue.Ticks + 1); }); - Assert.Trows(typeof(ArgumentOutOfRangeException), () => { DateTime dt2 = new DateTime(10000, 1, 1, 0, 0, 0, 0); }); + Assert.Throws(typeof(ArgumentOutOfRangeException), () => { DateTime dt1 = new DateTime(DateTime.MaxValue.Ticks + 1); }); + Assert.Throws(typeof(ArgumentOutOfRangeException), () => { DateTime dt2 = new DateTime(10000, 1, 1, 0, 0, 0, 0); }); } static double[] rdmFraction = new double[] { 0.0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9 }; diff --git a/Tests/NFUnitTestSystemLib/UnitTestGuid.cs b/Tests/NFUnitTestSystemLib/UnitTestGuid.cs index e2d59740..9bff4574 100644 --- a/Tests/NFUnitTestSystemLib/UnitTestGuid.cs +++ b/Tests/NFUnitTestSystemLib/UnitTestGuid.cs @@ -88,7 +88,7 @@ public void ArgumentException_Test3() size = random.Next(100); } Byte[] guidNot16 = GetRandomBytes(size); - Assert.Trows(typeof(ArgumentException), () => { Guid myGuid1 = new Guid(guidNot16); }); + Assert.Throws(typeof(ArgumentException), () => { Guid myGuid1 = new Guid(guidNot16); }); } [TestMethod] @@ -101,7 +101,7 @@ public void ArgumentNullException_Test4() /// Byte[] nullByte = null; - Assert.Trows(typeof(ArgumentNullException), () => { Guid myGuid1 = new Guid(nullByte); }); + Assert.Throws(typeof(ArgumentNullException), () => { Guid myGuid1 = new Guid(nullByte); }); } public static Guid GetGuid() diff --git a/Tests/NFUnitTestSystemLib/UnitTestParseTests.cs b/Tests/NFUnitTestSystemLib/UnitTestParseTests.cs index 68588116..2fd6f15d 100644 --- a/Tests/NFUnitTestSystemLib/UnitTestParseTests.cs +++ b/Tests/NFUnitTestSystemLib/UnitTestParseTests.cs @@ -491,49 +491,49 @@ public void UInt64_Boundary_Test_16() [TestMethod] public void SByte_ArgumentNullException_Test_17() { - Assert.Trows(typeof(ArgumentNullException), () => { SByte.Parse(str); }); + Assert.Throws(typeof(ArgumentNullException), () => { SByte.Parse(str); }); } [TestMethod] public void Byte_ArgumentNullException_Test_18() { - Assert.Trows(typeof(ArgumentNullException), () => { Byte.Parse(str); }); + Assert.Throws(typeof(ArgumentNullException), () => { Byte.Parse(str); }); } [TestMethod] public void Int16_ArgumentNullException_Test_19() { - Assert.Trows(typeof(ArgumentNullException), () => { Int16.Parse(str); }); + Assert.Throws(typeof(ArgumentNullException), () => { Int16.Parse(str); }); } [TestMethod] public void UInt16_ArgumentNullException_Test_20() { - Assert.Trows(typeof(ArgumentNullException), () => { UInt16.Parse(str); }); + Assert.Throws(typeof(ArgumentNullException), () => { UInt16.Parse(str); }); } [TestMethod] public void Int32_ArgumentNullException_Test_21() { - Assert.Trows(typeof(ArgumentNullException), () => { Int32.Parse(str); }); + Assert.Throws(typeof(ArgumentNullException), () => { Int32.Parse(str); }); } [TestMethod] public void UInt32_ArgumentNullException_Test_22() { - Assert.Trows(typeof(ArgumentNullException), () => { UInt32.Parse(str); }); + Assert.Throws(typeof(ArgumentNullException), () => { UInt32.Parse(str); }); } [TestMethod] public void Int64_ArgumentNullException_Test_23() { - Assert.Trows(typeof(ArgumentNullException), () => { Int64.Parse(str); }); + Assert.Throws(typeof(ArgumentNullException), () => { Int64.Parse(str); }); } [TestMethod] public void UInt64_ArgumentNullException_Test_24() { - Assert.Trows(typeof(ArgumentNullException), () => { UInt64.Parse(str); }); + Assert.Throws(typeof(ArgumentNullException), () => { UInt64.Parse(str); }); } /// @@ -581,12 +581,12 @@ public void ParseSByte_FormatException_Test_25() String[] strArr = new String[] { "", "1,234", "123e5", "a", "3.14159265358979" }; for (int i = 0; i < strArr.Length; i++) { - Assert.Trows(typeof(Exception), () => { SByte.Parse(strArr[i]); }); + Assert.Throws(typeof(Exception), () => { SByte.Parse(strArr[i]); }); } for (int i = 0; i < 5; i++) { String rdmString = GetRandomString(); - Assert.Trows(typeof(Exception), () => { SByte.Parse(rdmString); }); + Assert.Throws(typeof(Exception), () => { SByte.Parse(rdmString); }); } } @@ -596,12 +596,12 @@ public void ParseByte_FormatException_Test_26() String[] strArr = new String[] { "", "1,234", "123e5", "a", "3.14159265358979" }; for (int i = 0; i < strArr.Length; i++) { - Assert.Trows(typeof(Exception), () => { Byte.Parse(strArr[i]); }); + Assert.Throws(typeof(Exception), () => { Byte.Parse(strArr[i]); }); } for (int i = 0; i < 5; i++) { String rdmString = GetRandomString(); - Assert.Trows(typeof(Exception), () => { Byte.Parse(rdmString); }); + Assert.Throws(typeof(Exception), () => { Byte.Parse(rdmString); }); } } @@ -611,12 +611,12 @@ public void ParseInt16_FormatException_Test_27() String[] strArr = new String[] { "", "1,234", "123e5", "a", "3.14159265358979" }; for (int i = 0; i < strArr.Length; i++) { - Assert.Trows(typeof(Exception), () => { Int16.Parse(strArr[i]); }); + Assert.Throws(typeof(Exception), () => { Int16.Parse(strArr[i]); }); } for (int i = 0; i < 5; i++) { String rdmString = GetRandomString(); - Assert.Trows(typeof(Exception), () => { Int16.Parse(rdmString); }); + Assert.Throws(typeof(Exception), () => { Int16.Parse(rdmString); }); } } @@ -626,12 +626,12 @@ public void ParseUInt16_FormatException_Test_28() String[] strArr = new String[] { "", "1,234", "123e5", "a", "3.14159265358979" }; for (int i = 0; i < strArr.Length; i++) { - Assert.Trows(typeof(Exception), () => { UInt16.Parse(strArr[i]); }); + Assert.Throws(typeof(Exception), () => { UInt16.Parse(strArr[i]); }); } for (int i = 0; i < 5; i++) { String rdmString = GetRandomString(); - Assert.Trows(typeof(Exception), () => { UInt16.Parse(rdmString); }); + Assert.Throws(typeof(Exception), () => { UInt16.Parse(rdmString); }); } } @@ -641,12 +641,12 @@ public void ParseInt32_FormatException_Test_29() String[] strArr = new String[] { "", "1,234", "123e5", "a", "3.14159265358979" }; for (int i = 0; i < strArr.Length; i++) { - Assert.Trows(typeof(Exception), () => { Int32.Parse(strArr[i]); }); + Assert.Throws(typeof(Exception), () => { Int32.Parse(strArr[i]); }); } for (int i = 0; i < 5; i++) { String rdmString = GetRandomString(); - Assert.Trows(typeof(Exception), () => { Int32.Parse(rdmString); }); + Assert.Throws(typeof(Exception), () => { Int32.Parse(rdmString); }); } } @@ -656,12 +656,12 @@ public void ParseUInt32_FormatException_Test_30() String[] strArr = new String[] { "", "1,234", "123e5", "a", "3.14159265358979" }; for (int i = 0; i < strArr.Length; i++) { - Assert.Trows(typeof(Exception), () => { UInt32.Parse(strArr[i]); }); + Assert.Throws(typeof(Exception), () => { UInt32.Parse(strArr[i]); }); } for (int i = 0; i < 5; i++) { String rdmString = GetRandomString(); - Assert.Trows(typeof(Exception), () => { UInt32.Parse(rdmString); }); + Assert.Throws(typeof(Exception), () => { UInt32.Parse(rdmString); }); } } @@ -671,12 +671,12 @@ public void ParseInt64_FormatException_Test_31() String[] strArr = new String[] { "", "1,234", "123e5", "a", "3.14159265358979" }; for (int i = 0; i < strArr.Length; i++) { - Assert.Trows(typeof(Exception), () => { Int64.Parse(strArr[i]); }); + Assert.Throws(typeof(Exception), () => { Int64.Parse(strArr[i]); }); } for (int i = 0; i < 5; i++) { String rdmString = GetRandomString(); - Assert.Trows(typeof(Exception), () => { Int64.Parse(rdmString); }); + Assert.Throws(typeof(Exception), () => { Int64.Parse(rdmString); }); } } @@ -686,12 +686,12 @@ public void ParseUInt64_FormatException_Test_32() String[] strArr = new String[] { "", "1,234", "123e5", "a", "3.14159265358979" }; for (int i = 0; i < strArr.Length; i++) { - Assert.Trows(typeof(Exception), () => { UInt64.Parse(strArr[i]); }); + Assert.Throws(typeof(Exception), () => { UInt64.Parse(strArr[i]); }); } for (int i = 0; i < 5; i++) { String rdmString = GetRandomString(); - Assert.Trows(typeof(Exception), () => { UInt64.Parse(rdmString); }); + Assert.Throws(typeof(Exception), () => { UInt64.Parse(rdmString); }); } } @@ -707,7 +707,7 @@ public void ParseSByte_OverflowException_Test_33() ((Int64)SByte.MaxValue + 1).ToString(), ((Int64)SByte.MaxValue + 100).ToString() }; for (int i = 0; i < strArr.Length; i++) { - Assert.Trows(typeof(Exception), () => { SByte.Parse(strArr[i]); }); + Assert.Throws(typeof(Exception), () => { SByte.Parse(strArr[i]); }); } } @@ -718,7 +718,7 @@ public void ParseByte_OverflowException_Test_34() ((Int64)Byte.MaxValue + 1).ToString(), ((Int64)Byte.MaxValue + 100).ToString() }; for (int i = 0; i < strArr.Length; i++) { - Assert.Trows(typeof(Exception), () => { Byte.Parse(strArr[i]); }); + Assert.Throws(typeof(Exception), () => { Byte.Parse(strArr[i]); }); } } @@ -729,7 +729,7 @@ public void ParseInt16_OverflowException_Test_35() ((Int64)Int16.MaxValue + 1).ToString(), ((Int64)Int16.MaxValue + 100).ToString() }; for (int i = 0; i < strArr.Length; i++) { - Assert.Trows(typeof(Exception), () => { Int16.Parse(strArr[i]); }); + Assert.Throws(typeof(Exception), () => { Int16.Parse(strArr[i]); }); } } @@ -740,7 +740,7 @@ public void ParseUInt16_OverflowException_Test_36() ((Int64)UInt16.MaxValue + 1).ToString(), ((Int64)UInt16.MaxValue + 100).ToString() }; for (int i = 0; i < strArr.Length; i++) { - Assert.Trows(typeof(Exception), () => { UInt16.Parse(strArr[i]); }); + Assert.Throws(typeof(Exception), () => { UInt16.Parse(strArr[i]); }); } } @@ -751,7 +751,7 @@ public void ParseInt32_OverflowException_Test_37() ((Int64)Int32.MaxValue + 1).ToString(), ((Int64)Int32.MaxValue + 100).ToString() }; for (int i = 0; i < strArr.Length; i++) { - Assert.Trows(typeof(Exception), () => { Int32.Parse(strArr[i]); }); + Assert.Throws(typeof(Exception), () => { Int32.Parse(strArr[i]); }); } } @@ -762,7 +762,7 @@ public void ParseUInt32_OverflowException_Test_38() ((Int64)UInt32.MaxValue + 1).ToString(), ((Int64)UInt32.MaxValue + 100).ToString() }; for (int i = 0; i < strArr.Length; i++) { - Assert.Trows(typeof(Exception), () => { UInt32.Parse(strArr[i]); }); + Assert.Throws(typeof(Exception), () => { UInt32.Parse(strArr[i]); }); } } @@ -774,7 +774,7 @@ public void ParseInt64_OverflowException_Test_39() "9223372036854775808", "9223372036854775900" }; for (int i = 0; i < strArr.Length; i++) { - Assert.Trows(typeof(Exception), () => { Int64.Parse(strArr[i]); }); + Assert.Throws(typeof(Exception), () => { Int64.Parse(strArr[i]); }); } } @@ -784,7 +784,7 @@ public void ParseUInt64_OverflowException_Test_40() string[] strArr = new string[] { "-1", "-100", "18446744073709551616", "18446744073709551700" }; for (int i = 0; i < strArr.Length; i++) { - Assert.Trows(typeof(Exception), () => { UInt64.Parse(strArr[i]); }); + Assert.Throws(typeof(Exception), () => { UInt64.Parse(strArr[i]); }); } } @@ -850,27 +850,27 @@ public void box_unbox_Test_1() Guid guid = (Guid)o_guid; // Now casts that should throw exception. Any cast that does not throw - means error. - Assert.Trows(typeof(InvalidCastException), () => { + Assert.Throws(typeof(InvalidCastException), () => { MyEnum1 e1 = (MyEnum1)o_enum; }); // Now casts that should throw exception. Any cast that does not throw - means error. - Assert.Trows(typeof(InvalidCastException), () => { + Assert.Throws(typeof(InvalidCastException), () => { int i = (int)o_long; }); // Now casts that should throw exception. Any cast that does not throw - means error. - Assert.Trows(typeof(InvalidCastException), () => { + Assert.Throws(typeof(InvalidCastException), () => { int i = (int)o_class; }); // Now casts that should throw exception. Any cast that does not throw - means error. - Assert.Trows(typeof(InvalidCastException), () => { + Assert.Throws(typeof(InvalidCastException), () => { int i = (int)o_enum; }); // Now casts that should throw exception. Any cast that does not throw - means error. - Assert.Trows(typeof(InvalidCastException), () => { + Assert.Throws(typeof(InvalidCastException), () => { int i = (int)o_guid; }); } diff --git a/Tests/NFUnitTestSystemLib/UnitTestReflectionAssemblyTest.cs b/Tests/NFUnitTestSystemLib/UnitTestReflectionAssemblyTest.cs index 10d090e4..8b23d507 100644 --- a/Tests/NFUnitTestSystemLib/UnitTestReflectionAssemblyTest.cs +++ b/Tests/NFUnitTestSystemLib/UnitTestReflectionAssemblyTest.cs @@ -58,7 +58,7 @@ public void AssemblyVersion_Test3() Assembly assm1 = Assembly.Load("mscorlib, Version=" + v); Assert.NotNull(assm1); - Assert.Trows(typeof(ArgumentException), () => { Assembly assm2 = Assembly.Load("mscorlib, ,Version=" + v); }); + Assert.Throws(typeof(ArgumentException), () => { Assembly assm2 = Assembly.Load("mscorlib, ,Version=" + v); }); // Test for extra parameters after assembly version. The assembly version parser needs to handle this // because the VS debugger will identify in CultureInfo and PublicKeyToken when debugging. diff --git a/Tests/NFUnitTestSystemLib/UnitTestTypeTests.cs b/Tests/NFUnitTestSystemLib/UnitTestTypeTests.cs index 3328a5dc..9f5d64cb 100644 --- a/Tests/NFUnitTestSystemLib/UnitTestTypeTests.cs +++ b/Tests/NFUnitTestSystemLib/UnitTestTypeTests.cs @@ -223,7 +223,7 @@ public void SystemType1_GetTypeNew_Test() Debug.WriteLine("Since NoneSuch does not exist in this assembly, "); Debug.WriteLine("GetType throws a TypeLoadException."); - Assert.Trows(typeof(NullReferenceException), () => + Assert.Throws(typeof(NullReferenceException), () => { Type myType5 = Type.GetType("NoneSuch"); Debug.WriteLine("The full name is " + myType5.FullName); diff --git a/Tests/NFUnitTestThread/UnitTestMonitorTests.cs b/Tests/NFUnitTestThread/UnitTestMonitorTests.cs index f54250bb..c79cfd90 100644 --- a/Tests/NFUnitTestThread/UnitTestMonitorTests.cs +++ b/Tests/NFUnitTestThread/UnitTestMonitorTests.cs @@ -127,7 +127,7 @@ public void Monitor2_SynchronizationLockException_Test() /// Debug.WriteLine("Verify SynchronizationLockException exception is thrown"); Debug.WriteLine("Calling Monitor.Exit without first calling Monitor.Enter should throw an exception"); - Assert.Trows(typeof(Exception), () => { Monitor.Exit(locker1); }); + Assert.Throws(typeof(Exception), () => { Monitor.Exit(locker1); }); } [TestMethod] @@ -141,7 +141,7 @@ public void Monitor3_Enter_ArgumentNullException_Test() Debug.WriteLine("verify ArgumentNullException exception is thrown "); Debug.WriteLine("Calling Monitor.Enter passing null reference parameter should throw exception"); - Assert.Trows(typeof(ArgumentNullException), () => { Monitor.Enter(null); }); + Assert.Throws(typeof(ArgumentNullException), () => { Monitor.Enter(null); }); } @@ -155,7 +155,7 @@ public void Monitor4_Exit_ArgumentNullException_Test() /// Debug.WriteLine("verify ArgumentNullException exception is thrown "); Debug.WriteLine("Calling Monitor.Exit passing 'null' reference parameter should throw exception"); - Assert.Trows(typeof(ArgumentNullException), () => { Monitor.Exit(null); }); + Assert.Throws(typeof(ArgumentNullException), () => { Monitor.Exit(null); }); } static ManualResetEvent flag = new ManualResetEvent(false); diff --git a/Tests/NFUnitTestThread/UnitTestThreadTest.cs b/Tests/NFUnitTestThread/UnitTestThreadTest.cs index dfa11a2a..bc176c26 100644 --- a/Tests/NFUnitTestThread/UnitTestThreadTest.cs +++ b/Tests/NFUnitTestThread/UnitTestThreadTest.cs @@ -915,7 +915,7 @@ public void Threading_Join_ArgumentOutOfRangeException_Test17() Thread newThread1 = new Thread(Work.DoWork); newThread1.Start(); - Assert.Trows(typeof(ArgumentOutOfRangeException), () => { newThread1.Join(-77); }); + Assert.Throws(typeof(ArgumentOutOfRangeException), () => { newThread1.Join(-77); }); } [TestMethod] @@ -929,7 +929,7 @@ public void Threading_Sleep_ArgumentOutOfRangeException_Test18() Debug.WriteLine("Verify ArgumentOutOfRangeException exception is thrown"); Debug.WriteLine("Why not for -1 ?"); - Assert.Trows(typeof(ArgumentOutOfRangeException), () => { Thread.Sleep(-2); }); + Assert.Throws(typeof(ArgumentOutOfRangeException), () => { Thread.Sleep(-2); }); } [TestMethod] @@ -943,7 +943,7 @@ public void Threading_Join_ThreadStateException_Test19() Debug.WriteLine("The type of exception thrown should be ThreadStateException"); Thread newThread1 = new Thread(Work.DoWork); - Assert.Trows(typeof(Exception), () => { newThread1.Join(); }); + Assert.Throws(typeof(Exception), () => { newThread1.Join(); }); } [TestMethod] @@ -957,7 +957,7 @@ public void Threading_Suspend_ThreadStateException_Test20() Debug.WriteLine("The type of exception thrown should be ThreadStateException"); Thread newThread1 = new Thread(Work.DoWork); - Assert.Trows(typeof(Exception), () => { newThread1.Suspend(); }); + Assert.Throws(typeof(Exception), () => { newThread1.Suspend(); }); } [TestMethod] @@ -972,7 +972,7 @@ public void Threading_Resume_ThreadStateException_Test21() Debug.WriteLine("The type of exception thrown should be ThreadStateException"); Thread newThread1 = new Thread(Work.DoWork); - Assert.Trows(typeof(Exception), () => { newThread1.Resume(); }); + Assert.Throws(typeof(Exception), () => { newThread1.Resume(); }); } static bool sleepZero = false; diff --git a/Tests/NFUnitTestThread/UnitTestTimeTests.cs b/Tests/NFUnitTestThread/UnitTestTimeTests.cs index a945df62..c1f6ba12 100644 --- a/Tests/NFUnitTestThread/UnitTestTimeTests.cs +++ b/Tests/NFUnitTestThread/UnitTestTimeTests.cs @@ -366,7 +366,7 @@ public void Timer_Negative_Period_Test6() statusChecker.m_result = false; Debug.WriteLine("Changing period to -ve"); Debug.WriteLine("period is negative and is not equal to Infinite (or -1) should throw an exception"); - Assert.Trows(typeof(ArgumentOutOfRangeException), () => + Assert.Throws(typeof(ArgumentOutOfRangeException), () => { stateTimer.Change(0, -2); Debug.WriteLine("Waiting and verifying"); @@ -407,7 +407,7 @@ public void Timer_Negative_Duetime_Test7() statusChecker.m_result = false; Debug.WriteLine("Changing period -ve"); Debug.WriteLine("duetime is negative and is not equal to Infinite(or -1) should throw an exception"); - Assert.Trows(typeof(ArgumentOutOfRangeException), () => + Assert.Throws(typeof(ArgumentOutOfRangeException), () => { stateTimer.Change(-2, 500); Debug.WriteLine("Waiting and verifying"); @@ -433,7 +433,7 @@ public void Timer_TimerCallback_Null_Test8() Debug.WriteLine("Creating timer: " + DateTime.UtcNow.ToString()); - Assert.Trows(typeof(ArgumentNullException), () => + Assert.Throws(typeof(ArgumentNullException), () => { Debug.WriteLine("Passing a 'null' callback parameter to a timer should throw exception"); Timer stateTimer = new Timer(null, autoEvent, 1000, 250); diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 395d24e7..f84e9fcb 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -62,7 +62,6 @@ jobs: allowPackageConflicts: true packagesToPush: $(Build.ArtifactStagingDirectory)/nanoFramework.CoreLibrary.NoReflection.$(MY_NUGET_VERSION).nupkg - $(Build.ArtifactStagingDirectory)/nanoFramework.CoreLibrary.NoReflection.$(MY_NUGET_VERSION).snupkg publishFeedCredentials: 'AzureArtifacts-CoreLibrary' condition: and( succeeded(), ne( variables['StartReleaseCandidate'], true ) ) continueOnError: true @@ -75,7 +74,6 @@ jobs: allowPackageConflicts: true packagesToPush: $(Build.ArtifactStagingDirectory)/nanoFramework.CoreLibrary.NoReflection.$(MY_NUGET_VERSION).nupkg - $(Build.ArtifactStagingDirectory)/nanoFramework.CoreLibrary.NoReflection.$(MY_NUGET_VERSION).snupkg publishFeedCredentials: 'NuGet-CoreLibrary' condition: and( succeeded(), ne( variables['StartReleaseCandidate'], true ) ) continueOnError: true @@ -173,7 +171,7 @@ jobs: ################################## # report build failure to Discord - job: Report_Build_Failure - + dependsOn: - Build_mscorlib - Update_Dependents @@ -183,7 +181,7 @@ jobs: vmImage: 'VS2017-Win2016' steps: - + - checkout: self # step from template @ nf-tools repo diff --git a/nanoFramework.TestFramework b/nanoFramework.TestFramework index f8b6710c..56156e46 160000 --- a/nanoFramework.TestFramework +++ b/nanoFramework.TestFramework @@ -1 +1 @@ -Subproject commit f8b6710c724ce5209c26689b98df5b248e45977b +Subproject commit 56156e464c2b2b7bf717e4ae5f372c7aedc08812