Skip to content

Commit 3bc92b4

Browse files
flyrainflyrain
authored
Service: Move tests to the right package (#2469)
1 parent f8ad77a commit 3bc92b4

14 files changed

+23
-23
lines changed

‎runtime/service/src/test/java/org/apache/polaris/service/catalog/AbstractPolarisGenericTableCatalogTest.java‎ renamed to ‎runtime/service/src/test/java/org/apache/polaris/service/catalog/generic/AbstractPolarisGenericTableCatalogTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
package org.apache.polaris.service.catalog;
19+
package org.apache.polaris.service.catalog.generic;
2020

2121
import static org.apache.iceberg.types.Types.NestedField.required;
2222
import static org.mockito.ArgumentMatchers.isA;
@@ -64,7 +64,7 @@
6464
import org.apache.polaris.core.storage.aws.AwsStorageConfigurationInfo;
6565
import org.apache.polaris.core.storage.cache.StorageCredentialCache;
6666
import org.apache.polaris.service.admin.PolarisAdminService;
67-
import org.apache.polaris.service.catalog.generic.PolarisGenericTableCatalog;
67+
import org.apache.polaris.service.catalog.PolarisPassthroughResolutionView;
6868
import org.apache.polaris.service.catalog.iceberg.IcebergCatalog;
6969
import org.apache.polaris.service.catalog.io.DefaultFileIOFactory;
7070
import org.apache.polaris.service.catalog.io.FileIOFactory;

‎runtime/service/src/test/java/org/apache/polaris/service/catalog/PolarisGenericTableCatalogHandlerAuthzTest.java‎ renamed to ‎runtime/service/src/test/java/org/apache/polaris/service/catalog/generic/PolarisGenericTableCatalogHandlerAuthzTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
package org.apache.polaris.service.catalog;
19+
package org.apache.polaris.service.catalog.generic;
2020

2121
import io.quarkus.test.junit.QuarkusTest;
2222
import io.quarkus.test.junit.TestProfile;
@@ -27,7 +27,6 @@
2727
import org.apache.polaris.core.auth.PolarisPrincipal;
2828
import org.apache.polaris.core.entity.PolarisPrivilege;
2929
import org.apache.polaris.service.admin.PolarisAuthzTestBase;
30-
import org.apache.polaris.service.catalog.generic.GenericTableCatalogHandler;
3130
import org.junit.jupiter.api.Test;
3231

3332
@QuarkusTest

‎runtime/service/src/test/java/org/apache/polaris/service/catalog/PolarisGenericTableCatalogRelationalTest.java‎ renamed to ‎runtime/service/src/test/java/org/apache/polaris/service/catalog/generic/PolarisGenericTableCatalogRelationalTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
package org.apache.polaris.service.catalog;
19+
package org.apache.polaris.service.catalog.generic;
2020

2121
import io.quarkus.test.junit.QuarkusTest;
2222
import io.quarkus.test.junit.TestProfile;
23+
import org.apache.polaris.service.catalog.Profiles;
2324

2425
@QuarkusTest
2526
@TestProfile(Profiles.DefaultProfile.class)

‎runtime/service/src/test/java/org/apache/polaris/service/catalog/AbstractIcebergCatalogTest.java‎ renamed to ‎runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/AbstractIcebergCatalogTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
package org.apache.polaris.service.catalog;
19+
package org.apache.polaris.service.catalog.iceberg;
2020

2121
import static java.nio.charset.StandardCharsets.UTF_8;
2222
import static org.assertj.core.api.Assertions.assertThat;
@@ -130,8 +130,8 @@
130130
import org.apache.polaris.core.storage.aws.AwsStorageConfigurationInfo;
131131
import org.apache.polaris.core.storage.cache.StorageCredentialCache;
132132
import org.apache.polaris.service.admin.PolarisAdminService;
133-
import org.apache.polaris.service.catalog.iceberg.CatalogHandlerUtils;
134-
import org.apache.polaris.service.catalog.iceberg.IcebergCatalog;
133+
import org.apache.polaris.service.catalog.PolarisPassthroughResolutionView;
134+
import org.apache.polaris.service.catalog.Profiles;
135135
import org.apache.polaris.service.catalog.io.DefaultFileIOFactory;
136136
import org.apache.polaris.service.catalog.io.ExceptionMappingFileIO;
137137
import org.apache.polaris.service.catalog.io.FileIOFactory;

‎runtime/service/src/test/java/org/apache/polaris/service/catalog/AbstractIcebergCatalogViewTest.java‎ renamed to ‎runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/AbstractIcebergCatalogViewTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
package org.apache.polaris.service.catalog;
19+
package org.apache.polaris.service.catalog.iceberg;
2020

2121
import static org.mockito.Mockito.when;
2222

@@ -57,7 +57,8 @@
5757
import org.apache.polaris.core.secrets.UserSecretsManagerFactory;
5858
import org.apache.polaris.core.storage.cache.StorageCredentialCache;
5959
import org.apache.polaris.service.admin.PolarisAdminService;
60-
import org.apache.polaris.service.catalog.iceberg.IcebergCatalog;
60+
import org.apache.polaris.service.catalog.PolarisPassthroughResolutionView;
61+
import org.apache.polaris.service.catalog.Profiles;
6162
import org.apache.polaris.service.catalog.io.DefaultFileIOFactory;
6263
import org.apache.polaris.service.catalog.io.FileIOFactory;
6364
import org.apache.polaris.service.config.ReservedProperties;

‎runtime/service/src/test/java/org/apache/polaris/service/catalog/GetConfigTest.java‎ renamed to ‎runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/GetConfigTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
package org.apache.polaris.service.catalog;
19+
package org.apache.polaris.service.catalog.iceberg;
2020

2121
import static jakarta.ws.rs.core.Response.Status.CREATED;
2222
import static org.assertj.core.api.Assertions.assertThat;

‎runtime/service/src/test/java/org/apache/polaris/service/catalog/IcebergCatalogHandlerAuthzTest.java‎ renamed to ‎runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalogHandlerAuthzTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
package org.apache.polaris.service.catalog;
19+
package org.apache.polaris.service.catalog.iceberg;
2020

2121
import com.google.common.collect.ImmutableMap;
2222
import io.quarkus.test.junit.QuarkusTest;
@@ -66,7 +66,6 @@
6666
import org.apache.polaris.core.persistence.dao.entity.CreatePrincipalResult;
6767
import org.apache.polaris.core.persistence.resolver.PolarisResolutionManifest;
6868
import org.apache.polaris.service.admin.PolarisAuthzTestBase;
69-
import org.apache.polaris.service.catalog.iceberg.IcebergCatalogHandler;
7069
import org.apache.polaris.service.catalog.io.DefaultFileIOFactory;
7170
import org.apache.polaris.service.context.catalog.CallContextCatalogFactory;
7271
import org.apache.polaris.service.context.catalog.PolarisCallContextCatalogFactory;

‎runtime/service/src/test/java/org/apache/polaris/service/catalog/IcebergCatalogRelationalNoEntityCacheTest.java‎ renamed to ‎runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalogRelationalNoEntityCacheTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
package org.apache.polaris.service.catalog;
19+
package org.apache.polaris.service.catalog.iceberg;
2020

2121
import io.quarkus.test.junit.QuarkusTest;
2222
import io.quarkus.test.junit.TestProfile;

‎runtime/service/src/test/java/org/apache/polaris/service/catalog/IcebergCatalogRelationalWithEntityCacheTest.java‎ renamed to ‎runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalogRelationalWithEntityCacheTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
package org.apache.polaris.service.catalog;
19+
package org.apache.polaris.service.catalog.iceberg;
2020

2121
import io.quarkus.test.junit.QuarkusTest;
2222
import io.quarkus.test.junit.TestProfile;

‎runtime/service/src/test/java/org/apache/polaris/service/admin/PolarisOverlappingTableTest.java‎ renamed to ‎runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/IcebergOverlappingTableTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
package org.apache.polaris.service.admin;
19+
package org.apache.polaris.service.catalog.iceberg;
2020

2121
import static org.apache.polaris.core.config.FeatureConfiguration.ALLOW_TABLE_LOCATION_OVERLAP;
2222
import static org.apache.polaris.core.config.FeatureConfiguration.ALLOW_UNSTRUCTURED_TABLE_LOCATION;
@@ -51,7 +51,7 @@
5151
import org.junit.jupiter.params.provider.Arguments;
5252
import org.junit.jupiter.params.provider.MethodSource;
5353

54-
public class PolarisOverlappingTableTest {
54+
public class IcebergOverlappingTableTest {
5555

5656
private static final String namespace = "ns";
5757
private static final String catalog = "test-catalog";

0 commit comments

Comments
 (0)