postgresql-jdbc.git / summary / log / commit / refs

commit    5ad030d9bb1fb65a0e4121fe73fb4cb55e89adbb
Author:   Sehrope Sarkuni <sehrope@jackdb.com>
Date:     Sat May 15 12:17:27 2021 +0000

    test: Change DatabaseEncodingTest to mark test as skipped rather than successful if not run


 .../postgresql/test/jdbc2/DatabaseEncodingTest.java | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/DatabaseEncodingTest.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/DatabaseEncodingTest.java
index 711fc506..afb89851 100644
--- a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/DatabaseEncodingTest.java
+++ b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/DatabaseEncodingTest.java
@@ -13,6 +13,7 @@ import org.postgresql.core.Encoding;
 import org.postgresql.test.TestUtil;
 
 import org.junit.After;
+import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -69,21 +70,8 @@ public class DatabaseEncodingTest {
 
   @Test
   public void testEncoding() throws Exception {
-    // Check that we have a UTF8 server encoding, or we must skip this test.
-    Statement stmt = con.createStatement();
-    ResultSet rs = stmt.executeQuery("SELECT getdatabaseencoding()");
-    assertTrue(rs.next());
-
-    String dbEncoding = rs.getString(1);
-    if (!dbEncoding.equals("UTF8")) {
-      System.err.println(
-          "DatabaseEncodingTest: Skipping UTF8 database tests as test database encoding is "
-              + dbEncoding);
-      rs.close();
-      return; // not a UTF8 database.
-    }
-
-    rs.close();
+    String databaseEncoding = TestUtil.queryForString(con, "SELECT getdatabaseencoding()");
+    Assume.assumeTrue("Database encoding must be UTF8", databaseEncoding.equals("UTF8"));
 
     boolean testHighUnicode = true;
 
@@ -142,8 +130,9 @@ public class DatabaseEncodingTest {
     con.commit();
 
     // Check data.
+    Statement stmt = con.createStatement();
     stmt.setFetchSize(1);
-    rs = stmt.executeQuery(
+    ResultSet rs = stmt.executeQuery(
         "SELECT unicode_ordinal, unicode_string FROM testdbencoding ORDER BY unicode_ordinal");
     for (int i = 1; i < 0xd800; i += STEP) {
       assertTrue(rs.next());


[parent: c3abb05dbb5d]