X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Ffs%2Fbattfs_test.c;h=642e6d6423b179c60ee777f76a53c27cbc50b279;hb=6ea89e0647ea241ed2393a53cccb0d8ba01be48e;hp=8ab33a4885a3be472641615aeeb1b06dca7d8f74;hpb=fb50d9a9ef1afffd6ababf97350b98dd5fb066ec;p=bertos.git

diff --git a/bertos/fs/battfs_test.c b/bertos/fs/battfs_test.c
index 8ab33a48..642e6d64 100644
--- a/bertos/fs/battfs_test.c
+++ b/bertos/fs/battfs_test.c
@@ -50,26 +50,14 @@
 
 #if UNIT_TEST
 
-FILE *fp;
 const char test_filename[]="battfs_disk.bin";
 
 static uint8_t page_buffer[PAGE_SIZE];
 
-static bool disk_open(struct BattFsSuper *d)
-{
-	fp = fopen(test_filename, "r+b");
-	ASSERT(fp);
-	fseek(fp, 0, SEEK_END);
-	d->page_size = PAGE_SIZE;
-	d->page_count = ftell(fp) / d->page_size;
-	d->page_array = malloc(d->page_count * sizeof(pgcnt_t));
-	//TRACEMSG("page_size:%d, page_count:%d\n", d->page_size, d->page_count);
-	return (fp && d->page_array);
-}
-
 static size_t disk_page_read(struct BattFsSuper *d, pgcnt_t page, pgaddr_t addr, void *buf, size_t size)
 {
 	//TRACEMSG("page:%d, addr:%d, size:%d", page, addr, size);
+	FILE *fp = (FILE *)d->disk_ctx;
 	fseek(fp, page * d->page_size + addr, SEEK_SET);
 	return fread(buf, 1, size, fp);
 }
