breaking changes in GetAlternateLookup

ladeak · Sep 18, 2024 · 2d1da1a · 2d1da1a
1 parent 4eb8c4c
commit 2d1da1a
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 21 deletions.
diff --git a/src/CHttpExecutor/ExecutionPlanBuilder.cs b/src/CHttpExecutor/ExecutionPlanBuilder.cs
@@ -249,7 +249,7 @@ private void ValidateVariableExistance(ReadOnlySpan<char> source)
         //    .Where(x => !_variables.Contains(x))
         //    .Where(x => !_steps.Any(s => s.Name != null && x.StartsWith(s.Name)))
         //    .Where(x => !(_currentStep.Name != null && x.StartsWith(_currentStep.Name))).FirstOrDefault();
-        var variablesLookup = _variables.GetAlternateLookup<string, ReadOnlySpan<char>>();
+        var variablesLookup = _variables.GetAlternateLookup<ReadOnlySpan<char>>();
         foreach (Range varNameRange in VariablePreprocessor.GetVariableNameRanges(source))
         {
             bool matched = false;

diff --git a/src/CHttpExecutor/Executor.cs b/src/CHttpExecutor/Executor.cs
@@ -15,9 +15,9 @@ public ExecutionContext()
     {
         // TODO: Drop StringComparer.Ordinal .NET 9 https://github.com/dotnet/runtime/issues/27229
         VariableValues = new(StringComparer.Ordinal);
-        VariableValuesLookup = VariableValues.GetAlternateLookup<string, string, ReadOnlySpan<char>>();
+        VariableValuesLookup = VariableValues.GetAlternateLookup<ReadOnlySpan<char>>();
         ExecutionResults = new(StringComparer.Ordinal);
-        ExecutionResultsLookup = ExecutionResults.GetAlternateLookup<string, VariablePostProcessingWriterStrategy, ReadOnlySpan<char>>();
+        ExecutionResultsLookup = ExecutionResults.GetAlternateLookup<ReadOnlySpan<char>>();
     }
 
     public IFileSystem FileSystem { get; } = new MemoryFileSystem();

diff --git a/tests/CHttpExecutor.Tests/VariablePreprocessorTests.cs b/tests/CHttpExecutor.Tests/VariablePreprocessorTests.cs
@@ -20,8 +20,8 @@ public void SingleSubstitution(string input, string expected)
         {
             { "host", "localhost" }
         };
-        var result = VariablePreprocessor.Evaluate(input, variables.GetAlternateLookup<string, string, ReadOnlySpan<char>>(),
-            new Dictionary<string, VariablePostProcessingWriterStrategy>(StringComparer.Ordinal).GetAlternateLookup<string, VariablePostProcessingWriterStrategy, ReadOnlySpan<char>>());
+        var result = VariablePreprocessor.Evaluate(input, variables.GetAlternateLookup<ReadOnlySpan<char>>(),
+            new Dictionary<string, VariablePostProcessingWriterStrategy>(StringComparer.Ordinal).GetAlternateLookup<ReadOnlySpan<char>>());
         Assert.Equal(expected, result);
     }
 
@@ -41,8 +41,8 @@ public void NoSubstitution(string input, string expected)
         {
             { "host", "localhost" }
         };
-        var result = VariablePreprocessor.Evaluate(input, variables.GetAlternateLookup<string, string, ReadOnlySpan<char>>(),
-            new Dictionary<string, VariablePostProcessingWriterStrategy>(StringComparer.Ordinal).GetAlternateLookup<string, VariablePostProcessingWriterStrategy, ReadOnlySpan<char>>());
+        var result = VariablePreprocessor.Evaluate(input, variables.GetAlternateLookup<ReadOnlySpan<char>>(),
+            new Dictionary<string, VariablePostProcessingWriterStrategy>(StringComparer.Ordinal).GetAlternateLookup<ReadOnlySpan<char>>());
         Assert.Equal(expected, result);
     }
 
@@ -58,8 +58,8 @@ public void MultiSubstitution(string input, string expected)
             { "host", "localhost" },
             { "port", "5000" }
         };
-        var result = VariablePreprocessor.Evaluate(input, variables.GetAlternateLookup<string, string, ReadOnlySpan<char>>(),
-            new Dictionary<string, VariablePostProcessingWriterStrategy>(StringComparer.Ordinal).GetAlternateLookup<string, VariablePostProcessingWriterStrategy, ReadOnlySpan<char>>());
+        var result = VariablePreprocessor.Evaluate(input, variables.GetAlternateLookup<ReadOnlySpan<char>>(),
+            new Dictionary<string, VariablePostProcessingWriterStrategy>(StringComparer.Ordinal).GetAlternateLookup<ReadOnlySpan<char>>());
         Assert.Equal(expected, result);
     }
 
@@ -71,8 +71,8 @@ public void EnvironmentVariable()
         {
             { "host", "{{$envVarHost}}" }
         };
