From 82dbbe46002d43298ed4ff1df26623f9cb51effd Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Wed, 1 Jun 2022 16:51:24 +0300
Subject: [PATCH] test: avoid modifying global sendBufferSize and
 receiveBufferSize in SendRecvBufferSizeTest

---
 .../test/jdbc3/SendRecvBufferSizeTest.java    | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc3/SendRecvBufferSizeTest.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc3/SendRecvBufferSizeTest.java
index 2d309b6353..96034c948e 100644
--- a/pgjdbc/src/test/java/org/postgresql/test/jdbc3/SendRecvBufferSizeTest.java
+++ b/pgjdbc/src/test/java/org/postgresql/test/jdbc3/SendRecvBufferSizeTest.java
@@ -5,28 +5,32 @@
 
 package org.postgresql.test.jdbc3;
 
+import org.postgresql.PGProperty;
 import org.postgresql.test.TestUtil;
+import org.postgresql.test.jdbc2.BaseTest4;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.Statement;
+import java.util.Properties;
 
-public class SendRecvBufferSizeTest {
+public class SendRecvBufferSizeTest extends BaseTest4 {
 
-  private Connection conn;
+  @Override
+  protected void updateProperties(Properties props) {
+    super.updateProperties(props);
+    PGProperty.SEND_BUFFER_SIZE.set(props, "1024");
+    PGProperty.RECEIVE_BUFFER_SIZE.set(props, "1024");
+  }
 
   @Before
   public void setUp() throws Exception {
-    System.setProperty("sendBufferSize", "1024");
-    System.setProperty("receiveBufferSize", "1024");
-
-    conn = TestUtil.openDB();
-    Statement stmt = conn.createStatement();
-    stmt.execute("CREATE TEMP TABLE hold(a int)");
+    super.setUp();
+    TestUtil.createTable(con, "hold", "a int");
+    Statement stmt = con.createStatement();
     stmt.execute("INSERT INTO hold VALUES (1)");
     stmt.execute("INSERT INTO hold VALUES (2)");
     stmt.close();
@@ -34,16 +38,14 @@ public void setUp() throws Exception {
 
   @After
   public void tearDown() throws SQLException {
-    Statement stmt = conn.createStatement();
-    stmt.execute("DROP TABLE hold");
-    stmt.close();
-    TestUtil.closeDB(conn);
+    TestUtil.dropTable(con, "hold");
+    super.tearDown();
   }
 
   // dummy test
   @Test
   public void testSelect() throws SQLException {
-    Statement stmt = conn.createStatement();
+    Statement stmt = con.createStatement();
     stmt.execute("select * from hold");
     stmt.close();
   }