Changeset 158


Ignore:
Timestamp:
12/21/10 03:30:52 (13 years ago)
Author:
nanardon
Message:
  • factorize xml::rpc test code
  • add functions to test xml::rpc results (ie xml::rpc error code)
Location:
server/trunk/web/t
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed
  • server/trunk/web/t/controller_Chat-Cmd.t

    r45 r158  
    22use warnings; 
    33use Test::More; 
     4use FindBin; 
     5require "$FindBin::Bin/xml.pl"; 
    46 
    57BEGIN { use_ok 'Catalyst::Test', 'Sophie' } 
    68BEGIN { use_ok 'Sophie::Controller::Chat::Cmd' } 
    79 
    8 #ok( request('/chat/cmd')->is_success, 'Request should succeed' ); 
     10foreach (qw(version v packager p arch a buildfrom)) { 
     11    ok( 
     12        xmlrequest_ok("chat.cmd.$_", {}, "rpm"), 
     13        "XML::RPC chat.cmd.$_" 
     14    ); 
     15} 
     16 
    917done_testing(); 
  • server/trunk/web/t/controller_Chat.t

    r35 r158  
    22use warnings; 
    33use Test::More; 
     4use FindBin; 
     5require "$FindBin::Bin/xml.pl"; 
    46 
    57BEGIN { use_ok 'Catalyst::Test', 'Sophie' } 
     
    79 
    810ok( request('/chat')->is_success, 'Request should succeed' ); 
     11 
     12ok( xmlrequest_ok( 'chat.message', [], "help"), "Can request help"); 
     13 
    914done_testing(); 
  • server/trunk/web/t/controller_Distrib.t

    r82 r158  
    22use warnings; 
    33use Test::More; 
    4 require RPC::XML; 
    5 use HTTP::Request; 
     4use Test::More; 
     5use FindBin; 
     6require "$FindBin::Bin/xml.pl"; 
    67 
    78# know existing data: 
     
    1617BEGIN { use_ok 'Sophie::Controller::Distrib' } 
    1718 
    18 sub xmlrpcreq { 
    19     my (@xmlargs) = @_; 
    20     my $str = RPC::XML::request->new( @xmlargs )->as_string; 
    21  
    22     my $req = HTTP::Request->new( POST => 'http://localhost/rpc' ); 
    23     $req->header( 'Content-Length'  => length($str) ); 
    24     $req->header( 'Content-Type'    => 'text/xml' ); 
    25     $req->content( $str ); 
    26     return $req; 
    27 } 
    28  
    2919ok( request('/distrib')->is_success, 'Request should succeed' ); 
    3020ok( request("/distrib/$distribution")->is_success, 'Request should succeed' ); 
    31 ok( request( xmlrpcreq('distrib.list') ), "XMLRPC"); 
    32 ok( request( xmlrpcreq('distrib.list', $distribution) ), "XMLRPC"); 
     21ok( xmlrequest_ok( 'distrib.list'), "XMLRPC"); 
     22ok( xmlrequest_ok( 'distrib.list', $distribution), "XMLRPC"); 
    3323ok( request("/distrib/$distribution/$release")->is_success, 'Request should succeed' ); 
    3424ok( request("/distrib/$distribution/$release/$arch")->is_success, 'Request should succeed' ); 
  • server/trunk/web/t/controller_Search.t

    r92 r158  
    22use warnings; 
    33use Test::More; 
     4use FindBin; 
     5require "$FindBin::Bin/xml.pl"; 
    46 
    57my $pkgid = '45db73adf5f9ceabc8f9ea1dabccffcc'; 
     
    810BEGIN { use_ok 'Sophie::Controller::Search' } 
    911 
    10 sub xmlrpcreq { 
    11     my (@xmlargs) = @_; 
    12     my $str = RPC::XML::request->new( @xmlargs )->as_string; 
    13  
    14     my $req = HTTP::Request->new( POST => 'http://localhost/rpc' ); 
    15     $req->header( 'Content-Length'  => length($str) ); 
    16     $req->header( 'Content-Type'    => 'text/xml' ); 
    17     $req->content( $str ); 
    18     return $req; 
    19 } 
    20  
    2112ok(  
    22     request( xmlrpcreq('search.rpms.bydate', {}, time - 3600) ), 
     13    xmlrequest_ok('search.rpms.bydate', {}, time - 3600), 
    2314    "search.rpms.bydate" 
    2415); 
    2516 
    2617ok(  
    27     request( xmlrpcreq('search.rpm.bypkgid', {}, $pkgid) ), 
     18    xmlrequest_ok('search.rpm.bypkgid', {}, $pkgid), 
    2819    "search.rpm.bypkgid" 
    2920); 
    3021 
    3122ok(  
    32     request( xmlrpcreq('search.rpm.byname', {}, 'rpm', '>', '0') ), 
     23    xmlrequest_ok('search.rpm.byname', {}, 'rpm', '>', '0'), 
    3324    "search.rpm.byname" 
    3425); 
    3526 
    3627ok(  
    37     request( xmlrpcreq('search.rpm.bytag', {}, 'name', 'rpm') ), 
     28    xmlrequest_ok('search.rpm.bytag', {}, 'name', 'rpm'), 
    3829    "search.rpm.bytag" 
    3930); 
    4031 
    4132ok(  
    42     request( xmlrpcreq('search.rpm.bydep', {}, 'P', 'rpm', '>', '0') ), 
     33    xmlrequest_ok('search.rpm.bydep', {}, 'P', 'rpm', '>', '0'), 
    4334    "search.rpm.bydep" 
    4435); 
    4536 
    4637ok(  
    47     request( xmlrpcreq('search.rpm.byfile', {}, '/bin/rpm') ), 
     38    xmlrequest_ok('search.rpm.byfile', {}, '/bin/rpm'), 
    4839    "search.rpm.byfile" 
    4940); 
    5041 
    5142ok(  
    52     request( xmlrpcreq('search.rpm.fuzzy', {}, 'rpm-build') ), 
     43    xmlrequest_ok('search.rpm.fuzzy', {}, 'rpm-build'), 
    5344    "search.rpm.fuzzy" 
    5445); 
    5546ok(  
    56     request( xmlrpcreq('search.rpm.quick', {}, 'rpm-build') ), 
     47    xmlrequest_ok('search.rpm.quick', {}, 'rpm-build'), 
    5748    "search.rpm.quick" 
    5849); 
     
    6051 
    6152ok(  
    62     request( xmlrpcreq('search.rpm.description', {}, qw'rpm build') ), 
     53    xmlrequest_ok('search.rpm.description', {}, qw'rpm build'), 
    6354    "search.rpm.description" 
    6455); 
Note: See TracChangeset for help on using the changeset viewer.