Skip to content

polaris-admin/test: Centralize Quarkus test profiles #4735

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

Open
snazy wants to merge 1 commit into
base: main
Choose a base branch
from
+161 −222
Open

polaris-admin/test: Centralize Quarkus test profiles #4735

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
1 change: 1 addition & 0 deletions runtime/admin/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ dependencies {

testImplementation(project(":polaris-runtime-test-common"))
testFixturesApi(project(":polaris-core"))
testFixturesImplementation(project(":polaris-runtime-test-common"))

testFixturesApi(enforcedPlatform(libs.quarkus.bom))
testFixturesApi("io.quarkus:quarkus-junit")
Expand Down
3 changes: 2 additions & 1 deletion ...n/src/test/java/org/apache/polaris/admintool/nosql/NoSqlInMemoryBootstrapCommandTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
package org.apache.polaris.admintool.nosql;

import io.quarkus.test.junit.TestProfile;
import org.apache.polaris.admintool.AdminProfiles;
import org.apache.polaris.admintool.BootstrapCommandTestBase;

@TestProfile(NoSqlInMemoryProfile.class)
@TestProfile(AdminProfiles.NoSqlInMemory.class)
class NoSqlInMemoryBootstrapCommandTest extends BootstrapCommandTestBase {}
30 changes: 0 additions & 30 deletions runtime/admin/src/test/java/org/apache/polaris/admintool/nosql/NoSqlInMemoryProfile.java
View file
Open in desktop

This file was deleted.

18 changes: 3 additions & 15 deletions ...admin/src/test/java/org/apache/polaris/admintool/nosql/NoSqlInMemoryPurgeCommandTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,9 @@
*/
package org.apache.polaris.admintool.nosql;

import com.google.common.collect.ImmutableMap;
import io.quarkus.test.junit.TestProfile;
import java.util.Map;
import org.apache.polaris.admintool.AdminProfiles;
import org.apache.polaris.admintool.PurgeCommandTestBase;

@TestProfile(NoSqlInMemoryPurgeCommandTest.Profile.class)
class NoSqlInMemoryPurgeCommandTest extends PurgeCommandTestBase {

public static class Profile extends NoSqlInMemoryProfile {
@Override
public Map<String, String> getConfigOverrides() {
return ImmutableMap.<String, String>builder()
.putAll(super.getConfigOverrides())
.put("pre-bootstrap", "true")
.build();
}
}
}
@TestProfile(AdminProfiles.PreBootstrappedNoSqlInMemory.class)
class NoSqlInMemoryPurgeCommandTest extends PurgeCommandTestBase {}
3 changes: 2 additions & 1 deletion ...dmin/src/test/java/org/apache/polaris/admintool/nosql/NoSqlMongoBootstrapCommandTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
package org.apache.polaris.admintool.nosql;

import io.quarkus.test.junit.TestProfile;
import org.apache.polaris.admintool.AdminProfiles;
import org.apache.polaris.admintool.BootstrapCommandTestBase;

@TestProfile(NoSqlMongoProfile.class)
@TestProfile(AdminProfiles.NoSqlMongo.class)
class NoSqlMongoBootstrapCommandTest extends BootstrapCommandTestBase {}
3 changes: 2 additions & 1 deletion ...in/src/test/java/org/apache/polaris/admintool/nosql/NoSqlMongoMaintenanceCommandTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,10 @@
import io.quarkus.test.junit.main.Launch;
import io.quarkus.test.junit.main.LaunchResult;
import io.quarkus.test.junit.main.QuarkusMainTest;
import org.apache.polaris.admintool.AdminProfiles;
import org.junit.jupiter.api.Test;

@TestProfile(NoSqlMongoProfile.class)
@TestProfile(AdminProfiles.NoSqlMongo.class)
@QuarkusMainTest
class NoSqlMongoMaintenanceCommandTest {
@Test
Expand Down
37 changes: 0 additions & 37 deletions runtime/admin/src/test/java/org/apache/polaris/admintool/nosql/NoSqlMongoProfile.java
View file
Open in desktop

This file was deleted.

18 changes: 3 additions & 15 deletions ...me/admin/src/test/java/org/apache/polaris/admintool/nosql/NoSqlMongoPurgeCommandTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,9 @@
*/
package org.apache.polaris.admintool.nosql;

import com.google.common.collect.ImmutableMap;
import io.quarkus.test.junit.TestProfile;
import java.util.Map;
import org.apache.polaris.admintool.AdminProfiles;
import org.apache.polaris.admintool.PurgeCommandTestBase;

@TestProfile(NoSqlMongoPurgeCommandTest.Profile.class)
class NoSqlMongoPurgeCommandTest extends PurgeCommandTestBase {

public static class Profile extends NoSqlMongoProfile {
@Override
public Map<String, String> getConfigOverrides() {
return ImmutableMap.<String, String>builder()
.putAll(super.getConfigOverrides())
.put("pre-bootstrap", "true")
.build();
}
}
}
@TestProfile(AdminProfiles.PreBootstrappedNoSqlMongo.class)
class NoSqlMongoPurgeCommandTest extends PurgeCommandTestBase {}
47 changes: 0 additions & 47 deletions ...src/test/java/org/apache/polaris/admintool/relational/jdbc/CockroachJdbcAdminProfile.java
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion .../java/org/apache/polaris/admintool/relational/jdbc/CockroachJdbcBootstrapCommandTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,10 @@
import io.quarkus.test.junit.TestProfile;
import io.quarkus.test.junit.main.LaunchResult;
import io.quarkus.test.junit.main.QuarkusMainLauncher;
import org.apache.polaris.admintool.AdminProfiles;
import org.junit.jupiter.api.Test;

@TestProfile(CockroachJdbcAdminProfile.class)
@TestProfile(AdminProfiles.CockroachJdbc.class)
public class CockroachJdbcBootstrapCommandTest extends RelationalJdbcBootstrapCommandTest {

@Override
Expand Down
17 changes: 3 additions & 14 deletions ...test/java/org/apache/polaris/admintool/relational/jdbc/CockroachJdbcPurgeCommandTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,9 @@
*/
package org.apache.polaris.admintool.relational.jdbc;

import com.google.common.collect.ImmutableMap;
import io.quarkus.test.junit.TestProfile;
import java.util.Map;
import org.apache.polaris.admintool.AdminProfiles;
import org.apache.polaris.admintool.PurgeCommandTestBase;

@TestProfile(CockroachJdbcPurgeCommandTest.Profile.class)
public class CockroachJdbcPurgeCommandTest extends PurgeCommandTestBase {
public static class Profile extends CockroachJdbcAdminProfile {
@Override
public Map<String, String> getConfigOverrides() {
return ImmutableMap.<String, String>builder()
.putAll(super.getConfigOverrides())
.put("pre-bootstrap", "true")
.build();
}
}
}
@TestProfile(AdminProfiles.PreBootstrappedCockroachJdbc.class)
public class CockroachJdbcPurgeCommandTest extends PurgeCommandTestBase {}
45 changes: 0 additions & 45 deletions ...rc/test/java/org/apache/polaris/admintool/relational/jdbc/RelationalJdbcAdminProfile.java
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion ...java/org/apache/polaris/admintool/relational/jdbc/RelationalJdbcBootstrapCommandTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,11 @@
import io.quarkus.test.junit.TestProfile;
import io.quarkus.test.junit.main.LaunchResult;
import io.quarkus.test.junit.main.QuarkusMainLauncher;
import org.apache.polaris.admintool.AdminProfiles;
import org.apache.polaris.admintool.BootstrapCommandTestBase;
import org.junit.jupiter.api.Test;

@TestProfile(RelationalJdbcAdminProfile.class)
@TestProfile(AdminProfiles.RelationalJdbc.class)
public class RelationalJdbcBootstrapCommandTest extends BootstrapCommandTestBase {

@Test
Expand Down
17 changes: 3 additions & 14 deletions ...est/java/org/apache/polaris/admintool/relational/jdbc/RelationalJdbcPurgeCommandTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,9 @@
*/
package org.apache.polaris.admintool.relational.jdbc;

import com.google.common.collect.ImmutableMap;
import io.quarkus.test.junit.TestProfile;
import java.util.Map;
import org.apache.polaris.admintool.AdminProfiles;
import org.apache.polaris.admintool.PurgeCommandTestBase;

@TestProfile(RelationalJdbcPurgeCommandTest.Profile.class)
public class RelationalJdbcPurgeCommandTest extends PurgeCommandTestBase {
public static class Profile extends RelationalJdbcAdminProfile {
@Override
public Map<String, String> getConfigOverrides() {
return ImmutableMap.<String, String>builder()
.putAll(super.getConfigOverrides())
.put("pre-bootstrap", "true")
.build();
}
}
}
@TestProfile(AdminProfiles.PreBootstrappedRelationalJdbc.class)
public class RelationalJdbcPurgeCommandTest extends PurgeCommandTestBase {}
Loading