RelationalAI · NRHelmi · Jan 22, 2023 · Jan 23, 2023 · Jan 24, 2023 · Jan 26, 2023
diff --git a/RelationalAI.Test/DatabaseTest.cs b/RelationalAI.Test/DatabaseTest.cs
@@ -2,25 +2,28 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Xunit;
+using Xunit.Abstractions;
 
 namespace RelationalAI.Test
 {
     [Collection("RelationalAI.Test")]
     public class DatabaseTests : UnitTest
     {
         private readonly EngineFixture engineFixture;
+        private readonly ITestOutputHelper outputHelper;
         public static string Uuid = Guid.NewGuid().ToString();
         public static string Dbname = $"csharp-sdk-{Uuid}";
 
-        public DatabaseTests(EngineFixture fixture)
+        public DatabaseTests(EngineFixture fixture, ITestOutputHelper output)
         {
+            outputHelper = output;
             engineFixture = fixture;
         }
 
         [Fact]
         public async Task DatabaseTest()
         {
-            var client = CreateClient();
+            var client = CreateClient(outputHelper);
             await engineFixture.CreateEngineWaitAsync();
 
             await Assert.ThrowsAsync<HttpError>(async () => await client.DeleteDatabaseAsync(Dbname));
@@ -77,7 +80,7 @@ await Assert.ThrowsAsync<ArgumentOutOfRangeException>(() =>
         [Fact]
         public async Task DatabaseCloneTest()
         {
-            var client = CreateClient();
+            var client = CreateClient(outputHelper);
 
             await engineFixture.CreateEngineWaitAsync();
             await Assert.ThrowsAsync<HttpError>(async () => await client.DeleteDatabaseAsync(Dbname));
@@ -145,7 +148,7 @@ public async Task DatabaseCloneTest()
 
         public override async Task DisposeAsync()
         {
-            var client = CreateClient();
+            var client = CreateClient(outputHelper);
 
             try
             {

diff --git a/RelationalAI.Test/EngineTest.cs b/RelationalAI.Test/EngineTest.cs
@@ -1,24 +1,26 @@
 using System;
 using System.Threading.Tasks;
 using Xunit;
+using Xunit.Abstractions;
 
 namespace RelationalAI.Test
 {
     [Collection("RelationalAI.Test")]
     public class EngineTests : UnitTest
     {
-
+        private readonly ITestOutputHelper outputHelper;
         private readonly EngineFixture engineFixture;
 
-        public EngineTests(EngineFixture fixture)
+        public EngineTests(EngineFixture fixture, ITestOutputHelper output)
         {
+            outputHelper = output;
             engineFixture = fixture;
         }
 
         [Fact]
         public async Task EngineTest()
         {
-            var client = CreateClient();
+            var client = CreateClient(outputHelper);
 
             await engineFixture.CreateEngineWaitAsync();
 

diff --git a/RelationalAI.Test/ExecuteAsync.cs b/RelationalAI.Test/ExecuteAsync.cs
@@ -4,6 +4,7 @@
 using Relationalai.Protocol;
 using Xunit;
 using System.Threading.Tasks;
+using Xunit.Abstractions;
 
 namespace RelationalAI.Test
 {
@@ -13,17 +14,19 @@ public class ExecuteAsyncTests : UnitTest
 
         public static string Uuid = Guid.NewGuid().ToString();
         public static string Dbname = $"csharp-sdk-{Uuid}";
+        private readonly ITestOutputHelper outputHelper;
         private readonly EngineFixture engineFixture;
 
-        public ExecuteAsyncTests(EngineFixture fixture)
+        public ExecuteAsyncTests(EngineFixture fixture, ITestOutputHelper output)
         {
+            outputHelper = output;
             engineFixture = fixture;
         }
 
         [Fact]
         public async Task ExecuteAsyncTest()
         {
-            var client = CreateClient();
+            var client = CreateClient(outputHelper);
 
             await engineFixture.CreateEngineWaitAsync();
             await client.CreateDatabaseAsync(Dbname, engineFixture.Engine.Name);
@@ -50,7 +53,7 @@ public async Task ExecuteAsyncTest()
 
         public override async Task DisposeAsync()
         {
-            var client = CreateClient();
+            var client = CreateClient(outputHelper);
 
             try
             {

diff --git a/RelationalAI.Test/ExecuteV1Test.cs b/RelationalAI.Test/ExecuteV1Test.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Threading.Tasks;
 using Xunit;
+using Xunit.Abstractions;
 
 namespace RelationalAI.Test
 {
@@ -9,17 +10,19 @@ public class ExecuteTests : UnitTest
     {
         public static string Uuid = Guid.NewGuid().ToString();
         public static string Dbname = $"csharp-sdk-{Uuid}";
+        private readonly ITestOutputHelper outputHelper;
         private readonly EngineFixture engineFixture;
 
-        public ExecuteTests(EngineFixture fixture)
+        public ExecuteTests(EngineFixture fixture, ITestOutputHelper output)
         {
+            outputHelper = output;
             engineFixture = fixture;
         }
 
         [Fact]
         public async Task ExecuteV1Test()
         {
-            var client = CreateClient();
+            var client = CreateClient(outputHelper);
 
             await engineFixture.CreateEngineWaitAsync();
             await client.CreateDatabaseAsync(Dbname, engineFixture.Engine.Name);
@@ -49,7 +52,7 @@ public async Task ExecuteV1Test()
 
         public override async Task DisposeAsync()
         {
-            var client = CreateClient();
+            var client = CreateClient(outputHelper);
 
             try
             {

diff --git a/RelationalAI.Test/LoadCsvTest.cs b/RelationalAI.Test/LoadCsvTest.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Xunit;
+using Xunit.Abstractions;
 
 namespace RelationalAI.Test
 {
@@ -18,17 +19,19 @@ public class LoadCsvTests : UnitTest
                                       "\"cosmopolitan\",4,11.00,\"2020-03-03\"\n" +
                                       "\"bellini\",3,12.25,\"2020-04-04\"\n";
 
+        private readonly ITestOutputHelper outputHelper;
         private readonly EngineFixture engineFixture;
 
-        public LoadCsvTests(EngineFixture fixture)
+        public LoadCsvTests(EngineFixture fixture, ITestOutputHelper output)
         {
+            outputHelper = output;
             engineFixture = fixture;
         }
 
         [Fact]
         public async Task LoadCsvtTest()
         {
-            var client = CreateClient();
+            var client = CreateClient(outputHelper);
 
             await engineFixture.CreateEngineWaitAsync();
             await client.CreateDatabaseAsync(Dbname, engineFixture.Engine.Name);
@@ -98,7 +101,7 @@ public async Task LoadCsvtTest()
         [Fact]
         public async Task LoadCsvNoHeaderTest()
         {
-            var client = CreateClient();
+            var client = CreateClient(outputHelper);
 
             await engineFixture.CreateEngineWaitAsync();
             await client.CreateDatabaseAsync(Dbname, engineFixture.Engine.Name);
@@ -171,7 +174,7 @@ public async Task LoadCsvNoHeaderTest()
         [Fact]
         public async Task LoadCsvAltSyntaxTest()
         {
-            var client = CreateClient();
+            var client = CreateClient(outputHelper);
 
             await engineFixture.CreateEngineWaitAsync();
             await client.CreateDatabaseAsync(Dbname, engineFixture.Engine.Name);
@@ -236,7 +239,7 @@ public async Task LoadCsvAltSyntaxTest()
         [Fact]
         public async Task LoadCsvWithSchemaTest()
         {
-            var client = CreateClient();
+            var client = CreateClient(outputHelper);
 
             await engineFixture.CreateEngineWaitAsync();
             await client.CreateDatabaseAsync(Dbname, engineFixture.Engine.Name);
@@ -316,7 +319,7 @@ public async Task LoadCsvWithSchemaTest()
 
         public override async Task DisposeAsync()
         {
-            var client = CreateClient();
+            var client = CreateClient(outputHelper);
             try
             {
                 await client.DeleteDatabaseAsync(Dbname);

diff --git a/RelationalAI.Test/LoadJsonTest.cs b/RelationalAI.Test/LoadJsonTest.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Threading.Tasks;
 using Xunit;
+using Xunit.Abstractions;
 
 namespace RelationalAI.Test
 {
@@ -15,17 +16,19 @@ public class LoadJsonTests : UnitTest
                                       "\"height\":null,\n" +
                                       "\"pets\":[\"dog\",\"rabbit\"]}";
 
+        private readonly ITestOutputHelper outputHelper;
         private readonly EngineFixture engineFixture;
 
-        public LoadJsonTests(EngineFixture fixture)
+        public LoadJsonTests(EngineFixture fixture, ITestOutputHelper output)
         {
+            outputHelper = output;
             engineFixture = fixture;
         }
 
         [Fact]
         public async Task LoadJsontTest()
         {
-            var client = CreateClient();
+            var client = CreateClient(outputHelper);
 
             await engineFixture.CreateEngineWaitAsync();
             await client.CreateDatabaseAsync(Dbname, engineFixture.Engine.Name);
@@ -60,7 +63,7 @@ public async Task LoadJsontTest()
 
         public override async Task DisposeAsync()
         {
-            var client = CreateClient();
+            var client = CreateClient(outputHelper);
 
             try
             {

diff --git a/RelationalAI.Test/ModelsTest.cs b/RelationalAI.Test/ModelsTest.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Xunit;
+using Xunit.Abstractions;
 
 namespace RelationalAI.Test
 {
@@ -12,17 +13,19 @@ public class ModelsTests : UnitTest
         public static string Dbname = $"csharp-sdk-{Uuid}";
         private readonly Dictionary<string, string> TestModel = new Dictionary<string, string> { { "test_model", "def R = \"hello\", \"world\"" } };
 
+        private readonly ITestOutputHelper outputHelper;
         private readonly EngineFixture engineFixture;
 
-        public ModelsTests(EngineFixture fixture)
+        public ModelsTests(EngineFixture fixture, ITestOutputHelper output)
         {
+            outputHelper = output;
             engineFixture = fixture;
         }
 
         [Fact]
         public async Task ModelsTest()
         {
-            var client = CreateClient();
+            var client = CreateClient(outputHelper);
 
             await engineFixture.CreateEngineWaitAsync();
             await client.CreateDatabaseAsync(Dbname, engineFixture.Engine.Name);
@@ -51,7 +54,7 @@ public async Task ModelsTest()
 
         public override async Task DisposeAsync()
         {
-            var client = CreateClient();
+            var client = CreateClient(outputHelper);
 
             try
             {

diff --git a/RelationalAI.Test/OAuthClientTest.cs b/RelationalAI.Test/OAuthClientTest.cs
@@ -1,13 +1,20 @@
 using System;
 using System.Threading.Tasks;
 using Xunit;
+using Xunit.Abstractions;
 
 namespace RelationalAI.Test
 {
     public class OAuthClientTests : UnitTest
     {
         public static string Uuid = Guid.NewGuid().ToString();
         public static string OAuthClientName = $"csharp-sdk-{Uuid}";
+        private readonly ITestOutputHelper outputHelper;
+
+        public OAuthClientTests(ITestOutputHelper output)
+        {
+            outputHelper = output;
+        }
 
         [Fact]
         public async Task OAuthClientTest()

diff --git a/RelationalAI.Test/RAITestTraceListener.cs b/RelationalAI.Test/RAITestTraceListener.cs
@@ -0,0 +1,27 @@
+using System.Diagnostics;
+using Xunit.Abstractions;
+
+namespace RelationalAI.Test
+{
+    public class RAITestTraceListener : TraceListener
+    {
+        private readonly ITestOutputHelper testOutputHelper;
+
+        public RAITestTraceListener(ITestOutputHelper testOutputHelper)
+        {
+            this.testOutputHelper = testOutputHelper;
+        }
+        public override void Write(string message)
+        {
+            // ITestOutputHelper has no Write function
+            // using WriteLine for the moment until we figure
+            // out a better way to this
+            testOutputHelper.WriteLine(message);
+        }
+
+        public override void WriteLine(string message)
+        {
+            testOutputHelper.WriteLine(message);
+        }
+    }
+}
diff --git a/RelationalAI.Test/UnitTest.cs b/RelationalAI.Test/UnitTest.cs
@@ -1,17 +1,19 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
 using Xunit;
+using Xunit.Abstractions;
 
 namespace RelationalAI.Test
 {
     public class UnitTest : IAsyncLifetime
     {
-        public Client CreateClient()
+        public Client CreateClient(ITestOutputHelper testOutputHelper = null)
         {
             Dictionary<string, object> config;
 
@@ -52,6 +54,15 @@ public Client CreateClient()
             {
                 httpClient.DefaultRequestHeaders.Add(header.Key, header.Value);
             }
+
+            // Logging configuration
+            if (testOutputHelper != null)
+            {
+                var logger = testClient.Logger as RAITraceSourceLogger;
+                logger.AddListener(new RAITestTraceListener(testOutputHelper));
+                logger.SwitchLogLevel(TraceEventType.Verbose);
+            }
+
             return testClient;
         }