[tests] Make the template watchOS extension use Touch.Client's API to exclude tests based on categories.

This also removes the ability to filter tests based on the first character of
a test name, but we don't use this ability anymore.

Author: rolfbjarne

tests/templates/WatchExtension/InterfaceController.cs

@@ -1,12 +1,10 @@
 using System;
-using System.Collections;
-using System.Linq;
+using System.Collections.Generic;
 using System.Threading;
 
 using WatchKit;
 using Foundation;
 
-using NUnit.Framework.Internal.Filters;
 using MonoTouch.NUnit.UI;
 
 public static partial class TestLoader
@@ -70,16 +68,19 @@ public override void Awake (NSObject context)
 
 		void LoadTests ()
 		{
+			var excludeCategories = new [] {
+				"MobileNotWorking",
+				"NotOnMac",
+				"NotWorking",
+				"ValueAdd",
+				"CAS",
+				"InetAccess",
+				"NotWorkingLinqInterpreter",
+				"RequiresBSDSockets",
+				"BitcodeNotSupported",
+			};
 			runner = new WatchOSRunner ();
-			var categoryFilter = new NotFilter (new CategoryExpression ("MobileNotWorking,NotOnMac,NotWorking,ValueAdd,CAS,InetAccess,NotWorkingLinqInterpreter,RequiresBSDSockets,BitcodeNotSupported").Filter);
-			if (!string.IsNullOrEmpty (Environment.GetEnvironmentVariable ("NUNIT_FILTER_START"))) {
-				var firstChar = Environment.GetEnvironmentVariable ("NUNIT_FILTER_START") [0];
-				var lastChar = Environment.GetEnvironmentVariable ("NUNIT_FILTER_END") [0];
-				var nameFilter = new NameStartsWithFilter () { FirstChar = firstChar, LastChar = lastChar };
-				runner.Filter = new AndFilter (categoryFilter, nameFilter);
-			} else {
-				runner.Filter = categoryFilter;
-			}
+			runner.ExcludedCategories = new HashSet<string> (excludeCategories);
 			runner.Add (GetType ().Assembly);
 			TestLoader.AddTestAssemblies (runner);
 			ThreadPool.QueueUserWorkItem ((v) =>
@@ -153,35 +154,3 @@ partial void RunTests (NSObject obj)
 		}
 	}
 }
-
-class NameStartsWithFilter : NUnit.Framework.Internal.TestFilter
-{
-	public char FirstChar;
-	public char LastChar;
-
-	public override bool Match (NUnit.Framework.Api.ITest test)
-	{
-		if (test is NUnit.Framework.Internal.TestAssembly)
-			return true;
-
-		var method = test as NUnit.Framework.Internal.TestMethod;
-		if (method != null)
-			return Match (method.Parent);
-		
-		var name = !string.IsNullOrEmpty (test.Name) ? test.Name : test.FullName;
-		bool rv;
-		if (string.IsNullOrEmpty (name)) {
-			rv = true;
-		} else {
-			var z = Char.ToUpperInvariant (name [0]);
-			rv = z >= Char.ToUpperInvariant (FirstChar) && z <= Char.ToUpperInvariant (LastChar);
-		}
-
-		return rv;
-	}
-
-	public override bool Pass (NUnit.Framework.Api.ITest test)
-	{
-		return Match (test);
-	}
-}

tests/templates/WatchExtension/InterfaceController.fs

@@ -1,14 +1,12 @@
 namespace monotouchtestWatchKitExtension
 
 open System
-open System.Collections
-open System.Linq
+open System.Collections.Generic
 open System.Threading
 
 open WatchKit
 open Foundation
 
-open NUnit.Framework.Internal.Filters
 open MonoTouch.NUnit.UI
 
 [<Register ("InterfaceController")>]
@@ -34,9 +32,20 @@ type InterfaceController (handle: IntPtr) =
     member val cmdRun = Unchecked.defaultof<WKInterfaceButton> with get, set
 
     member this.LoadTests () =
+        let excludeCategories =
+            [|
+                "MobileNotWorking"
+                "NotOnMac"
+                "NotWorking"
+                "ValueAdd"
+                "CAS"
+                "InetAccess"
+                "NotWorkingLinqInterpreter"
+                "RequiresBSDSockets"
+                "BitcodeNotSupported"
+            |]
         runner <- new WatchOSRunner ()
-        let ce = new CategoryExpression ("MobileNotWorking,NotOnMac,NotWorking,ValueAdd,CAS,InetAccess,NotWorkingLinqInterpreter,BitcodeNotSupported")
-        runner.Filter <- new NotFilter (ce.Filter)
+        runner.ExcludedCategories <- new HashSet<string> (excludeCategories :> IEnumerable<string>)
         let tp = this.GetType ()
         runner.Add (tp.Assembly)
         ThreadPool.QueueUserWorkItem (fun v ->