Changeset 03daabd in mainline for uspace/srv/sysman/test/job_closure.c


Ignore:
Timestamp:
2019-10-06T19:47:36Z (5 years ago)
Author:
Matthieu Riolo <matthieu.riolo@…>
Children:
5be6361
Parents:
9559cf8
git-author:
Matthieu Riolo <matthieu.riolo@…> (2019-09-17 07:50:03)
git-committer:
Matthieu Riolo <matthieu.riolo@…> (2019-10-06 19:47:36)
Message:

Renaming dyn_array to array

The term dyn_array is redunant and has therefore been replaced
with the shorter term array

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/sysman/test/job_closure.c

    r9559cf8 r03daabd  
    4040PCUT_TEST_SUITE(job_closure);
    4141
    42 static dyn_array_t exp_closure;
    43 static dyn_array_t act_closure;
     42static array_t exp_closure;
     43static array_t act_closure;
    4444
    4545static bool same_job(job_t *expected, job_t *actual)
    … …  
    4949}
    5050
    51 static bool same_jobs(dyn_array_t *expected, dyn_array_t *actual)
     51static bool same_jobs(array_t *expected, array_t *actual)
    5252{
    5353        if (expected->size != actual->size) {
    … …  
    5858
    5959        /* Verify expected \subseteq actual (we've compared sizes) */
    60         dyn_array_foreach(*expected, job_t *, it_exp) {
     60        array_foreach(*expected, job_t *, it_exp) {
    6161                bool found = false;
    62                 dyn_array_foreach(*actual, job_t *, it_act) {
     62                array_foreach(*actual, job_t *, it_act) {
    6363                        if (same_job(*it_exp, *it_act)) {
    6464                                found = true;
    … …  
    7979{
    8080        bool found = false;
    81         dyn_array_foreach(blocking_job->blocked_jobs, job_t *, it) {
     81        array_foreach(blocking_job->blocked_jobs, job_t *, it) {
    8282                if (*it == blocked_job) {
    8383                        found = true;
    … …  
    9494}
    9595
    96 static void dummy_add_closure(dyn_array_t *closure)
    97 {
    98         dyn_array_foreach(*closure, job_t *, it) {
     96static void dummy_add_closure(array_t *closure)
     97{
     98        array_foreach(*closure, job_t *, it) {
    9999                (*it)->unit->job = *it;
    100100        }
    101101}
    102102
    103 static void destroy_job_closure(dyn_array_t *closure)
    104 {
    105         dyn_array_foreach(*closure, job_t *, it) {
     103static void destroy_job_closure(array_t *closure)
     104{
     105        array_foreach(*closure, job_t *, it) {
    106106                job_del_ref(&(*it));
    107107        }
    … …  
    113113        mock_set_units_state(STATE_STOPPED);
    114114
    115         dyn_array_initialize(&exp_closure, job_t *);
    116         errno_t rc = dyn_array_reserve(&exp_closure, MAX_TYPES * MAX_UNITS);
     115        array_initialize(&exp_closure, job_t *);
     116        errno_t rc = array_reserve(&exp_closure, MAX_TYPES * MAX_UNITS);
    117117        assert(rc == EOK);
    118118
    119         dyn_array_initialize(&act_closure, job_t *);
    120         rc = dyn_array_reserve(&act_closure, MAX_TYPES * MAX_UNITS);
     119        array_initialize(&act_closure, job_t *);
     120        rc = array_reserve(&act_closure, MAX_TYPES * MAX_UNITS);
    121121        assert(rc == EOK);
    122122
    … …  
    127127{
    128128        destroy_job_closure(&act_closure);
    129         dyn_array_destroy(&act_closure);
     129        array_destroy(&act_closure);
    130130
    131131        destroy_job_closure(&exp_closure);
    132         dyn_array_destroy(&exp_closure);
     132        array_destroy(&exp_closure);
    133133
    134134        mock_destroy_units();
    … …  
    156156        PCUT_ASSERT_INT_EQUALS(EOK, rc);
    157157
    158         dyn_array_append(&exp_closure, job_t *, dummy_job(u1, STATE_STARTED));
    159         dyn_array_append(&exp_closure, job_t *, dummy_job(u2, STATE_STARTED));
    160         dyn_array_append(&exp_closure, job_t *, dummy_job(u3, STATE_STARTED));
     158        array_append(&exp_closure, job_t *, dummy_job(u1, STATE_STARTED));
     159        array_append(&exp_closure, job_t *, dummy_job(u2, STATE_STARTED));
     160        array_append(&exp_closure, job_t *, dummy_job(u3, STATE_STARTED));
    161161
    162162        dummy_add_closure(&act_closure);
    … …  
    188188        PCUT_ASSERT_INT_EQUALS(EOK, rc);
    189189
    190         dyn_array_append(&exp_closure, job_t *, dummy_job(u1, STATE_STARTED));
    191         dyn_array_append(&exp_closure, job_t *, dummy_job(u2, STATE_STARTED));
    192         dyn_array_append(&exp_closure, job_t *, dummy_job(u3, STATE_STARTED));
     190        array_append(&exp_closure, job_t *, dummy_job(u1, STATE_STARTED));
     191        array_append(&exp_closure, job_t *, dummy_job(u2, STATE_STARTED));
     192        array_append(&exp_closure, job_t *, dummy_job(u3, STATE_STARTED));
    193193
    194194        dummy_add_closure(&act_closure);
    … …  
    222222        PCUT_ASSERT_INT_EQUALS(EOK, rc);
    223223
    224         dyn_array_append(&exp_closure, job_t *, dummy_job(u1, STATE_STARTED));
    225         dyn_array_append(&exp_closure, job_t *, dummy_job(u2, STATE_STARTED));
    226         dyn_array_append(&exp_closure, job_t *, dummy_job(u3, STATE_STARTED));
     224        array_append(&exp_closure, job_t *, dummy_job(u1, STATE_STARTED));
     225        array_append(&exp_closure, job_t *, dummy_job(u2, STATE_STARTED));
     226        array_append(&exp_closure, job_t *, dummy_job(u3, STATE_STARTED));
    227227
    228228        dummy_add_closure(&act_closure);
    … …  
    269269        PCUT_ASSERT_INT_EQUALS(EOK, rc);
    270270
    271         dyn_array_append(&exp_closure, job_t *, dummy_job(u0, STATE_STOPPED));
    272         dyn_array_append(&exp_closure, job_t *, dummy_job(u1, STATE_STARTED));
    273         dyn_array_append(&exp_closure, job_t *, dummy_job(u2, STATE_STARTED));
    274         dyn_array_append(&exp_closure, job_t *, dummy_job(u3, STATE_STOPPED));
    275         dyn_array_append(&exp_closure, job_t *, dummy_job(u4, STATE_STOPPED));
    276         dyn_array_append(&exp_closure, job_t *, dummy_job(u5, STATE_STOPPED));
    277         dyn_array_append(&exp_closure, job_t *, dummy_job(u6, STATE_STOPPED));
     271        array_append(&exp_closure, job_t *, dummy_job(u0, STATE_STOPPED));
     272        array_append(&exp_closure, job_t *, dummy_job(u1, STATE_STARTED));
     273        array_append(&exp_closure, job_t *, dummy_job(u2, STATE_STARTED));
     274        array_append(&exp_closure, job_t *, dummy_job(u3, STATE_STOPPED));
     275        array_append(&exp_closure, job_t *, dummy_job(u4, STATE_STOPPED));
     276        array_append(&exp_closure, job_t *, dummy_job(u5, STATE_STOPPED));
     277        array_append(&exp_closure, job_t *, dummy_job(u6, STATE_STOPPED));
    278278
    279279        dummy_add_closure(&act_closure);
Note: See TracChangeset for help on using the changeset viewer.