test: add more tests

Author: olavloite

drivers/spanner-ado-net/spanner-ado-net-specification-tests/DbFactoryFixture.cs

@@ -34,7 +34,7 @@ static DbFactoryFixture()
     internal readonly SpannerMockServerFixture MockServerFixture = new ();
 
     public DbProviderFactory Factory => SpannerFactory.Instance;
-    public string ConnectionString => $"{MockServerFixture.Host}:{MockServerFixture.Port}/projects/p1/instances/i1/databases/d1;UsePlainText=true";
+    public string ConnectionString => $"Host={MockServerFixture.Host};Port={MockServerFixture.Port};Data Source=projects/p1/instances/i1/databases/d1;UsePlainText=true";
 
     public IReadOnlyCollection<DbType> SupportedDbTypes { get; } = [
         DbType.Binary,

drivers/spanner-ado-net/spanner-ado-net-specification-tests/spanner-ado-net-specification-tests.csproj

@@ -15,7 +15,10 @@
   <ItemGroup>
     <PackageReference Include="AdoNet.Specification.Tests" Version="2.0.0-beta.2" />
     <PackageReference Include="Alpha.Google.Cloud.SpannerLib.MockServer" Version="1.0.0-alpha.20251009102337" />
-    <PackageReference Include="coverlet.collector" Version="6.0.0"/>
+    <PackageReference Include="coverlet.collector" Version="6.0.4">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
     <PackageReference Include="xunit" Version="2.9.3" />
   </ItemGroup>

drivers/spanner-ado-net/spanner-ado-net-tests/AbstractMockServerTests.cs

@@ -28,7 +28,7 @@ static AbstractMockServerTests()
 
     protected SpannerMockServerFixture Fixture;
 
-    protected string ConnectionString =>  $"{Fixture.Host}:{Fixture.Port}/projects/p1/instances/i1/databases/d1;UsePlainText=true";
+    protected string ConnectionString =>  $"Host={Fixture.Host};Port={Fixture.Port};Data Source=projects/p1/instances/i1/databases/d1;UsePlainText=true";
 
     [OneTimeSetUp]
     public void Setup()

drivers/spanner-ado-net/spanner-ado-net-tests/ConnectionStringBuilderTests.cs

@@ -13,10 +13,15 @@
 // limitations under the License.
 
 using System.Data;
+using Google.Cloud.SpannerLib;
+using Google.Cloud.SpannerLib.MockServer;
+using Google.Rpc;
+using Grpc.Core;
+using Status = Grpc.Core.Status;
 
 namespace Google.Cloud.Spanner.DataProvider.Tests;
 
-public class ConnectionStringBuilderTests
+public class ConnectionStringBuilderTests : AbstractMockServerTests
 {
     [Test]
     public void Basic()
@@ -167,5 +172,126 @@ public void PropertiesToConnectionString()
         Assert.That(builder.ConnectionString, Is.EqualTo("Data Source=projects/project1/instances/instance1/databases/database1;Host=localhost;Port=80;UsePlainText=True;DefaultIsolationLevel=RepeatableRead"));
         Assert.That(builder.SpannerLibConnectionString, Is.EqualTo("localhost:80/projects/project1/instances/instance1/databases/database1;UsePlainText=True;DefaultIsolationLevel=RepeatableRead"));
     }
+
+    [Test]
+    public void RequiredConnectionStringProperties()
+    {
+        using var connection = new SpannerConnection();
+        Assert.Throws<ArgumentException>(() => connection.ConnectionString = "Host=localhost;Port=80");
+    }
+
+    [Test]
+    public void FailedConnectThenSucceed()
+    {
+        // Close all current pools to ensure that we get a fresh pool.
+        SpannerPool.CloseSpannerLib();
+        // TODO: Make this a public property in the mock server.
+        const string detectDialectQuery =
+            "select option_value from information_schema.database_options where option_name='database_dialect'";
+        Fixture.SpannerMock.AddOrUpdateStatementResult(detectDialectQuery, StatementResult.CreateException(new RpcException(new Status(StatusCode.NotFound, "Database not found"))));
+        using var conn = new SpannerConnection();
+        conn.ConnectionString = ConnectionString;
+        var exception = Assert.Throws<SpannerException>(() => conn.Open());
+        Assert.That(exception.Code, Is.EqualTo(Code.NotFound));
+        Assert.That(conn.State, Is.EqualTo(ConnectionState.Closed));
+        
+        // Remove the error and retry.
+        Fixture.SpannerMock.AddOrUpdateStatementResult(detectDialectQuery, StatementResult.CreateResultSet(new List<Tuple<Google.Cloud.Spanner.V1.TypeCode, string>>
+        {
+            Tuple.Create<Google.Cloud.Spanner.V1.TypeCode, string>(V1.TypeCode.String, "option_value")
+        }, new List<object[]>
+        {
+            new object[] { "GOOGLE_STANDARD_SQL" }
+        }));
+        conn.Open();
+        Assert.That(conn.State, Is.EqualTo(ConnectionState.Open));
+    }
+
+    [Test]
+    [Ignore("Needs connect_timeout property")]
+    public void OpenTimeout()
+    {
+        // TODO: Add connect_timeout property.
+        var builder = new SpannerConnectionStringBuilder
+        {
+            Host = Fixture.Host,
+            Port = (uint) Fixture.Port,
+            UsePlainText = true,
+            DataSource = "projects/project1/instances/instance1/databases/database1",
+            //ConnectTimeout = TimeSpan.FromMicroseconds(1),
+        };
+        using var connection = new SpannerConnection();
+        connection.ConnectionString = builder.ConnectionString;
+        var exception = Assert.Throws<SpannerDbException>(() => connection.Open());
+        Assert.That(exception.ErrorCode, Is.EqualTo((int) Code.DeadlineExceeded));
+    }
+
+    [Test]
+    [Ignore("OpenAsync must be implemented")]
+    public async Task OpenCancel()
+    {
+        // Close all current pools to ensure that we get a fresh pool.
+        SpannerPool.CloseSpannerLib();
+        Fixture.SpannerMock.AddOrUpdateExecutionTime(nameof(Fixture.SpannerMock.CreateSession), ExecutionTime.FromMillis(20, 0));
+        var builder = new SpannerConnectionStringBuilder
+        {
+            Host = Fixture.Host,
+            Port = (uint) Fixture.Port,
+            UsePlainText = true,
+            DataSource = "projects/project1/instances/instance1/databases/database1",
+        };
+        await using var connection = new SpannerConnection();
+        connection.ConnectionString = builder.ConnectionString;
+        var tokenSource = new CancellationTokenSource(5);
+        // TODO: Implement actual async opening of connections
+        Assert.ThrowsAsync<OperationCanceledException>(async () => await connection.OpenAsync(tokenSource.Token));
+        Assert.That(connection.State, Is.EqualTo(ConnectionState.Closed));
+    }
+    
+    [Test]
+    public void DataSourceProperty()
+    {
+        using var conn = new SpannerConnection();
+        Assert.That(conn.DataSource, Is.EqualTo(string.Empty));
+
+        var builder = new SpannerConnectionStringBuilder(ConnectionString);
+
+        conn.ConnectionString = builder.ConnectionString;
+        Assert.That(conn.DataSource, Is.EqualTo("projects/p1/instances/i1/databases/d1"));
+    }
+    
+    [Test]
+    public void SettingConnectionStringWhileOpenThrows()
+    {
+        using var conn = new SpannerConnection();
+        conn.ConnectionString = ConnectionString;
+        conn.Open();
+        Assert.That(() => conn.ConnectionString = "", Throws.Exception.TypeOf<InvalidOperationException>());
+    }
+
+    [Test]
+    public void EmptyConstructor()
+    {
+        var conn = new SpannerConnection();
+        Assert.That(conn.ConnectionTimeout, Is.EqualTo(15));
+        Assert.That(conn.ConnectionString, Is.SameAs(string.Empty));
+        Assert.That(() => conn.Open(), Throws.Exception.TypeOf<InvalidOperationException>());
+    }
+
+    [Test]
+    public void Constructor_with_null_connection_string()
+    {
+        var conn = new SpannerConnection(null);
+        Assert.That(conn.ConnectionString, Is.SameAs(string.Empty));
+        Assert.That(() => conn.Open(), Throws.Exception.TypeOf<InvalidOperationException>());
+    }
+
+    [Test]
+    public void Constructor_with_empty_connection_string()
+    {
+        var conn = new NpgsqlConnection("");
+        Assert.That(conn.ConnectionString, Is.SameAs(string.Empty));
+        Assert.That(() => conn.Open(), Throws.Exception.TypeOf<InvalidOperationException>());
+    }
 
 }

