Merge pull request #452 from xamarin/better-asserts

Slightly better asserts.

Author: stephen-hawley

tests/tom-swifty-test/Extensions.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using NUnit.Framework;
 using SwiftReflector;
 
 namespace tomwiftytest {
@@ -28,6 +29,16 @@ public static void CopyTo (this Stream stm, Stream source, int blockSize = 4096)
 					break;
 			}
 		}
+
+		public static void AssertNoErrors (this ErrorHandling errors, string whileDoing)
+		{
+			Assert.IsFalse (errors.AnyErrors, $"{errors.ErrorCount} error(s) while {whileDoing}");
+		}
+
+		public static void AssertNoWarnings (this ErrorHandling errors, string whileDoing)
+		{
+			Assert.IsTrue (errors.WarningCount == 0, $"{errors} warning(s) while {whileDoing}");
+		}
 	}
 }
 

tests/tom-swifty-test/SwiftReflector/BindingImportTests.cs

@@ -23,7 +23,7 @@ public void LoadsDatabaseSmokeTest (PlatformName platform, int expectedLowerLimi
 			var database = importer.Import ();
 			Assert.IsNotNull (database, $"null database for {platform}");
 			Assert.Less (expectedLowerLimit, database.Count, $"Expected at least {expectedLowerLimit} db entries, but got {database.Count} entries.");
-			Assert.IsTrue (!errors.AnyErrors, $"{errors.ErrorCount} errors importing database.");
+			errors.AssertNoErrors ("importing database.");
 		}
 
 		[TestCase (PlatformName.iOS)]
@@ -39,7 +39,7 @@ public void HasAtLeastNSObject (PlatformName platform)
 			Assert.IsNotNull (entity, $"Didn't get an NSObject from database on {platform}");
 			Assert.IsTrue (entity.IsObjCClass, $"NSObject is not an ObjC class on {platform}. Seriously?");
 			Assert.IsNotNull (entity.Type, $"No type in NSObject on {platform}");
-			Assert.IsTrue (!errors.AnyErrors, $"{errors.ErrorCount} errors importing database.");
+			errors.AssertNoErrors ("importing database.");
 		}
 
 		[Test]
@@ -50,7 +50,7 @@ public void ExcludesEverything ()
 			importer.Excludes.Add (new PatternMatch (".*"));
 			var database = importer.Import ();
 			Assert.AreEqual (0, database.Count, $"This was supposed to exclude everything, but we got {database.Count} entries.");
-			Assert.IsTrue (!errors.AnyErrors, $"{errors.ErrorCount} errors importing database.");
+			errors.AssertNoErrors ("importing database.");
 		}
 
 
@@ -63,7 +63,7 @@ public void ReincludesNSObject()
 			importer.Includes.Add (new PatternMatch ("Foundation\\.NSObject"));
 			var database = importer.Import ();
 			Assert.AreEqual (1, database.Count, $"This was supposed to exclude everything, but we got {database.Count} entries.");
-			Assert.IsTrue (!errors.AnyErrors, $"{errors.ErrorCount} errors importing database.");
+			errors.AssertNoErrors ("importing database.");
 		}
 
 
@@ -77,7 +77,7 @@ public void ReincludesFoundation ()
 			importer.Includes.Add (new PatternMatch ("Foundation\\..*"));
 			var database = importer.Import ();
 			Assert.Less (175, database.Count, $"This was supposed to exclude everything, but we got {database.Count} entries.");
-			Assert.IsTrue (!errors.AnyErrors, $"{errors.ErrorCount} errors importing database.");
+			errors.AssertNoErrors ("importing database.");
 		}
 
 
@@ -93,8 +93,7 @@ public void LoadsIUIViewControllerTransitionCoordinator (PlatformName platform)
 			Assert.IsNotNull (entity, $"Didn't get an IUIViewControllerTransitionCoordinator from database on {platform}");
 			Assert.IsTrue (entity.IsObjCProtocol, $"NSObject is not an ObjC protocol on {platform}. Seriously?");
 			Assert.IsNotNull (entity.Type, $"No type in IUIViewControllerTransitionCoordinator on {platform}");
-			Assert.IsTrue (!errors.AnyErrors, $"{errors.ErrorCount} errors importing database.");
-
+			errors.AssertNoErrors ("importing database.");
 		}
 	}
 }