Make tests pass

Author: Forgind

src/Microsoft.TemplateEngine.Edge/TemplateConstraintManager.cs

@@ -15,7 +15,7 @@ public class TemplateConstraintManager : IDisposable
         private readonly ILogger<TemplateConstraintManager> _logger;
         private readonly CancellationTokenSource _cancellationTokenSource = new CancellationTokenSource();
         private readonly Dictionary<string, ITemplateConstraint> _templateConstraints = new();
-        private readonly Dictionary<string, TemplateConstraintResult> _evaluatedConstraints = new();
+        private readonly Dictionary<(string Type, string? Args), TemplateConstraintResult> _evaluatedConstraints = new();
 
         public TemplateConstraintManager(IEngineEnvironmentSettings engineEnvironmentSettings)
         {
@@ -58,21 +58,26 @@ public async Task<IReadOnlyList<ITemplateConstraint>> GetConstraintsAsync(IEnume
         public async Task<TemplateConstraintResult> EvaluateConstraintAsync(string type, string? args, CancellationToken cancellationToken)
         {
             cancellationToken.ThrowIfCancellationRequested();
-            if (_evaluatedConstraints.TryGetValue(type, out TemplateConstraintResult result))
+            if (_evaluatedConstraints.TryGetValue((type, args), out TemplateConstraintResult result))
             {
                 return result;
             }
 
             if (!_templateConstraints.TryGetValue(type, out ITemplateConstraint constraint))
             {
+                if (_evaluatedConstraints.TryGetValue((type, null), out result))
+                {
+                    return result;
+                }
+
                 _logger.LogDebug($"The constraint '{type}' is unknown.");
                 return TemplateConstraintResult.CreateInitializationFailure(type, string.Format(LocalizableStrings.TemplateConstraintManager_Error_UnknownType, type));
             }
 
             try
             {
                 result = constraint.Evaluate(args);
-                _evaluatedConstraints.Add(type, result);
+                _evaluatedConstraints.Add((type, args), result);
                 return result;
             }
             catch (Exception e)
@@ -159,7 +164,7 @@ private async Task InitializeTemplateConstraints(IEngineEnvironmentSettings engi
                 {
                     exception = exception is not null ? exception.InnerException ?? exception : exception;
                     _logger.LogDebug($"The constraint '{constraintFactory.Type}' failed to be initialized, details: {exception}.");
-                    _evaluatedConstraints.Add(constraintFactory.Type, TemplateConstraintResult.CreateInitializationFailure(constraintFactory.Type, string.Format(LocalizableStrings.TemplateConstraintManager_Error_FailedToInitialize, constraintFactory.Type, exception?.Message)));
+                    _evaluatedConstraints.Add((constraintFactory.Type, null), TemplateConstraintResult.CreateInitializationFailure(constraintFactory.Type, string.Format(LocalizableStrings.TemplateConstraintManager_Error_FailedToInitialize, constraintFactory.Type, exception?.Message)));
                 }
                 else
                 {

test/Microsoft.TemplateEngine.Edge.UnitTests/TemplateConstraintManagerTests.cs

@@ -227,7 +227,7 @@ public LongRunningTestConstraintFactory(string type)
 
             public async Task<ITemplateConstraint> CreateTemplateConstraintAsync(IEngineEnvironmentSettings environmentSettings, CancellationToken cancellationToken)
             {
-                await Task.Delay(30000);
+                await Task.Delay(3000);
                 throw new Exception("creation failed");
             }
         }