Changeset 850

Show
Ignore:
Timestamp:
02/11/09 21:57:03 (10 months ago)
Author:
ykerherve
Message:

Reused the handy ::JID class for all my tests, much more clever...

Location:
trunk/DJabberd/t
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • trunk/DJabberd/t/lib/djabberd-test.pl

    r849 r850  
    641641    my $jid_el = $bind  ->first_element or die "no jid elt..."; 
    642642    my $jid    = $jid_el->first_child   or die "no jid..."; 
    643     return $jid; 
     643    return DJabberd::JID->new($jid); 
    644644} 
    645645 

  • trunk/DJabberd/t/sasl-login.t

    r849 r850  
    3939 
    4040            my $jid = $login_and_be->($pa, $pb, $sasl, "yann"); 
    41             like $jid, qr/yann/, "resource assigned accordingly"; 
     41            is $jid->resource, 'yann', "resource assigned accordingly"; 
    4242        }); 
    4343    } 
    … …  
    5959        my $jid = $login_and_be->($pa, $pb, $sasl, undef); # << no resource 
    6060        ok $jid, "got jid"; 
    61         like $jid, qr{/\w+$}, "assigned resource $jid"; 
     61        ok $jid->resource, "assigned resource: " . $jid->resource; 
    6262    }); 
    6363} 
    … …  
    7575            }, 
    7676        ); 
    77         my $pa_jid = $pa->sasl_login($sasl, "yann"); 
    78         my $pb_jid = $pb->sasl_login($sasl, "yann"); 
    79         my ($pa_res) = $pa_jid =~ m{/(\w+)$}; 
    80         my ($pb_res) = $pb_jid =~ m{/(\w+)$}; 
     77        my $pa_res = $pa->sasl_login($sasl, "yann")->resource; 
     78        my $pb_res = $pb->sasl_login($sasl, "yann")->resource; 
    8179        cmp_ok $pa_res, 'ne', $pb_res, "resources are different"; 
    8280        is   $pa_res, "yann", "first got what it wanted";