From df1eed7047ab44fd7e753b4055b44d0ffd61582b Mon Sep 17 00:00:00 2001
From: Jacky Hu <jacky.hu@databricks.com>
Date: Thu, 3 Jul 2025 09:07:20 -0700
Subject: [PATCH 1/2] Split the Databricks test into unit test and integration
 test

---
 .../{ => E2E}/Auth/OAuthClientCredentialsProviderTests.cs       | 0
 csharp/test/Drivers/Databricks/{ => E2E}/ClientTests.cs         | 0
 .../Databricks/{ => E2E}/CloudFetch/CloudFetchDownloaderTest.cs | 0
 .../{ => E2E}/CloudFetch/CloudFetchResultFetcherTest.cs         | 0
 csharp/test/Drivers/Databricks/{ => E2E}/CloudFetchE2ETest.cs   | 0
 .../test/Drivers/Databricks/{ => E2E}/ComplexTypesValueTests.cs | 0
 .../Drivers/Databricks/{ => E2E}/DatabricksConnectionTest.cs    | 0
 .../Drivers/Databricks/{ => E2E}/DatabricksTestConfiguration.cs | 0
 .../Drivers/Databricks/{ => E2E}/DatabricksTestEnvironment.cs   | 0
 csharp/test/Drivers/Databricks/{ => E2E}/DateTimeValueTests.cs  | 0
 csharp/test/Drivers/Databricks/{ => E2E}/DriverTests.cs         | 0
 csharp/test/Drivers/Databricks/{ => E2E}/NumericValueTests.cs   | 0
 .../Drivers/Databricks/{ => E2E}/ServerSidePropertyE2ETest.cs   | 0
 csharp/test/Drivers/Databricks/{ => E2E}/StatementTests.cs      | 0
 csharp/test/Drivers/Databricks/{ => E2E}/StringValueTests.cs    | 0
 .../{ => Unit}/DatabricksOperationStatusPollerTests.cs          | 2 +-
 .../Databricks/{ => Unit}/Result/DescTableExtendedResultTest.cs | 2 +-
 .../test/Drivers/Databricks/{ => Unit}/RetryHttpHandlerTest.cs  | 2 +-
 18 files changed, 3 insertions(+), 3 deletions(-)
 rename csharp/test/Drivers/Databricks/{ => E2E}/Auth/OAuthClientCredentialsProviderTests.cs (100%)
 rename csharp/test/Drivers/Databricks/{ => E2E}/ClientTests.cs (100%)
 rename csharp/test/Drivers/Databricks/{ => E2E}/CloudFetch/CloudFetchDownloaderTest.cs (100%)
 rename csharp/test/Drivers/Databricks/{ => E2E}/CloudFetch/CloudFetchResultFetcherTest.cs (100%)
 rename csharp/test/Drivers/Databricks/{ => E2E}/CloudFetchE2ETest.cs (100%)
 rename csharp/test/Drivers/Databricks/{ => E2E}/ComplexTypesValueTests.cs (100%)
 rename csharp/test/Drivers/Databricks/{ => E2E}/DatabricksConnectionTest.cs (100%)
 rename csharp/test/Drivers/Databricks/{ => E2E}/DatabricksTestConfiguration.cs (100%)
 rename csharp/test/Drivers/Databricks/{ => E2E}/DatabricksTestEnvironment.cs (100%)
 rename csharp/test/Drivers/Databricks/{ => E2E}/DateTimeValueTests.cs (100%)
 rename csharp/test/Drivers/Databricks/{ => E2E}/DriverTests.cs (100%)
 rename csharp/test/Drivers/Databricks/{ => E2E}/NumericValueTests.cs (100%)
 rename csharp/test/Drivers/Databricks/{ => E2E}/ServerSidePropertyE2ETest.cs (100%)
 rename csharp/test/Drivers/Databricks/{ => E2E}/StatementTests.cs (100%)
 rename csharp/test/Drivers/Databricks/{ => E2E}/StringValueTests.cs (100%)
 rename csharp/test/Drivers/Databricks/{ => Unit}/DatabricksOperationStatusPollerTests.cs (98%)
 rename csharp/test/Drivers/Databricks/{ => Unit}/Result/DescTableExtendedResultTest.cs (99%)
 rename csharp/test/Drivers/Databricks/{ => Unit}/RetryHttpHandlerTest.cs (99%)

