clean up tests

Author: TimothyW553

kernel-spark/src/main/java/io/delta/kernel/spark/snapshot/CatalogManagedSnapshotManager.java

@@ -42,6 +42,7 @@ public class CatalogManagedSnapshotManager implements DeltaSnapshotManager, Auto
   private final ManagedCatalogAdapter catalogAdapter;
   private final String tableId;
   private final String tablePath;
+  private final Configuration hadoopConf;
 
   public CatalogManagedSnapshotManager(
       ManagedCatalogAdapter catalogAdapter,
@@ -51,7 +52,7 @@ public CatalogManagedSnapshotManager(
     this.catalogAdapter = requireNonNull(catalogAdapter, "catalogAdapter is null");
     this.tableId = requireNonNull(tableId, "tableId is null");
     this.tablePath = requireNonNull(tablePath, "tablePath is null");
-    requireNonNull(hadoopConf, "hadoopConf is null");
+    this.hadoopConf = requireNonNull(hadoopConf, "hadoopConf is null");
 
     logger.info(
         "Created CatalogManagedSnapshotManager for table {} at path {}", tableId, tablePath);

kernel-spark/src/main/java/io/delta/kernel/spark/snapshot/unitycatalog/UnityCatalogAdapter.java

@@ -37,10 +37,14 @@ public final class UnityCatalogAdapter implements ManagedCatalogAdapter {
 
   private final String tableId;
   private final String tablePath;
+  private final String endpoint;
+  private final String token;
 
-  public UnityCatalogAdapter(String tableId, String tablePath) {
+  public UnityCatalogAdapter(String tableId, String tablePath, String endpoint, String token) {
     this.tableId = requireNonNull(tableId, "tableId is null");
     this.tablePath = requireNonNull(tablePath, "tablePath is null");
+    this.endpoint = requireNonNull(endpoint, "endpoint is null");
+    this.token = requireNonNull(token, "token is null");
   }
 
   /**
@@ -59,7 +63,8 @@ public static Optional<ManagedCatalogAdapter> fromCatalog(
   /** Creates adapter from connection info (no Spark dependency). */
   public static ManagedCatalogAdapter fromConnectionInfo(UnityCatalogConnectionInfo info) {
     requireNonNull(info, "info is null");
-    return new UnityCatalogAdapter(info.getTableId(), info.getTablePath());
+    return new UnityCatalogAdapter(
+        info.getTableId(), info.getTablePath(), info.getEndpoint(), info.getToken());
   }
 
   public String getTableId() {
@@ -70,6 +75,14 @@ public String getTablePath() {
     return tablePath;
   }
 
+  public String getEndpoint() {
+    return endpoint;
+  }
+
+  public String getToken() {
+    return token;
+  }
+
   @Override
   public Snapshot loadSnapshot(
       Engine engine, Optional<Long> versionOpt, Optional<Long> timestampOpt) {

kernel-spark/src/test/java/io/delta/kernel/spark/snapshot/DeltaSnapshotManagerFactoryTest.java

@@ -46,30 +46,4 @@ void testFromCatalogTable_NullCatalogTable_ThrowsException() {
         () -> DeltaSnapshotManagerFactory.fromCatalogTable(null, null, new Configuration()),
         "Null catalogTable should throw NullPointerException");
   }
-
-  @Test
-  void testFromCatalogTable_NullHadoopConf_ThrowsException() {
-    // Can't test without a real CatalogTable instance, so this test validates the pattern
-    // See integration tests for full validation
-  }
-
-  // Note: Factory behavior tests (which manager type is created) require integration test setup.
-  // The following tests cannot be implemented as unit tests because the factory requires
-  // a non-null SparkSession parameter:
-  //
-  // - testCreate_NonCatalogManagedTable_ReturnsPathBasedManager: Verify non-UC tables use PathBased
-  // - testCreate_EmptyCatalogTable_ReturnsPathBasedManager: Verify empty catalogTable uses
-  // PathBased
-  // - testCreate_UCManagedTable_ReturnsCatalogManagedManager: Verify UC tables use CatalogManaged
-  //
-  // While PathBasedSnapshotManager doesn't technically need SparkSession, the factory API requires
-  // it to maintain a clean, consistent interface (always available in production via SparkTable).
-  // Cannot mock SparkSession effectively for these tests.
-  //
-  // Note: Testing CatalogManagedSnapshotManager creation requires integration tests with
-  // real SparkSession and Unity Catalog configuration. This is because:
-  // 1. CatalogManagedSnapshotManager constructor validates UC table and extracts metadata
-  // 2. It requires configured UC catalog (spark.sql.catalog.*.uri/token)
-  // 3. Unit tests cannot easily mock SparkSession's catalog manager
-  // See CatalogManagedSnapshotManagerTest for integration tests.
 }

kernel-spark/src/test/scala/io/delta/kernel/spark/snapshot/CatalogManagedSnapshotManagerSuite.scala

@@ -21,7 +21,7 @@ import io.delta.kernel.CommitRange
 import io.delta.kernel.Snapshot
 import io.delta.kernel.engine.Engine
 import io.delta.kernel.internal.files.ParsedLogData
-import io.delta.kernel.spark.snapshot.unitycatalog.UnityCatalogAdapter
+
 import org.apache.hadoop.conf.Configuration
 import org.scalatest.funsuite.AnyFunSuite
 
@@ -46,7 +46,8 @@ class CatalogManagedSnapshotManagerSuite extends AnyFunSuite {
         endTimestampOpt: Optional[java.lang.Long]): CommitRange =
       throw new UnsupportedOperationException("stub")
 
-    override def getRatifiedCommits(endVersionOpt: Optional[java.lang.Long]): java.util.List[ParsedLogData] =
+    override def getRatifiedCommits(endVersionOpt: Optional[java.lang.Long])
+        : java.util.List[ParsedLogData] =
       throw new UnsupportedOperationException("stub")
 
     override def getLatestRatifiedVersion: Long =
@@ -71,7 +72,8 @@ class CatalogManagedSnapshotManagerSuite extends AnyFunSuite {
   }
 
   test("operations are unsupported in wireframe") {
-    val manager = new CatalogManagedSnapshotManager(stubAdapter, tableId, tablePath, new Configuration())
+    val manager =
+      new CatalogManagedSnapshotManager(stubAdapter, tableId, tablePath, new Configuration())
 
     assertThrows[UnsupportedOperationException] {
       manager.loadLatestSnapshot()
@@ -91,21 +93,24 @@ class CatalogManagedSnapshotManagerSuite extends AnyFunSuite {
   }
 
   test("loadSnapshotAt validates version") {
-    val manager = new CatalogManagedSnapshotManager(stubAdapter, tableId, tablePath, new Configuration())
+    val manager =
+      new CatalogManagedSnapshotManager(stubAdapter, tableId, tablePath, new Configuration())
     assertThrows[IllegalArgumentException] {
       manager.loadSnapshotAt(-1L)
     }
   }
 
   test("checkVersionExists validates version") {
-    val manager = new CatalogManagedSnapshotManager(stubAdapter, tableId, tablePath, new Configuration())
+    val manager =
+      new CatalogManagedSnapshotManager(stubAdapter, tableId, tablePath, new Configuration())
     assertThrows[IllegalArgumentException] {
       manager.checkVersionExists(-1L, true, false)
     }
   }
 
   test("close is tolerant") {
-    val manager = new CatalogManagedSnapshotManager(stubAdapter, tableId, tablePath, new Configuration())
+    val manager =
+      new CatalogManagedSnapshotManager(stubAdapter, tableId, tablePath, new Configuration())
     manager.close() // should not throw
   }
 }