Re-Refactor code under new specs. BattFs. Nightlytest passed.

[bertos.git] / app / battfs / battfs_test.c

diff --git a/app/battfs/battfs_test.c b/app/battfs/battfs_test.c
index b74e227b3f6f099b7a0e5629a5944788c79e68d0..e7b529eb02c196f69a63fe16f98d1caf95ec76ff 100644 (file)
--- a/app/battfs/battfs_test.c
+++ b/app/battfs/battfs_test.c
@@ -99,7 +99,7 @@ static bool disk_close(struct BattFsSuper *d)
 static void testCheck(BattFsSuper *disk, pgcnt_t *reference)
 {
        ASSERT(battfs_init(disk));
-       
+
        for (int i = 0; i < disk->page_count; i++)
        {
                if (disk->page_array[i] != reference[i])
@@ -351,8 +351,8 @@ static void test9(BattFsSuper *disk)
 
 static void test10(BattFsSuper *disk)
 {
-       KFileBattFs fd1;
-       KFileBattFs fd2;
+       BattFS fd1;
+       BattFS fd2;
        kprintf("Test10: open file test, inode 0 and inode 4\n");
 
        fp = fopen(test_filename, "w+");
@@ -387,6 +387,15 @@ static void test10(BattFsSuper *disk)
        ASSERT(fd1.disk == disk);
        ASSERT(LIST_HEAD(&disk->file_opened_list) == &fd1.link);
 
+       ASSERT(kfile_reopen(&fd1.fd) == &fd1.fd);
+       ASSERT(fd1.fd.size == PAGE_FILL * 2);
+       ASSERT(fd1.fd.seek_pos == 0);
+       ASSERT(fd1.mode == MODE);
+       ASSERT(fd1.inode == INODE);
+       ASSERT(fd1.start == &disk->page_array[0]);
+       ASSERT(fd1.disk == disk);
+       ASSERT(LIST_HEAD(&disk->file_opened_list) == &fd1.link);
+
        ASSERT(battfs_fileExists(disk, INODE2));
        ASSERT(battfs_fileopen(disk, &fd2, INODE2, MODE));
        ASSERT(fd2.fd.size == PAGE_FILL * 2);
@@ -407,7 +416,7 @@ static void test10(BattFsSuper *disk)
 
 static void test11(BattFsSuper *disk)
 {
-       KFileBattFs fd1;
+       BattFS fd1;
        uint8_t buf[16];
 
        kprintf("Test11: read file test\n");
@@ -445,7 +454,7 @@ static void test11(BattFsSuper *disk)
 
 static void test12(BattFsSuper *disk)
 {
-       KFileBattFs fd1;
+       BattFS fd1;
 
        kprintf("Test12: read file test across page boundary and seek test\n");