From 3527193e065b2dd317bcdd079cda7cac7cc9cf78 Mon Sep 17 00:00:00 2001 From: Yufei Gu Date: Thu, 28 Aug 2025 15:51:09 -0700 Subject: [PATCH] Move tests to the right package --- .../AbstractPolarisGenericTableCatalogTest.java | 4 ++-- .../PolarisGenericTableCatalogHandlerAuthzTest.java | 3 +-- .../PolarisGenericTableCatalogRelationalTest.java | 3 ++- .../catalog/{ => iceberg}/AbstractIcebergCatalogTest.java | 6 +++--- .../{ => iceberg}/AbstractIcebergCatalogViewTest.java | 5 +++-- .../service/catalog/{ => iceberg}/GetConfigTest.java | 2 +- .../{ => iceberg}/IcebergCatalogHandlerAuthzTest.java | 3 +-- .../IcebergCatalogRelationalNoEntityCacheTest.java | 2 +- .../IcebergCatalogRelationalWithEntityCacheTest.java | 2 +- .../iceberg/IcebergOverlappingTableTest.java} | 4 ++-- .../{ => iceberg}/IcebergViewCatalogRelationalTest.java | 2 +- .../catalog/{ => policy}/AbstractPolicyCatalogTest.java | 4 ++-- .../catalog/{ => policy}/PolicyCatalogHandlerAuthzTest.java | 3 +-- .../catalog/{ => policy}/PolicyCatalogRelationalTest.java | 3 ++- 14 files changed, 23 insertions(+), 23 deletions(-) rename runtime/service/src/test/java/org/apache/polaris/service/catalog/{ => generic}/AbstractPolarisGenericTableCatalogTest.java (99%) rename runtime/service/src/test/java/org/apache/polaris/service/catalog/{ => generic}/PolarisGenericTableCatalogHandlerAuthzTest.java (98%) rename runtime/service/src/test/java/org/apache/polaris/service/catalog/{ => generic}/PolarisGenericTableCatalogRelationalTest.java (91%) rename runtime/service/src/test/java/org/apache/polaris/service/catalog/{ => iceberg}/AbstractIcebergCatalogTest.java (99%) rename runtime/service/src/test/java/org/apache/polaris/service/catalog/{ => iceberg}/AbstractIcebergCatalogViewTest.java (98%) rename runtime/service/src/test/java/org/apache/polaris/service/catalog/{ => iceberg}/GetConfigTest.java (98%) rename runtime/service/src/test/java/org/apache/polaris/service/catalog/{ => iceberg}/IcebergCatalogHandlerAuthzTest.java (99%) rename runtime/service/src/test/java/org/apache/polaris/service/catalog/{ => iceberg}/IcebergCatalogRelationalNoEntityCacheTest.java (96%) rename runtime/service/src/test/java/org/apache/polaris/service/catalog/{ => iceberg}/IcebergCatalogRelationalWithEntityCacheTest.java (96%) rename runtime/service/src/test/java/org/apache/polaris/service/{admin/PolarisOverlappingTableTest.java => catalog/iceberg/IcebergOverlappingTableTest.java} (99%) rename runtime/service/src/test/java/org/apache/polaris/service/catalog/{ => iceberg}/IcebergViewCatalogRelationalTest.java (95%) rename runtime/service/src/test/java/org/apache/polaris/service/catalog/{ => policy}/AbstractPolicyCatalogTest.java (99%) rename runtime/service/src/test/java/org/apache/polaris/service/catalog/{ => policy}/PolicyCatalogHandlerAuthzTest.java (99%) rename runtime/service/src/test/java/org/apache/polaris/service/catalog/{ => policy}/PolicyCatalogRelationalTest.java (90%) diff --git a/runtime/service/src/test/java/org/apache/polaris/service/catalog/AbstractPolarisGenericTableCatalogTest.java b/runtime/service/src/test/java/org/apache/polaris/service/catalog/generic/AbstractPolarisGenericTableCatalogTest.java similarity index 99% rename from runtime/service/src/test/java/org/apache/polaris/service/catalog/AbstractPolarisGenericTableCatalogTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/catalog/generic/AbstractPolarisGenericTableCatalogTest.java index af7556618d..232302b803 100644 --- a/runtime/service/src/test/java/org/apache/polaris/service/catalog/AbstractPolarisGenericTableCatalogTest.java +++ b/runtime/service/src/test/java/org/apache/polaris/service/catalog/generic/AbstractPolarisGenericTableCatalogTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.catalog; +package org.apache.polaris.service.catalog.generic; import static org.apache.iceberg.types.Types.NestedField.required; import static org.mockito.ArgumentMatchers.isA; @@ -64,7 +64,7 @@ import org.apache.polaris.core.storage.aws.AwsStorageConfigurationInfo; import org.apache.polaris.core.storage.cache.StorageCredentialCache; import org.apache.polaris.service.admin.PolarisAdminService; -import org.apache.polaris.service.catalog.generic.PolarisGenericTableCatalog; +import org.apache.polaris.service.catalog.PolarisPassthroughResolutionView; import org.apache.polaris.service.catalog.iceberg.IcebergCatalog; import org.apache.polaris.service.catalog.io.DefaultFileIOFactory; import org.apache.polaris.service.catalog.io.FileIOFactory; diff --git a/runtime/service/src/test/java/org/apache/polaris/service/catalog/PolarisGenericTableCatalogHandlerAuthzTest.java b/runtime/service/src/test/java/org/apache/polaris/service/catalog/generic/PolarisGenericTableCatalogHandlerAuthzTest.java similarity index 98% rename from runtime/service/src/test/java/org/apache/polaris/service/catalog/PolarisGenericTableCatalogHandlerAuthzTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/catalog/generic/PolarisGenericTableCatalogHandlerAuthzTest.java index ab8c429a90..afa0f440f3 100644 --- a/runtime/service/src/test/java/org/apache/polaris/service/catalog/PolarisGenericTableCatalogHandlerAuthzTest.java +++ b/runtime/service/src/test/java/org/apache/polaris/service/catalog/generic/PolarisGenericTableCatalogHandlerAuthzTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.catalog; +package org.apache.polaris.service.catalog.generic; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.TestProfile; @@ -27,7 +27,6 @@ import org.apache.polaris.core.auth.PolarisPrincipal; import org.apache.polaris.core.entity.PolarisPrivilege; import org.apache.polaris.service.admin.PolarisAuthzTestBase; -import org.apache.polaris.service.catalog.generic.GenericTableCatalogHandler; import org.junit.jupiter.api.Test; @QuarkusTest diff --git a/runtime/service/src/test/java/org/apache/polaris/service/catalog/PolarisGenericTableCatalogRelationalTest.java b/runtime/service/src/test/java/org/apache/polaris/service/catalog/generic/PolarisGenericTableCatalogRelationalTest.java similarity index 91% rename from runtime/service/src/test/java/org/apache/polaris/service/catalog/PolarisGenericTableCatalogRelationalTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/catalog/generic/PolarisGenericTableCatalogRelationalTest.java index d4db3826b2..54aef1843a 100644 --- a/runtime/service/src/test/java/org/apache/polaris/service/catalog/PolarisGenericTableCatalogRelationalTest.java +++ b/runtime/service/src/test/java/org/apache/polaris/service/catalog/generic/PolarisGenericTableCatalogRelationalTest.java @@ -16,10 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.catalog; +package org.apache.polaris.service.catalog.generic; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.TestProfile; +import org.apache.polaris.service.catalog.Profiles; @QuarkusTest @TestProfile(Profiles.DefaultProfile.class) diff --git a/runtime/service/src/test/java/org/apache/polaris/service/catalog/AbstractIcebergCatalogTest.java b/runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/AbstractIcebergCatalogTest.java similarity index 99% rename from runtime/service/src/test/java/org/apache/polaris/service/catalog/AbstractIcebergCatalogTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/AbstractIcebergCatalogTest.java index d66d25cd5c..fca6a969e4 100644 --- a/runtime/service/src/test/java/org/apache/polaris/service/catalog/AbstractIcebergCatalogTest.java +++ b/runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/AbstractIcebergCatalogTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.catalog; +package org.apache.polaris.service.catalog.iceberg; import static java.nio.charset.StandardCharsets.UTF_8; import static org.assertj.core.api.Assertions.assertThat; @@ -130,8 +130,8 @@ import org.apache.polaris.core.storage.aws.AwsStorageConfigurationInfo; import org.apache.polaris.core.storage.cache.StorageCredentialCache; import org.apache.polaris.service.admin.PolarisAdminService; -import org.apache.polaris.service.catalog.iceberg.CatalogHandlerUtils; -import org.apache.polaris.service.catalog.iceberg.IcebergCatalog; +import org.apache.polaris.service.catalog.PolarisPassthroughResolutionView; +import org.apache.polaris.service.catalog.Profiles; import org.apache.polaris.service.catalog.io.DefaultFileIOFactory; import org.apache.polaris.service.catalog.io.ExceptionMappingFileIO; import org.apache.polaris.service.catalog.io.FileIOFactory; diff --git a/runtime/service/src/test/java/org/apache/polaris/service/catalog/AbstractIcebergCatalogViewTest.java b/runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/AbstractIcebergCatalogViewTest.java similarity index 98% rename from runtime/service/src/test/java/org/apache/polaris/service/catalog/AbstractIcebergCatalogViewTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/AbstractIcebergCatalogViewTest.java index 92fff50cf4..51c1d08f5a 100644 --- a/runtime/service/src/test/java/org/apache/polaris/service/catalog/AbstractIcebergCatalogViewTest.java +++ b/runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/AbstractIcebergCatalogViewTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.catalog; +package org.apache.polaris.service.catalog.iceberg; import static org.mockito.Mockito.when; @@ -57,7 +57,8 @@ import org.apache.polaris.core.secrets.UserSecretsManagerFactory; import org.apache.polaris.core.storage.cache.StorageCredentialCache; import org.apache.polaris.service.admin.PolarisAdminService; -import org.apache.polaris.service.catalog.iceberg.IcebergCatalog; +import org.apache.polaris.service.catalog.PolarisPassthroughResolutionView; +import org.apache.polaris.service.catalog.Profiles; import org.apache.polaris.service.catalog.io.DefaultFileIOFactory; import org.apache.polaris.service.catalog.io.FileIOFactory; import org.apache.polaris.service.config.ReservedProperties; diff --git a/runtime/service/src/test/java/org/apache/polaris/service/catalog/GetConfigTest.java b/runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/GetConfigTest.java similarity index 98% rename from runtime/service/src/test/java/org/apache/polaris/service/catalog/GetConfigTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/GetConfigTest.java index 6781f673ff..8885fcd467 100644 --- a/runtime/service/src/test/java/org/apache/polaris/service/catalog/GetConfigTest.java +++ b/runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/GetConfigTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.catalog; +package org.apache.polaris.service.catalog.iceberg; import static jakarta.ws.rs.core.Response.Status.CREATED; import static org.assertj.core.api.Assertions.assertThat; diff --git a/runtime/service/src/test/java/org/apache/polaris/service/catalog/IcebergCatalogHandlerAuthzTest.java b/runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalogHandlerAuthzTest.java similarity index 99% rename from runtime/service/src/test/java/org/apache/polaris/service/catalog/IcebergCatalogHandlerAuthzTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalogHandlerAuthzTest.java index a8090f038b..5d6606d301 100644 --- a/runtime/service/src/test/java/org/apache/polaris/service/catalog/IcebergCatalogHandlerAuthzTest.java +++ b/runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalogHandlerAuthzTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.catalog; +package org.apache.polaris.service.catalog.iceberg; import com.google.common.collect.ImmutableMap; import io.quarkus.test.junit.QuarkusTest; @@ -66,7 +66,6 @@ import org.apache.polaris.core.persistence.dao.entity.CreatePrincipalResult; import org.apache.polaris.core.persistence.resolver.PolarisResolutionManifest; import org.apache.polaris.service.admin.PolarisAuthzTestBase; -import org.apache.polaris.service.catalog.iceberg.IcebergCatalogHandler; import org.apache.polaris.service.catalog.io.DefaultFileIOFactory; import org.apache.polaris.service.context.catalog.CallContextCatalogFactory; import org.apache.polaris.service.context.catalog.PolarisCallContextCatalogFactory; diff --git a/runtime/service/src/test/java/org/apache/polaris/service/catalog/IcebergCatalogRelationalNoEntityCacheTest.java b/runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalogRelationalNoEntityCacheTest.java similarity index 96% rename from runtime/service/src/test/java/org/apache/polaris/service/catalog/IcebergCatalogRelationalNoEntityCacheTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalogRelationalNoEntityCacheTest.java index 2fb0311c5b..bf8298e3ce 100644 --- a/runtime/service/src/test/java/org/apache/polaris/service/catalog/IcebergCatalogRelationalNoEntityCacheTest.java +++ b/runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalogRelationalNoEntityCacheTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.catalog; +package org.apache.polaris.service.catalog.iceberg; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.TestProfile; diff --git a/runtime/service/src/test/java/org/apache/polaris/service/catalog/IcebergCatalogRelationalWithEntityCacheTest.java b/runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalogRelationalWithEntityCacheTest.java similarity index 96% rename from runtime/service/src/test/java/org/apache/polaris/service/catalog/IcebergCatalogRelationalWithEntityCacheTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalogRelationalWithEntityCacheTest.java index 22f17f5b18..881f12eb5a 100644 --- a/runtime/service/src/test/java/org/apache/polaris/service/catalog/IcebergCatalogRelationalWithEntityCacheTest.java +++ b/runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalogRelationalWithEntityCacheTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.catalog; +package org.apache.polaris.service.catalog.iceberg; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.TestProfile; diff --git a/runtime/service/src/test/java/org/apache/polaris/service/admin/PolarisOverlappingTableTest.java b/runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/IcebergOverlappingTableTest.java similarity index 99% rename from runtime/service/src/test/java/org/apache/polaris/service/admin/PolarisOverlappingTableTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/IcebergOverlappingTableTest.java index 505bef967a..d73fd3d1f0 100644 --- a/runtime/service/src/test/java/org/apache/polaris/service/admin/PolarisOverlappingTableTest.java +++ b/runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/IcebergOverlappingTableTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.admin; +package org.apache.polaris.service.catalog.iceberg; import static org.apache.polaris.core.config.FeatureConfiguration.ALLOW_TABLE_LOCATION_OVERLAP; import static org.apache.polaris.core.config.FeatureConfiguration.ALLOW_UNSTRUCTURED_TABLE_LOCATION; @@ -51,7 +51,7 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -public class PolarisOverlappingTableTest { +public class IcebergOverlappingTableTest { private static final String namespace = "ns"; private static final String catalog = "test-catalog"; diff --git a/runtime/service/src/test/java/org/apache/polaris/service/catalog/IcebergViewCatalogRelationalTest.java b/runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/IcebergViewCatalogRelationalTest.java similarity index 95% rename from runtime/service/src/test/java/org/apache/polaris/service/catalog/IcebergViewCatalogRelationalTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/IcebergViewCatalogRelationalTest.java index ca89bc5f7c..3bbbf5f8a3 100644 --- a/runtime/service/src/test/java/org/apache/polaris/service/catalog/IcebergViewCatalogRelationalTest.java +++ b/runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/IcebergViewCatalogRelationalTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.catalog; +package org.apache.polaris.service.catalog.iceberg; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.TestProfile; diff --git a/runtime/service/src/test/java/org/apache/polaris/service/catalog/AbstractPolicyCatalogTest.java b/runtime/service/src/test/java/org/apache/polaris/service/catalog/policy/AbstractPolicyCatalogTest.java similarity index 99% rename from runtime/service/src/test/java/org/apache/polaris/service/catalog/AbstractPolicyCatalogTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/catalog/policy/AbstractPolicyCatalogTest.java index 2e34acac93..bf514e1277 100644 --- a/runtime/service/src/test/java/org/apache/polaris/service/catalog/AbstractPolicyCatalogTest.java +++ b/runtime/service/src/test/java/org/apache/polaris/service/catalog/policy/AbstractPolicyCatalogTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.catalog; +package org.apache.polaris.service.catalog.policy; import static org.apache.iceberg.types.Types.NestedField.required; import static org.apache.polaris.core.policy.PredefinedPolicyTypes.DATA_COMPACTION; @@ -76,10 +76,10 @@ import org.apache.polaris.core.storage.aws.AwsStorageConfigurationInfo; import org.apache.polaris.core.storage.cache.StorageCredentialCache; import org.apache.polaris.service.admin.PolarisAdminService; +import org.apache.polaris.service.catalog.PolarisPassthroughResolutionView; import org.apache.polaris.service.catalog.iceberg.IcebergCatalog; import org.apache.polaris.service.catalog.io.DefaultFileIOFactory; import org.apache.polaris.service.catalog.io.FileIOFactory; -import org.apache.polaris.service.catalog.policy.PolicyCatalog; import org.apache.polaris.service.config.ReservedProperties; import org.apache.polaris.service.events.NoOpPolarisEventListener; import org.apache.polaris.service.storage.PolarisStorageIntegrationProviderImpl; diff --git a/runtime/service/src/test/java/org/apache/polaris/service/catalog/PolicyCatalogHandlerAuthzTest.java b/runtime/service/src/test/java/org/apache/polaris/service/catalog/policy/PolicyCatalogHandlerAuthzTest.java similarity index 99% rename from runtime/service/src/test/java/org/apache/polaris/service/catalog/PolicyCatalogHandlerAuthzTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/catalog/policy/PolicyCatalogHandlerAuthzTest.java index 5d4fe957d4..3022ffdb09 100644 --- a/runtime/service/src/test/java/org/apache/polaris/service/catalog/PolicyCatalogHandlerAuthzTest.java +++ b/runtime/service/src/test/java/org/apache/polaris/service/catalog/policy/PolicyCatalogHandlerAuthzTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.catalog; +package org.apache.polaris.service.catalog.policy; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.TestProfile; @@ -28,7 +28,6 @@ import org.apache.polaris.core.entity.PolarisPrivilege; import org.apache.polaris.core.policy.PredefinedPolicyTypes; import org.apache.polaris.service.admin.PolarisAuthzTestBase; -import org.apache.polaris.service.catalog.policy.PolicyCatalogHandler; import org.apache.polaris.service.types.AttachPolicyRequest; import org.apache.polaris.service.types.CreatePolicyRequest; import org.apache.polaris.service.types.DetachPolicyRequest; diff --git a/runtime/service/src/test/java/org/apache/polaris/service/catalog/PolicyCatalogRelationalTest.java b/runtime/service/src/test/java/org/apache/polaris/service/catalog/policy/PolicyCatalogRelationalTest.java similarity index 90% rename from runtime/service/src/test/java/org/apache/polaris/service/catalog/PolicyCatalogRelationalTest.java rename to runtime/service/src/test/java/org/apache/polaris/service/catalog/policy/PolicyCatalogRelationalTest.java index 03e60744b0..fd812262b9 100644 --- a/runtime/service/src/test/java/org/apache/polaris/service/catalog/PolicyCatalogRelationalTest.java +++ b/runtime/service/src/test/java/org/apache/polaris/service/catalog/policy/PolicyCatalogRelationalTest.java @@ -16,10 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.catalog; +package org.apache.polaris.service.catalog.policy; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.TestProfile; +import org.apache.polaris.service.catalog.Profiles; @QuarkusTest @TestProfile(Profiles.DefaultProfile.class)