diff --git a/csharp/test/Drivers/Databricks/Auth/OAuthClientCredentialsProviderTests.cs b/csharp/test/Drivers/Databricks/E2E/Auth/OAuthClientCredentialsProviderTests.cs
similarity index 100%
rename from csharp/test/Drivers/Databricks/Auth/OAuthClientCredentialsProviderTests.cs
rename to csharp/test/Drivers/Databricks/E2E/Auth/OAuthClientCredentialsProviderTests.cs
diff --git a/csharp/test/Drivers/Databricks/ClientTests.cs b/csharp/test/Drivers/Databricks/E2E/ClientTests.cs
similarity index 100%
rename from csharp/test/Drivers/Databricks/ClientTests.cs
rename to csharp/test/Drivers/Databricks/E2E/ClientTests.cs
diff --git a/csharp/test/Drivers/Databricks/CloudFetch/CloudFetchDownloaderTest.cs b/csharp/test/Drivers/Databricks/E2E/CloudFetch/CloudFetchDownloaderTest.cs
similarity index 100%
rename from csharp/test/Drivers/Databricks/CloudFetch/CloudFetchDownloaderTest.cs
rename to csharp/test/Drivers/Databricks/E2E/CloudFetch/CloudFetchDownloaderTest.cs
diff --git a/csharp/test/Drivers/Databricks/CloudFetch/CloudFetchResultFetcherTest.cs b/csharp/test/Drivers/Databricks/E2E/CloudFetch/CloudFetchResultFetcherTest.cs
similarity index 100%
rename from csharp/test/Drivers/Databricks/CloudFetch/CloudFetchResultFetcherTest.cs
rename to csharp/test/Drivers/Databricks/E2E/CloudFetch/CloudFetchResultFetcherTest.cs
diff --git a/csharp/test/Drivers/Databricks/CloudFetchE2ETest.cs b/csharp/test/Drivers/Databricks/E2E/CloudFetchE2ETest.cs
similarity index 100%
rename from csharp/test/Drivers/Databricks/CloudFetchE2ETest.cs
rename to csharp/test/Drivers/Databricks/E2E/CloudFetchE2ETest.cs
diff --git a/csharp/test/Drivers/Databricks/ComplexTypesValueTests.cs b/csharp/test/Drivers/Databricks/E2E/ComplexTypesValueTests.cs
similarity index 100%
rename from csharp/test/Drivers/Databricks/ComplexTypesValueTests.cs
rename to csharp/test/Drivers/Databricks/E2E/ComplexTypesValueTests.cs
diff --git a/csharp/test/Drivers/Databricks/DatabricksConnectionTest.cs b/csharp/test/Drivers/Databricks/E2E/DatabricksConnectionTest.cs
similarity index 100%
rename from csharp/test/Drivers/Databricks/DatabricksConnectionTest.cs
rename to csharp/test/Drivers/Databricks/E2E/DatabricksConnectionTest.cs
diff --git a/csharp/test/Drivers/Databricks/DatabricksTestConfiguration.cs b/csharp/test/Drivers/Databricks/E2E/DatabricksTestConfiguration.cs
similarity index 100%
rename from csharp/test/Drivers/Databricks/DatabricksTestConfiguration.cs
rename to csharp/test/Drivers/Databricks/E2E/DatabricksTestConfiguration.cs
diff --git a/csharp/test/Drivers/Databricks/DatabricksTestEnvironment.cs b/csharp/test/Drivers/Databricks/E2E/DatabricksTestEnvironment.cs
similarity index 100%
rename from csharp/test/Drivers/Databricks/DatabricksTestEnvironment.cs
rename to csharp/test/Drivers/Databricks/E2E/DatabricksTestEnvironment.cs
diff --git a/csharp/test/Drivers/Databricks/DateTimeValueTests.cs b/csharp/test/Drivers/Databricks/E2E/DateTimeValueTests.cs
similarity index 100%
rename from csharp/test/Drivers/Databricks/DateTimeValueTests.cs
rename to csharp/test/Drivers/Databricks/E2E/DateTimeValueTests.cs
diff --git a/csharp/test/Drivers/Databricks/DriverTests.cs b/csharp/test/Drivers/Databricks/E2E/DriverTests.cs
similarity index 100%
rename from csharp/test/Drivers/Databricks/DriverTests.cs
rename to csharp/test/Drivers/Databricks/E2E/DriverTests.cs
diff --git a/csharp/test/Drivers/Databricks/NumericValueTests.cs b/csharp/test/Drivers/Databricks/E2E/NumericValueTests.cs
similarity index 100%
rename from csharp/test/Drivers/Databricks/NumericValueTests.cs
rename to csharp/test/Drivers/Databricks/E2E/NumericValueTests.cs
diff --git a/csharp/test/Drivers/Databricks/ServerSidePropertyE2ETest.cs b/csharp/test/Drivers/Databricks/E2E/ServerSidePropertyE2ETest.cs
similarity index 100%
rename from csharp/test/Drivers/Databricks/ServerSidePropertyE2ETest.cs
rename to csharp/test/Drivers/Databricks/E2E/ServerSidePropertyE2ETest.cs
diff --git a/csharp/test/Drivers/Databricks/StatementTests.cs b/csharp/test/Drivers/Databricks/E2E/StatementTests.cs
similarity index 100%
rename from csharp/test/Drivers/Databricks/StatementTests.cs
rename to csharp/test/Drivers/Databricks/E2E/StatementTests.cs
diff --git a/csharp/test/Drivers/Databricks/StringValueTests.cs b/csharp/test/Drivers/Databricks/E2E/StringValueTests.cs
similarity index 100%
rename from csharp/test/Drivers/Databricks/StringValueTests.cs
rename to csharp/test/Drivers/Databricks/E2E/StringValueTests.cs
diff --git a/csharp/test/Drivers/Databricks/DatabricksOperationStatusPollerTests.cs b/csharp/test/Drivers/Databricks/Unit/DatabricksOperationStatusPollerTests.cs
similarity index 98%
rename from csharp/test/Drivers/Databricks/DatabricksOperationStatusPollerTests.cs
rename to csharp/test/Drivers/Databricks/Unit/DatabricksOperationStatusPollerTests.cs
index c72326a621..a8f23fb660 100644
--- a/csharp/test/Drivers/Databricks/DatabricksOperationStatusPollerTests.cs
+++ b/csharp/test/Drivers/Databricks/Unit/DatabricksOperationStatusPollerTests.cs
@@ -25,7 +25,7 @@
 using Xunit;
 using Xunit.Abstractions;
 
