[Xml] Allow to specify the xml formatter to be used in a run. (#55)

Allow to pass ether from command line of env vars the xml format to use.

Author: mandel-macaque

NUnitLite/TouchRunner/TouchOptions.cs

@@ -41,6 +41,11 @@ public enum XmlMode {
 		Wrapped = 1,
 	}
 
+	public enum XmlVersion {
+		NUnitV2 = 0,
+		NUnitV3 = 1,
+	}
+
 	public class TouchOptions {
 
 		static public TouchOptions Current = new TouchOptions ();
@@ -79,6 +84,9 @@ public TouchOptions ()
 			var xml_mode = Environment.GetEnvironmentVariable ("NUNIT_ENABLE_XML_MODE");
 			if (!string.IsNullOrEmpty (xml_mode))
 				XmlMode = (XmlMode) Enum.Parse (typeof (XmlMode), xml_mode, true);
+			var xml_version = Environment.GetEnvironmentVariable ("NUNIT_XML_VERSION");
+			if (!string.IsNullOrEmpty (xml_version))
+				XmlVersion = (XmlVersion)Enum.Parse (typeof (XmlVersion), xml_version, true);
 			if (!string.IsNullOrEmpty (Environment.GetEnvironmentVariable ("NUNIT_LOG_FILE")))
 				LogFile = Environment.GetEnvironmentVariable ("NUNIT_LOG_FILE");
 
@@ -91,6 +99,7 @@ public TouchOptions ()
 				{ "transport=", "Select transport method. Either TCP (default), HTTP or FILE.", v => Transport = v },
 				{ "enablexml", "Enable the xml reported.", v => EnableXml = false },
 				{ "xmlmode", "The xml mode.", v => XmlMode = (XmlMode) Enum.Parse (typeof (XmlMode), v, false) },
+				{ "xmlversion", "The xml version.", v => XmlVersion = (XmlVersion) Enum.Parse (typeof (XmlVersion), v, false) },
 				{ "logfile=", "A path where output will be saved.", v => LogFile = v },
 			};
 
@@ -105,6 +114,8 @@ public TouchOptions ()
 
 		public XmlMode XmlMode { get; set; }
 
+		public XmlVersion XmlVersion { get; set; } = XmlVersion.NUnitV2;
+
 		public bool EnableXml { get; set; }
 
 		public string HostName { get; private set; }

NUnitLite/TouchRunner/TouchRunner.cs

@@ -276,8 +276,17 @@ public bool OpenWriter (string message)
 							break;
 						}
 						if (options.EnableXml) {
+							NUnitLite.Runner.OutputWriter formatter;
+							switch (options.XmlVersion) {
+							case XmlVersion.NUnitV3:
+								formatter = new NUnitLite.Runner.NUnit3XmlOutputWriter (DateTime.UtcNow);
+								break;
+							default:
+								formatter = new NUnitLite.Runner.NUnit2XmlOutputWriter (DateTime.UtcNow);
+								break;
+							}
 							Writer = new NUnitOutputTextWriter (
-								this, defaultWriter, new NUnitLite.Runner.NUnit2XmlOutputWriter (DateTime.UtcNow), options.XmlMode);
+								this, defaultWriter, formatter, options.XmlMode);
 						} else {
 							Writer = defaultWriter;
 						}