Skip to content

Fix catalog names in integration tests #769

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adutra merged 1 commit into from
Jan 15, 2025
Merged

Fix catalog names in integration tests #769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 11 additions & 12 deletions ...s/src/main/java/org/apache/polaris/service/it/test/PolarisApplicationIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,8 +353,8 @@ public void testIcebergDropNamespaceInExternalCatalog() throws IOException {
}

@Test
public void testIcebergCreateTablesInExternalCatalog(TestInfo testInfo) throws IOException {
String catalogName = testInfo.getTestMethod().orElseThrow().getName() + "External";
public void testIcebergCreateTablesInExternalCatalog() throws IOException {
String catalogName = client.newEntityName("testIcebergCreateTablesInExternalCatalogExternal");
createCatalog(catalogName, Catalog.TypeEnum.EXTERNAL, principalRoleName);
try (RESTSessionCatalog sessionCatalog = newSessionCatalog(catalogName)) {
SessionCatalog.SessionContext sessionContext = SessionCatalog.SessionContext.createEmpty();
Expand All @@ -380,8 +380,9 @@ public void testIcebergCreateTablesInExternalCatalog(TestInfo testInfo) throws I
}

@Test
public void testIcebergCreateTablesWithWritePathBlocked(TestInfo testInfo) throws IOException {
String catalogName = testInfo.getTestMethod().orElseThrow().getName() + "Internal";
public void testIcebergCreateTablesWithWritePathBlocked() throws IOException {
String catalogName =
client.newEntityName("testIcebergCreateTablesWithWritePathBlockedInternal");
createCatalog(catalogName, Catalog.TypeEnum.INTERNAL, principalRoleName);
try (RESTSessionCatalog sessionCatalog = newSessionCatalog(catalogName)) {
SessionCatalog.SessionContext sessionContext = SessionCatalog.SessionContext.createEmpty();
Expand Down Expand Up @@ -424,8 +425,8 @@ public void testIcebergCreateTablesWithWritePathBlocked(TestInfo testInfo) throw
}

@Test
public void testIcebergRegisterTableInExternalCatalog(TestInfo testInfo) throws IOException {
String catalogName = testInfo.getTestMethod().orElseThrow().getName() + "External";
public void testIcebergRegisterTableInExternalCatalog() throws IOException {
String catalogName = client.newEntityName("testIcebergRegisterTableInExternalCatalogExternal");
createCatalog(
catalogName,
Catalog.TypeEnum.EXTERNAL,
Expand All @@ -443,8 +444,7 @@ public void testIcebergRegisterTableInExternalCatalog(TestInfo testInfo) throws
String location =
"file://"
+ testDir.toFile().getAbsolutePath()
+ "/"
+ testInfo.getTestMethod().get().getName();
+ "/testIcebergRegisterTableInExternalCatalog";
String metadataLocation = location + "/metadata/000001-494949494949494949.metadata.json";

TableMetadata tableMetadata =
Expand All @@ -471,8 +471,8 @@ public void testIcebergRegisterTableInExternalCatalog(TestInfo testInfo) throws
}

@Test
public void testIcebergUpdateTableInExternalCatalog(TestInfo testInfo) throws IOException {
String catalogName = testInfo.getTestMethod().orElseThrow().getName() + "External";
public void testIcebergUpdateTableInExternalCatalog() throws IOException {
String catalogName = client.newEntityName("testIcebergUpdateTableInExternalCatalogExternal");
createCatalog(
catalogName,
Catalog.TypeEnum.EXTERNAL,
Expand All @@ -490,8 +490,7 @@ public void testIcebergUpdateTableInExternalCatalog(TestInfo testInfo) throws IO
String location =
"file://"
+ testDir.toFile().getAbsolutePath()
+ "/"
+ testInfo.getTestMethod().get().getName();
+ "/testIcebergUpdateTableInExternalCatalog";
String metadataLocation = location + "/metadata/000001-494949494949494949.metadata.json";

Types.NestedField col1 = Types.NestedField.of(1, false, "col1", Types.StringType.get());
Expand Down
3 changes: 2 additions & 1 deletion ...main/java/org/apache/polaris/service/it/test/PolarisManagementServiceIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,8 @@ public void testUpdateCatalogWithoutDefaultBaseLocationInUpdate() {
.setStorageType(StorageConfigInfo.StorageTypeEnum.S3)
.setAllowedLocations(List.of("s3://my-old-bucket/path/to/data"))
.build();
String catalogName = "mycatalog";
String catalogName =
client.newEntityName("testUpdateCatalogWithoutDefaultBaseLocationInUpdate");
Catalog catalog =
PolarisCatalog.builder()
.setType(Catalog.TypeEnum.INTERNAL)
Expand Down
Loading