Refactor test; add more tests.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@1101 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/app/battfs/battfs_test.c b/app/battfs/battfs_test.c
index e1972519e11f9671cece7baa45f70f0329a66639..8fe38a3f646f2ed5ce9472ab5cd643983f18f957 100644 (file)
--- a/app/battfs/battfs_test.c
+++ b/app/battfs/battfs_test.c
@@ -44,40 +44,43 @@
 #include <stdlib.h>
 #include <string.h>
 
+#define FILE_SIZE 32768
+#define PAGE_SIZE 128
+#define PAGE_COUNT FILE_SIZE / PAGE_SIZE
+
 FILE *fp;
 const char test_filename[]="battfs_disk.bin";
-const char *filename;
 
-#define PAGE_SIZE 128
+
 static bool disk_open(struct BattFsSuper *d)
 {
-       fp = fopen(filename, "r+b");
+       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);
+       //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\n", page, addr, size);
+       //TRACEMSG("page:%d, addr:%d, size:%d\n", page, addr, size);
        fseek(fp, page * d->page_size + addr, SEEK_SET);
        return fread(buf, 1, size, fp);
 }
 
 static size_t disk_page_write(struct BattFsSuper *d, pgcnt_t page, pgaddr_t addr, const void *buf, size_t size)
 {
-       TRACEMSG("page:%d, addr:%d, size:%d\n", page, addr, size);
+       //TRACEMSG("page:%d, addr:%d, size:%d\n", page, addr, size);
        fseek(fp, page * d->page_size + addr, SEEK_SET);
        return fwrite(buf, 1, size, fp);
 }
 
 static bool disk_page_erase(struct BattFsSuper *d, pgcnt_t page)
 {
-       TRACEMSG("page:%d\n", page);
+       //TRACEMSG("page:%d\n", page);
        fseek(fp, page * d->page_size, SEEK_SET);
 
        for (int i = 0; i < d->page_size; i++)
@@ -88,64 +91,292 @@ static bool disk_page_erase(struct BattFsSuper *d, pgcnt_t page)
 
 static bool disk_close(struct BattFsSuper *d)
 {
-       TRACE;
+       //TRACE;
        free(d->page_array);
        return (fclose(fp) != EOF);
 }
 
-int main(int argc, char *argv[])
+static void testCheck(BattFsSuper *disk, pgcnt_t *reference)
 {
-       if (argc < 2)
-       {
-/*             FILE *fpt = fopen(test_filename, "w+");
-               for (int i = 0; i < 32768; i++)
-                       fputc(0xff, fpt);
-               fclose(fpt);*/
-               filename = test_filename;
-       }
-       else
-               filename = argv[1];
-
-       BattFsSuper disk;
-       disk.open = disk_open;
-       disk.read = disk_page_read;
-       disk.write = disk_page_write;
-       disk.erase = disk_page_erase;
-       disk.close = disk_close;
-
-       if (battfs_init(&disk))
+       if (battfs_init(disk))
        {
-               kprintf("page_array:\n");
-               for (pgcnt_t i = 0; i < disk.page_count; i++)
-               {
-                       if (!(i % 16))
-                               kputchar('\n');
-                       kprintf("%04d ", disk.page_array[i]);
-               }
-               kputchar('\n');
-
-               for (pgcnt_t i = 0; i < disk.page_count; i++)
+               for (int i = 0; i < disk->page_count; i++)
                {
-                       if (i < disk.page_count / 2)
+                       if (disk->page_array[i] != reference[i])
                        {
-                               if (!battfs_writeTestBlock(&disk, i, i, i, i/3, 0, MARK_PAGE_VALID))
+                               kprintf("Error at addr %d: page_array read", i);
+                               for (pgcnt_t i = 0; i < disk->page_count; i++)
                                {
-                                       TRACEMSG("error writing:%d\n", i);
-                                       return 2;
+                                       if (!(i % 16))
+                                               kputchar('\n');
+                                       kprintf("%04d ", disk->page_array[i]);
                                }
-                       }
-                       else
-                       {
-                               if (!battfs_writeTestBlock(&disk, i, i, i, i/3, 0, i))
+                               kputchar('\n');
+                               kprintf("Expected:");
+                               for (pgcnt_t i = 0; i < disk->page_count; i++)
                                {
-                                       TRACEMSG("error writing:%d\n", i);
-                                       return 2;
+                                       if (!(i % 16))
+                                               kputchar('\n');
+                                       kprintf("%04d ", reference[i]);
                                }
+                               kputchar('\n');
+                               battfs_close(disk);
+                               exit(2);
                        }
-
                }
-               return 0;
+               battfs_close(disk);
        }
        else
-               return 1;
+       {
+               kprintf("Error in battfs_init\n");
+               exit(1);
+       }
+}
+
+static void test1(BattFsSuper *disk)
+{
+       pgcnt_t ref[PAGE_COUNT];
+       kprintf("Test1: disk new\n");
+
+       FILE *fpt = fopen(test_filename, "w+");
+
+       for (int i = 0; i < FILE_SIZE; i++)
+               fputc(0xff, fpt);
+       fclose(fpt);
+       for (int i = 0; i < PAGE_COUNT; i++)
+               ref[i] = PAGE_COUNT - i - 1;
+
+       testCheck(disk, ref);
+       kprintf("Test1: passed\n");
+}
+
+static void test2(BattFsSuper *disk)
+{
+       pgcnt_t ref[PAGE_COUNT];
+       kprintf("Test2: disk full with 1 contiguos file\n");
+
+
+       fp = fopen(test_filename, "w+");
+
+       for (int i = 0; i < PAGE_COUNT; i++)
+       {
+               battfs_writeTestBlock(disk, i, 0, 0, 0, i, MARK_PAGE_VALID);
+               ref[i] = i;
+       }
+       fclose(fp);
+
+       testCheck(disk, ref);
+       kprintf("Test2: passed\n");
+}
+
+
+static void test3(BattFsSuper *disk)
+{
+       pgcnt_t ref[PAGE_COUNT];
+       kprintf("Test3: disk half full with 1 contiguos file, rest unformatted\n");
+
+
+       fp = fopen(test_filename, "w+");
+
+       for (int i = 0; i < PAGE_COUNT / 2; i++)
+       {
+               battfs_writeTestBlock(disk, i, 0, 0, 0, i, MARK_PAGE_VALID);
+               ref[i] = i;
+       }
+       fseek(fp, FILE_SIZE / 2, SEEK_SET);
+       for (int i = FILE_SIZE / 2; i < FILE_SIZE; i++)
+               fputc(0xff, fp);
+       fclose(fp);
+
+       for (int i = PAGE_COUNT / 2; i < PAGE_COUNT; i++)
+       {
+               ref[i] = PAGE_COUNT + PAGE_COUNT / 2 - i - 1;
+       }
+
+
+       testCheck(disk, ref);
+       kprintf("Test3: passed\n");
+}
+
+static void test4(BattFsSuper *disk)
+{
+       pgcnt_t ref[PAGE_COUNT];
+       kprintf("Test4: disk half full with 1 contiguos file, rest marked free\n");
+
+
+       fp = fopen(test_filename, "w+");
+
+       for (int i = 0; i < PAGE_COUNT / 2; i++)
+       {
+               battfs_writeTestBlock(disk, i, 0, 0, 0, i, MARK_PAGE_VALID);
+               ref[i] = i;
+       }
+       for (int i = PAGE_COUNT / 2; i < PAGE_COUNT; i++)
+       {
+               battfs_writeTestBlock(disk, i, 0, 0, 0, i, i);
+               ref[i] = i;
+       }
+       fclose(fp);
+
+
+       testCheck(disk, ref);
+       kprintf("Test4: passed\n");
+}
+
+static void test5(BattFsSuper *disk)
+{
+       pgcnt_t ref[PAGE_COUNT];
+       kprintf("Test5: disk 1/3 full with 1 contiguos file, 1/3 marked free, rest unformatted\n");
+
+
+       fp = fopen(test_filename, "w+");
+
+       for (int i = 0; i < FILE_SIZE; i++)
+               fputc(0xff, fp);
+
+       for (int i = 0; i < PAGE_COUNT / 3; i++)
+       {
+               battfs_writeTestBlock(disk, i, 0, 0, 0, i, MARK_PAGE_VALID);
+               ref[i] = i;
+       }
+       for (int i = PAGE_COUNT / 3; i < 2 * (PAGE_COUNT / 3); i++)
+       {
+               battfs_writeTestBlock(disk, i, 0, 0, 0, i, i);
+               ref[i + PAGE_COUNT / 3 + 1] = i;
+       }
+       fclose(fp);
+
+       for (int i = PAGE_COUNT / 3; i < 2 * (PAGE_COUNT / 3) + 1; i++)
+               ref[i] = PAGE_COUNT + PAGE_COUNT / 3 - i - 1;
+
+       testCheck(disk, ref);
+       kprintf("Test5: passed\n");
+}
+
+static void test6(BattFsSuper *disk)
+{
+       pgcnt_t ref[4];
+       kprintf("Test6: 1 file with 1 old seq num, 1 free block\n");
+
+
+       fp = fopen(test_filename, "w+");
+
+       battfs_writeTestBlock(disk, 0, 0, 0, 0, 0, MARK_PAGE_VALID);
+       battfs_writeTestBlock(disk, 1, 0, 0, 0, 1, MARK_PAGE_VALID);
+       battfs_writeTestBlock(disk, 2, 0, 1, 0, 1, MARK_PAGE_VALID);
+       battfs_writeTestBlock(disk, 3, 0, 0, 0, 0, 123);
+
+       fclose(fp);
+       ref[0] = 0;
+       ref[1] = 2;
+       ref[2] = 3;
+       ref[3] = 1;
+
+       testCheck(disk, ref);
+       kprintf("Test6: passed\n");
+}
+
+static void test7(BattFsSuper *disk)
+{
+       pgcnt_t ref[4];
+       kprintf("Test7: 1 file with 1 old seq num, 1 free block\n");
+
+
+       fp = fopen(test_filename, "w+");
+
+       battfs_writeTestBlock(disk, 0, 0, 0, 0, 0, MARK_PAGE_VALID);
+       battfs_writeTestBlock(disk, 1, 0, 1, 0, 1, MARK_PAGE_VALID);
+       battfs_writeTestBlock(disk, 2, 0, 0, 0, 1, MARK_PAGE_VALID);
+       battfs_writeTestBlock(disk, 3, 0, 0, 0, 0, 123);
+
+       fclose(fp);
+       ref[0] = 0;
+       ref[1] = 1;
+       ref[2] = 3;
+       ref[3] = 2;
+
+       testCheck(disk, ref);
+       kprintf("Test7: passed\n");
+}
+
+static void test8(BattFsSuper *disk)
+{
+       pgcnt_t ref[4];
+       kprintf("Test8: 1 file with 1 old seq num, 1 free block\n");
+
+
+       fp = fopen(test_filename, "w+");
+
+       battfs_writeTestBlock(disk, 0, 0, 0, 0, 0, 1235);
+       battfs_writeTestBlock(disk, 1, 0, 0, 0, 0, MARK_PAGE_VALID);
+       battfs_writeTestBlock(disk, 2, 0, 1, 0, 1, MARK_PAGE_VALID);
+       battfs_writeTestBlock(disk, 3, 0, 0, 0, 1, MARK_PAGE_VALID);
+
+
+       fclose(fp);
+       ref[0] = 1;
+       ref[1] = 2;
+       ref[2] = 0;
+       ref[3] = 3;
+
+       testCheck(disk, ref);
+       kprintf("Test8: passed\n");
+}
+
+static void test9(BattFsSuper *disk)
+{
+       pgcnt_t ref[8];
+       kprintf("Test9: 2 file with old seq num, 2 free block\n");
+
+
+       fp = fopen(test_filename, "w+");
+
+       battfs_writeTestBlock(disk, 0, 0, 0, 0, 0, 1235);
+       battfs_writeTestBlock(disk, 1, 0, 0, 0, 0, MARK_PAGE_VALID);
+       battfs_writeTestBlock(disk, 2, 0, 3, 0, 1, MARK_PAGE_VALID);
+       battfs_writeTestBlock(disk, 3, 0, 0, 0, 1, MARK_PAGE_VALID);
+       battfs_writeTestBlock(disk, 4, 0, 0, 0, 0, 1236);
+       battfs_writeTestBlock(disk, 5, 4, 0, 0, 0, MARK_PAGE_VALID);
+       battfs_writeTestBlock(disk, 6, 4, 1, 0, 1, MARK_PAGE_VALID);
+       battfs_writeTestBlock(disk, 7, 4, 0, 0, 1, MARK_PAGE_VALID);
+
+
+       fclose(fp);
+       ref[0] = 1;
+       ref[1] = 3;
+       ref[2] = 5;
+       ref[3] = 6;
+       ref[4] = 0;
+       ref[5] = 4;
+       ref[6] = 2;
+       ref[7] = 7;
+
+       testCheck(disk, ref);
+       kprintf("Test9: passed\n");
+}
+
+
+
+
+int main(void)
+{
+       BattFsSuper disk;
+
+       disk.open = disk_open;
+       disk.read = disk_page_read;
+       disk.write = disk_page_write;
+       disk.erase = disk_page_erase;
+       disk.close = disk_close;
+       test1(&disk);
+       test2(&disk);
+       test3(&disk);
+       test4(&disk);
+       test5(&disk);
+       test6(&disk);
+       test7(&disk);
+       test8(&disk);
+       test9(&disk);
+       kprintf("All test passed!\n");
+
+       return 0;
 }