Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(HikariCP:6.0.0): resolve test failures #602

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions metadata/com.zaxxer/HikariCP/6.0.0/index.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[
"proxy-config.json",
"reflect-config.json"
]
6 changes: 6 additions & 0 deletions metadata/com.zaxxer/HikariCP/6.0.0/proxy-config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[
{
"condition":{"typeReachable":"com.zaxxer.hikari.pool.ProxyConnection$ClosedConnection"},
"interfaces":["java.sql.Connection"]
}
]
35 changes: 35 additions & 0 deletions metadata/com.zaxxer/HikariCP/6.0.0/reflect-config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
[
{
"condition":{"typeReachable":"com.zaxxer.hikari.util.ConcurrentBag"},
"name":"[Lcom.zaxxer.hikari.util.ConcurrentBag$IConcurrentBagEntry;"
},
{
"condition":{"typeReachable":"com.zaxxer.hikari.pool.PoolEntry"},
"name":"[Ljava.sql.Statement;"
},
{
"condition":{"typeReachable":"com.zaxxer.hikari.HikariConfig"},
"name":"com.zaxxer.hikari.HikariConfig",
"allDeclaredFields":true
},
{
"condition":{"typeReachable":"com.zaxxer.hikari.pool.HikariPool$HouseKeeper"},
"name":"com.zaxxer.hikari.pool.PoolBase",
"fields":[{"name":"catalog"}]
},
{
"condition":{"typeReachable":"com.zaxxer.hikari.pool.PoolEntry"},
"name":"com.zaxxer.hikari.pool.PoolEntry",
"fields":[{"name":"state"}]
},
{
"condition":{"typeReachable":"com.zaxxer.hikari.HikariConfig"},
"name":"com.zaxxer.hikaricp.test.driver.CustomDriver",
"methods":[{"name":"<init>","parameterTypes":[] }]
},
{
"condition":{"typeReachable":"com.zaxxer.hikari.util.DriverDataSource"},
"name":"com.zaxxer.hikaricp.test.driver.CustomDriver",
"methods":[{"name":"<init>","parameterTypes":[] }]
}
]
15 changes: 11 additions & 4 deletions metadata/com.zaxxer/HikariCP/index.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
[
{
"metadata-version" : "5.0.1",
"tested-versions" : [
"metadata-version": "5.0.1",
"tested-versions": [
"5.0.1",
"5.1.0"
],
"latest" : true,
"module" : "com.zaxxer:HikariCP"
"module": "com.zaxxer:HikariCP"
},
{
"latest": true,
"metadata-version": "6.0.0",
"module": "com.zaxxer:HikariCP",
"tested-versions": [
"6.0.0"
]
}
]
4 changes: 4 additions & 0 deletions tests/src/com.zaxxer/HikariCP/6.0.0/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
gradlew.bat
gradlew
gradle/
build/
33 changes: 33 additions & 0 deletions tests/src/com.zaxxer/HikariCP/6.0.0/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/*
* Copyright and related rights waived via CC0
*
* You should have received a copy of the CC0 legalcode along with this
* work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
*/

plugins {
id "org.graalvm.internal.tck"
}

String libraryVersion = tck.testedLibraryVersion.get()

dependencies {
testImplementation "com.zaxxer:HikariCP:$libraryVersion"
testImplementation 'org.assertj:assertj-core:3.22.0'
}

graalvmNative {
agent {
defaultMode = "conditional"
modes {
conditional {
userCodeFilterPath = "user-code-filter.json"
}
}
metadataCopy {
mergeWithExisting = true
inputTaskNames.add("test")
outputDirectories.add("src/test/resources/META-INF/native-image/com.zaxxer/HikariCP")
}
}
}
2 changes: 2 additions & 0 deletions tests/src/com.zaxxer/HikariCP/6.0.0/gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
library.version = 6.0.0
metadata.dir = com.zaxxer/HikariCP/6.0.0/
13 changes: 13 additions & 0 deletions tests/src/com.zaxxer/HikariCP/6.0.0/settings.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
pluginManagement {
def tckPath = Objects.requireNonNullElse(
System.getenv("GVM_TCK_TCKDIR"),
"../../../../tck-build-logic"
)
includeBuild(tckPath)
}

plugins {
id "org.graalvm.internal.tck-settings" version "1.0.0-SNAPSHOT"
}

rootProject.name = 'com.zaxxer.HikariCP_tests'
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
/*
* Copyright and related rights waived via CC0
*
* You should have received a copy of the CC0 legalcode along with this
* work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
*/

package com.zaxxer.hikaricp.test;

import com.zaxxer.hikari.HikariConfig;
import com.zaxxer.hikari.HikariDataSource;
import com.zaxxer.hikaricp.test.driver.CustomDriver;
import org.junit.jupiter.api.Test;

import java.sql.Connection;
import java.sql.SQLException;

import static org.junit.jupiter.api.Assertions.assertNotNull;

public class HikariCPTest {
@Test
void test() throws SQLException {
HikariConfig config = new HikariConfig();

config.setAutoCommit(false);
config.setConnectionTimeout(1000);
config.setMaximumPoolSize(10);
config.setDriverClassName(CustomDriver.class.getName());
config.setJdbcUrl("jdbc:custom:foo");
config.setUsername("bart");
config.setPassword("51mp50n");
config.addDataSourceProperty("cachePrepStmts", "true");
config.addDataSourceProperty("prepStmtCacheSize", "250");
config.addDataSourceProperty("prepStmtCacheSqlLimit", "2048");

try (HikariDataSource ds = new HikariDataSource(config)) {
for (int i = 0; i < 10; i++) {
try (Connection connection = ds.getConnection()) {
assertNotNull(connection);
}
}
}

}
}
Loading
Loading