X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=app%2Fbattfs%2Fbattfs_test.c;h=839d78113e7d4c79da2b4e5cb57a0ab03cf1bb6e;hb=760437314c9e9af5fad596121de78c332129d2f5;hp=183d6c8ae99c6264ddde945ddfa0ea205d2fe4b0;hpb=90f3a07ec855d9bf82367d00f262c478434993d5;p=bertos.git diff --git a/app/battfs/battfs_test.c b/app/battfs/battfs_test.c index 183d6c8a..839d7811 100644 --- a/app/battfs/battfs_test.c +++ b/app/battfs/battfs_test.c @@ -26,20 +26,20 @@ * invalidate any other reasons why the executable file might be covered by * the GNU General Public License. * - * Copyright 2007 Develer S.r.l. (http://www.develer.com/) - * + * Copyright 2007, 2008 Develer S.r.l. (http://www.develer.com/) * --> * - * \version $Id: demo.c 18242 2007-10-08 17:35:23Z marco $ + * \brief BattFS Test. * + * \version $Id: demo.c 18242 2007-10-08 17:35:23Z marco $ * \author Francesco Sacchi - * - * \brief BattFs Test. */ -#include #include +#include +#include + #include #include #include @@ -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,18 +351,19 @@ 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+"); - #define PAGE_FILL 116 - #define INODE 0 - #define INODE2 4 - #define MODE 0 + unsigned int PAGE_FILL = 116; + unsigned int INODE = 0; + unsigned int INODE2 = 4; + unsigned int INEXISTENT_INODE = 123; + unsigned int MODE = 0; - battfs_writeTestBlock(disk, 0, INODE, 0, PAGE_FILL, 0, 1235); + battfs_writeTestBlock(disk, 0, 123, 0, PAGE_FILL, 0, 1235); battfs_writeTestBlock(disk, 1, INODE, 0, PAGE_FILL, 0, MARK_PAGE_VALID); battfs_writeTestBlock(disk, 2, INODE, 3, PAGE_FILL, 1, MARK_PAGE_VALID); battfs_writeTestBlock(disk, 3, INODE, 0, PAGE_FILL, 1, MARK_PAGE_VALID); @@ -374,7 +375,9 @@ static void test10(BattFsSuper *disk) fclose(fp); ASSERT(battfs_init(disk)); + ASSERT(!battfs_fileExists(disk, INEXISTENT_INODE)); + ASSERT(battfs_fileExists(disk, INODE)); ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE)); ASSERT(fd1.fd.size == PAGE_FILL * 2); ASSERT(fd1.fd.seek_pos == 0); @@ -384,6 +387,16 @@ 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); ASSERT(fd2.fd.seek_pos == 0); @@ -391,7 +404,7 @@ static void test10(BattFsSuper *disk) ASSERT(fd2.inode == INODE2); ASSERT(fd2.start == &disk->page_array[2]); ASSERT(fd2.disk == disk); - ASSERT(LIST_HEAD(&disk->file_opened_list)->succ == &fd2.link); + ASSERT(LIST_HEAD(&disk->file_opened_list)->succ == &fd2.link); ASSERT(kfile_close(&fd1.fd) == 0); ASSERT(kfile_close(&fd2.fd) == 0); @@ -401,11 +414,105 @@ static void test10(BattFsSuper *disk) kprintf("Test10: passed\n"); } +static void test11(BattFsSuper *disk) +{ + BattFS fd1; + uint8_t buf[16]; + kprintf("Test11: read file test\n"); + fp = fopen(test_filename, "w+"); + unsigned int PAGE_FILL = 116; + unsigned int INODE = 0; + unsigned int INODE2 = 4; + unsigned int MODE = 0; -int main(void) + battfs_writeTestBlock(disk, 0, 123, 0, PAGE_FILL, 0, 1235); + battfs_writeTestBlock(disk, 1, INODE, 0, PAGE_FILL, 0, MARK_PAGE_VALID); + battfs_writeTestBlock(disk, 2, INODE, 3, PAGE_FILL, 1, MARK_PAGE_VALID); + battfs_writeTestBlock(disk, 3, INODE, 0, PAGE_FILL, 1, MARK_PAGE_VALID); + battfs_writeTestBlock(disk, 4, INODE2, 0, PAGE_FILL, 0, 1236); + battfs_writeTestBlock(disk, 5, INODE2, 0, PAGE_FILL, 0, MARK_PAGE_VALID); + battfs_writeTestBlock(disk, 6, INODE2, 1, PAGE_FILL, 1, MARK_PAGE_VALID); + battfs_writeTestBlock(disk, 7, INODE2, 0, PAGE_FILL, 1, MARK_PAGE_VALID); + + fclose(fp); + + ASSERT(battfs_init(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)); + for (size_t i = 0; i < sizeof(buf); i++) + ASSERT(buf[i] == 0); + + ASSERT(kfile_close(&fd1.fd) == 0); + ASSERT(battfs_close(disk)); + + kprintf("Test11: passed\n"); +} + +static void test12(BattFsSuper *disk) +{ + BattFS fd1; + + kprintf("Test12: read file test across page boundary and seek test\n"); + + fp = fopen(test_filename, "w+"); + + const unsigned int PAGE_FILL = 116; + unsigned int INODE = 0; + unsigned int MODE = 0; + uint8_t buf[PAGE_FILL + 10]; + + battfs_writeTestBlock(disk, 0, 123, 0, PAGE_FILL, 0, 1235); + battfs_writeTestBlock(disk, 1, INODE, 0, PAGE_FILL, 0, MARK_PAGE_VALID); + battfs_writeTestBlock(disk, 2, INODE, 3, PAGE_FILL, 1, MARK_PAGE_VALID); + battfs_writeTestBlock(disk, 3, INODE, 0, PAGE_FILL, 1, MARK_PAGE_VALID); + battfs_writeTestBlock(disk, 4, INODE, 0, PAGE_FILL, 0, 1236); + battfs_writeTestBlock(disk, 5, INODE, 0, PAGE_FILL, 2, MARK_PAGE_VALID); + battfs_writeTestBlock(disk, 6, INODE, 1, PAGE_FILL, 3, MARK_PAGE_VALID); + battfs_writeTestBlock(disk, 7, INODE, 0, PAGE_FILL, 3, MARK_PAGE_VALID); + + fclose(fp); + + ASSERT(battfs_init(disk)); + ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE)); + + ASSERT(kfile_read(&fd1.fd, buf, sizeof(buf)) == sizeof(buf)); + ASSERT(fd1.fd.seek_pos == (kfile_off_t)sizeof(buf)); + for (size_t i = 0; i < sizeof(buf); i++) + ASSERT(buf[i] == 0); + + ASSERT(kfile_read(&fd1.fd, buf, sizeof(buf)) == sizeof(buf)); + ASSERT(fd1.fd.seek_pos == (kfile_off_t)sizeof(buf) * 2); + for (size_t i = 0; i < sizeof(buf); i++) + ASSERT(buf[i] == 0); + + ASSERT(kfile_read(&fd1.fd, buf, sizeof(buf)) == sizeof(buf)); + ASSERT(fd1.fd.seek_pos == (kfile_off_t)sizeof(buf) * 3); + for (size_t i = 0; i < sizeof(buf); i++) + ASSERT(buf[i] == 0); + + ASSERT(kfile_read(&fd1.fd, buf, sizeof(buf)) == 86); + ASSERT(fd1.fd.seek_pos == (kfile_off_t)fd1.fd.size); + for (size_t i = 0; i < 86; i++) + ASSERT(buf[i] == 0); + + ASSERT(kfile_seek(&fd1.fd, 0, KSM_SEEK_SET) == 0); + ASSERT(fd1.fd.seek_pos == 0); + + ASSERT(kfile_seek(&fd1.fd, 0, KSM_SEEK_END) == (kfile_off_t)fd1.fd.size); + ASSERT(fd1.fd.seek_pos = (kfile_off_t)fd1.fd.size); + + ASSERT(kfile_close(&fd1.fd) == 0); + ASSERT(battfs_close(disk)); + + kprintf("Test12: passed\n"); +} + + +int battfs_testRun(void) { BattFsSuper disk; @@ -424,7 +531,35 @@ int main(void) test8(&disk); test9(&disk); test10(&disk); - kprintf("All test passed!\n"); + test11(&disk); + test12(&disk); + kprintf("All tests passed!\n"); + + return 0; +} + +#if UNIT_TEST + +int battfs_testSetup(void) +{ + return 0; +} +int battfs_testTearDown(void) +{ return 0; } + +TEST_MAIN(battfs) + +#include "fs/battfs.c" +#include "drv/kdebug.c" +#include "mware/formatwr.c" +#include "mware/hex.c" + +#else +int main(void) +{ + return battfs_testRun(); +} +#endif // _TEST