diff --git a/pom.xml b/pom.xml index fec32196..8f129479 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ 4.0.0-SNAPSHOT 3.1.0-alpha.3 1.0.0-alpha.2 - 1.0.0-alpha.7 + 1.0.0-archi-254-remove-jupiter-SNAPSHOT 1.3.0 ${project.build.directory}/schemas diff --git a/src/test/java/io/gravitee/policy/latency/LatencyPolicyIntegrationV3Test.java b/src/test/java/io/gravitee/policy/latency/LatencyPolicyIntegrationV3Test.java index 5b989d9a..f374e091 100644 --- a/src/test/java/io/gravitee/policy/latency/LatencyPolicyIntegrationV3Test.java +++ b/src/test/java/io/gravitee/policy/latency/LatencyPolicyIntegrationV3Test.java @@ -26,6 +26,7 @@ import io.gravitee.apim.gateway.tests.sdk.annotations.DeployApi; import io.gravitee.apim.gateway.tests.sdk.annotations.GatewayTest; import io.gravitee.apim.gateway.tests.sdk.configuration.GatewayConfigurationBuilder; +import io.gravitee.apim.gateway.tests.sdk.configuration.GatewayMode; import io.gravitee.apim.gateway.tests.sdk.reporter.FakeReporter; import io.gravitee.definition.model.Api; import io.gravitee.definition.model.ExecutionMode; @@ -47,22 +48,10 @@ * @author Yann TAVERNIER (yann.tavernier at graviteesource.com) * @author GraviteeSource Team */ -@GatewayTest +@GatewayTest(v2ExecutionMode = ExecutionMode.V3) @DeployApi("/apis/latency-v2.json") class LatencyPolicyIntegrationV3Test extends AbstractPolicyTest { - @Override - protected void configureGateway(GatewayConfigurationBuilder gatewayConfigurationBuilder) { - super.configureGateway(gatewayConfigurationBuilder); - gatewayConfigurationBuilder.set("api.jupiterMode.enabled", "false"); - } - - @Override - public void configureApi(Api api) { - super.configureApi(api); - api.setExecutionMode(ExecutionMode.V3); - } - @Test void should_apply_latency_on_request(HttpClient httpClient, VertxTestContext vertxTestContext) throws InterruptedException { Checkpoint fakeReporterCheckpoint = vertxTestContext.checkpoint(); diff --git a/src/test/java/io/gravitee/policy/latency/LatencyPolicyIntegrationV4CompatibilityTest.java b/src/test/java/io/gravitee/policy/latency/LatencyPolicyIntegrationV4EmulationTest.java similarity index 53% rename from src/test/java/io/gravitee/policy/latency/LatencyPolicyIntegrationV4CompatibilityTest.java rename to src/test/java/io/gravitee/policy/latency/LatencyPolicyIntegrationV4EmulationTest.java index 2adca5ee..d0684fa6 100644 --- a/src/test/java/io/gravitee/policy/latency/LatencyPolicyIntegrationV4CompatibilityTest.java +++ b/src/test/java/io/gravitee/policy/latency/LatencyPolicyIntegrationV4EmulationTest.java @@ -15,27 +15,12 @@ */ package io.gravitee.policy.latency; -import io.gravitee.apim.gateway.tests.sdk.annotations.DeployApi; import io.gravitee.apim.gateway.tests.sdk.annotations.GatewayTest; -import io.gravitee.apim.gateway.tests.sdk.configuration.GatewayConfigurationBuilder; -import io.gravitee.definition.model.Api; -import io.gravitee.definition.model.ExecutionMode; +import io.gravitee.apim.gateway.tests.sdk.configuration.GatewayMode; /** * @author Guillaume Lamirand (guillaume.lamirand at graviteesource.com) * @author GraviteeSource Team */ -class LatencyPolicyIntegrationV4CompatibilityTest extends LatencyPolicyIntegrationV3Test { - - @Override - protected void configureGateway(GatewayConfigurationBuilder gatewayConfigurationBuilder) { - super.configureGateway(gatewayConfigurationBuilder); - gatewayConfigurationBuilder.set("api.jupiterMode.enabled", "true"); - } - - @Override - public void configureApi(Api api) { - super.configureApi(api); - api.setExecutionMode(ExecutionMode.JUPITER); - } -} +@GatewayTest +class LatencyPolicyIntegrationV4EmulationTest extends LatencyPolicyIntegrationV3Test {} diff --git a/src/test/java/io/gravitee/policy/latency/LatencyPolicyIntegrationV4Test.java b/src/test/java/io/gravitee/policy/latency/LatencyPolicyIntegrationV4Test.java index 5fe5e9ba..dcd15fd5 100644 --- a/src/test/java/io/gravitee/policy/latency/LatencyPolicyIntegrationV4Test.java +++ b/src/test/java/io/gravitee/policy/latency/LatencyPolicyIntegrationV4Test.java @@ -79,12 +79,6 @@ void afterEach() { fakeReporter.reset(); } - @Override - protected void configureGateway(GatewayConfigurationBuilder gatewayConfigurationBuilder) { - super.configureGateway(gatewayConfigurationBuilder); - gatewayConfigurationBuilder.set("api.jupiterMode.enabled", "true"); - } - @Override public void configureReactors(Set>> reactors) { reactors.add(ReactorBuilder.build(MessageApiReactorFactory.class));