andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added test case for dynamic buffers, fixed a problem. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10900 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
Giovanni Di Sirio 2017-10-27 13:34:22 +00:00
parent 3f72c7787e
commit b140ed8c61
3 changed files with 293 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
os/common/oslib/src/chfactory.c
View File

@ -138,7 +138,7 @@ static dyn_element_t *dyn_create_object_heap(const char *name,
/* Allocating space for the new buffer object.*/
dep = (dyn_element_t *)chHeapAlloc(NULL, size);
if (dep) {
if (dep == NULL) {
return NULL;
}

129
test/oslib/configuration.xml
View File

@ -974,14 +974,21 @@ test_assert(p1 == NULL, "allocation not failed");]]></value>
<value>This test case verifies the static objects registry.</value>
</description>
<condition>
<value />
<value>CH_CFG_FACTORY_OBJECTS_REGISTRY == TRUE</value>
</condition>
<various_code>
<setup_code>
<value />
</setup_code>
<teardown_code>
<value />
<value><![CDATA[registered_object_t *rop;
rop = chFactoryFindObject("myobj");
if (rop != NULL) {
while (rop->element.refs > 0U) {
chFactoryReleaseObject(rop);
}
}]]></value>
</teardown_code>
<local_variables>
<value><![CDATA[registered_object_t *rop;]]></value>
@ -1082,6 +1089,124 @@ test_assert(rop == NULL, "found");]]></value>
</step>
</steps>
</case>
<case>
<brief>
<value>Dynamic Buffers Factory.</value>
</brief>
<description>
<value>This test case verifies the dynamic buffers factory.</value>
</description>
<condition>
<value>CH_CFG_FACTORY_GENERIC_BUFFERS == TRUE</value>
</condition>
<various_code>
<setup_code>
<value />
</setup_code>
<teardown_code>
<value><![CDATA[dyn_buffer_t *dbp;
dbp = chFactoryFindBuffer("mybuf");
if (dbp != NULL) {
while (dbp->element.refs > 0U) {
chFactoryReleaseBuffer(dbp);
}
}]]></value>
</teardown_code>
<local_variables>
<value><![CDATA[dyn_buffer_t *dbp;]]></value>
</local_variables>
</various_code>
<steps>
<step>
<description>
<value>Retrieving a dynamic buffer by name, must not exist.</value>
</description>
<tags>
<value />
</tags>
<code>
<value><![CDATA[dbp = chFactoryFindBuffer("mybuf");
test_assert(dbp == NULL, "found");]]></value>
</code>
</step>
<step>
<description>
<value>Creating a dynamic buffer it must not exists, must succeed.</value>
</description>
<tags>
<value />
</tags>
<code>
<value><![CDATA[dbp = chFactoryCreateBuffer("mybuf", 128U);
test_assert(dbp != NULL, "cannot create");]]></value>
</code>
</step>
<step>
<description>
<value>Creating a dynamic buffer with the same name, must fail.</value>
</description>
<tags>
<value />
</tags>
<code>
<value><![CDATA[dyn_buffer_t *dbp1;
dbp1 = chFactoryCreateBuffer("mybuf", 128U);
test_assert(dbp1 == NULL, "can create");]]></value>
</code>
</step>
<step>
<description>
<value>Retrieving the dynamic buffer by name, must exist, then increasing the reference counter, finally releasing both references.</value>
</description>
<tags>
<value />
</tags>
<code>
<value><![CDATA[dyn_buffer_t *dbp1, *dbp2;
dbp1 = chFactoryFindBuffer("mybuf");
test_assert(dbp1 != NULL, "not found");
test_assert(dbp == dbp1, "object reference mismatch");
test_assert(dbp1->element.refs == 2, "object reference mismatch");
dbp2 = (dyn_buffer_t *)chFactoryDuplicateReference((dyn_element_t *)dbp1);
test_assert(dbp1 == dbp2, "object reference mismatch");
test_assert(dbp2->element.refs == 3, "object reference mismatch");
chFactoryReleaseBuffer(dbp2);
test_assert(dbp1->element.refs == 2, "references mismatch");
chFactoryReleaseBuffer(dbp1);
test_assert(dbp->element.refs == 1, "references mismatch");]]></value>
</code>
</step>
<step>
<description>
<value>Releasing the first reference to the dynamic buffer, must not trigger an assertion.</value>
</description>
<tags>
<value />
</tags>
<code>
<value><![CDATA[chFactoryReleaseBuffer(dbp);]]></value>
</code>
</step>
<step>
<description>
<value>Retrieving the dynamic buffer by name again, must not exist.</value>
</description>
<tags>
<value />
</tags>
<code>
<value><![CDATA[dbp = chFactoryFindBuffer("mybuf");
test_assert(dbp == NULL, "found");]]></value>
</code>
</step>
</steps>
</case>
</cases>
</sequence>
</sequences>

140
test/oslib/source/test/oslib_test_sequence_004.c
View File

