Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

do not use as_str, as_bytes in tests #563

Merged
merged 1 commit into from
Aug 12, 2024
Merged

do not use as_str, as_bytes in tests #563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 0 additions & 17 deletions vertica_python/tests/common/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
import getpass
from configparser import ConfigParser

from ...compat import as_str, as_bytes
from ...vertica.log import VerticaLogging


Expand Down Expand Up @@ -128,22 +127,6 @@ def tearDown(self):
self.logger.info('\n'+'-'*10+' End '+self.__class__.__name__+"."+self._testMethodName+' '+'-'*10+'\n')

# Common assertions
def assertStrEqual(self, first, second, msg=None):
first_str = as_str(first)
second_str = as_str(second)
self.assertEqual(first=first_str, second=second_str, msg=msg)

def assertBytesEqual(self, first, second, msg=None):
first_bytes = as_bytes(first)
second_bytes = as_bytes(second)
self.assertEqual(first=first_bytes, second=second_bytes, msg=msg)

def assertResultEqual(self, value, result, msg=None):
if isinstance(value, str):
self.assertStrEqual(first=value, second=result, msg=msg)
else:
self.assertEqual(first=value, second=result, msg=msg)

def assertListOfListsEqual(self, list1, list2, msg=None):
self.assertEqual(len(list1), len(list2), msg=msg)
for l1, l2 in zip(list1, list2):
Expand Down
12 changes: 6 additions & 6 deletions vertica_python/tests/integration_tests/test_unicode.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def test_unicode_query(self):
cur.execute(query)
res = cur.fetchone()

self.assertResultEqual(value, res[0])
self.assertEqual(value, res[0])

def test_unicode_list_parameter(self):
values = ['\u00f1', 'foo', 3]
Expand All @@ -60,7 +60,7 @@ def test_unicode_list_parameter(self):
results = cur.fetchone()

for val, res in zip(values, results):
self.assertResultEqual(val, res)
self.assertEqual(val, res)

def test_unicode_named_parameter_binding(self):
values = ['\u16b1', 'foo', 3]
Expand All @@ -74,7 +74,7 @@ def test_unicode_named_parameter_binding(self):
results = cur.fetchone()

for val, res in zip(values, results):
self.assertResultEqual(val, res)
self.assertEqual(val, res)

def test_string_query(self):
value = 'test'
Expand All @@ -97,7 +97,7 @@ def test_string_named_parameter_binding(self):
cur.execute(query, {key: value})
res = cur.fetchone()

self.assertResultEqual(value, res[0])
self.assertEqual(value, res[0])

# unit test for issue #160
def test_null_named_parameter_binding(self):
Expand All @@ -110,7 +110,7 @@ def test_null_named_parameter_binding(self):
cur.execute(query, {key: value})
res = cur.fetchone()

self.assertResultEqual(value, res[0])
self.assertEqual(value, res[0])

# unit test for issue #160
def test_null_list_parameter(self):
Expand All @@ -123,4 +123,4 @@ def test_null_list_parameter(self):
results = cur.fetchone()

for val, res in zip(values, results):
self.assertResultEqual(val, res)
self.assertEqual(val, res)