Rename "base" to "test_env" to be clearer as to the purpose of the module.

Author: anthony-tuininga

Diff for: test/DropTest.py

@@ -9,15 +9,15 @@
 #------------------------------------------------------------------------------
 
 import cx_Oracle
-import base
+import test_env
 
 def drop_tests(conn):
     print("Dropping test schemas...")
-    base.run_sql_script(conn, "DropTest",
-                        main_user=base.get_main_user(),
-                        proxy_user=base.get_proxy_user())
+    test_env.run_sql_script(conn, "DropTest",
+                            main_user=test_env.get_main_user(),
+                            proxy_user=test_env.get_proxy_user())
 
 if __name__ == "__main__":
-    conn = cx_Oracle.connect(base.get_admin_connect_string())
+    conn = cx_Oracle.connect(test_env.get_admin_connect_string())
     drop_tests(conn)
     print("Done.")

Diff for: test/SetupTest.py

@@ -11,20 +11,20 @@
 
 import cx_Oracle
 
-import base
+import test_env
 import DropTest
 
 # connect as administrative user (usually SYSTEM or ADMIN)
-conn = cx_Oracle.connect(base.get_admin_connect_string())
+conn = cx_Oracle.connect(test_env.get_admin_connect_string())
 
 # drop existing users and editions, if applicable
 DropTest.drop_tests(conn)
 
 # create test schemas
 print("Creating test schemas...")
-base.run_sql_script(conn, "SetupTest",
-                    main_user=base.get_main_user(),
-                    main_password=base.get_main_password(),
-                    proxy_user=base.get_proxy_user(),
-                    proxy_password=base.get_proxy_password())
+test_env.run_sql_script(conn, "SetupTest",
+                        main_user=test_env.get_main_user(),
+                        main_password=test_env.get_main_password(),
+                        proxy_user=test_env.get_proxy_user(),
+                        proxy_password=test_env.get_proxy_password())
 print("Done.")

Diff for: test/test_1000_module.py

@@ -6,13 +6,13 @@
 1000 - Module for testing top-level module methods
 """
 
-import base
+import test_env
 
 import cx_Oracle as oracledb
 import datetime
 import time
 
-class TestCase(base.BaseTestCase):
+class TestCase(test_env.BaseTestCase):
     requires_connection = False
 
     def test_1000_date_from_ticks(self):
@@ -42,4 +42,4 @@ def test_1003_unsupported_functions(self):
                           100)
 
 if __name__ == "__main__":
-    base.run_test_cases()
+    test_env.run_test_cases()

Diff for: test/test_1100_connection.py

@@ -11,11 +11,11 @@
 1200 - Module for testing cursors
 """
 
-import base
+import test_env
 import cx_Oracle as oracledb
 import decimal
 
-class TestCase(base.BaseTestCase):
+class TestCase(test_env.BaseTestCase):
 
     def test_1200_create_scrollable_cursor(self):
         "1200 - test creating a scrollable cursor"
@@ -594,7 +594,7 @@ def test_1252_string_format(self):
         "1252 - test string format of cursor"
         format_string = "<cx_Oracle.Cursor on <cx_Oracle.Connection to %s@%s>>"
         expected_value = format_string % \
-                (base.get_main_user(), base.get_connect_string())
+                (test_env.get_main_user(), test_env.get_connect_string())
         self.assertEqual(str(self.cursor), expected_value)
 
     def test_1253_cursor_fetch_raw(self):
@@ -934,4 +934,4 @@ def test_1278_execute_with_incorrect_bind_values(self):
                           statement, value=var, value2=var, value3=var)
 
 if __name__ == "__main__":
-    base.run_test_cases()
+    test_env.run_test_cases()

Diff for: test/test_1200_cursor.py

@@ -11,12 +11,12 @@
 1300 - Module for testing cursor variables
 """
 
-import base
+import test_env
 
 import cx_Oracle as oracledb
 import sys
 
-class TestCase(base.BaseTestCase):
+class TestCase(test_env.BaseTestCase):
 
     def test_1300_bind_cursor(self):
         "1300 - test binding in a cursor"
@@ -29,7 +29,7 @@ def test_1300_bind_cursor(self):
                 cursor=cursor)
         expected_value = [
             ('STRINGVALUE', oracledb.DB_TYPE_CHAR, 1,
-                    base.get_charset_ratio(), None, None, 1)
+                    test_env.get_charset_ratio(), None, None, 1)
         ]
         self.assertEqual(cursor.description, expected_value)
         self.assertEqual(cursor.fetchall(), [('X',)])
@@ -42,7 +42,7 @@ def test_1301_bind_cursor_in_package(self):
         expected_value = [
             ('INTCOL', oracledb.DB_TYPE_NUMBER, 10, None, 9, 0, 0),
             ('STRINGCOL', oracledb.DB_TYPE_VARCHAR, 20,
-                    20 * base.get_charset_ratio(), None, None, 0)
+                    20 * test_env.get_charset_ratio(), None, None, 0)
         ]
         self.assertEqual(cursor.description, expected_value)
         self.assertEqual(cursor.fetchall(), [(1, 'String 1'), (2, 'String 2')])
@@ -95,4 +95,4 @@ def test_1304_fetch_cursor(self):
             self.assertEqual(cursor.fetchall(), [(i + 1,)])
 
 if __name__ == "__main__":
-    base.run_test_cases()
+    test_env.run_test_cases()

Diff for: test/test_1300_cursor_var.py

@@ -11,13 +11,13 @@
 1400 - Module for testing date/time variables
 """
 
-import base
+import test_env
 
 import cx_Oracle as oracledb
 import datetime
 import time
 
-class TestCase(base.BaseTestCase):
+class TestCase(test_env.BaseTestCase):
 
     def setUp(self):
         super().setUp()
@@ -246,4 +246,4 @@ def test_1417_fetchone(self):
         self.assertEqual(self.cursor.fetchone(), None)
 
 if __name__ == "__main__":
-    base.run_test_cases()
+    test_env.run_test_cases()

Diff for: test/test_1400_datetime_var.py

@@ -8,12 +8,12 @@
 tests for pickling/unpickling of database types and API types.
 """
 
-import base
+import test_env
 
 import cx_Oracle as oracledb
 import pickle
 
-class TestCase(base.BaseTestCase):
+class TestCase(test_env.BaseTestCase):
     requires_connection = False
 
     def __test_compare(self, db_type, api_type):
@@ -177,4 +177,4 @@ def test_1528_ROWID(self):
         self.__test_pickle(oracledb.ROWID)
 
 if __name__ == "__main__":
-    base.run_test_cases()
+    test_env.run_test_cases()

Diff for: test/test_1500_types.py

@@ -6,11 +6,11 @@
 1600 - Module for testing DML returning clauses
 """
 
-import base
+import test_env
 
 import cx_Oracle as oracledb
 
-class TestCase(base.BaseTestCase):
+class TestCase(test_env.BaseTestCase):
 
     def test_1600_insert(self):
         "1600 - test insert (single row) with DML returning"
@@ -270,4 +270,4 @@ def test_1611_delete_returning_no_rows_after_many_rows(self):
         self.assertEqual(int_var.getvalue(), [])
 
 if __name__ == "__main__":
-    base.run_test_cases()
+    test_env.run_test_cases()

Diff for: test/test_1600_dml_returning.py

@@ -11,12 +11,12 @@
 1700 - Module for testing error objects
 """
 
-import base
+import test_env
 
 import cx_Oracle as oracledb
 import pickle
 
-class TestCase(base.BaseTestCase):
+class TestCase(test_env.BaseTestCase):
 
     def test_1700_parse_error(self):
         "1700 - test parse error returns offset correctly"
@@ -47,4 +47,4 @@ def test_1701_pickle_error(self):
         self.assertTrue(new_error_obj.isrecoverable == error_obj.isrecoverable)
 
 if __name__ == "__main__":
-    base.run_test_cases()
+    test_env.run_test_cases()

Diff for: test/test_1700_error.py

@@ -11,12 +11,12 @@
 1800 - Module for testing interval variables
 """
 
-import base
+import test_env
 
 import cx_Oracle as oracledb
 import datetime
 
-class TestCase(base.BaseTestCase):
+class TestCase(test_env.BaseTestCase):
 
     def setUp(self):
         super().setUp()
@@ -152,4 +152,4 @@ def test_1810_fetchone(self):
         self.assertEqual(self.cursor.fetchone(), None)
 
 if __name__ == "__main__":
-    base.run_test_cases()
+    test_env.run_test_cases()

Diff for: test/test_1800_interval_var.py

@@ -11,11 +11,11 @@
 1900 - Module for testing LOB (CLOB and BLOB) variables
 """
 
-import base
+import test_env
 
 import cx_Oracle as oracledb
 
-class TestCase(base.BaseTestCase):
+class TestCase(test_env.BaseTestCase):
 
     def __get_temp_lobs(self, sid):
         cursor = self.connection.cursor()
@@ -234,9 +234,9 @@ def test_1914_nclob_direct(self):
 
     def test_1915_nclob_different_encodings(self):
         "1915 - test binding and fetching NCLOB data (different encodings)"
-        connection = oracledb.connect(base.get_main_user(),
-                                      base.get_main_password(),
-                                      base.get_connect_string(),
+        connection = oracledb.connect(test_env.get_main_user(),
+                                      test_env.get_main_password(),
+                                      test_env.get_connect_string(),
                                       encoding="UTF-8", nencoding="UTF-16")
         value = "\u03b4\u4e2a"
         cursor = connection.cursor()
@@ -286,4 +286,4 @@ def test_1919_AssignStringBeyondArraySize(self):
         self.assertRaises(IndexError, nclobVar.setvalue, 1, "test char")
 
 if __name__ == "__main__":
-    base.run_test_cases()
+    test_env.run_test_cases()

Diff for: test/test_1900_lob_var.py

@@ -11,11 +11,11 @@
 2000 - Module for testing long and long raw variables
 """
 
-import base
+import test_env
 
 import cx_Oracle as oracledb
 
-class TestCase(base.BaseTestCase):
+class TestCase(test_env.BaseTestCase):
 
     def __perform_test(self, typ):
         name_part = "Long" if typ is oracledb.DB_TYPE_LONG else "LongRaw"
@@ -102,4 +102,4 @@ def test_2005_array_size_too_large(self):
                           "select * from TestLongRaws")
 
 if __name__ == "__main__":
-    base.run_test_cases()
+    test_env.run_test_cases()

Diff for: test/test_2000_long_var.py

@@ -11,11 +11,11 @@
 2100 - Module for testing NCHAR variables
 """
 
-import base
+import test_env
 
 import cx_Oracle as oracledb
 
-class TestCase(base.BaseTestCase):
+class TestCase(test_env.BaseTestCase):
 
     def setUp(self):
         super().setUp()
@@ -237,4 +237,4 @@ def test_2117_fetchone(self):
         self.assertEqual(self.cursor.fetchone(), None)
 
 if __name__ == "__main__":
-    base.run_test_cases()
+    test_env.run_test_cases()

Diff for: test/test_2100_nchar_var.py

@@ -11,13 +11,13 @@
 2200 - Module for testing number variables
 """
 
-import base
+import test_env
 
 import cx_Oracle as oracledb
 import decimal
 import sys
 
-class TestCase(base.BaseTestCase):
+class TestCase(test_env.BaseTestCase):
 
     def output_type_handler_binary_int(self, cursor, name, default_type, size,
                                        precision, scale):
@@ -407,4 +407,4 @@ def test_2232_fetch_binary_int(self):
             self.assertEqual(value, fetched_value)
 
 if __name__ == "__main__":
-    base.run_test_cases()
+    test_env.run_test_cases()

Diff for: test/test_2200_number_var.py

@@ -11,13 +11,13 @@
 2300 - Module for testing object variables
 """
 
-import base
+import test_env
 
 import cx_Oracle as oracledb
 import datetime
 import decimal
 
-class TestCase(base.BaseTestCase):
+class TestCase(test_env.BaseTestCase):
 
     def __get_object_as_tuple(self, obj):
         if obj.type.iscollection:
@@ -435,7 +435,7 @@ def test_2313_setting_var_wrong_object_type(self):
     def test_2314_string_format(self):
         "2314 - test object string format"
         obj_type = self.connection.gettype("UDT_OBJECT")
-        user = base.get_main_user()
+        user = test_env.get_main_user()
         self.assertEqual(str(obj_type),
                          "<cx_Oracle.ObjectType %s.UDT_OBJECT>" % user.upper())
         self.assertEqual(str(obj_type.attributes[0]),
@@ -463,4 +463,4 @@ def test_2315_trim_collection_list(self):
         self.assertEqual(self.__get_object_as_tuple(array_obj), [])
 
 if __name__ == "__main__":
-    base.run_test_cases()
+    test_env.run_test_cases()