Refactor numbits into their own files

2 files changed, 37 insertions, 30 deletions

diff --git a/tests/test_data.py b/tests/test_data.py
index ad752d65..ff97b330 100644
--- a/tests/test_data.py
+++ b/tests/test_data.py
@@ -6,7 +6,6 @@
 import glob
 import os
 import os.path
-import random
 import re
 import sqlite3
 import threading
@@ -18,7 +17,6 @@ from coverage.data import add_data_to_hash, line_counts
 from coverage.debug import DebugControlString
 from coverage.files import PathAliases, canonical_filename
 from coverage.misc import CoverageException
-from coverage.sqldata import nums_to_bitmap, bitmap_to_nums, merge_bitmaps
 
 from tests.coveragetest import CoverageTest
 
@@ -835,31 +833,3 @@ class DumpsLoadsTest(DataTestHelpers, CoverageTest):
             )
         with self.assertRaisesRegex(CoverageException, msg):
             covdata.loads(bad_data)
-
-
-class BitmapOpTest(CoverageTest):
-    """Tests of the bitmap operations in sqldata.py."""
-
-    run_in_temp_dir = False
-
-    def numbers(self, r):
-        """Produce a list of numbers from a Random object."""
-        return list(set(r.randint(1, 1000) for _ in range(r.randint(100, 200))))
-
-    def test_conversion(self):
-        r = random.Random(1792)
-        for _ in range(10):
-            nums = self.numbers(r)
-            bitmap = nums_to_bitmap(nums)
-            self.assertEqual(sorted(bitmap_to_nums(bitmap)), sorted(nums))
-
-    def test_merging(self):
-        r = random.Random(314159)
-        for _ in range(10):
-            nums1 = self.numbers(r)
-            nums2 = self.numbers(r)
-            merged = bitmap_to_nums(merge_bitmaps(nums_to_bitmap(nums1), nums_to_bitmap(nums2)))
-            all_nums = set()
-            all_nums.update(nums1)
-            all_nums.update(nums2)
-            self.assertEqual(sorted(all_nums), sorted(merged))
diff --git a/tests/test_numbits.py b/tests/test_numbits.py
new file mode 100644
index 00000000..b54f65df
--- /dev/null
+++ b/tests/test_numbits.py
@@ -0,0 +1,37 @@
+# Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0
+# For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt
+
+"""Tests for coverage.numbits"""
+
+import random
+
+from coverage.numbits import nums_to_numbits, numbits_to_nums, merge_numbits
+
+from tests.coveragetest import CoverageTest
+
+class NumbitsOpTest(CoverageTest):
+    """Tests of the numbits operations in numbits.py."""
+
+    run_in_temp_dir = False
+
+    def numbers(self, r):
+        """Produce a list of numbers from a Random object."""
+        return list(set(r.randint(1, 1000) for _ in range(r.randint(100, 200))))
+
+    def test_conversion(self):
+        r = random.Random(1792)
+        for _ in range(10):
+            nums = self.numbers(r)
+            numbits = nums_to_numbits(nums)
+            self.assertEqual(sorted(numbits_to_nums(numbits)), sorted(nums))
+
+    def test_merging(self):
+        r = random.Random(314159)
+        for _ in range(10):
+            nums1 = self.numbers(r)
+            nums2 = self.numbers(r)
+            merged = numbits_to_nums(merge_numbits(nums_to_numbits(nums1), nums_to_numbits(nums2)))
+            all_nums = set()
+            all_nums.update(nums1)
+            all_nums.update(nums2)
+            self.assertEqual(sorted(all_nums), sorted(merged))