New test requires AL32UTF8 to work correctly -- add that check and since

it is done in quite a few places now, include it in the test library.

Author: anthony-tuininga

tests/test_1900_lob_var.py

@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2023, Oracle and/or its affiliates.
+# Copyright (c) 2020, 2024, Oracle and/or its affiliates.
 #
 # This software is dual-licensed to you under the Universal Permissive License
 # (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
@@ -417,15 +417,7 @@ def test_1919_assign_string_beyond_array_size(self):
 
     def test_1920_supplemental_characters(self):
         "1920 - test read/write temporary LOBs using supplemental characters"
-        self.cursor.execute(
-            """
-            select value
-            from nls_database_parameters
-            where parameter = 'NLS_CHARACTERSET'
-            """
-        )
-        (charset,) = self.cursor.fetchone()
-        if charset != "AL32UTF8":
+        if test_env.get_charset() != "AL32UTF8":
             self.skipTest("Database character set must be AL32UTF8")
         supplemental_chars = (
             "𠜎 𠜱 𠝹 𠱓 𠱸 𠲖 𠳏 𠳕 𠴕 𠵼 𠵿 𠸎 𠸏 𠹷 𠺝 𠺢 𠻗 𠻹 𠻺 𠼭 𠼮 "

tests/test_2500_string_var.py

@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2023, Oracle and/or its affiliates.
+# Copyright (c) 2020, 2024, Oracle and/or its affiliates.
 #
 # This software is dual-licensed to you under the Universal Permissive License
 # (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
@@ -382,15 +382,7 @@ def test_2525_fetchone(self):
 
     def test_2526_supplemental_characters(self):
         "2526 - test binding and fetching supplemental charcters"
-        self.cursor.execute(
-            """
-            select value
-            from nls_database_parameters
-            where parameter = 'NLS_CHARACTERSET'
-            """
-        )
-        (charset,) = self.cursor.fetchone()
-        if charset != "AL32UTF8":
+        if test_env.get_charset() != "AL32UTF8":
             self.skipTest("Database character set must be AL32UTF8")
         supplemental_chars = (
             "𠜎 𠜱 𠝹 𠱓 𠱸 𠲖 𠳏 𠳕 𠴕 𠵼 𠵿 𠸎 𠸏 "

tests/test_3800_typehandler.py

@@ -284,6 +284,9 @@ def output_type_handler(cursor, metadata):
     def test_3807(self):
         "3807 - output type handler for encoding errors"
 
+        if test_env.get_charset() != "AL32UTF8":
+            self.skipTest("Database character set must be AL32UTF8")
+
         def output_type_handler(cursor, metadata):
             if metadata.type_code is oracledb.DB_TYPE_VARCHAR:
                 return cursor.var(

tests/test_5700_lob_var_async.py

@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 #
 # This software is dual-licensed to you under the Universal Permissive License
 # (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
@@ -382,14 +382,7 @@ async def test_5715_temporary_lobs(self):
 
     async def test_5716_supplemental_characters(self):
         "5716 - test read/write temporary LOBs using supplemental characters"
-        await self.cursor.execute(
-            """
-            select value
-            from nls_database_parameters
-            where parameter = 'NLS_CHARACTERSET'
-            """
-        )
-        (charset,) = await self.cursor.fetchone()
+        charset = await test_env.get_charset_async()
         if charset != "AL32UTF8":
             self.skipTest("Database character set must be AL32UTF8")
         supplemental_chars = (

tests/test_env.py

@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2023, Oracle and/or its affiliates.
+# Copyright (c) 2020, 2024, Oracle and/or its affiliates.
 #
 # This software is dual-licensed to you under the Universal Permissive License
 # (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
@@ -129,6 +129,40 @@ async def get_admin_connection_async(use_async=False):
     return await get_admin_connection(use_async=True)
 
 
+def get_charset():
+    value = PARAMETERS.get("CHARSET")
+    if value is None:
+        with get_connection() as conn:
+            with conn.cursor() as cursor:
+                cursor.execute(
+                    """
+                    select value
+                    from nls_database_parameters
+                    where parameter = 'NLS_CHARACTERSET'
+                    """
+                )
+                (value,) = cursor.fetchone()
+                PARAMETERS["CHARSET"] = value
+    return value
+
+
+async def get_charset_async():
+    value = PARAMETERS.get("CHARSET")
+    if value is None:
+        async with get_connection_async() as conn:
+            with conn.cursor() as cursor:
+                await cursor.execute(
+                    """
+                    select value
+                    from nls_database_parameters
+                    where parameter = 'NLS_CHARACTERSET'
+                    """
+                )
+                (value,) = await cursor.fetchone()
+                PARAMETERS["CHARSET"] = value
+    return value
+
+
 def get_charset_ratios():
     value = PARAMETERS.get("CS_RATIO")
     if value is None: