mirror of https://github.com/ARMmbed/mbed-os.git
Rework fseek/ftell tests
ARM C library is really good at optimising out calls to underlying seek. The only ones we were actually detecting in the empty file case were the ones that the default FileHandle::size() made itself during the SEEK_END case. When we implement TestFile::size() directly, we will no longer see a single seek call from the ARM C library in the empty file case, so remove those tests. Beef up the non-empty file case, adding checks that we are making underlying read+write calls in the correct position, as a proxy for direct checks for underlying seek being called.pull/9208/head
parent
0c4d7d4dd6
commit
c401662941
|
@ -384,17 +384,15 @@ void test_fprintf_fscanf()
|
||||||
|
|
||||||
/** Test fseek and ftell
|
/** Test fseek and ftell
|
||||||
*
|
*
|
||||||
* Given already opened file is empty
|
* ARM library is quite good at optimising out unnecessary calls to underlying
|
||||||
*
|
* seek, so only test real non empty files.
|
||||||
* When set the file position indicator via fseek
|
|
||||||
* Then underneath retargeting layer seek function is called
|
|
||||||
* fseek return with succeed and ftell return already set position
|
|
||||||
*
|
*
|
||||||
* Given already opened file is not empty
|
* Given already opened file is not empty
|
||||||
*
|
*
|
||||||
* When set the file position indicator via fseek
|
* When set the file position indicator via fseek
|
||||||
* Then underneath retargeting layer seek function is called
|
* Then underneath retargeting layer seek function is called
|
||||||
* fseek return with succeed and ftell return already set position
|
* fseek return with succeed and ftell return already set position
|
||||||
|
* Check actual character read or written.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
void test_fseek_ftell()
|
void test_fseek_ftell()
|
||||||
|
@ -413,19 +411,6 @@ void test_fseek_ftell()
|
||||||
ftell_ret = std::ftell(file);
|
ftell_ret = std::ftell(file);
|
||||||
TEST_ASSERT_EQUAL(0, ftell_ret);
|
TEST_ASSERT_EQUAL(0, ftell_ret);
|
||||||
|
|
||||||
TestFile<FS>::resetFunctionCallHistory();
|
|
||||||
fssek_ret = std::fseek(file, 0, SEEK_CUR);
|
|
||||||
TEST_ASSERT_EQUAL(0, fssek_ret);
|
|
||||||
|
|
||||||
TestFile<FS>::resetFunctionCallHistory();
|
|
||||||
fssek_ret = std::fseek(file, 0, SEEK_SET);
|
|
||||||
TEST_ASSERT_EQUAL(0, fssek_ret);
|
|
||||||
|
|
||||||
TestFile<FS>::resetFunctionCallHistory();
|
|
||||||
fssek_ret = std::fseek(file, 0, SEEK_END);
|
|
||||||
TEST_ASSERT_TRUE(TestFile<FS>::functionCalled(TestFile<FS>::fnSeek));
|
|
||||||
TEST_ASSERT_EQUAL(0, fssek_ret);
|
|
||||||
|
|
||||||
const char *str = "Hello world";
|
const char *str = "Hello world";
|
||||||
const std::size_t size = std::strlen(str);
|
const std::size_t size = std::strlen(str);
|
||||||
|
|
||||||
|
@ -440,19 +425,28 @@ void test_fseek_ftell()
|
||||||
TEST_ASSERT_EQUAL(0, fssek_ret);
|
TEST_ASSERT_EQUAL(0, fssek_ret);
|
||||||
ftell_ret = std::ftell(file);
|
ftell_ret = std::ftell(file);
|
||||||
TEST_ASSERT_EQUAL(5, ftell_ret);
|
TEST_ASSERT_EQUAL(5, ftell_ret);
|
||||||
|
int c = std::fgetc(file);
|
||||||
|
TEST_ASSERT_TRUE(TestFile<FS>::functionCalled(TestFile<FS>::fnRead));
|
||||||
|
TEST_ASSERT_EQUAL(c, str[5]);
|
||||||
|
|
||||||
TestFile<FS>::resetFunctionCallHistory();
|
TestFile<FS>::resetFunctionCallHistory();
|
||||||
fssek_ret = std::fseek(file, -5, SEEK_CUR);
|
fssek_ret = std::fseek(file, -6, SEEK_CUR);
|
||||||
TEST_ASSERT_EQUAL(0, fssek_ret);
|
TEST_ASSERT_EQUAL(0, fssek_ret);
|
||||||
ftell_ret = std::ftell(file);
|
ftell_ret = std::ftell(file);
|
||||||
TEST_ASSERT_EQUAL(0, ftell_ret);
|
TEST_ASSERT_EQUAL(0, ftell_ret);
|
||||||
|
c = std::fgetc(file);
|
||||||
|
TEST_ASSERT_TRUE(TestFile<FS>::functionCalled(TestFile<FS>::fnRead));
|
||||||
|
TEST_ASSERT_EQUAL(c, str[0]);
|
||||||
|
|
||||||
TestFile<FS>::resetFunctionCallHistory();
|
TestFile<FS>::resetFunctionCallHistory();
|
||||||
fssek_ret = std::fseek(file, 0, SEEK_END);
|
fssek_ret = std::fseek(file, 0, SEEK_END);
|
||||||
TEST_ASSERT_TRUE(TestFile<FS>::functionCalled(TestFile<FS>::fnSeek));
|
|
||||||
TEST_ASSERT_EQUAL(0, fssek_ret);
|
TEST_ASSERT_EQUAL(0, fssek_ret);
|
||||||
ftell_ret = std::ftell(file);
|
ftell_ret = std::ftell(file);
|
||||||
TEST_ASSERT_EQUAL(size, ftell_ret);
|
TEST_ASSERT_EQUAL(size, ftell_ret);
|
||||||
|
c = std::fputc('!', file);
|
||||||
|
TEST_ASSERT_TRUE(TestFile<FS>::functionCalled(TestFile<FS>::fnWrite));
|
||||||
|
TEST_ASSERT_EQUAL(c, '!');
|
||||||
|
TEST_ASSERT_EQUAL(fh.size(), size + 1);
|
||||||
|
|
||||||
std::fclose(file);
|
std::fclose(file);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue