Fix some codes in fs tc to remove duplicated logics

diff --git a/apps/examples/testcase/le_tc/filesystem/fs_main.c b/apps/examples/testcase/le_tc/filesystem/fs_main.c
index ec3866c..d484310 100644 (file)
--- a/apps/examples/testcase/le_tc/filesystem/fs_main.c
+++ b/apps/examples/testcase/le_tc/filesystem/fs_main.c
@@ -302,8 +302,8 @@ static void fs_vfs_read_tc(void)
        TC_ASSERT_GEQ("open", fd, 0);
        memset(buf, 0, sizeof(buf));
        ret = read(fd, buf, sizeof(buf));
-       TC_ASSERT_LT_CLEANUP("read", ret, 0, close(fd));
        close(fd);
+       TC_ASSERT_LT("read", ret, 0);
 
        /* Nagative case with invalid argument, fd. It will return ERROR */
        ret = read(CONFIG_NFILE_DESCRIPTORS, buf, sizeof(buf));
@@ -357,11 +357,11 @@ static void fs_vfs_dup_tc(void)
        TC_ASSERT_EQ_CLEANUP("write", ret, len, close(fd1));
 
        fd2 = dup(fd1);
-       TC_ASSERT_GEQ_CLEANUP("dup", fd2, 0,  close(fd1));
+       close(fd1);
+       TC_ASSERT_GEQ("dup", fd2, 0);
 
        len = strlen(str2);
        ret = write(fd2, str2, strlen(str2));
-       close(fd1);
        close(fd2);
        TC_ASSERT_EQ("write", ret, len);
 
@@ -474,16 +474,16 @@ static void fs_vfs_fsync_tc(void)
        TC_ASSERT_EQ_CLEANUP("write", ret, len, close(fd));
 
        ret = fsync(fd);
-       TC_ASSERT_GEQ_CLEANUP("fsync", ret, 0, close(fd));
        close(fd);
+       TC_ASSERT_GEQ("fsync", ret, 0);
 
        /* Nagative case with invalid argument, no write access. It will return ERROR */
        fd = open(filename, O_RDOK);
        TC_ASSERT_GEQ("open", fd, 0);
 
        ret = fsync(fd);
-       TC_ASSERT_EQ_CLEANUP("fsync", ret, ERROR, close(fd));
        close(fd);
+       TC_ASSERT_EQ("fsync", ret, ERROR);
 
        /* Nagative case with invalid argument, fd. It will return ERROR */
        ret = fsync(CONFIG_NFILE_DESCRIPTORS);
@@ -1219,8 +1219,8 @@ static void libc_stdio_fdopen_tc(void)
        TC_ASSERT_GEQ("open", fd, 0);
 
        fp = fdopen(fd, "r");
-       TC_ASSERT_CLEANUP("fdopen", fp, close(fd));
        close(fd);
+       TC_ASSERT("fdopen", fp);
        TC_ASSERT_EQ_CLEANUP("fdopen", fp->fs_oflags, O_RDONLY, fclose(fp));
        fclose(fp);
 
@@ -1505,8 +1505,8 @@ static void libc_stdio_fsetpos_tc(void)
 
        /* Nagative case with invalid arguments, NULL position. It will return ERROR */
        ret = fsetpos(fp, NULL);
-       TC_ASSERT_EQ_CLEANUP("fsetpos", ret, ERROR, fclose(fp));
        fclose(fp);
+       TC_ASSERT_EQ("fsetpos", ret, ERROR);
 
        TC_SUCCESS_RESULT();
 }
@@ -1581,7 +1581,7 @@ static void libc_stdio_fgetc_tc(void)
        int ch;
 
        fp = fopen(filename, "r");
-       TC_ASSERT("fgetc", fp);
+       TC_ASSERT("fopen", fp);
 
        ch = fgetc(fp);
        fclose(fp);
@@ -1617,9 +1617,9 @@ static void libc_stdio_fwrite_tc(void)
 
        len = strlen(VFS_TEST_CONTENTS_3);
        ret = fwrite(VFS_TEST_CONTENTS_3, 1, len, fp);
-       TC_ASSERT_EQ_CLEANUP("fwrite", ret, len, fclose(fp));
-
        fclose(fp);
+       TC_ASSERT_EQ("fwrite", ret, len);
+
        TC_SUCCESS_RESULT();
 }
 
@@ -1656,10 +1656,10 @@ static void libc_stdio_fread_tc(void)
        len = strlen(VFS_TEST_CONTENTS_3);
        memset(buf, 0, sizeof(buf));
        ret = fread(buf, 1, len, fp);
-       TC_ASSERT_EQ_CLEANUP("fread", ret, len, fclose(fp));
-       TC_ASSERT_EQ_CLEANUP("fread", strcmp(buf, VFS_TEST_CONTENTS_3), 0, fclose(fp));
-
        fclose(fp);
+       TC_ASSERT_EQ("fread", ret, len);
+       TC_ASSERT_EQ("fread", strcmp(buf, VFS_TEST_CONTENTS_3), 0);
+
        TC_SUCCESS_RESULT();
 }
 
@@ -1953,9 +1953,8 @@ static void libc_stdio_setvbuf_tc(void)
        ret = setvbuf(fp, buffer, _IOFBF, 64);
        TC_ASSERT_LEQ_CLEANUP("setvbuf", ret, 0, fclose(fp));
        ret = setvbuf(fp, NULL, _IONBF, 0);
-       TC_ASSERT_LEQ_CLEANUP("setvbuf", ret, 0, fclose(fp));
-
        fclose(fp);
+       TC_ASSERT_LEQ("setvbuf", ret, 0);
 
        TC_SUCCESS_RESULT();
 }