@ -37,6 +37,7 @@
*
* <h2>Test Cases</h2>
* - @subpage oslib_test_004_001
* - @subpage oslib_test_004_002
* .
*/
@ -51,12 +52,19 @@
* Test cases.
****************************************************************************/
#if (CH_CFG_FACTORY_OBJECTS_REGISTRY == TRUE) || defined(__DOXYGEN__)
/**
* @page oslib_test_004_001 [4.1] Objects Registry
*
* <h2>Description</h2>
* This test case verifies the static objects registry.
*
* <h2>Conditions</h2>
* This test is only executed if the following preprocessor condition
* evaluates to true:
* - CH_CFG_FACTORY_OBJECTS_REGISTRY == TRUE
* .
*
* <h2>Test Steps</h2>
* - [4.1.1] Retrieving a registered object by name, must not exist.
* - [4.1.2] Registering an object, it must not exists, must succeed.
@ -71,6 +79,17 @@
* .
*/
static void oslib_test_004_001_teardown(void) {
registered_object_t *rop;
rop = chFactoryFindObject("myobj");
if (rop != NULL) {
while (rop->element.refs > 0U) {
chFactoryReleaseObject(rop);
}
}
}
static void oslib_test_004_001_execute(void) {
registered_object_t *rop;
@ -144,9 +163,123 @@ static void oslib_test_004_001_execute(void) {
static const testcase_t oslib_test_004_001 = {
"Objects Registry",
NULL,
NULL,
oslib_test_004_001_teardown,
oslib_test_004_001_execute
};
#endif /* CH_CFG_FACTORY_OBJECTS_REGISTRY == TRUE */
#if (CH_CFG_FACTORY_GENERIC_BUFFERS == TRUE) || defined(__DOXYGEN__)
/**
* @page oslib_test_004_002 [4.2] Dynamic Buffers Factory
*
* <h2>Description</h2>
* This test case verifies the dynamic buffers factory.
*
* <h2>Conditions</h2>
* This test is only executed if the following preprocessor condition
* evaluates to true:
* - CH_CFG_FACTORY_GENERIC_BUFFERS == TRUE
* .
*
* <h2>Test Steps</h2>
* - [4.2.1] Retrieving a dynamic buffer by name, must not exist.
* - [4.2.2] Creating a dynamic buffer it must not exists, must
* succeed.
* - [4.2.3] Creating a dynamic buffer with the same name, must fail.
* - [4.2.4] Retrieving the dynamic buffer by name, must exist, then
* increasing the reference counter, finally releasing both
* references.
* - [4.2.5] Releasing the first reference to the dynamic buffer, must
* not trigger an assertion.
* - [4.2.6] Retrieving the dynamic buffer by name again, must not
* exist.
* .
*/
static void oslib_test_004_002_teardown(void) {
dyn_buffer_t *dbp;
dbp = chFactoryFindBuffer("mybuf");
if (dbp != NULL) {
while (dbp->element.refs > 0U) {
chFactoryReleaseBuffer(dbp);
}
}
}
static void oslib_test_004_002_execute(void) {
dyn_buffer_t *dbp;
/* [4.2.1] Retrieving a dynamic buffer by name, must not exist.*/
test_set_step(1);
{
dbp = chFactoryFindBuffer("mybuf");
test_assert(dbp == NULL, "found");
}
/* [4.2.2] Creating a dynamic buffer it must not exists, must
succeed.*/
test_set_step(2);
{
dbp = chFactoryCreateBuffer("mybuf", 128U);
test_assert(dbp != NULL, "cannot create");
}
/* [4.2.3] Creating a dynamic buffer with the same name, must fail.*/
test_set_step(3);
{
dyn_buffer_t *dbp1;
dbp1 = chFactoryCreateBuffer("mybuf", 128U);
test_assert(dbp1 == NULL, "can create");
}
/* [4.2.4] Retrieving the dynamic buffer by name, must exist, then
increasing the reference counter, finally releasing both
references.*/
test_set_step(4);
{
dyn_buffer_t *dbp1, *dbp2;
dbp1 = chFactoryFindBuffer("mybuf");
test_assert(dbp1 != NULL, "not found");
test_assert(dbp == dbp1, "object reference mismatch");
test_assert(dbp1->element.refs == 2, "object reference mismatch");
dbp2 = (dyn_buffer_t *)chFactoryDuplicateReference((dyn_element_t *)dbp1);
test_assert(dbp1 == dbp2, "object reference mismatch");
test_assert(dbp2->element.refs == 3, "object reference mismatch");
chFactoryReleaseBuffer(dbp2);
test_assert(dbp1->element.refs == 2, "references mismatch");
chFactoryReleaseBuffer(dbp1);
test_assert(dbp->element.refs == 1, "references mismatch");
}
/* [4.2.5] Releasing the first reference to the dynamic buffer, must
not trigger an assertion.*/
test_set_step(5);
{
chFactoryReleaseBuffer(dbp);
}
/* [4.2.6] Retrieving the dynamic buffer by name again, must not
exist.*/
test_set_step(6);
{
dbp = chFactoryFindBuffer("mybuf");
test_assert(dbp == NULL, "found");
}
}
static const testcase_t oslib_test_004_002 = {
"Dynamic Buffers Factory",
NULL,
oslib_test_004_002_teardown,
oslib_test_004_002_execute
};
#endif /* CH_CFG_FACTORY_GENERIC_BUFFERS == TRUE */
/****************************************************************************
* Exported data.
@ -156,7 +289,12 @@ static const testcase_t oslib_test_004_001 = {
* @brief Array of test cases.
*/
const testcase_t * const oslib_test_sequence_004_array[] = {
#if (CH_CFG_FACTORY_OBJECTS_REGISTRY == TRUE) || defined(__DOXYGEN__)
&oslib_test_004_001,
#endif
#if (CH_CFG_FACTORY_GENERIC_BUFFERS == TRUE) || defined(__DOXYGEN__)
&oslib_test_004_002,
#endif
NULL
};