Core: Add more options in CatalogTests (apache#4906)

yqf1991 · May 30, 2022 · a8b494f · a8b494f
1 parent 5955dff
commit a8b494f
Showing 1 changed file with 24 additions and 4 deletions.
diff --git a/core/src/test/java/org/apache/iceberg/catalog/CatalogTests.java b/core/src/test/java/org/apache/iceberg/catalog/CatalogTests.java
@@ -160,6 +160,14 @@ protected boolean supportsServerSideRetry() {
     return false;
   }
 
+  protected boolean overridesRequestedLocation() {
+    return false;
+  }
+
+  protected boolean supportsNamesWithSlashes() {
+    return true;
+  }
+
   @Test
   public void testCreateNamespace() {
     C catalog = catalog();
@@ -428,6 +436,8 @@ public void testListNestedNamespaces() {
 
   @Test
   public void testNamespaceWithSlash() {
+    Assume.assumeTrue(supportsNamesWithSlashes());
+
     C catalog = catalog();
 
     Namespace withSlash = Namespace.of("new/db");
@@ -485,6 +495,8 @@ public void testBasicCreateTable() {
 
   @Test
   public void testTableNameWithSlash() {
+    Assume.assumeTrue(supportsNamesWithSlashes());
+
     C catalog = catalog();
 
     TableIdentifier ident = TableIdentifier.of("ns", "tab/le");
@@ -1181,7 +1193,9 @@ public void testCompleteCreateTransaction() {
     Assert.assertEquals("Table properties should be a superset of the requested properties",
         properties.entrySet(),
         Sets.intersection(properties.entrySet(), table.properties().entrySet()));
-    Assert.assertEquals("Table location should match requested", "file:/tmp/ns/table", table.location());
+    if (!overridesRequestedLocation()) {
+      Assert.assertEquals("Table location should match requested", "file:/tmp/ns/table", table.location());
+    }
     assertFiles(table, FILE_A);
     assertPreviousMetadataFileCount(table, 0);
   }
@@ -1269,7 +1283,9 @@ public void testCompleteCreateOrReplaceTransactionCreate() {
     Assert.assertEquals("Table properties should be a superset of the requested properties",
         properties.entrySet(),
         Sets.intersection(properties.entrySet(), table.properties().entrySet()));
-    Assert.assertEquals("Table location should match requested", "file:/tmp/ns/table", table.location());
+    if (!overridesRequestedLocation()) {
+      Assert.assertEquals("Table location should match requested", "file:/tmp/ns/table", table.location());
+    }
     assertFiles(table, FILE_A);
     assertPreviousMetadataFileCount(table, 0);
   }
@@ -1361,7 +1377,9 @@ public void testCompleteCreateOrReplaceTransactionReplace() {
     Assert.assertEquals("Table properties should be a superset of the requested properties",
         properties.entrySet(),
         Sets.intersection(properties.entrySet(), loaded.properties().entrySet()));
-    Assert.assertEquals("Table location should be replaced", "file:/tmp/ns/table", table.location());
+    if (!overridesRequestedLocation()) {
+      Assert.assertEquals("Table location should be replaced", "file:/tmp/ns/table", table.location());
+    }
     assertUUIDsMatch(original, loaded);
     assertFiles(loaded, FILE_A);
     assertPreviousMetadataFileCount(loaded, 1);
@@ -1484,7 +1502,9 @@ public void testCompleteReplaceTransaction() {
     Assert.assertEquals("Table properties should be a superset of the requested properties",
         properties.entrySet(),
         Sets.intersection(properties.entrySet(), loaded.properties().entrySet()));
-    Assert.assertEquals("Table location should be replaced", "file:/tmp/ns/table", table.location());
+    if (!overridesRequestedLocation()) {
+      Assert.assertEquals("Table location should be replaced", "file:/tmp/ns/table", table.location());
+    }
     assertUUIDsMatch(original, loaded);
     assertFiles(loaded, FILE_A);
     assertPreviousMetadataFileCount(loaded, 1);