Skip to content
  • Nick Mathewson's avatar
    Use coccinelle scripts to clean up our unit tests · 02438957
    Nick Mathewson authored
    This should get rid of most of the users of the old test_*
    functions.  Some are in macros and will need manual cleanup, though.
    
    This patch is for 13119, and was automatically generated with these
    scripts.  The perl scripts are there because coccinelle hates
    operators as macro arguments.
    
    ------------------------------
    
    s/==,/_X_EQ_,/g;
    s/!=,/_X_NE_,/g;
    s/<,/_X_LT_,/g;
    s/>,/_X_GT_,/g;
    s/>=,/_X_GEQ_,/g;
    s/<=,/_X_LEQ_,/g;
    
    ------------------------------
    @@
    expression a;
    identifier func;
    @@
     func (...) {
    <...
    -test_fail_msg
    +TT_DIE
     (
    +(
     a
    +)
     )
     ...>
     }
    
    @@
    identifier func;
    @@
     func (...) {
    <...
    -test_fail()
    +TT_DIE(("Assertion failed."))
     ...>
     }
    
    @@
    expression a;
    identifier func;
    @@
     func (...) {
    <...
    -test_assert
    +tt_assert
    	(a)
     ...>
     }
    
    @@
    expression a, b;
    identifier func;
    @@
     func (...) {
    <...
    -test_eq
    +tt_int_op
     (a,
    +_X_EQ_,
      b)
     ...>
     }
    
    @@
    expression a, b;
    identifier func;
    @@
     func (...) {
    <...
    -test_neq
    +tt_int_op
     (a,
    +_X_NEQ_,
      b)
     ...>
     }
    
    @@
    expression a, b;
    identifier func;
    @@
     func (...) {
    <...
    -test_streq
    +tt_str_op
     (a,
    +_X_EQ_,
      b)
     ...>
     }
    
    @@
    expression a, b;
    identifier func;
    @@
     func (...) {
    <...
    -test_strneq
    +tt_str_op
     (a,
    +_X_NEQ_,
      b)
     ...>
     }
    
    @@
    expression a, b;
    identifier func;
    @@
     func (...) {
    <...
    -test_eq_ptr
    +tt_ptr_op
     (a,
    +_X_EQ_,
      b)
     ...>
     }
    
    @@
    expression a, b;
    identifier func;
    @@
     func() {
    <...
    -test_neq_ptr
    +tt_ptr_op
     (a,
    +_X_NEQ_,
      b)
     ...>
     }
    
    @@
    expression a, b, len;
    identifier func;
    @@
     func (...) {
    <...
    -test_memeq
    +tt_mem_op
     (a,
    +_X_EQ_,
      b, len)
     ...>
     }
    
    @@
    expression a, b, len;
    identifier func;
    @@
     func (...) {
    <...
    -test_memneq
    +tt_mem_op
     (a,
    +_X_NEQ_,
      b, len)
     ...>
     }
    
    ------------------------------
    @@
    char a, b;
    identifier func;
    @@
     func (...) {
    <...
    -tt_assert
    +tt_int_op
     (
    -a == b
    +a, _X_EQ_, b
     )
     ...>
    }
    
    @@
    int a, b;
    identifier func;
    @@
     func (...) {
    <...
    -tt_assert
    +tt_int_op
     (
    -a == b
    +a, _X_EQ_, b
     )
     ...>
    }
    
    @@
    long a, b;
    identifier func;
    @@
     func (...) {
    <...
    -tt_assert
    +tt_int_op
     (
    -a == b
    +a, _X_EQ_, b
     )
     ...>
    }
    
    @@
    unsigned int a, b;
    identifier func;
    @@
     func (...) {
    <...
    -tt_assert
    +tt_uint_op
     (
    -a == b
    +a, _X_EQ_, b
     )
     ...>
    }
    
    @@
    unsigned long a, b;
    identifier func;
    @@
     func (...) {
    <...
    -tt_assert
    +tt_uint_op
     (
    -a == b
    +a, _X_EQ_, b
     )
     ...>
    }
    
    @@
    char a, b;
    identifier func;
    @@
     func (...) {
    <...
    -tt_assert
    +tt_int_op
     (
    -a != b
    +a, _X_NEQ_, b
     )
     ...>
    }
    
    @@
    int a, b;
    identifier func;
    @@
     func (...) {
    <...
    -tt_assert
    +tt_int_op
     (
    -a != b
    +a, _X_NEQ_, b
     )
     ...>
    }
    
    @@
    long a, b;
    identifier func;
    @@
     func (...) {
    <...
    -tt_assert
    +tt_int_op
     (
    -a != b
    +a, _X_NEQ_, b
     )
     ...>
    }
    
    @@
    unsigned int a, b;
    identifier func;
    @@
     func (...) {
    <...
    -tt_assert
    +tt_uint_op
     (
    -a != b
    +a, _X_NEQ_, b
     )
     ...>
    }
    
    @@
    unsigned long a, b;
    identifier func;
    @@
     func (...) {
    <...
    -tt_assert
    +tt_uint_op
     (
    -a != b
    +a, _X_NEQ_, b
     )
     ...>
    }
    
    @@
    char a, b;
    identifier func;
    @@
     func (...) {
    <...
    -tt_assert
    +tt_int_op
     (
    -a >= b
    +a, _X_GEQ_, b
     )
     ...>
    }
    
    @@
    int a, b;
    identifier func;
    @@
     func (...) {
    <...
    -tt_assert
    +tt_int_op
     (
    -a >= b
    +a, _X_GEQ_, b
     )
     ...>
    }
    
    @@
    long a, b;
    identifier func;
    @@
     func (...) {
    <...
    -tt_assert
    +tt_int_op
     (
    -a >= b
    +a, _X_GEQ_, b
     )
     ...>
    }
    
    @@
    unsigned int a, b;
    identifier func;
    @@
     func (...) {
    <...
    -tt_assert
    +tt_uint_op
     (
    -a >= b
    +a, _X_GEQ_, b
     )
     ...>
    }
    
    @@
    unsigned long a, b;
    identifier func;
    @@
     func (...) {
    <...
    -tt_assert
    +tt_uint_op
     (
    -a >= b
    +a, _X_GEQ_, b
     )
     ...>
    }
    
    @@
    char a, b;
    identifier func;
    @@
     func (...) {
    <...
    -tt_assert
    +tt_int_op
     (
    -a <= b
    +a, _X_LEQ_, b
     )
     ...>
    }
    
    @@
    int a, b;
    identifier func;
    @@
     func (...) {
    <...
    -tt_assert
    +tt_int_op
     (
    -a <= b
    +a, _X_LEQ_, b
     )
     ...>
    }
    
    @@
    long a, b;
    identifier func;
    @@
     func (...) {
    <...
    -tt_assert
    +tt_int_op
     (
    -a <= b
    +a, _X_LEQ_, b
     )
     ...>
    }
    
    @@
    unsigned int a, b;
    identifier func;
    @@
     func (...) {
    <...
    -tt_assert
    +tt_uint_op
     (
    -a <= b
    +a, _X_LEQ_, b
     )
     ...>
    }
    
    @@
    unsigned long a, b;
    identifier func;
    @@
     func (...) {
    <...
    -tt_assert
    +tt_uint_op
     (
    -a <= b
    +a, _X_LEQ_, b
     )
     ...>
    }
    
    @@
    char a, b;
    identifier func;
    @@
     func (...) {
    <...
    -tt_assert
    +tt_int_op
     (
    -a > b
    +a, _X_GT_, b
     )
     ...>
    }
    
    @@
    int a, b;
    identifier func;
    @@
     func (...) {
    <...
    -tt_assert
    +tt_int_op
     (
    -a > b
    +a, _X_GT_, b
     )
     ...>
    }
    
    @@
    long a, b;
    identifier func;
    @@
     func (...) {
    <...
    -tt_assert
    +tt_int_op
     (
    -a > b
    +a, _X_GT_, b
     )
     ...>
    }
    
    @@
    unsigned int a, b;
    identifier func;
    @@
     func (...) {
    <...
    -tt_assert
    +tt_uint_op
     (
    -a > b
    +a, _X_GT_, b
     )
     ...>
    }
    
    @@
    unsigned long a, b;
    identifier func;
    @@
     func (...) {
    <...
    -tt_assert
    +tt_uint_op
     (
    -a > b
    +a, _X_GT_, b
     )
     ...>
    }
    
    @@
    char a, b;
    identifier func;
    @@
     func (...) {
    <...
    -tt_assert
    +tt_int_op
     (
    -a < b
    +a, _X_LT_, b
     )
     ...>
    }
    
    @@
    int a, b;
    identifier func;
    @@
     func (...) {
    <...
    -tt_assert
    +tt_int_op
     (
    -a < b
    +a, _X_LT_, b
     )
     ...>
    }
    
    @@
    long a, b;
    identifier func;
    @@
     func (...) {
    <...
    -tt_assert
    +tt_int_op
     (
    -a < b
    +a, _X_LT_, b
     )
     ...>
    }
    
    @@
    unsigned int a, b;
    identifier func;
    @@
     func (...) {
    <...
    -tt_assert
    +tt_uint_op
     (
    -a < b
    +a, _X_LT_, b
     )
     ...>
    }
    
    @@
    unsigned long a, b;
    identifier func;
    @@
     func (...) {
    <...
    -tt_assert
    +tt_uint_op
     (
    -a < b
    +a, _X_LT_, b
     )
     ...>
    }
    
    ------------------------------
    
    s/_X_NEQ_/!=/g;
    s/_X_NE_/!=/g;
    s/_X_EQ_/==/g;
    s/_X_GT_/>/g;
    s/_X_LT_/</g;
    s/_X_GEQ_/>=/g;
    s/_X_LEQ_/<=/g;
    
    s/test_mem_op\(/tt_mem_op\(/g;
    02438957