Hive: Refactor TestHiveCatalog tests to use the core CatalogTests

build.gradle

@@ -723,6 +723,7 @@ project(':iceberg-hive-metastore') {
     }
 
     testImplementation project(path: ':iceberg-api', configuration: 'testArtifacts')
+    testImplementation project(path: ':iceberg-core', configuration: 'testArtifacts')
     testImplementation libs.awaitility
   }
 }

core/src/test/java/org/apache/iceberg/catalog/CatalogTests.java

@@ -164,6 +164,10 @@ protected boolean supportsNamesWithSlashes() {
     return true;
   }
 
+  protected boolean supportsNamesWithDot() {
+    return true;
+  }
+
   @Test
   public void testCreateNamespace() {
     C catalog = catalog();
@@ -470,6 +474,8 @@ public void testNamespaceWithSlash() {
 
   @Test
   public void testNamespaceWithDot() {
+    Assumptions.assumeTrue(supportsNamesWithDot());
+
     C catalog = catalog();
 
     Namespace withDot = Namespace.of("new.db");
@@ -547,6 +553,8 @@ public void testTableNameWithSlash() {
 
   @Test
   public void testTableNameWithDot() {
+    Assumptions.assumeTrue(supportsNamesWithDot());
+
     C catalog = catalog();
 
     TableIdentifier ident = TableIdentifier.of("ns", "ta.ble");

hive-metastore/src/main/java/org/apache/iceberg/hive/HiveCatalog.java

@@ -261,6 +261,17 @@ public void renameTable(TableIdentifier from, TableIdentifier originalTo) {
     } catch (InterruptedException e) {
       Thread.currentThread().interrupt();
       throw new RuntimeException("Interrupted in call to rename", e);
+    } catch (RuntimeException e) {
+      // in case of table already exists,
+      // Hive rename operation throws exception as
+      // java.lang.RuntimeException:InvalidOperationException(message:new table <> already exists)
+      if (e.getCause() instanceof InvalidOperationException
+          && e.getCause().getMessage() != null
+          && e.getCause().getMessage().contains(String.format("new table %s already exists", to))) {
+        throw new org.apache.iceberg.exceptions.AlreadyExistsException(
+            "Table already exists: %s", to);
+      }
+      throw new RuntimeException("Failed to rename " + from + " to " + to, e);
     }
   }
 
@@ -288,7 +299,7 @@ public void createNamespace(Namespace namespace, Map<String, String> meta) {
 
     } catch (AlreadyExistsException e) {
       throw new org.apache.iceberg.exceptions.AlreadyExistsException(
-          e, "Namespace '%s' already exists!", namespace);
+          e, "Namespace already exists: %s", namespace);
 
     } catch (TException e) {
       throw new RuntimeException(
@@ -500,6 +511,9 @@ protected String defaultWarehouseLocation(TableIdentifier tableIdentifier) {
         return String.format("%s/%s", databaseData.getLocationUri(), tableIdentifier.name());
       }
 
+    } catch (NoSuchObjectException e) {
+      throw new NoSuchNamespaceException(
+          e, "Namespace does not exist: %s", tableIdentifier.namespace().levels()[0]);
     } catch (TException e) {
       throw new RuntimeException(
           String.format("Metastore operation failed for %s", tableIdentifier), e);

hive-metastore/src/main/java/org/apache/iceberg/hive/HiveTableOperations.java

@@ -209,7 +209,7 @@ protected void doCommit(TableMetadata base, TableMetadata metadata) {
       String baseMetadataLocation = base != null ? base.metadataFileLocation() : null;
       if (!Objects.equals(baseMetadataLocation, metadataLocation)) {
         throw new CommitFailedException(
-            "Base metadata location '%s' is not same as the current table metadata location '%s' for %s.%s",
+            "Cannot commit: Base metadata location '%s' is not same as the current table metadata location '%s' for %s.%s",
             baseMetadataLocation, metadataLocation, database, tableName);
       }
 

hive-metastore/src/test/java/org/apache/iceberg/hive/HiveMetastoreExtension.java

@@ -23,11 +23,11 @@
 import org.apache.hadoop.hive.metastore.HiveMetaStoreClient;
 import org.apache.hadoop.hive.metastore.api.Database;
 import org.apache.iceberg.relocated.com.google.common.collect.Maps;
-import org.junit.jupiter.api.extension.AfterAllCallback;
-import org.junit.jupiter.api.extension.BeforeAllCallback;
+import org.junit.jupiter.api.extension.AfterEachCallback;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
 import org.junit.jupiter.api.extension.ExtensionContext;
 
-public class HiveMetastoreExtension implements BeforeAllCallback, AfterAllCallback {
+public class HiveMetastoreExtension implements BeforeEachCallback, AfterEachCallback {
   private HiveMetaStoreClient metastoreClient;
   private TestHiveMetastore metastore;
   private final Map<String, String> hiveConfOverride;
@@ -39,7 +39,7 @@ public HiveMetastoreExtension(String databaseName, Map<String, String> hiveConfO
   }
 
   @Override
-  public void beforeAll(ExtensionContext extensionContext) throws Exception {
+  public void beforeEach(ExtensionContext extensionContext) throws Exception {
     metastore = new TestHiveMetastore();
     HiveConf hiveConfWithOverrides = new HiveConf(TestHiveMetastore.class);
     if (hiveConfOverride != null) {
@@ -50,13 +50,14 @@ public void beforeAll(ExtensionContext extensionContext) throws Exception {
 
     metastore.start(hiveConfWithOverrides);
     metastoreClient = new HiveMetaStoreClient(hiveConfWithOverrides);
+
     String dbPath = metastore.getDatabasePath(databaseName);
     Database db = new Database(databaseName, "description", dbPath, Maps.newHashMap());
     metastoreClient.createDatabase(db);
   }
 
   @Override
-  public void afterAll(ExtensionContext extensionContext) throws Exception {
+  public void afterEach(ExtensionContext extensionContext) throws Exception {
     if (null != metastoreClient) {
       metastoreClient.close();
     }