@@ -94,6 +82,7 @@ static size_t disk_buffer_read(struct BattFsSuper *d, pgaddr_t addr, void *buf,
 
 static bool disk_page_load(struct BattFsSuper *d, pgcnt_t page)
 {
+	FILE *fp = (FILE *)d->disk_ctx;
 	//TRACEMSG("page:%d", page);
 	fseek(fp, page * d->page_size, SEEK_SET);
 	return fread(page_buffer, 1, d->page_size, fp) == d->page_size;
@@ -101,6 +90,7 @@ static bool disk_page_load(struct BattFsSuper *d, pgcnt_t page)
 
 static bool disk_page_save(struct BattFsSuper *d, pgcnt_t page)
 {
+	FILE *fp = (FILE *)d->disk_ctx;
 	//TRACEMSG("page:%d", page);
 	fseek(fp, page * d->page_size, SEEK_SET);
 	return fwrite(page_buffer, 1, d->page_size, fp) == d->page_size;
@@ -108,6 +98,7 @@ static bool disk_page_save(struct BattFsSuper *d, pgcnt_t page)
 
 static bool disk_page_erase(struct BattFsSuper *d, pgcnt_t page)
 {
+	FILE *fp = (FILE *)d->disk_ctx;
 	//TRACEMSG("page:%d", page);
 	fseek(fp, page * d->page_size, SEEK_SET);
 
@@ -119,14 +110,38 @@ static bool disk_page_erase(struct BattFsSuper *d, pgcnt_t page)
 
 static bool disk_close(struct BattFsSuper *d)
 {
+	FILE *fp = (FILE *)d->disk_ctx;
 	//TRACE;
 	free(d->page_array);
 	return (fclose(fp) != EOF);
 }
 
+static bool disk_open(struct BattFsSuper *d)
+{
+	d->read = disk_page_read;
+	d->load = disk_page_load;
+	d->bufferWrite = disk_buffer_write;
+	d->bufferRead = disk_buffer_read;
+	d->save = disk_page_save;
+	d->erase = disk_page_erase;
+	d->close = disk_close;
+
+	FILE *fp = fopen(test_filename, "r+b");
+	ASSERT(fp);
+	d->disk_ctx = fp;
+	fseek(fp, 0, SEEK_END);
+	d->page_size = PAGE_SIZE;
+	d->page_count = ftell(fp) / d->page_size;
+	d->page_array = malloc(d->page_count * sizeof(pgcnt_t));
+	//TRACEMSG("page_size:%d, page_count:%d\n", d->page_size, d->page_count);
+	return (fp && d->page_array);
+}
+
 static void testCheck(BattFsSuper *disk, pgcnt_t *reference)
 {
-	ASSERT(battfs_init(disk));
+	ASSERT(disk_open(disk));
+	ASSERT(battfs_mount(disk));
+	ASSERT(battfs_fsck(disk));
 
 	for (int i = 0; i < disk->page_count; i++)
 	{
@@ -148,11 +163,13 @@ static void testCheck(BattFsSuper *disk, pgcnt_t *reference)
 				kprintf("%04d ", reference[i]);
 			}
 			kputchar('\n');
-			battfs_close(disk);
+			battfs_umount(disk);
 			exit(2);
 		}
 	}
-	battfs_close(disk);
+
+	ASSERT(battfs_fsck(disk));
+	ASSERT(battfs_umount(disk));
 }
 
 static void diskNew(BattFsSuper *disk)
@@ -178,11 +195,11 @@ static void disk1File(BattFsSuper *disk)
 	TRACEMSG("2: disk full with 1 contiguos file\n");
 
 
-	fp = fopen(test_filename, "w+");
+	FILE *fp = fopen(test_filename, "w+");
 
 	for (int i = 0; i < PAGE_COUNT; i++)
 	{
-		battfs_writeTestBlock(disk, i, 0, 0, 0, i);
+		battfs_writeTestBlock(disk, i, 0, 0, disk->data_size, i);
 		ref[i] = i;
 	}
 	fclose(fp);
@@ -198,11 +215,11 @@ static void diskHalfFile(BattFsSuper *disk)
 	TRACEMSG("3: disk half full with 1 contiguos file, rest unformatted\n");
 
 
-	fp = fopen(test_filename, "w+");
+	FILE *fp = fopen(test_filename, "w+");
 
 	for (int i = 0; i < PAGE_COUNT / 2; i++)
 	{
-		battfs_writeTestBlock(disk, i, 0, 0, 0, i);
+		battfs_writeTestBlock(disk, i, 0, 0, disk->data_size, i);
 		ref[i] = i;
 	}
 	fseek(fp, FILE_SIZE / 2, SEEK_SET);
@@ -227,11 +244,11 @@ static void oldSeq1(BattFsSuper *disk)
 	TRACEMSG("6: 1 file with 1 old seq num, 1 free block\n");
 
 
-	fp = fopen(test_filename, "w+");
+	FILE *fp = fopen(test_filename, "w+");
 	// page, inode, seq, fill, pgoff
-	battfs_writeTestBlock(disk, 0, 0, 0, 0, 0);
-	battfs_writeTestBlock(disk, 1, 0, 0, 0, 1);
-	battfs_writeTestBlock(disk, 2, 0, 1, 0, 1);
+	battfs_writeTestBlock(disk, 0, 0, 0, disk->data_size, 0);
+	battfs_writeTestBlock(disk, 1, 0, 0, disk->data_size, 1);
+	battfs_writeTestBlock(disk, 2, 0, 1, disk->data_size, 1);
 	disk->erase(disk, 3);
 
 
@@ -251,11 +268,11 @@ static void oldSeq2(BattFsSuper *disk)
 	TRACEMSG("7: 1 file with 1 old seq num, 1 free block\n");
 
 
-	fp = fopen(test_filename, "w+");
+	FILE *fp = fopen(test_filename, "w+");
 	// page, inode, seq, fill, pgoff
-	battfs_writeTestBlock(disk, 0, 0, 0, 0, 0);
-	battfs_writeTestBlock(disk, 1, 0, 1, 0, 1);
-	battfs_writeTestBlock(disk, 2, 0, 0, 0, 1);
+	battfs_writeTestBlock(disk, 0, 0, 0, disk->data_size, 0);
+	battfs_writeTestBlock(disk, 1, 0, 1, disk->data_size, 1);
+	battfs_writeTestBlock(disk, 2, 0, 0, disk->data_size, 1);
 	disk->erase(disk, 3);
 
 	fclose(fp);
@@ -274,13 +291,13 @@ static void oldSeq3(BattFsSuper *disk)
 	TRACEMSG("8: 1 file with 1 old seq num, 1 free block\n");
 
 
-	fp = fopen(test_filename, "w+");
+	FILE *fp = fopen(test_filename, "w+");
 
 	// page, inode, seq, fill, pgoff
 	disk->erase(disk, 0);
-	battfs_writeTestBlock(disk, 1, 0, 0, 0, 0);
-	battfs_writeTestBlock(disk, 2, 0, 1, 0, 1);
-	battfs_writeTestBlock(disk, 3, 0, 0, 0, 1);
+	battfs_writeTestBlock(disk, 1, 0, 0, disk->data_size, 0);
+	battfs_writeTestBlock(disk, 2, 0, 1, disk->data_size, 1);
+	battfs_writeTestBlock(disk, 3, 0, 0, disk->data_size, 1);
 
 
 	fclose(fp);
@@ -299,17 +316,17 @@ static void oldSeq2File(BattFsSuper *disk)
 	TRACEMSG("9: 2 file with old seq num, 2 free block\n");
 
 
-	fp = fopen(test_filename, "w+");
+	FILE *fp = fopen(test_filename, "w+");
 
 	// page, inode, seq, fill, pgoff
 	disk->erase(disk, 0);
-	battfs_writeTestBlock(disk, 1, 0, 0, 0, 0);
-	battfs_writeTestBlock(disk, 2, 0, 3, 0, 1);
-	battfs_writeTestBlock(disk, 3, 0, 0, 0, 1);
+	battfs_writeTestBlock(disk, 1, 0, 0, disk->data_size, 0);
+	battfs_writeTestBlock(disk, 2, 0, 3, disk->data_size, 1);
+	battfs_writeTestBlock(disk, 3, 0, 0, disk->data_size, 1);
 	disk->erase(disk, 4);
-	battfs_writeTestBlock(disk, 5, 4, 0, 0, 0);
-	battfs_writeTestBlock(disk, 6, 4, 1, 0, 1);
-	battfs_writeTestBlock(disk, 7, 4, 0, 0, 1);
+	battfs_writeTestBlock(disk, 5, 4, 0, disk->data_size, 0);
+	battfs_writeTestBlock(disk, 6, 4, 1, disk->data_size, 1);
+	battfs_writeTestBlock(disk, 7, 4, 0, disk->data_size, 1);
 
 
 	fclose(fp);
@@ -332,7 +349,7 @@ static void openFile(BattFsSuper *disk)
 	BattFs fd2;
 	TRACEMSG("10: open file test, inode 0 and inode 4\n");
 
-	fp = fopen(test_filename, "w+");
+	FILE *fp = fopen(test_filename, "w+");
 
 	int PAGE_FILL = PAGE_SIZE - BATTFS_HEADER_LEN;
 	inode_t INODE = 0;
@@ -352,7 +369,9 @@ static void openFile(BattFsSuper *disk)
 
 	fclose(fp);
 
-	ASSERT(battfs_init(disk));
+	ASSERT(disk_open(disk));
+	ASSERT(battfs_mount(disk));
+	ASSERT(battfs_fsck(disk));
 	ASSERT(!battfs_fileExists(disk, INEXISTENT_INODE));
 
 	ASSERT(battfs_fileExists(disk, INODE));
@@ -385,9 +404,12 @@ static void openFile(BattFsSuper *disk)
 	ASSERT(LIST_HEAD(&disk->file_opened_list)->succ == &fd2.link);
 
 	ASSERT(kfile_close(&fd1.fd) == 0);
+	ASSERT(kfile_error(&fd1.fd) == 0);
 	ASSERT(kfile_close(&fd2.fd) == 0);
+	ASSERT(kfile_error(&fd2.fd) == 0);
 	ASSERT(LIST_EMPTY(&disk->file_opened_list));
-	ASSERT(battfs_close(disk));
+	ASSERT(battfs_fsck(disk));
+	ASSERT(battfs_umount(disk));
 
 	TRACEMSG("10: passed\n");
 }
@@ -399,7 +421,7 @@ static void readFile(BattFsSuper *disk)
 
 	TRACEMSG("11: read file test\n");
 
-	fp = fopen(test_filename, "w+");
+	FILE *fp = fopen(test_filename, "w+");
 
 	unsigned int PAGE_FILL = PAGE_SIZE - BATTFS_HEADER_LEN;
 	inode_t INODE = 0;
@@ -417,7 +439,9 @@ static void readFile(BattFsSuper *disk)
 
 	fclose(fp);
 
-	ASSERT(battfs_init(disk));
+	ASSERT(disk_open(disk));
+	ASSERT(battfs_mount(disk));
+	ASSERT(battfs_fsck(disk));
 	ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
 	ASSERT(kfile_read(&fd1.fd, buf, sizeof(buf)) == sizeof(buf));
 	ASSERT(fd1.fd.seek_pos == sizeof(buf));
@@ -425,7 +449,9 @@ static void readFile(BattFsSuper *disk)
 		ASSERT(buf[i] == 0xff);
 
 	ASSERT(kfile_close(&fd1.fd) == 0);
-	ASSERT(battfs_close(disk));
+	ASSERT(kfile_error(&fd1.fd) == 0);
+	ASSERT(battfs_fsck(disk));
+	ASSERT(battfs_umount(disk));
 
 	TRACEMSG("11: passed\n");
 }
