Skip to content

Commit

Permalink
[#noissue] Fix oracle 19 GssCredential
Browse files Browse the repository at this point in the history
  • Loading branch information
@jaehong-kim
jaehong-kim committed Apr 17, 2024
1 parent bf9322a commit 14ad90c
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
16 changes: 8 additions & 8 deletions ...ledb-11-it/src/test/java/com/navercorp/pinpoint/it/plugin/jdbc/oracle/OracleItHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,8 @@ public void verifyTestStatement_connectWithGssCredential(OracleJDBCApi JDBC_API,
verifier.verifyTrace(event(ORACLE, connect, null, OracleItHelper.DB_ADDRESS, OracleItHelper.DB_NAME, cachedArgs(OracleItHelper.JDBC_URL)));

// OracleDriver#connect(String, Properties, GssCredential)
Method connectGssCredential = JDBC_API.getDriver().getConnectionWithGssCredential();
verifier.verifyTrace(event(ORACLE, connectGssCredential, null, OracleItHelper.DB_ADDRESS, OracleItHelper.DB_NAME, cachedArgs(OracleItHelper.JDBC_URL)));
// Method connectGssCredential = JDBC_API.getDriver().getConnectionWithGssCredential();
// verifier.verifyTrace(event(ORACLE, connectGssCredential, null, OracleItHelper.DB_ADDRESS, OracleItHelper.DB_NAME, cachedArgs(OracleItHelper.JDBC_URL)));

final JDBCApi.ConnectionClass connectionClass = JDBC_API.getConnection();

Expand Down Expand Up @@ -233,15 +233,15 @@ public void verifyTestStoredProcedure_with_IN_OUT_parameters_connectWithGssCrede
PluginTestVerifier verifier = PluginTestVerifierHolder.getInstance();

verifier.printCache();
verifier.verifyTraceCount(5);
verifier.verifyTraceCount(4);

// OracleDriver#connect(String, Properties)
Method connect = JDBC_API.getDriver().getConnect();
verifier.verifyTrace(event(ORACLE, connect, null, OracleItHelper.DB_ADDRESS, OracleItHelper.DB_NAME, cachedArgs(OracleItHelper.JDBC_URL)));

// OracleDriver#connect(String, Properties, GssCredential)
Method connectGssCredential = JDBC_API.getDriver().getConnectionWithGssCredential();
verifier.verifyTrace(event(ORACLE, connectGssCredential, null, OracleItHelper.DB_ADDRESS, OracleItHelper.DB_NAME, cachedArgs(OracleItHelper.JDBC_URL)));
// Method connectGssCredential = JDBC_API.getDriver().getConnectionWithGssCredential();
// verifier.verifyTrace(event(ORACLE, connectGssCredential, null, OracleItHelper.DB_ADDRESS, OracleItHelper.DB_NAME, cachedArgs(OracleItHelper.JDBC_URL)));

// PhysicalConnection#prepareCall(String)
final JDBCApi.ConnectionClass connectionClass = JDBC_API.getConnection();
Expand Down Expand Up @@ -295,15 +295,15 @@ public void verifyTestStoredProcedure_with_INOUT_parameters_connectWithGssCreden

verifier.printCache();
// including one new connect api: oracle.jdbc.driver.OracleDriver.connect(java.lang.String, java.util.Properties, org.ietf.jgss.GSSCredential)
verifier.verifyTraceCount(7);
verifier.verifyTraceCount(6);

// OracleDriver#connect(String, Properties)
Method connect = JDBC_API.getDriver().getConnect();
verifier.verifyTrace(event(ORACLE, connect, null, DB_ADDRESS, DB_NAME, cachedArgs(JDBC_URL)));

// OracleDriver#connect(String, Properties, GssCredential)
Method connectGssCredential = JDBC_API.getDriver().getConnectionWithGssCredential();
verifier.verifyTrace(event(ORACLE, connectGssCredential, null, DB_ADDRESS, DB_NAME, cachedArgs(JDBC_URL)));
// Method connectGssCredential = JDBC_API.getDriver().getConnectionWithGssCredential();
// verifier.verifyTrace(event(ORACLE, connectGssCredential, null, DB_ADDRESS, DB_NAME, cachedArgs(JDBC_URL)));

// PhysicalConnection#prepareCall(String)
final JDBCApi.ConnectionClass connectionClass = JDBC_API.getConnection();
Expand Down
16 changes: 8 additions & 8 deletions ...ledb-19-it/src/test/java/com/navercorp/pinpoint/it/plugin/jdbc/oracle/OracleItHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,8 @@ public void verifyTestStatement_connectWithGssCredential(OracleJDBCApi JDBC_API,
verifier.verifyTrace(event(ORACLE, connect, null, OracleItHelper.DB_ADDRESS, OracleItHelper.DB_NAME, cachedArgs(OracleItHelper.JDBC_URL)));

// OracleDriver#connect(String, Properties, GssCredential)
Method connectGssCredential = JDBC_API.getDriver().getConnectionWithGssCredential();
verifier.verifyTrace(event(ORACLE, connectGssCredential, null, OracleItHelper.DB_ADDRESS, OracleItHelper.DB_NAME, cachedArgs(OracleItHelper.JDBC_URL)));
// Method connectGssCredential = JDBC_API.getDriver().getConnectionWithGssCredential();
// verifier.verifyTrace(event(ORACLE, connectGssCredential, null, OracleItHelper.DB_ADDRESS, OracleItHelper.DB_NAME, cachedArgs(OracleItHelper.JDBC_URL)));

final JDBCApi.ConnectionClass connectionClass = JDBC_API.getConnection();

Expand Down Expand Up @@ -216,15 +216,15 @@ public void verifyTestStoredProcedure_with_IN_OUT_parameters_connectWithGssCrede
PluginTestVerifier verifier = PluginTestVerifierHolder.getInstance();

verifier.printCache();
verifier.verifyTraceCount(5);
verifier.verifyTraceCount(4);

// OracleDriver#connect(String, Properties)
Method connect = JDBC_API.getDriver().getConnect();
verifier.verifyTrace(event(ORACLE, connect, null, OracleItHelper.DB_ADDRESS, OracleItHelper.DB_NAME, cachedArgs(OracleItHelper.JDBC_URL)));

// OracleDriver#connect(String, Properties, GssCredential)
Method connectGssCredential = JDBC_API.getDriver().getConnectionWithGssCredential();
verifier.verifyTrace(event(ORACLE, connectGssCredential, null, OracleItHelper.DB_ADDRESS, OracleItHelper.DB_NAME, cachedArgs(OracleItHelper.JDBC_URL)));
// Method connectGssCredential = JDBC_API.getDriver().getConnectionWithGssCredential();
// verifier.verifyTrace(event(ORACLE, connectGssCredential, null, OracleItHelper.DB_ADDRESS, OracleItHelper.DB_NAME, cachedArgs(OracleItHelper.JDBC_URL)));

// PhysicalConnection#prepareCall(String)
final JDBCApi.ConnectionClass connectionClass = JDBC_API.getConnection();
Expand Down Expand Up @@ -278,15 +278,15 @@ public void verifyTestStoredProcedure_with_INOUT_parameters_connectWithGssCreden

verifier.printCache();
// including one new connect api: oracle.jdbc.driver.OracleDriver.connect(java.lang.String, java.util.Properties, org.ietf.jgss.GSSCredential)
verifier.verifyTraceCount(7);
verifier.verifyTraceCount(6);

// OracleDriver#connect(String, Properties)
Method connect = JDBC_API.getDriver().getConnect();
verifier.verifyTrace(event(ORACLE, connect, null, DB_ADDRESS, DB_NAME, cachedArgs(JDBC_URL)));

// OracleDriver#connect(String, Properties, GssCredential)
Method connectGssCredential = JDBC_API.getDriver().getConnectionWithGssCredential();
verifier.verifyTrace(event(ORACLE, connectGssCredential, null, DB_ADDRESS, DB_NAME, cachedArgs(JDBC_URL)));
// Method connectGssCredential = JDBC_API.getDriver().getConnectionWithGssCredential();
// verifier.verifyTrace(event(ORACLE, connectGssCredential, null, DB_ADDRESS, DB_NAME, cachedArgs(JDBC_URL)));

// PhysicalConnection#prepareCall(String)
final JDBCApi.ConnectionClass connectionClass = JDBC_API.getConnection();
Expand Down

0 comments on commit 14ad90c

Please sign in to comment.