Integration test

Author: nblumhardt

src/SeqCli/Cli/Commands/HelpCommand.cs

@@ -179,13 +179,13 @@ void PrintHelp(string executableName)
             {
                 if (!printedGroups.Contains(avail.Metadata.Name))
                 {
-                    Printing.Define($"  {avail.Metadata.Name}", "<sub-command>", 13, Console.Out);
+                    Printing.Define($"  {avail.Metadata.Name}", "<sub-command>", Console.Out);
                     printedGroups.Add(avail.Metadata.Name);
                 }
             }
             else
             {
-                Printing.Define($"  {avail.Metadata.Name}", avail.Metadata.HelpText, 13, Console.Out);
+                Printing.Define($"  {avail.Metadata.Name}", avail.Metadata.HelpText, Console.Out);
             }
         }
 
@@ -201,7 +201,7 @@ void PrintHelp(string executableName, string topLevelCommand)
 
         foreach (var avail in _orderedCommands.Where(c => c.Metadata.Name == topLevelCommand))
         {
-            Printing.Define($"  {avail.Metadata.SubCommand}", avail.Metadata.HelpText, 13, Console.Out);
+            Printing.Define($"  {avail.Metadata.SubCommand}", avail.Metadata.HelpText, Console.Out);
         }
 
         Console.WriteLine();

src/SeqCli/Cli/Printing.cs

@@ -19,11 +19,11 @@ namespace SeqCli.Cli;
 
 static class Printing
 {
-    const int ConsoleWidth = 80;
+    const int ConsoleWidth = 82, TermColumnWidth = 14;
 
-    public static void Define(string term, string definition, int termColumnWidth, TextWriter output)
+    public static void Define(string term, string definition, TextWriter output)
     {
-        var header = term.PadRight(termColumnWidth);
+        var header = term.PadRight(TermColumnWidth);
         var right = ConsoleWidth - header.Length;
 
         var rest = definition.ToCharArray();

test/SeqCli.EndToEnd/App/AppBasicsTestCase.cs

@@ -17,6 +17,9 @@ public Task ExecuteAsync(SeqConnection connection, ILogger logger, CliCommandRun
         exit = runner.Exec("app install", "--package-id Seq.App.EmailPlus");
         Assert.Equal(0, exit);
 
+        exit = runner.Exec("app list", "--package-id Seq.App.EmailPlus");
+        Assert.Equal(0, exit);
+
         exit = runner.Exec("app update", "--all");
         Assert.Equal(0, exit);
 

test/SeqCli.EndToEnd/AppInstance/AppInstanceBasicsTestCase.cs

@@ -0,0 +1,45 @@
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using Seq.Api;
+using SeqCli.EndToEnd.Support;
+using Serilog;
+using Xunit;
+
+namespace SeqCli.EndToEnd.AppInstance;
+
+public class AppInstanceBasicsTestCase : ICliTestCase
+{
+    public async Task ExecuteAsync(SeqConnection connection, ILogger logger, CliCommandRunner runner)
+    {
+        var exit = runner.Exec("appinstance list", "-i appinstance-none");
+        Assert.Equal(1, exit);
+
+        exit = runner.Exec("app install", "--package-id Seq.App.EmailPlus");
+        Assert.Equal(0, exit);
+
+        var app = (await connection.Apps.ListAsync()).Single();
+
+        var title = Guid.NewGuid().ToString("N");
+        exit = runner.Exec("appinstance create", $"-t {title} --app {app.Id} -p To=");
+        Assert.Equal(0, exit);
+
+        var appInstance = (await connection.AppInstances.ListAsync()).Single();
+        
+        exit = runner.Exec("appinstance list", $"-t {title}");
+        Assert.Equal(0, exit);
+
+        var output = runner.LastRunProcess?.Output;
+        Assert.Equal(appInstance.Id, output?.Trim());
+        Assert.Equal(appInstance.Title, output?.Trim());
+
+        exit = runner.Exec("appinstance remove", $"-t {title}");
+        Assert.Equal(0, exit);
+
+        exit = runner.Exec("appinstance list", $"-i {appInstance.Id}");
+        Assert.Equal(1, exit);
+
+        exit = runner.Exec("appinstance list", $"-t {title}");
+        Assert.Equal(0, exit);
+    }
+}

test/SeqCli.EndToEnd/Signal/SignalBasicsTestCase.cs

@@ -19,8 +19,8 @@ public Task ExecuteAsync(
         exit = runner.Exec("signal list", "-t Warnings");
         Assert.Equal(0, exit);
 
-        var output = runner.LastRunProcess.Output;
-        Assert.Equal("signal-m33302 Warnings", output.Trim());
+        var output = runner.LastRunProcess?.Output;
+        Assert.Equal("signal-m33302 Warnings", output?.Trim());
 
         exit = runner.Exec("signal remove", "-t Warnings");
         Assert.Equal(0, exit);

test/SeqCli.EndToEnd/Support/TestConfiguration.cs

@@ -12,10 +12,12 @@ public TestConfiguration(Args args)
     {
         _args = args;
     }
-        
-    public int ServerListenPort { get; } = 9989;
 
+    static int ServerListenPort => 9989;
+
+#pragma warning disable CA1822
     public string ServerListenUrl => $"http://localhost:{ServerListenPort}";
+#pragma warning restore CA1822
 
     string EquivalentBaseDirectory { get; } = AppDomain.CurrentDomain.BaseDirectory
         .Replace(Path.Combine("test", "SeqCli.EndToEnd"), Path.Combine("src", "SeqCli"));
@@ -48,4 +50,4 @@ public CaptiveProcess SpawnServerProcess(string storagePath)
         }
         return new CaptiveProcess("seq", commandWithArgs);
     }
-}
+}