Changeset 5237

Show
Ignore:
Timestamp:
10/04/07 17:23:07 (6 years ago)
Author:
jgaeddert
Message:

adding tests for depacketizer

Location:
experimental/components/Packetizer/trunk/Packetizer-metadata
Files:
7 modified

Legend:

Unmodified
Added
Removed

  • experimental/components/Packetizer/trunk/Packetizer-metadata/Makefile.am

    r5219 r5237  
    5959        cxxtestgen.py --error-printer -o autotest.cpp \ 
    6060        tests/binary_sequence_testsuite.h             \ 
    61         tests/Packetizer_testsuite.h                   
    62 #       tests/Depacketizer_testsuite.h 
     61        tests/Packetizer_testsuite.h                  \ 
     62        tests/Depacketizer_testsuite.h 
    6363 
    6464# ---------- documentation --------- 

  • experimental/components/Packetizer/trunk/Packetizer-metadata/src/PNCodes.cpp

    r4104 r5237  
    2424 
    2525// P/N packet synchronization code 
    26 char pnPacketSyncCode[63] = { 
     26char pn_code_63[63] = { 
    2727    1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 1, 
    2828    1, 0, 1, 1, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 0, 1, 
    … …  
    3131 
    3232// P/N packet control code 
    33 char pnControlCode[7] = {1, 1, 1, 0, 1, 0, 0}; 
     33char pn_code_7[7] = {1, 1, 1, 0, 1, 0, 0}; 
    3434 
    3535// P/N inverse packet control code 
    36 char pnControlCodeInv[7] = {0, 0, 0, 1, 0, 1, 1}; 
     36char pn_code_7_inv[7] = {0, 0, 0, 1, 0, 1, 1}; 
    3737 
    3838 

  • experimental/components/Packetizer/trunk/Packetizer-metadata/src/PNCodes.h

    r4104 r5237  
    2626/// 
    2727/// generator polynomial : g = 103 (octal) 
    28 extern char pnPacketSyncCode[63]; 
     28extern char pn_code_63[63]; 
    2929 
    3030// P/N packet control code 
    31 extern char pnControlCode[7]; 
     31extern char pn_code_7[7]; 
    3232 
    3333// P/N inverse packet control code 
    34 extern char pnControlCodeInv[7]; 
     34extern char pn_code_7_inv[7]; 
    3535 

  • experimental/components/Packetizer/trunk/Packetizer-metadata/src/PacketizerDSP.cpp

    r5236 r5237  
    3030{ 
    3131    // Initialize P/N synchronization code block 
    32     pnSyncCode = pnPacketSyncCode; 
     32    pnSyncCode = pn_code_63; 
    3333 
    3434    // Initialize P/N synchronization shift register 
    … …  
    3737    for (unsigned int i=0; i<PN_SYNC_CODE_LENGTH; i++) 
    3838        binary_sequence_push(pn_sync_code, pnSyncCode[i] & 0x01); 
     39 
     40    // Initialize P/N synchronization code block 
     41    pnControlCode = pn_code_7; 
     42 
     43    // Initialize P/N control code shift register 
     44    pn_control_code = binary_sequence_create(); 
     45    binary_sequence_initialize(pn_control_code, PN_CONTROL_CODE_LENGTH); 
     46    for (unsigned int i=0; i<PN_CONTROL_CODE_LENGTH; i++) 
     47        binary_sequence_push(pn_control_code, pnControlCode[i] & 0x01); 
    3948 
    4049    // Initialize control block pointers 
    … …  
    7079{ 
    7180    for (unsigned int i=NUM_CONTROL_CODES; i>0; i--) { 
    72         controlBlock[i-1] = ( id & 0x01 ) ? pnControlCode : pnControlCodeInv; 
     81        controlBlock[i-1] = ( id & 0x01 ) ? pn_code_7 : pn_code_7_inv; 
    7382        id >>= 1; 
    7483    } 

  • experimental/components/Packetizer/trunk/Packetizer-metadata/src/PacketizerDSP.h

    r5236 r5237  
    9999    binary_sequence_t * pn_sync_code;   ///< packet synchronization code shift register 
    100100 
     101    char * pnControlCode;               ///< packet control code 
     102    binary_sequence_t * pn_control_code;///< packet control code shift register 
     103 
    101104    char * pnEOMCode;                   ///< packet EOM code 
    102105    binary_sequence_t * pn_eom_code;    ///< packet EOM code shift register 

  • experimental/components/Packetizer/trunk/Packetizer-metadata/tests/Depacketizer_testsuite.h

    r5219 r5237  
    33 
    44#include <cxxtest/TestSuite.h> 
    5 #include "src/DepacketizerDSP.h" 
     5#include "src/PacketizerDSP.h" 
    66 
    77// 
    … …  
    1212//       as a test class 
    1313class Depacketizer_testsuite1 : public CxxTest::TestSuite, 
    14     public DepacketizerDSP 
     14    public PacketizerDSP 
    1515{ 
    1616public: 
    … …  
    2121        // Test for positive P/N sync code correlation 
    2222        for (unsigned int i=0; i<63; i++) 
    23             inputBuffer.Push( pnSyncCode[i] ); 
     23            binary_sequence_push( pn_sync_buffer, pnSyncCode[i] ); 
    2424 
    25         r = CorrelateSequence( pnSyncCode, 63 ); 
     25        r = binary_sequence_correlate( pn_sync_buffer, pn_sync_code ); 
    2626        TS_ASSERT_EQUALS( r, 63 ); 
    2727         
    2828        // Test for negative P/N sync code correlation 
    2929        for (unsigned int i=0; i<63; i++) 
    30             inputBuffer.Push( 1-pnSyncCode[i] ); 
     30            binary_sequence_push( pn_sync_buffer, 1-pnSyncCode[i] ); 
    3131 
    32         r = CorrelateSequence( pnSyncCode, 63 ); 
     32        r = binary_sequence_correlate( pn_sync_buffer, pn_sync_code ); 
    3333        TS_ASSERT_EQUALS( r, -63 ); 
    3434 
    3535        // Test for positive P/N control code correlation 
    36         inputBuffer.Release(); 
    3736        for (unsigned int i=0; i<7; i++) 
    38             inputBuffer.Push( pnCtrlCode[i] ); 
     37            binary_sequence_push( pn_control_buffer,  pnControlCode[i] ); 
    3938 
    40         r = CorrelateSequence( pnCtrlCode, 7 ); 
     39        r = binary_sequence_correlate( pn_control_buffer, pn_control_code ); 
    4140        TS_ASSERT_EQUALS( r, 7 ); 
    4241         
    4342        // Test for positive P/N control code correlation 
    44         inputBuffer.Release(); 
    4543        for (unsigned int i=0; i<7; i++) 
    46             inputBuffer.Push( 1-pnCtrlCode[i] ); 
     44            binary_sequence_push( pn_control_buffer,  1-pnControlCode[i] ); 
    4745 
    48         r = CorrelateSequence( pnCtrlCode, 7 ); 
     46        r = binary_sequence_correlate( pn_control_buffer, pn_control_code ); 
    4947        TS_ASSERT_EQUALS( r, -7 ); 
    5048         
    5149    } 
    5250 
    53     void test_DecodeControlSequence() { 
    54         controlSequence[0] = -10; 
    55         controlSequence[1] = -10; 
    56         controlSequence[2] = -10; 
    57         controlSequence[3] = -10; 
    58         controlSequence[4] = -10; 
    59         controlSequence[5] = -10; 
    60         controlSequence[6] = -10; 
    61         DecodeControlSequence(); 
    62         TS_ASSERT_EQUALS( controlOutput, 0 ); 
    63          
    64         controlSequence[0] = -10; 
    65         controlSequence[1] = -10; 
    66         controlSequence[2] = -10; 
    67         controlSequence[3] = -10; 
    68         controlSequence[4] = -10; 
    69         controlSequence[5] = -10; 
    70         controlSequence[6] =  10; 
    71         DecodeControlSequence(); 
    72         TS_ASSERT_EQUALS( controlOutput, 1 ); 
    73              
    74         controlSequence[0] = -10; 
    75         controlSequence[1] = -10; 
    76         controlSequence[2] = -10; 
    77         controlSequence[3] = -10; 
    78         controlSequence[4] =  10; 
    79         controlSequence[5] =  10; 
    80         controlSequence[6] =  10; 
    81         DecodeControlSequence(); 
    82         TS_ASSERT_EQUALS( controlOutput, 7 ); 
    83              
    84         controlSequence[0] =  10; 
    85         controlSequence[1] =  10; 
    86         controlSequence[2] =  10; 
    87         controlSequence[3] =  10; 
    88         controlSequence[4] =  10; 
    89         controlSequence[5] =  10; 
    90         controlSequence[6] =  10; 
    91         DecodeControlSequence(); 
    92         TS_ASSERT_EQUALS( controlOutput, 127 ); 
    93              
    94         controlSequence[0] =  10; 
    95         controlSequence[1] = -10; 
    96         controlSequence[2] = -10; 
    97         controlSequence[3] = -10; 
    98         controlSequence[4] = -10; 
    99         controlSequence[5] = -10; 
    100         controlSequence[6] = -10; 
    101         DecodeControlSequence(); 
    102         TS_ASSERT_EQUALS( controlOutput, 64 ); 
    103              
    104             
    105     } 
    10651 
    10752}; 

  • experimental/components/Packetizer/trunk/Packetizer-metadata/tests/Packetizer_testsuite.h

    r5236 r5237  
    1919        ConfigureControl(0x00); 
    2020        for (unsigned int i=0; i<NUM_CONTROL_CODES; i++) 
    21             TS_ASSERT_EQUALS( controlBlock[i], pnControlCodeInv ); 
     21            TS_ASSERT_EQUALS( controlBlock[i], pn_code_7_inv ); 
    2222 
    2323        ConfigureControl(0x0f); 
    2424        for (unsigned int i=0; i<NUM_CONTROL_CODES; i++) 
    25             TS_ASSERT_EQUALS( controlBlock[i], pnControlCode ); 
     25            TS_ASSERT_EQUALS( controlBlock[i], pn_code_7 ); 
    2626 
    2727        ConfigureControl(0x01); 
    28         TS_ASSERT_EQUALS( controlBlock[0], pnControlCodeInv ); 
    29         TS_ASSERT_EQUALS( controlBlock[1], pnControlCodeInv ); 
    30         TS_ASSERT_EQUALS( controlBlock[2], pnControlCodeInv ); 
    31         TS_ASSERT_EQUALS( controlBlock[3], pnControlCode    ); 
     28        TS_ASSERT_EQUALS( controlBlock[0], pn_code_7_inv ); 
     29        TS_ASSERT_EQUALS( controlBlock[1], pn_code_7_inv ); 
     30        TS_ASSERT_EQUALS( controlBlock[2], pn_code_7_inv ); 
     31        TS_ASSERT_EQUALS( controlBlock[3], pn_code_7     ); 
    3232 
    3333    } 
    … …  
    4747        AssemblePacket( input, 400, output, output_length, PACKET_RAW_400 ); 
    4848 
    49         TS_ASSERT_SAME_DATA( output, pnSyncCode, PN_SYNC_CODE_LENGTH*sizeof(char) ); 
     49        TS_ASSERT_SAME_DATA( output, pn_code_63, PN_SYNC_CODE_LENGTH*sizeof(char) ); 
    5050        TS_ASSERT_SAME_DATA( output+111, input,  400*sizeof(char) ); 
    5151        TS_ASSERT_EQUALS( output_length, 512 );