X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=bertos%2Fkern%2Fkfile_test.c;h=36fde490048f2157d5e5f83572a03c374a9e8eec;hb=dace4f8d53875eb8cdf1af8c063750185a7b1db5;hp=8874209c0facae2874e132a846a7610173858927;hpb=eb0c74883956941313a276c90fff8210fad1989c;p=bertos.git

diff --git a/bertos/kern/kfile_test.c b/bertos/kern/kfile_test.c
index 8874209c..36fde490 100644
--- a/bertos/kern/kfile_test.c
+++ b/bertos/kern/kfile_test.c
@@ -41,9 +41,11 @@
 
 
 #include "kfile.h"
+#include <struct/kfile_mem.h>
 
 #include "cfg/cfg_kfile.h"
 #include <cfg/debug.h>
+#include <cfg/test.h>
 #include <cfg/module.h>
 
 // Define logging setting (for cfg/log.h module).
@@ -55,9 +57,36 @@
 
 #include <string.h>
 
-
 MOD_DEFINE(kfile_test);
 
+// Size of the "virtual" disk that
+// we want to test.
+#define BUF_TEST_LEN     3209
+
+// Buffer for test
+uint8_t test_buf[BUF_TEST_LEN];
+uint8_t test_buf_save[BUF_TEST_LEN];
+
+uint8_t test_disk[BUF_TEST_LEN];
+KFileMem mem;
+
+/*
+ * Help function to init disk and the buffers.
+ */
+static void init_testBuf(void)
+{
+
+	kprintf("Init fake buffer..\n");
+	for (int i = 0; i < BUF_TEST_LEN; i++)
+	{
+		test_disk[i] = i;
+		kprintf("%d ", test_disk[i]);
+	}
+	kprintf("\nend\n");
+
+	memset(test_buf, 0, sizeof(test_buf));
+	memset(test_buf_save, 0, sizeof(test_buf_save));
+}
 
 /**
  * KFile read/write subtest.
@@ -99,28 +128,17 @@ static bool kfile_rwTest(KFile *f, uint8_t *buf, size_t size)
 	for (size_t i = 0; i < size; i++)
 		if (buf[i] != (i & 0xff))
 			return false;
-	return true;
-}
 
-/**
- * Setup all needed for kfile test
- */
-int kfile_testSetUp(void)
-{
-        MOD_INIT(kfile_test);
-        LOG_INFO("Mod init..ok\n");
-
-        return 0;
+	return true;
 }
 
-
 /**
  * KFile read/write test.
  * This function write and read \a test_buf long \a size
  * on \a fd handler.
  * \a save_buf can be NULL or a buffer where to save previous file content.
  */
-int kfile_testRun(KFile *fd, uint8_t *test_buf, uint8_t *save_buf, size_t size)
+int kfile_testRunGeneric(KFile *fd, uint8_t *test_buf, uint8_t *save_buf, size_t size)
 {
 
 	/*
@@ -141,8 +159,8 @@ int kfile_testRun(KFile *fd, uint8_t *test_buf, uint8_t *save_buf, size_t size)
 	 */
 	if (save_buf)
 	{
-		kfile_read(fd, save_buf, size);
 		LOG_INFO("Saved content..form [%ld] to [%ld]\n", fd->seek_pos, fd->seek_pos + size);
+		kfile_read(fd, save_buf, size);
 	}
 
 	/* TEST 1 BEGIN. */
@@ -172,12 +190,12 @@ int kfile_testRun(KFile *fd, uint8_t *test_buf, uint8_t *save_buf, size_t size)
 		if (kfile_write(fd, save_buf, size) != size)
 			goto kfile_test_end;
 
-		LOG_INFO("Restore content..form [%lu] to [%lu]\n", fd->seek_pos, fd->seek_pos + size);
+		LOG_INFO("Restore content..form [%ld] to [%ld]\n", fd->seek_pos, fd->seek_pos + size);
 	}
 	/* TEST 1 END. */
 
 	/* TEST 2 BEGIN. */