@@ -436,7 +462,7 @@ static void readAcross(BattFsSuper *disk)
 
 	TRACEMSG("12: read file test across page boundary and seek test\n");
 
-	fp = fopen(test_filename, "w+");
+	FILE *fp = fopen(test_filename, "w+");
 
 	const unsigned int PAGE_FILL = PAGE_SIZE - BATTFS_HEADER_LEN;
 	inode_t INODE = 0;
@@ -454,7 +480,9 @@ static void readAcross(BattFsSuper *disk)
 
 	fclose(fp);
 
-	ASSERT(battfs_init(disk));
+	ASSERT(disk_open(disk));
+	ASSERT(battfs_mount(disk));
+	ASSERT(battfs_fsck(disk));
 	ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
 
 	ASSERT(kfile_read(&fd1.fd, buf, sizeof(buf)) == sizeof(buf));
@@ -484,7 +512,9 @@ static void readAcross(BattFsSuper *disk)
 	ASSERT(fd1.fd.seek_pos = (kfile_off_t)fd1.fd.size);
 
 	ASSERT(kfile_close(&fd1.fd) == 0);
-	ASSERT(battfs_close(disk));
+	ASSERT(kfile_error(&fd1.fd) == 0);
+	ASSERT(battfs_fsck(disk));
+	ASSERT(battfs_umount(disk));
 
 	TRACEMSG("12: passed\n");
 }
@@ -497,7 +527,7 @@ static void writeFile(BattFsSuper *disk)
 
 	TRACEMSG("13: write file test\n");
 
-	fp = fopen(test_filename, "w+");
+	FILE *fp = fopen(test_filename, "w+");
 
 	unsigned int PAGE_FILL = PAGE_SIZE - BATTFS_HEADER_LEN;
 	inode_t INODE = 0;
@@ -518,7 +548,9 @@ static void writeFile(BattFsSuper *disk)
 	for (size_t i = 0; i < sizeof(buf); i++)
 		buf[i] = i;
 
-	ASSERT(battfs_init(disk));
+	ASSERT(disk_open(disk));
+	ASSERT(battfs_mount(disk));
+	ASSERT(battfs_fsck(disk));
 	ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
 	ASSERT(kfile_write(&fd1.fd, buf, sizeof(buf)) == sizeof(buf));
 	ASSERT(fd1.fd.seek_pos == sizeof(buf));
@@ -531,7 +563,9 @@ static void writeFile(BattFsSuper *disk)
 		ASSERT(buf[i] == i);
 
 	ASSERT(kfile_close(&fd1.fd) == 0);
-	ASSERT(battfs_close(disk));
+	ASSERT(kfile_error(&fd1.fd) == 0);
+	ASSERT(battfs_fsck(disk));
+	ASSERT(battfs_umount(disk));
 
 	TRACEMSG("13: passed\n");
 }
@@ -542,7 +576,7 @@ static void writeAcross(BattFsSuper *disk)
 
 	TRACEMSG("14: write file test across page boundary and seek test\n");
 
-	fp = fopen(test_filename, "w+");
+	FILE *fp = fopen(test_filename, "w+");
 
 	const unsigned int PAGE_FILL = PAGE_SIZE - BATTFS_HEADER_LEN;
 	inode_t INODE = 0;
@@ -560,7 +594,9 @@ static void writeAcross(BattFsSuper *disk)
 
 	fclose(fp);
 
-	ASSERT(battfs_init(disk));
+	ASSERT(disk_open(disk));
+	ASSERT(battfs_mount(disk));
+	ASSERT(battfs_fsck(disk));
 	ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
 
 	uint8_t val = 0;
@@ -601,7 +637,9 @@ static void writeAcross(BattFsSuper *disk)
 	ASSERT(fd1.fd.seek_pos == (kfile_off_t)sizeof(buf) * 3);
 
 	ASSERT(kfile_close(&fd1.fd) == 0);
-	ASSERT(battfs_close(disk));
+	ASSERT(kfile_error(&fd1.fd) == 0);
+	ASSERT(battfs_fsck(disk));
+	ASSERT(battfs_umount(disk));
 
 	TRACEMSG("14: passed\n");
 }
@@ -620,7 +658,9 @@ static void createFile(BattFsSuper *disk)
 	inode_t INODE = 0;
 	unsigned int MODE = BATTFS_CREATE;
 
-	ASSERT(battfs_init(disk));
+	ASSERT(disk_open(disk));
+	ASSERT(battfs_mount(disk));
+	ASSERT(battfs_fsck(disk));
 	ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
 	for (int i = 0; i < FILE_SIZE / 2; i++)
 		ASSERT(kfile_putc(i, &fd1.fd) != EOF);
@@ -628,9 +668,13 @@ static void createFile(BattFsSuper *disk)
 	ASSERT(fd1.fd.seek_pos == FILE_SIZE / 2);
 	ASSERT(fd1.fd.size == FILE_SIZE / 2);
 	ASSERT(kfile_close(&fd1.fd) == 0);
-	ASSERT(battfs_close(disk));
+	ASSERT(kfile_error(&fd1.fd) == 0);
+	ASSERT(battfs_fsck(disk));
+	ASSERT(battfs_umount(disk));
 
-	ASSERT(battfs_init(disk));
+	ASSERT(disk_open(disk));
+	ASSERT(battfs_mount(disk));
+	ASSERT(battfs_fsck(disk));
 	ASSERT(battfs_fileopen(disk, &fd1, INODE, 0));
 	ASSERT(fd1.fd.size == FILE_SIZE / 2);
 	ASSERT(fd1.fd.seek_pos == 0);
@@ -644,7 +688,9 @@ static void createFile(BattFsSuper *disk)
 
 	ASSERT(fd1.fd.seek_pos == FILE_SIZE / 2);
 	ASSERT(kfile_close(&fd1.fd) == 0);
