refactor: unittest2pytest -w tests

One step of moving to pure pytest tests.

1 files changed, 12 insertions, 14 deletions

diff --git a/tests/test_numbits.py b/tests/test_numbits.py
index 232d48d3..8216b628 100644
--- a/tests/test_numbits.py
+++ b/tests/test_numbits.py
@@ -47,7 +47,7 @@ class NumbitsOpTest(CoverageTest):
         numbits = nums_to_numbits(nums)
         good_numbits(numbits)
         nums2 = numbits_to_nums(numbits)
-        self.assertEqual(nums, set(nums2))
+        assert nums == set(nums2)
 
     @given(line_number_sets, line_number_sets)
     @settings(default_settings)
@@ -59,7 +59,7 @@ class NumbitsOpTest(CoverageTest):
         nbu = numbits_union(nb1, nb2)
         good_numbits(nbu)
         union = numbits_to_nums(nbu)
-        self.assertEqual(nums1 | nums2, set(union))
+        assert nums1 | nums2 == set(union)
 
     @given(line_number_sets, line_number_sets)
     @settings(default_settings)
@@ -71,7 +71,7 @@ class NumbitsOpTest(CoverageTest):
         nbi = numbits_intersection(nb1, nb2)
         good_numbits(nbi)
         intersection = numbits_to_nums(nbi)
-        self.assertEqual(nums1 & nums2, set(intersection))
+        assert nums1 & nums2 == set(intersection)
 
     @given(line_number_sets, line_number_sets)
     @settings(default_settings)
@@ -82,7 +82,7 @@ class NumbitsOpTest(CoverageTest):
         good_numbits(nb2)
         inter = numbits_any_intersection(nb1, nb2)
         expect = bool(nums1 & nums2)
-        self.assertEqual(expect, bool(inter))
+        assert expect == bool(inter)
 
     @given(line_numbers, line_number_sets)
     @settings(default_settings)
@@ -91,7 +91,7 @@ class NumbitsOpTest(CoverageTest):
         numbits = nums_to_numbits(nums)
         good_numbits(numbits)
         is_in = num_in_numbits(num, numbits)
-        self.assertEqual(num in nums, is_in)
+        assert (num in nums) == is_in
 
 
 class NumbitsSqliteFunctionTest(CoverageTest):
@@ -122,11 +122,9 @@ class NumbitsSqliteFunctionTest(CoverageTest):
                 ")"
         )
         answer = numbits_to_nums(list(res)[0][0])
-        self.assertEqual(
-            [7, 9, 14, 18, 21, 27, 28, 35, 36, 42, 45, 49,
-                54, 56, 63, 70, 72, 77, 81, 84, 90, 91, 98, 99],
+        assert [7, 9, 14, 18, 21, 27, 28, 35, 36, 42, 45, 49,
+                54, 56, 63, 70, 72, 77, 81, 84, 90, 91, 98, 99] == \
             answer
-        )
 
     def test_numbits_intersection(self):
         res = self.cursor.execute(
@@ -136,7 +134,7 @@ class NumbitsSqliteFunctionTest(CoverageTest):
                 ")"
         )
         answer = numbits_to_nums(list(res)[0][0])
-        self.assertEqual([63], answer)
+        assert [63] == answer
 
     def test_numbits_any_intersection(self):
         res = self.cursor.execute(
@@ -144,20 +142,20 @@ class NumbitsSqliteFunctionTest(CoverageTest):
             (nums_to_numbits([1, 2, 3]), nums_to_numbits([3, 4, 5]))
         )
         answer = [any_inter for (any_inter,) in res]
-        self.assertEqual([1], answer)
+        assert [1] == answer
 
         res = self.cursor.execute(
             "select numbits_any_intersection(?, ?)",
             (nums_to_numbits([1, 2, 3]), nums_to_numbits([7, 8, 9]))
         )
         answer = [any_inter for (any_inter,) in res]
-        self.assertEqual([0], answer)
+        assert [0] == answer
 
     def test_num_in_numbits(self):
         res = self.cursor.execute("select id, num_in_numbits(12, numbits) from data order by id")
         answer = [is_in for (id, is_in) in res]
-        self.assertEqual([1, 1, 1, 1, 0, 1, 0, 0, 0, 0], answer)
+        assert [1, 1, 1, 1, 0, 1, 0, 0, 0, 0] == answer
 
     def test_numbits_to_nums(self):
         res = self.cursor.execute("select numbits_to_nums(?)", [nums_to_numbits([1, 2, 3])])
-        self.assertEqual([1, 2, 3], json.loads(res.fetchone()[0]))
+        assert [1, 2, 3] == json.loads(res.fetchone()[0])