From bfee798e5045a309af2e297baed3d8544e68d4c2 Mon Sep 17 00:00:00 2001 From: Bo Peng Date: Fri, 15 Mar 2024 13:54:59 +0900 Subject: [PATCH] Test: fixed regression test 005.jdbc to avoid Java 21 deprecation warnings. Replace Runtime.exec(String) with Runtime.exec(String[]) to avoid Java 21 deprecation warnings. Patch is created by Vladimir Petko and modified by Bo Peng. --- src/test/regression/tests/005.jdbc/PgpoolTest.java | 9 ++++++--- src/test/regression/tests/005.jdbc/RunTest.java | 9 +++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/test/regression/tests/005.jdbc/PgpoolTest.java b/src/test/regression/tests/005.jdbc/PgpoolTest.java index cdf8fcf8a..89e7e5c94 100644 --- a/src/test/regression/tests/005.jdbc/PgpoolTest.java +++ b/src/test/regression/tests/005.jdbc/PgpoolTest.java @@ -52,11 +52,14 @@ public abstract class PgpoolTest { public void check() { try { - String command_line = "diff -u expected/" + getTestName() + " result/" + - getTestName(); Process proc; - proc = Runtime.getRuntime().exec(command_line); + proc = Runtime.getRuntime().exec(new String[] + "diff", + "-u", + "expected/" + getTestName(), + "result/" + getTestName() + }); proc.waitFor(); System.out.print(getTestName() + ": "); if (proc.exitValue() == 0) diff --git a/src/test/regression/tests/005.jdbc/RunTest.java b/src/test/regression/tests/005.jdbc/RunTest.java index 1ee4aceee..f3b9e66c4 100644 --- a/src/test/regression/tests/005.jdbc/RunTest.java +++ b/src/test/regression/tests/005.jdbc/RunTest.java @@ -23,10 +23,11 @@ public class RunTest { String dbname = prop.getProperty("pgpooltest.dbname"); // setup database - String command_line = "psql -f prepare.sql"; - command_line = command_line + " -h " + host + " -p " + port + - " -U " + user + " " + dbname; - Process proc = Runtime.getRuntime().exec(command_line); + Process proc = Runtime.getRuntime().exec(new String[]{ + "psql", "-f", "prepare.sql", + "-h", host, "-p", port, + "-U", user, dbname + }); proc.waitFor(); StringTokenizer tokenizer = new StringTokenizer(tests, " "); -- 2.39.5