-        var result = VariablePreprocessor.Evaluate("https://{{host}}/", variables.GetAlternateLookup<string, string, ReadOnlySpan<char>>(),
-            new Dictionary<string, VariablePostProcessingWriterStrategy>(StringComparer.Ordinal).GetAlternateLookup<string, VariablePostProcessingWriterStrategy, ReadOnlySpan<char>>());
+        var result = VariablePreprocessor.Evaluate("https://{{host}}/", variables.GetAlternateLookup<ReadOnlySpan<char>>(),
+            new Dictionary<string, VariablePostProcessingWriterStrategy>(StringComparer.Ordinal).GetAlternateLookup<ReadOnlySpan<char>>());
         Assert.Equal("https://localhost/", result);
     }
 
@@ -84,8 +84,8 @@ public void InlineReplacementFromValues()
             { "something", "localhost" },
             { "host", "{{ something }}" }
         };
-        var result = VariablePreprocessor.Evaluate("https://{{host}}/", variables.GetAlternateLookup<string, string, ReadOnlySpan<char>>(),
-            new Dictionary<string, VariablePostProcessingWriterStrategy>(StringComparer.Ordinal).GetAlternateLookup<string, VariablePostProcessingWriterStrategy, ReadOnlySpan<char>>());
+        var result = VariablePreprocessor.Evaluate("https://{{host}}/", variables.GetAlternateLookup<ReadOnlySpan<char>>(),
+            new Dictionary<string, VariablePostProcessingWriterStrategy>(StringComparer.Ordinal).GetAlternateLookup<ReadOnlySpan<char>>());
         Assert.Equal("https://localhost/", result);
     }
 
@@ -98,8 +98,8 @@ public void InlinedReplacementFromValues()
             { "someOtherVariable", "localhost" },
             { "host", "{{$ envVarHost  }}" }
         };
-        var result = VariablePreprocessor.Evaluate("https://{{host}}/", variables.GetAlternateLookup<string, string, ReadOnlySpan<char>>(),
-            new Dictionary<string, VariablePostProcessingWriterStrategy>(StringComparer.Ordinal).GetAlternateLookup<string, VariablePostProcessingWriterStrategy, ReadOnlySpan<char>>());
+        var result = VariablePreprocessor.Evaluate("https://{{host}}/", variables.GetAlternateLookup<ReadOnlySpan<char>>(),
+            new Dictionary<string, VariablePostProcessingWriterStrategy>(StringComparer.Ordinal).GetAlternateLookup<ReadOnlySpan<char>>());
         Assert.Equal("https://localhost/", result);
     }
 
@@ -114,8 +114,8 @@ public async Task BodyParse()
         {
             { "first",  responseWriter }
         };
-        var result = VariablePreprocessor.Evaluate("https://{{first.response.body.$.Data}}/", new Dictionary<string, string>(StringComparer.Ordinal).GetAlternateLookup<string, string, ReadOnlySpan<char>>(),
-            responses.GetAlternateLookup<string, VariablePostProcessingWriterStrategy, ReadOnlySpan<char>>());
+        var result = VariablePreprocessor.Evaluate("https://{{first.response.body.$.Data}}/", new Dictionary<string, string>(StringComparer.Ordinal).GetAlternateLookup<ReadOnlySpan<char>>(),
+            responses.GetAlternateLookup<ReadOnlySpan<char>>());
         Assert.Equal("https://hello/", result);
     }
 
@@ -131,8 +131,8 @@ public async Task BodyFilterParse()
             { "first",  responseWriter }
         };
         var result = VariablePreprocessor.Evaluate("https://{{first.response.body.$.Data[[email protected]<1].Name}}/",
-            new Dictionary<string, string>(StringComparer.Ordinal).GetAlternateLookup<string, string, ReadOnlySpan<char>>(),
-            responses.GetAlternateLookup<string, VariablePostProcessingWriterStrategy, ReadOnlySpan<char>>());
+            new Dictionary<string, string>(StringComparer.Ordinal).GetAlternateLookup<ReadOnlySpan<char>>(),
+            responses.GetAlternateLookup<ReadOnlySpan<char>>());
         Assert.Equal("https://test0/", result);
     }
 
@@ -152,8 +152,8 @@ public async Task Header()
             { "first",  responseWriter }
         };
         var result = VariablePreprocessor.Evaluate("{{first.response.Headers.my}}{{first.response.headers.content-type}}",
-            new Dictionary<string, string>(StringComparer.Ordinal).GetAlternateLookup<string, string, ReadOnlySpan<char>>(),
-            responses.GetAlternateLookup<string, VariablePostProcessingWriterStrategy, ReadOnlySpan<char>>());
+            new Dictionary<string, string>(StringComparer.Ordinal).GetAlternateLookup<ReadOnlySpan<char>>(),
+            responses.GetAlternateLookup<ReadOnlySpan<char>>());
         Assert.Equal("value-application/json", result);
     }
 }