drivers/spanner-ado-net/spanner-ado-net-tests/spanner-ado-net-tests.csproj

@@ -14,7 +14,10 @@
 
   <ItemGroup>
     <PackageReference Include="Alpha.Google.Cloud.SpannerLib.MockServer" Version="1.0.0-alpha.20251009100446" />
-    <PackageReference Include="coverlet.collector" Version="6.0.0"/>
+    <PackageReference Include="coverlet.collector" Version="6.0.4">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
     <PackageReference Include="NUnit" Version="3.14.0"/>
     <PackageReference Include="NUnit.Analyzers" Version="3.9.0"/>

drivers/spanner-ado-net/spanner-ado-net/SpannerConnection.cs

@@ -20,6 +20,7 @@
 using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
+using Google.Api.Gax;
 using Google.Cloud.Spanner.Common.V1;
 using Google.Cloud.Spanner.V1;
 using Google.Cloud.SpannerLib;
@@ -31,51 +32,49 @@ public class SpannerConnection : DbConnection
     public bool UseSharedLibrary { get; set; }
 
     private string _connectionString = string.Empty;
+    
+    private SpannerConnectionStringBuilder? _connectionStringBuilder;
 
     [AllowNull]
     public override string ConnectionString {
         get => _connectionString;
         set
         {
             AssertClosed();
-            if (!IsValidConnectionString(value))
+            if (string.IsNullOrWhiteSpace(value))
+            {
+                _connectionStringBuilder = null;
+                _connectionString = string.Empty;
+            }
+            else
             {
-                throw new ArgumentException($"Invalid connection string: {value}");
+                var builder = new SpannerConnectionStringBuilder(value);
+                builder.CheckValid();
+                _connectionStringBuilder = builder;
+                _connectionString = value;
             }
-            _connectionString = value ?? string.Empty;
         }
     }
 
     public override string Database
     {
         get
         {
-            // TODO: Move this to SpannerLib.
-            if (String.IsNullOrWhiteSpace(ConnectionString))
+            if (string.IsNullOrWhiteSpace(ConnectionString) || _connectionStringBuilder == null)
             {
                 return "";
             }
-            var startIndex = ConnectionString.IndexOf("projects/", StringComparison.Ordinal);
-            if (startIndex == -1)
-            {
-                throw new ArgumentException($"Invalid database name in connection string: {ConnectionString}");
-            }
-                
-            var endIndex = ConnectionString.IndexOf('?');
-            if (endIndex == -1)
-            {
-                endIndex = ConnectionString.IndexOf(';');
-            }
-            if (endIndex == -1)
+            if (!string.IsNullOrEmpty(_connectionStringBuilder.DataSource))
             {
-                endIndex = ConnectionString.Length;
+                return _connectionStringBuilder.DataSource;
             }
-            var name = ConnectionString.Substring(startIndex, endIndex);
-            if (DatabaseName.TryParse(name, false, out var result))
+            if (!string.IsNullOrEmpty(_connectionStringBuilder.Project) &&
+                !string.IsNullOrEmpty(_connectionStringBuilder.Instance) &&
+                !string.IsNullOrEmpty(_connectionStringBuilder.Project))
             {
-                return result.DatabaseId;
+                return $"projects/{_connectionStringBuilder.Project}/instances/{_connectionStringBuilder.Instance}/databases/{_connectionStringBuilder.Database}";
             }
-            throw new ArgumentException($"Invalid database name in connection string: {ConnectionString}");
+            return "";
         }
     }
 
