IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 4045


Ignore:
Timestamp:
May 27, 2005, 4:51:28 PM (21 years ago)
Author:
evanalst
Message:

Removed rand generation for records since this affects STDERR file.

Location:
trunk/psLib/test/dataIO
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/test/dataIO/tst_psDB.c

    r4044 r4045  
    99 *  @author Aaron Culliney, MHPCC
    1010 *
    11  *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
    12  *  @date $Date: 2005-05-28 01:02:08 $
     11 *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
     12 *  @date $Date: 2005-05-28 02:50:59 $
    1313 *
    1414 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    184184}
    185185
    186 psMetadata *_get_rand_row( void )
     186psMetadata *_get_const_row1( void )
    187187{
    188188    char buf[32];
    189     snprintf(buf, 32, "%d", rand());
     189    snprintf(buf, 32, "%s","randrow1" );
    190190    return _get_RowMetadata(
    191191               "key_string", "comment-string", buf,
    192                "key_s32",    "comment-s32",    rand(),
    193                "key_f32",    "comment-f32",    (double)rand()/RAND_MAX,
    194                "key_f64",    "comment-f64",    (double)rand()/RAND_MAX,
    195                "key_bool",   "comment-bool",   round((double)rand()/RAND_MAX),
     192               //               "key_s32",    "comment-s32",    rand(),
     193               "key_s32",    "comment-s32",    12345,
     194               //               "key_f32",    "comment-f32",    (double)rand()/RAND_MAX,
     195               "key_f32",    "comment-f32",    9876.5,
     196               //               "key_f64",    "comment-f64",    (double)rand()/RAND_MAX,
     197               "key_f64",    "comment-f64",    456.75,
     198               //               "key_bool",   "comment-bool",   round((double)rand()/RAND_MAX),
     199               "key_bool",   "comment-bool",   true,
     200               NULL,         NULL,             0.0);
     201}
     202
     203psMetadata *_get_const_row2( void )
     204{
     205    char buf[32];
     206    snprintf(buf, 32, "%s","randrow2");
     207    return _get_RowMetadata(
     208               "key_string", "comment-string", buf,
     209               //               "key_s32",    "comment-s32",    rand(),
     210               "key_s32",    "comment-s32",    2345,
     211               //               "key_f32",    "comment-f32",    (double)rand()/RAND_MAX,
     212               "key_f32",    "comment-f32",    876.5,
     213               //               "key_f64",    "comment-f64",    (double)rand()/RAND_MAX,
     214               "key_f64",    "comment-f64",    56.75,
     215               //               "key_bool",   "comment-bool",   round((double)rand()/RAND_MAX),
     216               "key_bool",   "comment-bool",   false,
    196217               NULL,         NULL,             0.0);
    197218}
    … …  
    388409    if (!failed) {
    389410
    390         row = _get_rand_row();
    391         psDBInsertOneRow(dbh, table, row);
    392         psFree(row);
    393 
    394         row = _get_rand_row();
     411        row = _get_const_row1();
     412        psDBInsertOneRow(dbh, table, row);
     413        psFree(row);
     414
     415        row = _get_const_row2();
    395416        psDBInsertOneRow(dbh, table, row);
    396417        psFree(row);
    … …  
    474495    if (!failed) {
    475496
    476         row = _get_rand_row();
    477         psDBInsertOneRow(dbh, table, row);
    478         psFree(row);
    479 
    480         row = _get_rand_row();
     497        row = _get_const_row1();
     498        psDBInsertOneRow(dbh, table, row);
     499        psFree(row);
     500
     501        row = _get_const_row2();
    481502        psDBInsertOneRow(dbh, table, row);
    482503        psFree(row);
    … …  
    548569    if (!failed) {
    549570
    550         row = _get_rand_row();
    551         psDBInsertOneRow(dbh, table, row);
    552         psFree(row);
    553 
    554         row = _get_rand_row();
     571        row = _get_const_row1();
     572        psDBInsertOneRow(dbh, table, row);
     573        psFree(row);
     574
     575        row = _get_const_row2();
    555576        psDBInsertOneRow(dbh, table, row);
    556577        psFree(row);
    … …  
    627648    failed = ! psDBCreateTable(dbh, table, md);
    628649    if (!failed) {
    629         row = _get_rand_row();
     650        row = _get_const_row1();
    630651        failed = ! psDBInsertOneRow(dbh, table, row);
    631652        psFree(row);
    … …  
    661682        rowSet->n = 0;
    662683
    663         row = _get_rand_row();
     684        row = _get_const_row1();
    664685        psArrayAdd(rowSet, 0, row);
    665686        psFree(row);
    666687
    667         row = _get_rand_row();
     688        row = _get_const_row2();
    668689        psArrayAdd(rowSet, 0, row);
    669690        psFree(row);
    … …  
    734755    if (!failed) {
    735756
    736         row = _get_rand_row();
    737         psDBInsertOneRow(dbh, table, row);
    738         psFree(row);
    739 
    740         row = _get_rand_row();
     757        row = _get_const_row1();
     758        psDBInsertOneRow(dbh, table, row);
     759        psFree(row);
     760
     761        row = _get_const_row2();
    741762        psDBInsertOneRow(dbh, table, row);
    742763        psFree(row);
    … …  
    804825    if (!failed) {
    805826
    806         row = _get_rand_row();
    807         psDBInsertOneRow(dbh, table, row);
    808         psFree(row);
    809 
    810         row = _get_rand_row();
     827        row = _get_const_row1();
     828        psDBInsertOneRow(dbh, table, row);
     829        psFree(row);
     830
     831        row = _get_const_row2();
    811832        psDBInsertOneRow(dbh, table, row);
    812833        psFree(row);
    … …  
    854875        rowSet->n = 0;
    855876
    856         row = _get_rand_row();
     877        row = _get_const_row1();
    857878        psArrayAdd(rowSet, 0, row);
    858879        psFree(row);
    859880
    860         row = _get_rand_row();
     881        row = _get_const_row2();
    861882        psArrayAdd(rowSet, 0, row);
    862883        psFree(row);
    … …  
    933954        rowSet->n = 0;
    934955
    935         row = _get_rand_row();
     956        row = _get_const_row1();
    936957        psArrayAdd(rowSet, 0, row);
    937958        psFree(row);
    938959
    939         row = _get_rand_row();
     960        row = _get_const_row2();
    940961        psArrayAdd(rowSet, 0, row);
    941962        psFree(row);

  • trunk/psLib/test/dataIO/verified/tst_psDB.stderr

    r3939 r4045  
    6868    psDBSelectColumn shall select data from a test table.
    6969<DATE><TIME>|<HOST>|I|TPDBSelectColumn
     70    psDBSelectColumn: [randrow1]
     71<DATE><TIME>|<HOST>|I|TPDBSelectColumn
     72    psDBSelectColumn: [randrow2]
     73<DATE><TIME>|<HOST>|I|TPDBSelectColumn
    7074    psDBSelectColumn: [hello world!]
    7175<DATE><TIME>|<HOST>|I|TPDBSelectColumn
    72     psDBSelectColumn: [hello world!]
    73 <DATE><TIME>|<HOST>|I|TPDBSelectColumn
    74     psDBSelectColumn: [hello world!]
    75 <DATE><TIME>|<HOST>|I|TPDBSelectColumn
    7676    found expected string output.
     77<DATE><TIME>|<HOST>|I|TPDBSelectColumn
     78    psDBSelectColumn: [1]
     79<DATE><TIME>|<HOST>|I|TPDBSelectColumn
     80    psDBSelectColumn: [0]
     81<DATE><TIME>|<HOST>|I|TPDBSelectColumn
     82    psDBSelectColumn: [1]
     83<DATE><TIME>|<HOST>|I|TPDBSelectColumn
     84    found expected string output.
    7785
    7886---> TESTPOINT PASSED (psDB{dbSelectColumn} | tst_psDB.c)
    … …  
    8997    psDBSelectColumnNum shall select data from a test table.
    9098<DATE><TIME>|<HOST>|I|TPDBSelectColumnNum
     99    str=[12345]
     100<DATE><TIME>|<HOST>|I|TPDBSelectColumnNum
     101    str=[2345]
     102<DATE><TIME>|<HOST>|I|TPDBSelectColumnNum
    91103    str=[1974]
    92104<DATE><TIME>|<HOST>|I|TPDBSelectColumnNum
    93     str=[1974]
    94 <DATE><TIME>|<HOST>|I|TPDBSelectColumnNum
    95     str=[1974]
    96 <DATE><TIME>|<HOST>|I|TPDBSelectColumnNum
    97105    found expected S32 output.
     106<DATE><TIME>|<HOST>|I|TPDBSelectColumnNum
     107    bool=[1]
     108<DATE><TIME>|<HOST>|I|TPDBSelectColumnNum
     109    bool=[0]
     110<DATE><TIME>|<HOST>|I|TPDBSelectColumnNum
     111    bool=[1]
     112<DATE><TIME>|<HOST>|I|TPDBSelectColumnNum
     113    found expected bool output.
    98114
    99115---> TESTPOINT PASSED (psDB{dbSelectColumnNum} | tst_psDB.c)
    … …  
    118134    [key_f64]=[2.71828]
    119135<DATE><TIME>|<HOST>|I|_print_row
     136    [key_bool]=[Yay]
     137<DATE><TIME>|<HOST>|I|_print_row
     138    [key_s32_0]=[3]
     139<DATE><TIME>|<HOST>|I|TPDBSelectRows
     140    found expected output.
     141<DATE><TIME>|<HOST>|I|TPDBSelectRows
     142    found expected output.
     143<DATE><TIME>|<HOST>|I|_print_row
    120144    [key_string]=[hello world!]
    121145<DATE><TIME>|<HOST>|I|_print_row
    … …  
    126150    [key_f64]=[2.71828]
    127151<DATE><TIME>|<HOST>|I|_print_row
    128     [key_string]=[hello world!]
    129 <DATE><TIME>|<HOST>|I|_print_row
    130     [key_s32]=[1974]
    131 <DATE><TIME>|<HOST>|I|_print_row
    132     [key_f32]=[3.14159]
    133 <DATE><TIME>|<HOST>|I|_print_row
    134     [key_f64]=[2.71828]
     152    [key_bool]=[Yay]
     153<DATE><TIME>|<HOST>|I|_print_row
     154    [key_s32_0]=[3]
     155<DATE><TIME>|<HOST>|I|TPDBSelectRows
     156    found expected output.
    135157<DATE><TIME>|<HOST>|I|TPDBSelectRows
    136158    found expected output.
    … …  
    162184    psDBInsertRows shall insert rows into a test table.
    163185<DATE><TIME>|<HOST>|I|_print_row
     186    [key_string]=[randrow1]
     187<DATE><TIME>|<HOST>|I|_print_row
     188    [key_s32]=[12345]
     189<DATE><TIME>|<HOST>|I|_print_row
     190    [key_f32]=[9876.5]
     191<DATE><TIME>|<HOST>|I|_print_row
     192    [key_f64]=[456.75]
     193<DATE><TIME>|<HOST>|I|_print_row
     194    [key_bool]=[Yay]
     195<DATE><TIME>|<HOST>|I|_print_row
     196    [key_s32_0]=[1]
     197<DATE><TIME>|<HOST>|I|_print_row
     198    [key_string]=[randrow2]
     199<DATE><TIME>|<HOST>|I|_print_row
     200    [key_s32]=[2345]
     201<DATE><TIME>|<HOST>|I|_print_row
     202    [key_f32]=[876.5]
     203<DATE><TIME>|<HOST>|I|_print_row
     204    [key_f64]=[56.75]
     205<DATE><TIME>|<HOST>|I|_print_row
     206    [key_bool]=[Nay]
     207<DATE><TIME>|<HOST>|I|_print_row
     208    [key_s32_0]=[2]
     209<DATE><TIME>|<HOST>|I|_print_row
    164210    [key_string]=[hello world!]
    165211<DATE><TIME>|<HOST>|I|_print_row
    … …  
    170216    [key_f64]=[2.71828]
    171217<DATE><TIME>|<HOST>|I|_print_row
    172     [key_string]=[hello world!]
    173 <DATE><TIME>|<HOST>|I|_print_row
    174     [key_s32]=[1974]
    175 <DATE><TIME>|<HOST>|I|_print_row
    176     [key_f32]=[3.14159]
    177 <DATE><TIME>|<HOST>|I|_print_row
    178     [key_f64]=[2.71828]
    179 <DATE><TIME>|<HOST>|I|_print_row
    180     [key_string]=[hello world!]
    181 <DATE><TIME>|<HOST>|I|_print_row
    182     [key_s32]=[1974]
    183 <DATE><TIME>|<HOST>|I|_print_row
    184     [key_f32]=[3.14159]
    185 <DATE><TIME>|<HOST>|I|_print_row
    186     [key_f64]=[2.71828]
     218    [key_bool]=[Yay]
     219<DATE><TIME>|<HOST>|I|_print_row
     220    [key_s32_0]=[3]
     221<DATE><TIME>|<HOST>|I|TPDBInsertRows
     222    found expected output.
    187223<DATE><TIME>|<HOST>|I|TPDBInsertRows
    188224    found expected output.
    … …  
    201237    psDBDumpRows shall dump all rows from a test table.
    202238<DATE><TIME>|<HOST>|I|_print_row
     239    [key_string]=[randrow1]
     240<DATE><TIME>|<HOST>|I|_print_row
     241    [key_s32]=[12345]
     242<DATE><TIME>|<HOST>|I|_print_row
     243    [key_f32]=[9876.5]
     244<DATE><TIME>|<HOST>|I|_print_row
     245    [key_f64]=[456.75]
     246<DATE><TIME>|<HOST>|I|_print_row
     247    [key_bool]=[Yay]
     248<DATE><TIME>|<HOST>|I|_print_row
     249    [key_s32_0]=[1]
     250<DATE><TIME>|<HOST>|I|_print_row
     251    [key_string]=[randrow2]
     252<DATE><TIME>|<HOST>|I|_print_row
     253    [key_s32]=[2345]
     254<DATE><TIME>|<HOST>|I|_print_row
     255    [key_f32]=[876.5]
     256<DATE><TIME>|<HOST>|I|_print_row
     257    [key_f64]=[56.75]
     258<DATE><TIME>|<HOST>|I|_print_row
     259    [key_bool]=[Nay]
     260<DATE><TIME>|<HOST>|I|_print_row
     261    [key_s32_0]=[2]
     262<DATE><TIME>|<HOST>|I|_print_row
    203263    [key_string]=[hello world!]
    204264<DATE><TIME>|<HOST>|I|_print_row
    … …  
    209269    [key_f64]=[2.71828]
    210270<DATE><TIME>|<HOST>|I|_print_row
    211     [key_string]=[hello world!]
    212 <DATE><TIME>|<HOST>|I|_print_row
    213     [key_s32]=[1974]
    214 <DATE><TIME>|<HOST>|I|_print_row
    215     [key_f32]=[3.14159]
    216 <DATE><TIME>|<HOST>|I|_print_row
    217     [key_f64]=[2.71828]
    218 <DATE><TIME>|<HOST>|I|_print_row
    219     [key_string]=[hello world!]
    220 <DATE><TIME>|<HOST>|I|_print_row
    221     [key_s32]=[1974]
    222 <DATE><TIME>|<HOST>|I|_print_row
    223     [key_f32]=[3.14159]
    224 <DATE><TIME>|<HOST>|I|_print_row
    225     [key_f64]=[2.71828]
     271    [key_bool]=[Yay]
     272<DATE><TIME>|<HOST>|I|_print_row
     273    [key_s32_0]=[3]
     274<DATE><TIME>|<HOST>|I|TPDBDumpRows
     275    found expected output.
    226276<DATE><TIME>|<HOST>|I|TPDBDumpRows
    227277    found expected output.
    … …  
    240290    psDBDumpCols shall dump all cols from a test table.
    241291<DATE><TIME>|<HOST>|I|_print_row
    242     [key_string]=[]
     292    [key_string]=[]
    243293
    244294---> TESTPOINT PASSED (psDB{dbDumpCols} | tst_psDB.c)
    … …  
    263313    [key_f64]=[1.23457]
    264314<DATE><TIME>|<HOST>|I|_print_row
    265     [key_string]=[foobar]
    266 <DATE><TIME>|<HOST>|I|_print_row
    267     [key_s32]=[-18]
    268 <DATE><TIME>|<HOST>|I|_print_row
    269     [key_f32]=[3.33]
    270 <DATE><TIME>|<HOST>|I|_print_row
    271     [key_f64]=[1.23457]
    272 <DATE><TIME>|<HOST>|I|_print_row
    273     [key_string]=[foobar]
    274 <DATE><TIME>|<HOST>|I|_print_row
    275     [key_s32]=[-18]
    276 <DATE><TIME>|<HOST>|I|_print_row
    277     [key_f32]=[3.33]
    278 <DATE><TIME>|<HOST>|I|_print_row
    279     [key_f64]=[1.23457]
     315    [key_bool]=[Nay]
     316<DATE><TIME>|<HOST>|I|_print_row
     317    [key_s32_0]=[3]
     318<DATE><TIME>|<HOST>|I|TPDBUpdateRows
     319    found expected output.
    280320<DATE><TIME>|<HOST>|I|TPDBUpdateRows
    281321    found expected output.
    … …  
    294334    psDBDeleteRows shall delete rows from a test table.
    295335<DATE><TIME>|<HOST>|I|TPDBDeleteRows
    296     found expected empty table.
     336    found expected two-row table.
    297337
    298338---> TESTPOINT PASSED (psDB{dbDeleteRows} | tst_psDB.c)
Note: See TracChangeset for help on using the changeset viewer.