Apple-2-Tools/atrcopy
1
0
Fork 0
mirror of https://github.com/robmcmullen/atrcopy.git synced 2025-02-18 03:30:39 +00:00
Code Issues Projects Releases Wiki Activity

Changed file comparisons to numpy array_equals

Browse Source
This commit is contained in:
Rob McMullen 2017-02-23 22:15:20 -08:00
parent 2558a51826
commit 7afa2a0e92
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
test/test_add_file.py
View File

@ -24,16 +24,16 @@ class BaseFilesystemModifyTest(object):
filename = "%s%d.BIN" % (prefix, count) filename = "%s%d.BIN" % (prefix, count)
self.image.write_file(filename, None, data) self.image.write_file(filename, None, data)
assert len(self.image.files) == orig_num_files + count assert len(self.image.files) == orig_num_files + count
data2 = self.image.find_file(filename) data2 = np.fromstring(self.image.find_file(filename), dtype=np.uint8)
assert data.tostring() == data2 assert np.array_equal(data, data2[0:len(data)])
count += 1 count += 1
# loop over them again to make sure data wasn't overwritten # loop over them again to make sure data wasn't overwritten
count = 1 count = 1
for data in entries: for data in entries:
filename = "%s%d.BIN" % (prefix, count) filename = "%s%d.BIN" % (prefix, count)
data2 = self.image.find_file(filename) data2 = np.fromstring(self.image.find_file(filename), dtype=np.uint8)
assert data.tostring() == data2 assert np.array_equal(data, data2[0:len(data)])
count += 1 count += 1
filenames.append(filename) filenames.append(filename)
@ -49,8 +49,8 @@ class BaseFilesystemModifyTest(object):
self.image.write_file("TEST.XEX", None, data) self.image.write_file("TEST.XEX", None, data)
assert len(self.image.files) == self.num_files_in_sample + 1 assert len(self.image.files) == self.num_files_in_sample + 1
data2 = self.image.find_file("TEST.XEX") data2 = np.fromstring(self.image.find_file("TEST.XEX"), dtype=np.uint8)
assert data.tostring() == data2 assert np.array_equal(data, data2[0:len(data)])
def test_50k(self): def test_50k(self):
assert len(self.image.files) == self.num_files_in_sample assert len(self.image.files) == self.num_files_in_sample
@ -118,10 +118,10 @@ class BaseFilesystemModifyTest(object):
filename = self.check_entries(entries2, "SECOND", save="test_delete.atr") filename = self.check_entries(entries2, "SECOND", save="test_delete.atr")
assert len(self.image.files) == self.num_files_in_sample + 9 assert len(self.image.files) == self.num_files_in_sample + 9
# class TestAtariDosSDImage(BaseFilesystemModifyTest): class TestAtariDosSDImage(BaseFilesystemModifyTest):
# diskimage_type = AtariDosDiskImage diskimage_type = AtariDosDiskImage
# sample_file = "../test_data/dos_sd_test1.atr" sample_file = "../test_data/dos_sd_test1.atr"
# num_files_in_sample = 5 num_files_in_sample = 5
class TestDos33Image(BaseFilesystemModifyTest): class TestDos33Image(BaseFilesystemModifyTest):
diskimage_type = Dos33DiskImage diskimage_type = Dos33DiskImage