-namespace Apache.Arrow.Adbc.Tests.Drivers.Databricks
+namespace Apache.Arrow.Adbc.Tests.Drivers.Databricks.Unit
 {
     public class DatabricksOperationStatusPollerTests
     {
diff --git a/csharp/test/Drivers/Databricks/Result/DescTableExtendedResultTest.cs b/csharp/test/Drivers/Databricks/Unit/Result/DescTableExtendedResultTest.cs
similarity index 99%
rename from csharp/test/Drivers/Databricks/Result/DescTableExtendedResultTest.cs
rename to csharp/test/Drivers/Databricks/Unit/Result/DescTableExtendedResultTest.cs
index 93a29ad363..651334d650 100644
--- a/csharp/test/Drivers/Databricks/Result/DescTableExtendedResultTest.cs
+++ b/csharp/test/Drivers/Databricks/Unit/Result/DescTableExtendedResultTest.cs
@@ -23,7 +23,7 @@
 
 using Xunit;
 
-namespace Apache.Arrow.Adbc.Tests.Drivers.Databricks.Result
+namespace Apache.Arrow.Adbc.Tests.Drivers.Databricks.Unit.Result
 {
     public class DescTableExtendedResultTest
     {
diff --git a/csharp/test/Drivers/Databricks/RetryHttpHandlerTest.cs b/csharp/test/Drivers/Databricks/Unit/RetryHttpHandlerTest.cs
similarity index 99%
rename from csharp/test/Drivers/Databricks/RetryHttpHandlerTest.cs
rename to csharp/test/Drivers/Databricks/Unit/RetryHttpHandlerTest.cs
index e0849593f2..0aa8ba55ad 100644
--- a/csharp/test/Drivers/Databricks/RetryHttpHandlerTest.cs
+++ b/csharp/test/Drivers/Databricks/Unit/RetryHttpHandlerTest.cs
@@ -22,7 +22,7 @@
 using Apache.Arrow.Adbc.Drivers.Databricks;
 using Xunit;
 
-namespace Apache.Arrow.Adbc.Tests.Drivers.Databricks
+namespace Apache.Arrow.Adbc.Tests.Drivers.Databricks.Unit
 {
     /// <summary>
     /// Tests for the RetryHttpHandler class.

From 04372041c0501c607d4a1af755a6183827883477 Mon Sep 17 00:00:00 2001
From: Jacky Hu <jacky.hu@databricks.com>
Date: Thu, 3 Jul 2025 09:07:51 -0700
Subject: [PATCH 2/2] Include Databricks unit test into csharp CI test

---
 ci/scripts/csharp_test.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ci/scripts/csharp_test.sh b/ci/scripts/csharp_test.sh
index 4f79069be9..da6ce98e23 100755
--- a/ci/scripts/csharp_test.sh
+++ b/ci/scripts/csharp_test.sh
@@ -24,3 +24,8 @@ source_dir=${1}/csharp/test/Apache.Arrow.Adbc.Tests
 pushd ${source_dir}
 dotnet test
 popd
+
+source_dir=${1}/csharp/test/Drivers/Databricks
+pushd ${source_dir}
+dotnet test --filter "FullyQualifiedName~Apache.Arrow.Adbc.Tests.Drivers.Databricks.Unit"
+popd