-	ASSERT(battfs_close(disk));
+	ASSERT(kfile_error(&fd1.fd) == 0);
+	ASSERT(battfs_fsck(disk));
+	ASSERT(battfs_umount(disk));
 
 
 	TRACEMSG("15: passed\n");
@@ -665,13 +711,15 @@ static void multipleWrite(BattFsSuper *disk)
 	unsigned int MODE = BATTFS_CREATE;
 	uint8_t buf[1000];
 
-	ASSERT(battfs_init(disk));
+	ASSERT(disk_open(disk));
+	ASSERT(battfs_mount(disk));
+	ASSERT(battfs_fsck(disk));
 	ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
 
 	int j;
 	for (j = 1; j < 1013; j++)
 	{
-		for (int i = 0; i < sizeof(buf); i++)
+		for (unsigned i = 0; i < sizeof(buf); i++)
 			buf[i] = j+i;
 
 		ASSERT(kfile_write(&fd1.fd, buf, sizeof(buf)) == sizeof(buf));
@@ -681,24 +729,30 @@ static void multipleWrite(BattFsSuper *disk)
 		memset(buf, 0, sizeof(buf));
 		ASSERT(kfile_read(&fd1.fd, buf, sizeof(buf)) == sizeof(buf));
 		ASSERT(fd1.fd.seek_pos == sizeof(buf));
-		for (int i = 0; i < sizeof(buf); i++)
+		for (unsigned i = 0; i < sizeof(buf); i++)
 			ASSERT(buf[i] == ((j+i) & 0xff));
 		ASSERT(kfile_seek(&fd1.fd, 0, KSM_SEEK_SET) == 0);
 		ASSERT(disk->free_bytes == disk->disk_size - sizeof(buf));
 	}
 	ASSERT(kfile_close(&fd1.fd) == 0);
-	ASSERT(battfs_close(disk));
+	ASSERT(kfile_error(&fd1.fd) == 0);
+	ASSERT(battfs_fsck(disk));
+	ASSERT(battfs_umount(disk));
 
-	ASSERT(battfs_init(disk));
+	ASSERT(disk_open(disk));
+	ASSERT(battfs_mount(disk));
+	ASSERT(battfs_fsck(disk));
 	ASSERT(disk->free_bytes == disk->disk_size - sizeof(buf));
 	ASSERT(battfs_fileopen(disk, &fd1, INODE, 0));
 	ASSERT(fd1.fd.size == sizeof(buf));
 	memset(buf, 0, sizeof(buf));
 	ASSERT(kfile_read(&fd1.fd, buf, sizeof(buf)) == sizeof(buf));
-	for (int i = 0; i < sizeof(buf); i++)
+	for (unsigned i = 0; i < sizeof(buf); i++)
 			ASSERT(buf[i] == ((j-1+i) & 0xff));
 	ASSERT(kfile_close(&fd1.fd) == 0);
-	ASSERT(battfs_close(disk));
+	ASSERT(kfile_error(&fd1.fd) == 0);
+	ASSERT(battfs_fsck(disk));
+	ASSERT(battfs_umount(disk));
 
 
 	TRACEMSG("16: passed\n");
@@ -719,48 +773,341 @@ static void increaseFile(BattFsSuper *disk)
 	unsigned int MODE = BATTFS_CREATE;
 	uint8_t buf[1000];
 
-	ASSERT(battfs_init(disk));
+	ASSERT(disk_open(disk));
+	ASSERT(battfs_mount(disk));
+	ASSERT(battfs_fsck(disk));
 	ASSERT(battfs_fileopen(disk, &fd1, INODE1, MODE));
 	ASSERT(battfs_fileopen(disk, &fd2, INODE2, MODE));
-	for (int i = 0; i < sizeof(buf); i++)
+	for (unsigned i = 0; i < sizeof(buf); i++)
 		ASSERT(kfile_putc(i, &fd2.fd) != EOF);
 	ASSERT(kfile_seek(&fd2.fd, 0, KSM_SEEK_SET) == 0);
 	memset(buf, 0, sizeof(buf));
 	ASSERT(kfile_read(&fd2.fd, buf, sizeof(buf)) == sizeof(buf));
 
-	for (int i = 0; i < sizeof(buf); i++)
+	for (unsigned i = 0; i < sizeof(buf); i++)
 		ASSERT(buf[i] == (i & 0xff));
 	ASSERT(kfile_seek(&fd2.fd, 0, KSM_SEEK_SET) == 0);
 
-	for (int i = 0; i < sizeof(buf); i++)
+	for (unsigned i = 0; i < sizeof(buf); i++)
 		ASSERT(kfile_putc(i, &fd1.fd) != EOF);
 
 	memset(buf, 0, sizeof(buf));
 	ASSERT(kfile_read(&fd2.fd, buf, sizeof(buf)) == sizeof(buf));
 
-	for (int i = 0; i < sizeof(buf); i++)
+	for (unsigned i = 0; i < sizeof(buf); i++)
 		ASSERT(buf[i] == (i & 0xff));
 
 	ASSERT(kfile_close(&fd1.fd) == 0);
