Skip to content

Commit

Permalink
test: convert some unittest based tests to pytest (#2075)
Browse files Browse the repository at this point in the history
Fairly straight forward conversion, converted one skip to an xfail
though with an explanation of what is going wrong.
  • Loading branch information
aucampia authored Aug 7, 2022
1 parent 9f64823 commit 131d9e6
Show file tree
Hide file tree
Showing 6 changed files with 78 additions and 93 deletions.
27 changes: 11 additions & 16 deletions test/test_literal/test_hex_binary.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
# -*- coding: utf-8 -*-

import binascii
import unittest

from rdflib import XSD, Literal


class HexBinaryTestCase(unittest.TestCase):
class TestHexBinaryCase:
def test_int(self):
self._test_integer(5)
self._test_integer(3452)
Expand All @@ -20,30 +19,26 @@ def _test_integer(self, i):

l = Literal(hex_i, datatype=XSD.hexBinary)
bin_i = l.toPython()
self.assertEqual(int(binascii.hexlify(bin_i), 16), i)
assert int(binascii.hexlify(bin_i), 16) == i

self.assertEqual(str(l), hex_i)
self.assertEqual(int(hex_i, 16), i)
self.assertEqual(int(l, 16), i)
self.assertEqual(int(str(l), 16), i)
assert str(l) == hex_i
assert int(hex_i, 16) == i
assert int(l, 16) == i
assert int(str(l), 16) == i

def test_unicode(self):
str1 = "Test utf-8 string éàë"
# u hexstring
hex_str1 = binascii.hexlify(str1.encode("utf-8")).decode()
l1 = Literal(hex_str1, datatype=XSD.hexBinary)
b_str1 = l1.toPython()
self.assertEqual(b_str1.decode("utf-8"), str1)
self.assertEqual(str(l1), hex_str1)
assert b_str1.decode("utf-8") == str1
assert str(l1) == hex_str1

# b hexstring
hex_str1b = binascii.hexlify(str1.encode("utf-8"))
l1b = Literal(hex_str1b, datatype=XSD.hexBinary)
b_str1b = l1b.toPython()
self.assertEqual(b_str1, b_str1b)
self.assertEqual(b_str1b.decode("utf-8"), str1)
self.assertEqual(str(l1b), hex_str1)


if __name__ == "__main__":
unittest.main()
assert b_str1 == b_str1b
assert b_str1b.decode("utf-8") == str1
assert str(l1b) == hex_str1
33 changes: 13 additions & 20 deletions test/test_literal/test_uriref_literal_comparison.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import unittest

from rdflib.graph import Graph
from rdflib.namespace import RDF
from rdflib.plugins.parsers.rdfxml import CORE_SYNTAX_TERMS
Expand All @@ -26,51 +24,46 @@
"""


class IdentifierEquality(unittest.TestCase):
def setUp(self):
class TestIdentifierEquality:
def setup_method(self):
self.uriref = URIRef("http://example.org/")
self.bnode = BNode()
self.literal = Literal("http://example.org/")
self.python_literal = "http://example.org/"
self.python_literal_2 = "foo"

def testA(self):
self.assertEqual(self.uriref == self.literal, False)
assert self.uriref != self.literal

def testB(self):
self.assertEqual(self.literal == self.uriref, False)
assert self.literal != self.uriref

def testC(self):
self.assertEqual(self.uriref == self.python_literal, False)
assert self.uriref != self.python_literal

def testD(self):
self.assertEqual(self.python_literal == self.uriref, False)
assert self.python_literal != self.uriref

def testE(self):
self.assertEqual(self.literal == self.python_literal, False)
assert self.literal != self.python_literal

def testE2(self):
self.assertTrue(self.literal.eq(self.python_literal), True)
assert self.literal.eq(self.python_literal)

def testF(self):
self.assertEqual(self.python_literal == self.literal, False)
assert self.python_literal != self.literal

def testG(self):
self.assertEqual("foo" in CORE_SYNTAX_TERMS, False)
assert "foo" not in CORE_SYNTAX_TERMS

def testH(self):
self.assertEqual(
assert (
URIRef("http://www.w3.org/1999/02/22-rdf-syntax-ns#RDF")
in CORE_SYNTAX_TERMS,
True,
in CORE_SYNTAX_TERMS
)

def testI(self):
g = Graph()
g.add((self.uriref, RDF.value, self.literal))
g.add((self.uriref, RDF.value, self.uriref))
self.assertEqual(len(g), 2)


if __name__ == "__main__":
unittest.main()
assert len(g) == 2
9 changes: 2 additions & 7 deletions test/test_misc/test_conventions.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import os.path
import pkgutil
import unittest

import rdflib

Expand All @@ -11,7 +10,7 @@
"""


class A(unittest.TestCase):
class TestA:
def module_names(self, path=None, names=None, parent=""):

skip_as_ignorably_private = ["embeddedRDF", "OpenID", "DublinCore", "RDFVOC"]
Expand Down Expand Up @@ -45,8 +44,4 @@ def module_names(self, path=None, names=None, parent=""):

def test_module_names(self):
names = self.module_names()
self.assertTrue(names == set(), "module names '%s' are not lower case" % names)


if __name__ == "__main__":
unittest.main()
assert names == set(), "module names '%s' are not lower case" % names
8 changes: 1 addition & 7 deletions test/test_misc/test_events.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import unittest

from rdflib import events


Expand Down Expand Up @@ -52,7 +50,7 @@ def __contains__(self, key):
has_key = __contains__


class EventTestCase(unittest.TestCase):
class TestEvent:
def testEvents(self):
c1 = Cache()
c2 = Cache()
Expand All @@ -64,7 +62,3 @@ def testEvents(self):
del c3["bob"]
assert ("bob" in c1) == False
assert ("bob" in c2) == False


if __name__ == "__main__":
unittest.main()
Loading

0 comments on commit 131d9e6

Please sign in to comment.