change over to use the engine result

Author: siywilliams

FluentCommandLineParser.Tests/FluentCommandLineParser/when_executing_parse_operation/with_a_parser_engine_that_is_custom.cs

@@ -48,7 +48,7 @@ public class with_a_parser_engine_that_is_custom : FluentCommandLineParserTestCo
 
 										mockedEngine
 											.Setup(x => x.Parse(args))
-											.Returns(new List<ParsedOption>())
+											.Returns(Create<ParserEngineResult>())
 											.Verifiable();
 									};
 

FluentCommandLineParser.Tests/FluentCommandLineParser/when_executing_parse_operation/with_options_that_are_specified_in_the_args.cs

@@ -76,14 +76,16 @@ class with_options_that_are_specified_in_the_args : FluentCommandLineParserTestC
 				_blankOption.Setup(x => x.Bind(_parsedBlankOption)).Verifiable();
 				sut.Options.Add(_blankOption.Object);
 
-				var parserEngineResult = new List<ParsedOption>
+				var parsedOptions = new List<ParsedOption>
 				{
 					_parsedOptionThatHasCallback,
 					_parsedOptionThatIsRequired,
 					_parsedBlankOption
 				};
 
-				args = CreateArgsFromKvp(parserEngineResult);
+				var parserEngineResult = new ParserEngineResult(parsedOptions, CreateEmptyList<string>());
+
+				args = CreateArgsFromKvp(parsedOptions);
 
 				var parserEngineMock = new Mock<ICommandLineParserEngine>();
 				parserEngineMock.Setup(x => x.Parse(args)).Returns(parserEngineResult);

FluentCommandLineParser.Tests/FluentCommandLineParser/when_executing_parse_operation/with_options_that_have_not_been_setup.cs

@@ -52,7 +52,10 @@ class with_options_that_have_not_been_setup : FluentCommandLineParserTestContext
 				args = CreateArgsFromKvp(additionalOptions);
 
 				var mockEngine = new Mock<ICommandLineParserEngine>();
-				mockEngine.Setup(x => x.Parse(args)).Returns(additionalOptions);
+
+				var result = new ParserEngineResult(additionalOptions, CreateEmptyList<string>());
+
+				mockEngine.Setup(x => x.Parse(args)).Returns(result);
 				sut.ParserEngine = mockEngine.Object;
 			};
 

FluentCommandLineParser.Tests/TestContext/TestContext.cs

@@ -27,15 +27,13 @@
 using System.Globalization;
 using System.Linq;
 using Fclp.Internals.Parsing;
+using Fclp.Tests.Internals;
 using Machine.Specifications;
 
 namespace Fclp.Tests
 {
-	public abstract class TestContext<T>
+	public abstract class TestContext<T> : TestContextBase<T> where T : class
 	{
-		protected static T sut;
-		protected static Exception error;
-
 		protected static void CatchAnyError(Action test)
 		{
 			error = Catch.Exception(test);

FluentCommandLineParser/FluentCommandLineParser.cs

@@ -221,7 +221,8 @@ public ICommandLineOptionFluent<T> Setup<T>(string longOption)
 		/// <returns>An <see cref="ICommandLineParserResult"/> representing the results of the parse operation.</returns>
 		public ICommandLineParserResult Parse(string[] args)
 		{
-			var parsedOptions = this.ParserEngine.Parse(args).ToList();
+			var parserEngineResult = this.ParserEngine.Parse(args);
+			var parsedOptions = parserEngineResult.ParsedOptions.ToList();
 
 			var result = new CommandLineParserResult { EmptyArgs = parsedOptions.IsNullOrEmpty() };
 

FluentCommandLineParser/Internals/Parsing/CommandLineParserEngineMark2.cs

@@ -146,15 +146,5 @@ static bool IsEndOfOptionsKey(string arg)
 		{
 			return string.Equals(arg, SpecialCharacters.EndOfOptionsKey, StringComparison.InvariantCultureIgnoreCase);
 		}
-
-		/// <summary>
-		/// Parses the specified <see><cref>T:System.String[]</cref></see> into key value pairs.
-		/// </summary>
-		/// <param name="args">The <see><cref>T:System.String[]</cref></see> to parse.</param>
-		/// <returns>An <see cref="IEnumerable{T}"/> containing the results of the parse operation.</returns>
-		IEnumerable<ParsedOption> ICommandLineParserEngine.Parse(string[] args)
-		{
-			return Parse(args).ParsedOptions;
-		}
 	}
 }

FluentCommandLineParser/Internals/Parsing/ICommandLineParserEngine.cs

@@ -22,8 +22,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 #endregion
 
-using System.Collections.Generic;
-
 namespace Fclp.Internals.Parsing
 {
 	/// <summary>
@@ -36,6 +34,6 @@ public interface ICommandLineParserEngine
 		/// </summary>
 		/// <param name="args">The <see><cref>T:System.String[]</cref></see> to parse.</param>
 		/// <returns>An <see cref="ICommandLineParserResult"/> representing the results of the parse operation.</returns>
-		IEnumerable<ParsedOption> Parse(string[] args);
+		ParserEngineResult Parse(string[] args);
 	}
 }