+	ASSERT(kfile_error(&fd1.fd) == 0);
 	ASSERT(kfile_close(&fd2.fd) == 0);
-	ASSERT(battfs_close(disk));
+	ASSERT(kfile_error(&fd2.fd) == 0);
+	ASSERT(battfs_fsck(disk));
+	ASSERT(battfs_umount(disk));
 
 	TRACEMSG("17: passed\n");
 }
 
+static void readEOF(BattFsSuper *disk)
+{
+	BattFs fd1;
+	uint8_t buf[16];
+
+	TRACEMSG("18: reading over EOF test\n");
+
+	FILE *fp = fopen(test_filename, "w+");
+
+	unsigned int PAGE_FILL = PAGE_SIZE - BATTFS_HEADER_LEN;
+	inode_t INODE = 0;
+	inode_t INODE2 = 4;
+	unsigned int MODE = 0;
+
+	disk->erase(disk, 0);
+	battfs_writeTestBlock(disk, 1, INODE, 0, PAGE_FILL, 0);
+	battfs_writeTestBlock(disk, 2, INODE, 3, PAGE_FILL, 1);
+	battfs_writeTestBlock(disk, 3, INODE, 0, PAGE_FILL, 1);
+	disk->erase(disk, 4);
+	battfs_writeTestBlock(disk, 5, INODE2, 0, PAGE_FILL, 0);
+	battfs_writeTestBlock(disk, 6, INODE2, 1, PAGE_FILL, 1);
+	battfs_writeTestBlock(disk, 7, INODE2, 0, PAGE_FILL, 1);
+
+	fclose(fp);
+
+	ASSERT(disk_open(disk));
+	ASSERT(battfs_mount(disk));
+	ASSERT(battfs_fsck(disk));
+	ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
+	ASSERT(kfile_seek(&fd1.fd, fd1.fd.size + 10, SEEK_SET) == fd1.fd.size + 10);
+	ASSERT(fd1.fd.seek_pos == fd1.fd.size + 10);
+	ASSERT(kfile_read(&fd1.fd, buf, sizeof(buf)) == 0);
+
+	ASSERT(kfile_close(&fd1.fd) == 0);
+	ASSERT(kfile_error(&fd1.fd) == 0);
+	ASSERT(battfs_fsck(disk));
+	ASSERT(battfs_umount(disk));
+
+	TRACEMSG("18: passed\n");
+}
+
+static void writeEOF(BattFsSuper *disk)
+{
+	TRACEMSG("19: writing over EOF test\n");
+
+	FILE *fpt = fopen(test_filename, "w+");
+
+	for (int i = 0; i < FILE_SIZE / 5; i++)
+		fputc(0xff, fpt);
+	fclose(fpt);
+
+	BattFs fd1;
+	inode_t INODE = 0;
+	unsigned int MODE = BATTFS_CREATE;
+	uint8_t buf[FILE_SIZE / 13];
+
+	for (int i = 0; i < 2; i++)
+		buf[i] = i;
+
+	ASSERT(disk_open(disk));
+	ASSERT(battfs_mount(disk));
+	ASSERT(battfs_fsck(disk));
+	disk_size_t prev_free = disk->free_bytes;
+	ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
+	ASSERT(fd1.fd.size == 0);
+
+	ASSERT(kfile_seek(&fd1.fd, 2, KSM_SEEK_END) == 2);
+	ASSERT(kfile_write(&fd1.fd, buf, 2));
+	ASSERT(fd1.fd.seek_pos == 4);
+	ASSERT(fd1.fd.size == 4);
+	ASSERT(disk->free_bytes == prev_free - 4);
+	ASSERT(kfile_seek(&fd1.fd, 0, KSM_SEEK_SET) == 0);
+	memset(buf, 0, 2);
+	ASSERT(kfile_read(&fd1.fd, buf, 2) == 2);
+	for (int i = 0; i < 2; i++)
+		ASSERT(buf[i] == 0);
+
+	memset(buf, 0, 2);
+	ASSERT(kfile_read(&fd1.fd, buf, 2) == 2);
+	for (int i = 0; i < 2; i++)
+		ASSERT(buf[i] == (i & 0xff));
+
+	ASSERT(kfile_seek(&fd1.fd, sizeof(buf), KSM_SEEK_END) == sizeof(buf) + 4);
+	for (unsigned i = 0; i < sizeof(buf); i++)
+		buf[i] = i;
+	ASSERT(kfile_write(&fd1.fd, buf, sizeof(buf)));
+	ASSERT(fd1.fd.seek_pos == sizeof(buf) * 2 + 4);
+	ASSERT(fd1.fd.size == sizeof(buf) * 2 + 4);
+	ASSERT(disk->free_bytes == prev_free - sizeof(buf) * 2 - 4);
+
+	ASSERT(kfile_seek(&fd1.fd, 0, KSM_SEEK_SET) == 0);
+
+	memset(buf, 0, 2);
+	ASSERT(kfile_read(&fd1.fd, buf, 2) == 2);
+	ASSERT(fd1.fd.seek_pos == 2);
+	for (int i = 0; i < 2; i++)
+		ASSERT(buf[i] == 0);
+
+	memset(buf, 0, 2);
+	ASSERT(kfile_read(&fd1.fd, buf, 2) == 2);
+	ASSERT(fd1.fd.seek_pos == 4);
+	for (int i = 0; i < 2; i++)
+		ASSERT(buf[i] == (i & 0xff));
+
+	memset(buf, 0, 4);
+	ASSERT(kfile_read(&fd1.fd, buf, sizeof(buf)) == sizeof(buf));
+	ASSERT(fd1.fd.seek_pos == sizeof(buf) + 4);
+	for (unsigned i = 0; i < sizeof(buf); i++)
+		ASSERT(buf[i] == 0);
+
+	memset(buf, 0, sizeof(buf));
+	ASSERT(kfile_read(&fd1.fd, buf, sizeof(buf)) == sizeof(buf));
+	for (unsigned i = 0; i < sizeof(buf); i++)
+		ASSERT(buf[i] == (i & 0xff));
+
+	ASSERT(kfile_close(&fd1.fd) == 0);
+	ASSERT(kfile_error(&fd1.fd) == 0);
+	ASSERT(battfs_fsck(disk));
+	ASSERT(battfs_umount(disk));
+
+	TRACEMSG("19: passed\n");
+
+}
+
+static void endOfSpace(BattFsSuper *disk)
+{
+	TRACEMSG("20: what happens when disk space is over?\n");
+	BattFs fd1;
+	uint8_t buf[(PAGE_SIZE - BATTFS_HEADER_LEN) * 5];
+
+	FILE *fp = fopen(test_filename, "w+");
+
+	unsigned int PAGE_FILL = PAGE_SIZE - BATTFS_HEADER_LEN;
+	inode_t INODE = 0;
+	unsigned int MODE = BATTFS_CREATE;
+
+	disk->erase(disk, 0);
+	disk->erase(disk, 1);
+	disk->erase(disk, 2);
+	disk->erase(disk, 3);
+	fclose(fp);
+
+	ASSERT(disk_open(disk));
+	ASSERT(battfs_mount(disk));
+	ASSERT(battfs_fsck(disk));
+	ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
+	ASSERT(kfile_write(&fd1.fd, buf, sizeof(buf)) == PAGE_FILL * 4);
+	ASSERT(fd1.fd.size == (kfile_off_t)(PAGE_FILL * 4));
+	ASSERT(fd1.fd.seek_pos == (kfile_off_t)(PAGE_FILL * 4));
+	ASSERT(disk->free_bytes == 0);
+
+	ASSERT(kfile_close(&fd1.fd) == 0);
+	ASSERT(kfile_error(&fd1.fd) == BATTFS_DISK_GETNEWPAGE_ERR);
+	ASSERT(battfs_fsck(disk));
+	ASSERT(battfs_umount(disk));
+
+	TRACEMSG("20: passed\n");
+}
+
+
+static void multipleFilesRW(BattFsSuper *disk)
+{
+	TRACEMSG("21: multiple files read/write test\n");
+
+	FILE *fpt = fopen(test_filename, "w+");
+
+	for (int i = 0; i < FILE_SIZE; i++)
+		fputc(0xff, fpt);
+	fclose(fpt);
+
+	#define N_FILES 10
+	BattFs fd[N_FILES];
+	unsigned int MODE = BATTFS_CREATE;
+	uint32_t buf[FILE_SIZE / (4 * N_FILES * sizeof(uint32_t))];
+
+	ASSERT(disk_open(disk));
+	ASSERT(battfs_mount(disk));
+	ASSERT(battfs_fsck(disk));
+	for (inode_t i = 0; i < N_FILES; i++)
+		ASSERT(battfs_fileopen(disk, &fd[i], i, MODE));
+
+	for (int i = N_FILES - 1; i >= 0; i--)
+	{
+		for (uint32_t j = 0; j < countof(buf); j++)
+			buf[j] = j+i;
+
+		ASSERT(kfile_write(&fd[i].fd, buf, sizeof(buf)) == sizeof(buf));
+		ASSERT(fd[i].fd.size == sizeof(buf));
+		ASSERT(fd[i].fd.seek_pos == sizeof(buf));
+		ASSERT(kfile_seek(&fd[i].fd, 0, SEEK_SET) == 0);
+	}
+
+	for (inode_t i = 0; i < N_FILES; i++)
+	{
+		memset(buf, 0, sizeof(buf));
+		ASSERT(kfile_read(&fd[i].fd, buf, sizeof(buf)) == sizeof(buf));
+
+		for (uint32_t j = 0; j < countof(buf); j++)
+			ASSERT(buf[j] == j+i);
+
+		ASSERT(fd[i].fd.size == sizeof(buf));
+		ASSERT(fd[i].fd.seek_pos == sizeof(buf));
+		ASSERT(kfile_seek(&fd[i].fd, 0, SEEK_SET) == 0);
+	}
+
+	for (inode_t i = 0; i < N_FILES; i++)
+	{
+		ASSERT(kfile_close(&fd[i].fd) == 0);
+		ASSERT(kfile_error(&fd[i].fd) == 0);
+	}
+
+	ASSERT(battfs_fsck(disk));
+	ASSERT(battfs_umount(disk));
+
+	ASSERT(disk_open(disk));
+	ASSERT(battfs_mount(disk));
+	ASSERT(battfs_fsck(disk));
+
+	for (inode_t i = 0; i < N_FILES; i++)
+		ASSERT(battfs_fileopen(disk, &fd[i], i, 0));
+
+	for (inode_t i = 0; i < N_FILES; i++)
+	{
+		memset(buf, 0, sizeof(buf));
+		ASSERT(kfile_read(&fd[i].fd, buf, sizeof(buf)) == sizeof(buf));
+
+		for (uint32_t j = 0; j < countof(buf); j++)
+			ASSERT(buf[j] == j+i);
+
+		ASSERT(fd[i].fd.size == sizeof(buf));
+		ASSERT(fd[i].fd.seek_pos == sizeof(buf));
+		ASSERT(kfile_seek(&fd[i].fd, 0, SEEK_SET) == 0);
+	}
+
+	for (inode_t i = 0; i < N_FILES; i++)
+	{
+		ASSERT(kfile_close(&fd[i].fd) == 0);
+		ASSERT(kfile_error(&fd[i].fd) == 0);
+	}
+
+	ASSERT(battfs_umount(disk));
+	TRACEMSG("21: passed\n");
+}
+
+
+static void openAllFiles(BattFsSuper *disk)
+{
+	TRACEMSG("22: try to open a lot of files\n");
+
+	FILE *fpt = fopen(test_filename, "w+");
+
+	for (int i = 0; i < FILE_SIZE; i++)
+		fputc(0xff, fpt);
+	fclose(fpt);
+
+	BattFs fd[BATTFS_MAX_FILES];
+	unsigned int MODE = BATTFS_CREATE;
+
+	ASSERT(disk_open(disk));
+	ASSERT(battfs_mount(disk));
+	ASSERT(battfs_fsck(disk));
+	for (unsigned i = 0; i < countof(fd); i++)
+		ASSERT(battfs_fileopen(disk, &fd[i], i, MODE));
+
+	ASSERT(battfs_fsck(disk));
+
+	for (unsigned i = 0; i < countof(fd); i++)
+	{
+		ASSERT(kfile_close(&fd[i].fd) == 0);
+		ASSERT(kfile_error(&fd[i].fd) == 0);
+	}
+
+	ASSERT(battfs_fsck(disk));
+	ASSERT(battfs_umount(disk));
+
+	ASSERT(disk_open(disk));
+	ASSERT(battfs_mount(disk));
+	ASSERT(battfs_fsck(disk));
+
+
+	for (unsigned i = 0; i < countof(fd); i++)
+		ASSERT(battfs_fileopen(disk, &fd[i], i, MODE));
+
+	ASSERT(battfs_fsck(disk));
+
+	for (unsigned i = 0; i < countof(fd); i++)
+	{
+		ASSERT(kfile_close(&fd[i].fd) == 0);
+		ASSERT(kfile_error(&fd[i].fd) == 0);
+	}
+
+	ASSERT(battfs_fsck(disk));
+	ASSERT(battfs_umount(disk));
+	TRACEMSG("22: passed\n");
+}
+
+
 int battfs_testRun(void)
 {
 	BattFsSuper disk;
 
-	disk.open = disk_open;
-	disk.read = disk_page_read;
-	disk.load = disk_page_load;
-	disk.bufferWrite = disk_buffer_write;
-	disk.bufferRead = disk_buffer_read;
-	disk.save = disk_page_save;
-	disk.erase = disk_page_erase;
-	disk.close = disk_close;
-
 	diskNew(&disk);
 	disk1File(&disk);
 	diskHalfFile(&disk);
@@ -776,6 +1123,11 @@ int battfs_testRun(void)
 	createFile(&disk);
 	multipleWrite(&disk);
 	increaseFile(&disk);
+	readEOF(&disk);
+	writeEOF(&disk);
+	endOfSpace(&disk);
+	multipleFilesRW(&disk);
+	openAllFiles(&disk);
 
 	kprintf("All tests passed!\n");
 
@@ -792,12 +1144,6 @@ int battfs_testTearDown(void)
 	return 0;
 }
 
-TEST_MAIN(battfs)
-
-#include <fs/battfs.c>
-#include <kern/kfile.c>
-#include <drv/kdebug.c>
-#include <mware/formatwr.c>
-#include <mware/hex.c>
+TEST_MAIN(battfs);
 
 #endif // _TEST