diff --git a/integration-tests/devtools/src/test/java/io/quarkus/platform/catalog/RegistrySnapshotCatalogCompatibilityTest.java b/integration-tests/devtools/src/test/java/io/quarkus/platform/catalog/CatalogCompatibilityTest.java similarity index 81% rename from integration-tests/devtools/src/test/java/io/quarkus/platform/catalog/RegistrySnapshotCatalogCompatibilityTest.java rename to integration-tests/devtools/src/test/java/io/quarkus/platform/catalog/CatalogCompatibilityTest.java index 3d65b8f8f4aff..84149c7f2d24e 100644 --- a/integration-tests/devtools/src/test/java/io/quarkus/platform/catalog/RegistrySnapshotCatalogCompatibilityTest.java +++ b/integration-tests/devtools/src/test/java/io/quarkus/platform/catalog/CatalogCompatibilityTest.java @@ -5,17 +5,16 @@ import java.io.IOException; import java.util.List; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartCatalog; import io.quarkus.devtools.project.CodestartResourceLoadersBuilder; import io.quarkus.devtools.project.QuarkusProjectHelper; +import io.quarkus.devtools.testing.PlatformAwareTestBase; import io.quarkus.platform.catalog.processor.CatalogProcessor; import io.quarkus.platform.catalog.processor.ExtensionProcessor; import io.quarkus.platform.catalog.processor.ProcessedCategory; import io.quarkus.platform.descriptor.loader.json.ResourceLoader; -import io.quarkus.registry.Constants; import io.quarkus.registry.ExtensionCatalogResolver; import io.quarkus.registry.RegistryResolutionException; import io.quarkus.registry.catalog.Extension; @@ -25,20 +24,13 @@ import io.quarkus.registry.catalog.PlatformRelease; import io.quarkus.registry.catalog.PlatformStream; -@Disabled -public class RegistrySnapshotCatalogCompatibilityTest { - - private final ExtensionCatalogResolver catalogResolver = QuarkusProjectHelper.getCatalogResolver(); - - public RegistrySnapshotCatalogCompatibilityTest() throws RegistryResolutionException { - } +public class CatalogCompatibilityTest extends PlatformAwareTestBase { @Test - public void testRegistrySnapshotPlatformCatalog() throws RegistryResolutionException, IOException { - // TODO Use a local snapshot of the registry for testing - final PlatformCatalog platformCatalog = getRegistryPlatformCatalog(); - assertThat(platformCatalog.getMetadata().get(Constants.LAST_UPDATED)).isNotNull(); - testPlatformCatalog(catalogResolver, platformCatalog, "io.quarkus.platform"); + void testCatalog() throws RegistryResolutionException, IOException { + final ExtensionCatalogResolver catalogResolver = QuarkusProjectHelper.getCatalogResolver(); + testPlatformCatalog(catalogResolver, catalogResolver.resolvePlatformCatalog(), + "io.quarkus"); } static void testPlatformCatalog(ExtensionCatalogResolver catalogResolver, PlatformCatalog platformCatalog, @@ -55,7 +47,6 @@ static void testPlatformCatalog(ExtensionCatalogResolver catalogResolver, Platfo for (PlatformRelease r : s.getReleases()) { checkPlatformRelease(catalogResolver, r); } - } } @@ -102,7 +93,4 @@ private static void checkExtensionProcessor(Extension e) { extensionProcessor.getNonQuarkusBomOnly(); } - private PlatformCatalog getRegistryPlatformCatalog() throws RegistryResolutionException { - return catalogResolver.resolvePlatformCatalog(); - } } diff --git a/integration-tests/devtools/src/test/java/io/quarkus/platform/catalog/LocalCatalogCompatibilityTest.java b/integration-tests/devtools/src/test/java/io/quarkus/platform/catalog/LocalCatalogCompatibilityTest.java deleted file mode 100644 index ec7e505654782..0000000000000 --- a/integration-tests/devtools/src/test/java/io/quarkus/platform/catalog/LocalCatalogCompatibilityTest.java +++ /dev/null @@ -1,20 +0,0 @@ -package io.quarkus.platform.catalog; - -import java.io.IOException; - -import org.junit.jupiter.api.Test; - -import io.quarkus.devtools.project.QuarkusProjectHelper; -import io.quarkus.devtools.testing.PlatformAwareTestBase; -import io.quarkus.registry.ExtensionCatalogResolver; -import io.quarkus.registry.RegistryResolutionException; - -public class LocalCatalogCompatibilityTest extends PlatformAwareTestBase { - - @Test - void testCatalog() throws RegistryResolutionException, IOException { - final ExtensionCatalogResolver catalogResolver = QuarkusProjectHelper.getCatalogResolver(); - RegistrySnapshotCatalogCompatibilityTest.testPlatformCatalog(catalogResolver, catalogResolver.resolvePlatformCatalog(), - "io.quarkus"); - } -}