Skip to content

Commit

Permalink
Merge pull request quarkus-qe#840 from jedla97/exclude-dev-mode-issue…
Browse files Browse the repository at this point in the history
…-720

Disable DevMode tests for native and update files name.
  • Loading branch information
michalvavrik authored Jul 21, 2023
2 parents ab7377c + 03999ba commit 91e93d5
Show file tree
Hide file tree
Showing 14 changed files with 18 additions and 37 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,12 @@
import io.quarkus.test.bootstrap.DefaultService;
import io.quarkus.test.bootstrap.RestService;
import io.quarkus.test.scenarios.QuarkusScenario;
import io.quarkus.test.scenarios.annotations.DisabledOnNative;
import io.quarkus.test.services.Container;
import io.quarkus.test.services.DevModeQuarkusApplication;

/**
* This test verifies that resources in test can be used in DevMode.
*/
@DisabledOnNative // Don't run DEV mode tests in native: https://github.com/quarkus-qe/quarkus-test-framework/issues/720
@QuarkusScenario
public class DevModeMySqlDatabaseIT extends AbstractSqlDatabaseIT {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,11 @@

import io.quarkus.test.bootstrap.RestService;
import io.quarkus.test.scenarios.QuarkusScenario;
import io.quarkus.test.scenarios.annotations.DisabledOnNative;
import io.quarkus.test.services.DevModeQuarkusApplication;

/**
* Running Quarkus on DEV mode will spin up a Database instance automatically.
*/
@DisabledOnNative // Don't run DEV mode tests in native: https://github.com/quarkus-qe/quarkus-test-framework/issues/720
@QuarkusScenario
public class DevModeMySqlDevServicesDatabaseIT extends AbstractSqlDatabaseIT {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,12 @@
import io.quarkus.test.bootstrap.DefaultService;
import io.quarkus.test.bootstrap.RestService;
import io.quarkus.test.scenarios.QuarkusScenario;
import io.quarkus.test.scenarios.annotations.DisabledOnNative;
import io.quarkus.test.services.Container;
import io.quarkus.test.services.DevModeQuarkusApplication;

/**
* This test verifies that resources in test can be used in DevMode.
*/
@DisabledOnNative // Don't run DEV mode tests in native: https://github.com/quarkus-qe/quarkus-test-framework/issues/720
@QuarkusScenario
public class DevModeOracleDatabaseIT extends AbstractSqlDatabaseIT {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,11 @@

import io.quarkus.test.bootstrap.RestService;
import io.quarkus.test.scenarios.QuarkusScenario;
import io.quarkus.test.scenarios.annotations.DisabledOnNative;
import io.quarkus.test.services.DevModeQuarkusApplication;

/**
* Running Quarkus on DEV mode will spin up a Database instance automatically.
*/
@DisabledOnNative // Don't run DEV mode tests in native: https://github.com/quarkus-qe/quarkus-test-framework/issues/720
@QuarkusScenario
public class DevModeOracleDevServiceDatabaseIT extends AbstractSqlDatabaseIT {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,9 @@

import io.quarkus.test.bootstrap.RestService;
import io.quarkus.test.scenarios.QuarkusScenario;
import io.quarkus.test.scenarios.annotations.DisabledOnNative;
import io.quarkus.test.services.GitRepositoryQuarkusApplication;

@QuarkusScenario
@DisabledOnNative
@DisabledOnOs(value = OS.WINDOWS, disabledReason = "Windows does not support long file paths")
public class DevModeQuickstartUsingDefaultsIT {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,11 @@

import io.quarkus.test.bootstrap.DevModeQuarkusService;
import io.quarkus.test.scenarios.QuarkusScenario;
import io.quarkus.test.scenarios.annotations.DisabledOnNative;
import io.quarkus.test.scenarios.annotations.DisabledOnQuarkusVersion;
import io.quarkus.test.services.DevModeQuarkusApplication;
import io.quarkus.test.utils.AwaitilityUtils;

@QuarkusScenario
@DisabledOnNative
@DisabledOnQuarkusVersion(version = "3.0.0.CR2", reason = "Continuous Testing page was added to DEV UI in Quarkus 3.0.0.Final")
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
public class DevModeGreetingResourceIT {
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package io.quarkus.qe;

import io.quarkus.test.scenarios.KubernetesScenario;

@KubernetesScenario
public class KubernetesRemoteDevModeGreetingResourceIT extends RemoteDevModeGreetingResourceIT {
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package io.quarkus.qe;

import io.quarkus.test.scenarios.OpenShiftScenario;

@OpenShiftScenario
public class OpenShiftRemoteDevModeGreetingResourceIT extends RemoteDevModeGreetingResourceIT {
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,11 @@

import io.quarkus.test.bootstrap.DevModeQuarkusService;
import io.quarkus.test.scenarios.QuarkusScenario;
import io.quarkus.test.scenarios.annotations.DisabledOnNative;
import io.quarkus.test.services.RemoteDevModeQuarkusApplication;
import io.quarkus.test.utils.AwaitilityUtils;

@QuarkusScenario
@DisabledOnNative
public class RemoteDevGreetingResourceIT {
public class RemoteDevModeGreetingResourceIT {

static final String VICTOR_NAME = "victor";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,9 @@

import io.quarkus.test.bootstrap.GrpcService;
import io.quarkus.test.scenarios.QuarkusScenario;
import io.quarkus.test.scenarios.annotations.DisabledOnNative;
import io.quarkus.test.services.DevModeQuarkusApplication;

@QuarkusScenario
@DisabledOnNative
public class DevModeGrpcServiceIT {

static final String NAME = "Victor";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,9 @@

import io.quarkus.test.bootstrap.DevModeQuarkusService;
import io.quarkus.test.scenarios.QuarkusScenario;
import io.quarkus.test.scenarios.annotations.DisabledOnNative;
import io.quarkus.test.services.DevModeQuarkusApplication;

@QuarkusScenario
@DisabledOnNative
public class DevModeGreetingResourceIT {
@DevModeQuarkusApplication(ssl = true)
static DevModeQuarkusService app = new DevModeQuarkusService();
Expand Down
3 changes: 3 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
<include.tests>**/*IT.java</include.tests>
<exclude.openshift.tests>**/OpenShift*IT.java</exclude.openshift.tests>
<exclude.kubernetes.tests>**/Kubernetes*IT.java</exclude.kubernetes.tests>
<exclude.quarkus.devmode.tests>no</exclude.quarkus.devmode.tests>
<!-- Format Settings -->
<src.format.goal>format</src.format.goal>
<src.sort.goal>sort</src.sort.goal>
Expand Down Expand Up @@ -348,6 +349,7 @@
<excludes>
<exclude>${exclude.openshift.tests}</exclude>
<exclude>${exclude.kubernetes.tests}</exclude>
<exclude>${exclude.quarkus.devmode.tests}</exclude>
</excludes>
</configuration>
</execution>
Expand Down Expand Up @@ -432,6 +434,7 @@
<quarkus.package.type>native</quarkus.package.type>
<quarkus.native.container-build>true</quarkus.native.container-build>
<quarkus.native.native-image-xmx>5g</quarkus.native.native-image-xmx>
<exclude.quarkus.devmode.tests>**/*DevMode*IT.java</exclude.quarkus.devmode.tests>
</properties>
</profile>
<profile>
Expand Down

0 comments on commit 91e93d5

Please sign in to comment.