Skip to content

Commit

Permalink
Enable disabled Oracle tests
Browse files Browse the repository at this point in the history
Resolved upstream issues:
- quarkusio/quarkus#24501
- quarkusio/quarkus#24264

Follow-up to quarkus-qe#563.
  • Loading branch information
jsmrcka committed Jun 30, 2022
1 parent 558a1a4 commit a8868f5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 27 deletions.
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
package io.quarkus.ts.hibernate.reactive;

import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

import io.quarkus.test.bootstrap.OracleService;
import io.quarkus.test.bootstrap.RestService;
import io.quarkus.test.scenarios.QuarkusScenario;
Expand Down Expand Up @@ -32,24 +29,6 @@ protected RestService getApp() {
return app;
}

@Test
@Override
@Disabled("https://github.com/quarkusio/quarkus/issues/24501")
public void deleteAuthorById() {
}

@Test
@Override
@Disabled("https://github.com/quarkusio/quarkus/issues/24501")
public void setConvertedValue() {
}

@Test
@Override
@Disabled("https://github.com/quarkusio/quarkus/issues/24501")
public void ensureSessionIsPropagatedOnReactiveTransactions() {
}

// TODO: Remove after https://github.com/quarkus-qe/quarkus-test-framework/issues/503 is resolved
private static class ProvisionalOracleService extends OracleService {
@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
import javax.validation.ConstraintViolationException;

import io.quarkus.vertx.web.Route;
import io.vertx.core.VertxException;
import io.vertx.core.http.HttpServerResponse;
import io.vertx.core.json.Json;
import io.vertx.core.json.JsonObject;
import io.vertx.db2client.DB2Exception;
import io.vertx.mssqlclient.MSSQLException;
import io.vertx.mysqlclient.MySQLException;
import io.vertx.oracleclient.OracleException;
import io.vertx.pgclient.PgException;

@ApplicationScoped
Expand All @@ -38,12 +38,9 @@ void databaseMssqlConstraintFailure(MSSQLException e, HttpServerResponse respons
response.setStatusCode(400).end(Json.encode(new JsonObject().put("msg", e.getMessage())));
}

// TODO: https://github.com/quarkusio/quarkus/issues/24264 - No Oracle-specific exception available
@Route(path = "/*", type = Route.HandlerType.FAILURE, produces = "application/json")
void databaseOracleConstraintFailure(VertxException e, HttpServerResponse response) {
if (e.getMessage().contains("Error Msg = ORA")) {
response.setStatusCode(400).end(Json.encode(new JsonObject().put("msg", e.getMessage())));
}
void databaseOracleConstraintFailure(OracleException e, HttpServerResponse response) {
response.setStatusCode(400).end(Json.encode(new JsonObject().put("msg", e.getMessage())));
}

@Route(path = "*", type = Route.HandlerType.FAILURE, produces = "application/json")
Expand Down

0 comments on commit a8868f5

Please sign in to comment.