@@ -92,8 +91,9 @@ private ConnectionState InternalState
 
     public override ConnectionState State => InternalState;
     protected override DbProviderFactory DbProviderFactory => SpannerFactory.Instance;
+    
+    public override string DataSource => _connectionStringBuilder?.DataSource ?? string.Empty;
 
-    public override string DataSource { get; } = "";
     public override string ServerVersion
     {
         get
@@ -188,15 +188,23 @@ protected override void Dispose(bool disposing)
     public override void Open()
     {
         AssertClosed();
-        if (ConnectionString == string.Empty)
+        if (ConnectionString == string.Empty || _connectionStringBuilder == null)
         {
             throw new InvalidOperationException("Connection string is empty");
         }
-            
-        InternalState = ConnectionState.Connecting;
-        Pool = SpannerPool.GetOrCreate(ConnectionString);
-        _libConnection = Pool.CreateConnection();
-        InternalState = ConnectionState.Open;
+
+        try
+        {
+            InternalState = ConnectionState.Connecting;
+            Pool = SpannerPool.GetOrCreate(_connectionStringBuilder.SpannerLibConnectionString);
+            _libConnection = Pool.CreateConnection();
+            InternalState = ConnectionState.Open;
+        }
+        catch (Exception)
+        {
+            InternalState = ConnectionState.Closed;
+            throw;
+        }
     }
 
     private void EnsureOpen()
@@ -223,12 +231,6 @@ private void AssertClosed()
         }
     }
 
-    private bool IsValidConnectionString(string? connectionString)
-    {
-        // TODO: Move to Spanner lib.
-        return string.IsNullOrEmpty(connectionString) || connectionString.Contains("projects/");
-    }
-
     public CommitResponse? WriteMutations(BatchWriteRequest.Types.MutationGroup mutations)
     {
         EnsureOpen();