show before/after output in verbose mode

gicastel · Dec 1, 2022 · b64327c · b64327c
1 parent 1ab813b
commit b64327c
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 19 deletions.
diff --git a/src/qest/Connectors/MsSqlConnector.cs b/src/qest/Connectors/MsSqlConnector.cs
@@ -216,12 +216,15 @@ private async Task RunScriptAsync(Scripts scripts)
             var transaction = Connection.BeginTransaction();
             try
             {
+                scripts.ActualScripts = new();
                 foreach (var item in scripts)
                 {
-                    string script = item.Compact(currentTest.Variables);
-                    if (script.Length > 0)
+                    foreach (string innerScript in item.GetValues())
                     {
-                        var cmd = new SqlCommand(script, Connection, transaction);
+                        string actualScript = (string)innerScript.ReplaceVarsInParameter(currentTest.Variables);
+                        scripts.ActualScripts.Add(actualScript);
+                        SqlCommand cmd = new(actualScript, Connection, transaction);
+                        cmd.CommandType = CommandType.Text;
                         await cmd.ExecuteNonQueryAsync();
                     }
                 }

diff --git a/src/qest/Models/Script.cs b/src/qest/Models/Script.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 using System.IO;
 using YamlDotNet.Serialization;
 
@@ -10,33 +11,34 @@ public class Script
         public ScriptType Type { get; set; }
         public List<string> Values { get; set; }
 
-        public string Compact(Dictionary<string, object>? variables)
+        public IEnumerable<string> GetValues()
         {
             if (Values == null)
                 throw new ArgumentNullException(nameof(Values));
 
-            switch (this.Type)
+            foreach (var value in Values)
             {
-                case ScriptType.Inline:
-                    return string.Join(";", Values).ReplaceVars(variables);
+                switch (this.Type)
+                {
+                    case ScriptType.Inline:
+                        yield return value;
+                        break;
+                    case ScriptType.File:
 
-                case ScriptType.File:
-                    List<string> list = new List<string>();
-                    foreach (var item in Values)
-                    {
-                        if (File.Exists(item))
+                        if (File.Exists(value))
                         {
-                            using var sr = new StreamReader(item);
+                            using var sr = new StreamReader(value);
                             string data = sr.ReadToEnd();
-                            list.Add(data);
+                            yield return data;
                         }
                         else
-                            throw new FileNotFoundException(null, item);
-                    }
-                    return string.Join(";", list).ReplaceVars(variables);
-                default:
-                    throw new ArgumentException(nameof(Type));
+                            throw new FileNotFoundException(null, value);
+                        break;
+                    default:
+                        throw new ArgumentException(nameof(Type));
+                }
             }
+
         }
     }
 
@@ -48,6 +50,8 @@ public enum ScriptType
 
     public class Scripts : List<Script>
     {
+        [YamlIgnore]
+        public List<string>? ActualScripts { get; set; }
         [YamlIgnore]
         public bool Result => ResultException is null;
         [YamlIgnore]

diff --git a/src/qest/Visualizers/ConsoleVisualizer.cs b/src/qest/Visualizers/ConsoleVisualizer.cs
@@ -285,9 +285,24 @@ private void EvaluateScript(string scope, Scripts scripts)
             LogHierarchy.Add(objName);
 
             if (scripts.Result)
+            {
+                if (Verbose)
+                    for (int i = 0; i < scripts.ActualScripts?.Count; i++)
+                    {
+                        string? item = scripts.ActualScripts[i];
+                        LogConsole(item.EscapeAndAddStyles(objectStyle_l3));
+                    }
+
                 LogConsole("OK".EscapeAndAddStyles(okStyle));
+            }
             else
             {
+                for (int i = 0; i < scripts.ActualScripts?.Count; i++)
+                {
+                    string? item = scripts.ActualScripts[i];
+                    LogConsoleError(item.EscapeAndAddStyles(objectStyle_l3));
+                }
+
                 LogException(scripts.ResultException!);
                 Pass = false;
             }

diff --git a/src/qest/Visualizers/TreeVisualizer.cs b/src/qest/Visualizers/TreeVisualizer.cs
@@ -296,11 +296,24 @@ private void EvaluateScript(string scope, Scripts scripts, TreeNode root)
 
             if (scripts.Result)
             {
+                if (Verbose)
+                    for (int i = 0; i < scripts.ActualScripts?.Count; i++)
+                    {
+                        string? item = scripts.ActualScripts[i];
+                        scriptsNode.AddNode(new Markup(item.EscapeAndAddStyles(objectStyle_l3)));
+                    }
+
                 scriptsNode.AddNode("OK".EscapeAndAddStyles(okStyle));
                 root.AddOutputNode(scriptsNode, Verbose);
             }
             else
             {
+                for (int i = 0; i < scripts.ActualScripts?.Count; i++)
+                {
+                    string? item = scripts.ActualScripts[i];
+                    scriptsNode.AddNode(new Markup(item.EscapeAndAddStyles(objectStyle_l3)));
+                }
+
                 scriptsNode.AddExceptionNode(scripts.ResultException!);
                 root.AddNode(scriptsNode);
                 Pass = false;