Adjusted tests for TokenPartitioner 📎

gsscoder · gsscoder · commit 82f578d2d7cb · 2015-08-24T13:37:00.000+02:00
diff --git a/README.md b/README.md
@@ -112,7 +112,7 @@ type options = {
 ```
 Consume them:
 ```fsharp
-let main argv = 
+let main argv =
   let result = CommandLine.Parser.Default.ParseArguments<options>(argv)
   match result with
   | :? Parsed<options> as parsed -> run parsed.Value
@@ -255,6 +255,7 @@ Latest Changes:
   - Issue #225/b (reported by @rmunn) Fixed.
   - All `ParserResult<T>.Return` renamed to `MapResult`.
   - PR #227 (by @Thilas) Merged.
+  - Reverted back to `Tuple<...>` instead of `TokePartitions` type.
 
 Contact:
 ---
diff --git a/docs/ChangeLog b/docs/ChangeLog
@@ -1,15 +1,16 @@
 2015-08-24    Giacomo Stelluti Scala  <gsscoder@gmail.com>
 
-* PR #227 (by @Thilas) Merged.
+  * PR #227 (by @Thilas) Merged.
+  * Reverted back to Tuple<...> instead of TokePartitions type.
 
 2015-08-20    Giacomo Stelluti Scala  <gsscoder@gmail.com>
 
-* All ParserResult<T>.Return renamed to MapResult.
+  * All ParserResult<T>.Return renamed to MapResult.
 
 2015-08-19    Giacomo Stelluti Scala  <gsscoder@gmail.com>
 
-* Issue #225 (reported by @rmunn) Fixed.
-* Issue #225/b (reported by @rmunn) Fixed.
+  * Issue #225 (reported by @rmunn) Fixed.
+  * Issue #225/b (reported by @rmunn) Fixed.
 
 2015-08-15    Giacomo Stelluti Scala  <gsscoder@gmail.com>
 
diff --git a/src/CommandLine/Core/TokenPartitioner.cs b/src/CommandLine/Core/TokenPartitioner.cs
@@ -11,9 +11,9 @@ static class TokenPartitioner
     {
         public static
             Tuple<
-                IEnumerable<KeyValuePair<string, IEnumerable<string>>>,
-                IEnumerable<string>,
-                IEnumerable<Token>
+                IEnumerable<KeyValuePair<string, IEnumerable<string>>>, // options
+                IEnumerable<string>,                                    // values
+                IEnumerable<Token>                                      // errors
             > Partition(
                 IEnumerable<Token> tokens,
                 Func<string, Maybe<TypeDescriptor>> typeLookup)
diff --git a/tests/CommandLine.Tests/Unit/Core/TokenPartitionerTests.cs b/tests/CommandLine.Tests/Unit/Core/TokenPartitionerTests.cs
@@ -32,7 +32,8 @@ public void Partition_sequence_returns_sequence()
                 );
 
             // Verify outcome
-            Assert.True(expectedSequence.All(a => result.Options.Any(r => a.Key.Equals(r.Key) && a.Value.SequenceEqual(r.Value))));
+            var options = result.Item1;
+            Assert.True(expectedSequence.All(a => options.Any(r => a.Key.Equals(r.Key) && a.Value.SequenceEqual(r.Value))));
 
             // Teardown
         }
@@ -58,7 +59,8 @@ public void Partition_sequence_returns_sequence_with_duplicates()
                 );
 
             // Verify outcome
-            Assert.True(expectedSequence.All(a => result.Options.Any(r => a.Key.Equals(r.Key) && a.Value.SequenceEqual(r.Value))));
+            var options = result.Item1;
+            Assert.True(expectedSequence.All(a => options.Any(r => a.Key.Equals(r.Key) && a.Value.SequenceEqual(r.Value))));
 
             // Teardown
         }
