Merge pull request praeclarum#75 from damirarh/TestsWithExceptions

Asserting exceptions in Metro style tests

Author: praeclarum

tests/AsyncTests.cs

@@ -570,9 +570,7 @@ public void TestAsyncTableQueryToFirstAsyncFound ()
 			Assert.AreEqual(customer.Email, loaded.Email);
 		}
 
-#if !NETFX_CORE
 		[Test]
-		[ExpectedException(typeof(AggregateException))]
 		public void TestAsyncTableQueryToFirstAsyncMissing ()
 		{
 			var conn = GetConnection();
@@ -585,9 +583,8 @@ public void TestAsyncTableQueryToFirstAsyncMissing ()
 			// query...
 			var query = conn.Table<Customer>().Where(v => v.Id == -1);
 			var task = query.FirstAsync();
-			task.Wait();
+			ExceptionAssert.Throws<AggregateException>(() => task.Wait());
 		}
-#endif
 
 		[Test]
 		public void TestAsyncTableQueryToFirstOrDefaultAsyncFound ()

tests/DropTableTest.cs

@@ -37,8 +37,7 @@ public TestDb () : base(TestPath.GetTempFileName ())
 			}
 		}
 
-#if !NETFX_CORE
-		[Test, ExpectedException (typeof (SQLiteException))]
+		[Test]
 		public void CreateInsertDrop ()
 		{
 			var db = new TestDb ();
@@ -56,8 +55,7 @@ public void CreateInsertDrop ()
 
 			db.DropTable<Product> ();
 
-			db.Table<Product> ().Count (); // Should throw
+			ExceptionAssert.Throws<SQLiteException>(() => db.Table<Product> ().Count ());
 		}
-#endif
 	}
 }

tests/ExceptionAssert.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+#if NETFX_CORE
+using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+#else
+using NUnit.Framework;
+#endif
+
+namespace SQLite.Tests
+{
+	public class ExceptionAssert
+	{
+		public static T Throws<T>(Action action) where T : Exception
+		{
+			try
+			{
+				action();
+			}
+			catch (T ex)
+			{
+				return ex;
+			}
+
+			Assert.Fail("Expected exception of type {0}.", typeof(T));
+
+			return null;
+		}
+	}
+}

tests/SQLite.Tests.csproj

@@ -38,6 +38,7 @@
     <Compile Include="BooleanTest.cs" />
     <Compile Include="..\src\SQLite.cs" />
     <Compile Include="ByteArrayTest.cs" />
+    <Compile Include="ExceptionAssert.cs" />
     <Compile Include="InsertTest.cs" />
     <Compile Include="CreateTableTest.cs" />
     <Compile Include="GuidTests.cs" />
@@ -58,4 +59,4 @@
     </Compile>
     <Compile Include="MappingTest.cs" />
   </ItemGroup>
-</Project>
+</Project>

tests/SQLiteMetroTests/SQLiteMetroTests.csproj

@@ -142,6 +142,9 @@
     <Compile Include="..\DropTableTest.cs">
       <Link>DropTableTest.cs</Link>
     </Compile>
+    <Compile Include="..\ExceptionAssert.cs">
+      <Link>ExceptionAssert.cs</Link>
+    </Compile>
     <Compile Include="..\GuidTests.cs">
       <Link>GuidTests.cs</Link>
     </Compile>