-	LOG_INFO("Test 2: write from pos [%lu] to [%lu]\n", fd->size/2 , fd->size/2 + size);
+	LOG_INFO("Test 2: write from pos [%ld] to [%ld]\n", fd->size/2 , fd->size/2 + size);
 
 	/*
 	 * Go to half test size.
@@ -192,7 +210,7 @@ int kfile_testRun(KFile *fd, uint8_t *test_buf, uint8_t *save_buf, size_t size)
 	{
 		kfile_read(fd, save_buf, size);
 		kfile_seek(fd, -(kfile_off_t)size, KSM_SEEK_CUR);
-		LOG_INFO("Saved content..form [%lu] to [%lu]\n", fd->seek_pos, fd->seek_pos + size);
+		LOG_INFO("Saved content..form [%ld] to [%ld]\n", fd->seek_pos, fd->seek_pos + size);
 	}
 
 	/*
@@ -213,14 +231,13 @@ int kfile_testRun(KFile *fd, uint8_t *test_buf, uint8_t *save_buf, size_t size)
 		if (kfile_write(fd, save_buf, size) != size)
 			goto kfile_test_end;
 
-		LOG_INFO("Restore content..form [%lu] to [%lu]\n", fd->seek_pos, fd->seek_pos + size);
+		LOG_INFO("Restore content..form [%ld] to [%ld]\n", fd->seek_pos, fd->seek_pos + size);
 	}
 
 	/* TEST 2 END. */
 
 	/* TEST 3 BEGIN. */
-	LOG_INFO("Test 3: write outside of fd->size limit [%lu]\n", fd->size);
-	LOG_INFO("This test should FAIL!, you must see an assertion fail message.\n");
+	LOG_INFO("Test 3: write outside of fd->size limit [%ld]\n", fd->size);
 
 	/*
 	 * Go to the Flash end
@@ -235,7 +252,7 @@ int kfile_testRun(KFile *fd, uint8_t *test_buf, uint8_t *save_buf, size_t size)
 	{
 		kfile_read(fd, save_buf, len);
 		kfile_seek(fd, -len, KSM_SEEK_CUR);
-		LOG_INFO("Saved content..form [%lu] to [%lu]\n", fd->seek_pos, fd->seek_pos + len);
+		LOG_INFO("Saved content..form [%ld] to [%ld]\n", fd->seek_pos, fd->seek_pos + len);
 	}
 
 	/*
@@ -256,7 +273,7 @@ int kfile_testRun(KFile *fd, uint8_t *test_buf, uint8_t *save_buf, size_t size)
 		if ((kfile_off_t)kfile_write(fd, save_buf, len) != len)
 			goto kfile_test_end;
 
-		LOG_INFO("Restore content..form [%lu] to [%lu]\n", fd->seek_pos, fd->seek_pos + len);
+		LOG_INFO("Restore content..form [%ld] to [%ld]\n", fd->seek_pos, fd->seek_pos + len);
 	}
 
 	/* TEST 3 END. */
@@ -270,12 +287,37 @@ kfile_test_end:
 	return EOF;
 }
 
+
+
+
+/**
+ * Setup all needed for kfile test
+ */
+int kfile_testSetup(void)
+{
+        MOD_INIT(kfile_test);
+        LOG_INFO("Mod init..ok\n");
+
+		// Init our backend and the buffers
+		kfilemem_init(&mem, test_disk, BUF_TEST_LEN);
+		init_testBuf();
+
+        return 0;
+}
+
+int kfile_testRun(void)
+{
+	return kfile_testRunGeneric(&mem.fd, test_buf, test_buf_save, BUF_TEST_LEN);
+}
+
 /**
  * End a dataflash Test.
  * (Unused)
  */
 int kfile_testTearDown(void)
 {
-	/*    */
 	return 0;
 }
+
+TEST_MAIN(kfile);
+