=================================================================== RCS file: /cvs/trango/Net-Telnet-Trango/t/51-network-add_su-ap.t,v retrieving revision 1.4 retrieving revision 1.8 diff -u -r1.4 -r1.8 --- trango/Net-Telnet-Trango/t/51-network-add_su-ap.t 2007/02/06 16:52:21 1.4 +++ trango/Net-Telnet-Trango/t/51-network-add_su-ap.t 2007/02/06 20:59:10 1.8 @@ -1,21 +1,20 @@ #!perl -T -# $RedRiver: 51-network-add_su.t,v 1.3 2007/02/06 16:29:58 andrew Exp $ +# $RedRiver: 51-network-add_su-ap.t,v 1.7 2007/02/06 19:09:25 andrew Exp $ -use Test::More tests => 12; +use Test::More tests => 17; use File::Spec; BEGIN { use_ok( 'Net::Telnet::Trango' ); } -diag("Testing Net::Telnet::Trango $Net::Telnet::Trango::VERSION, Perl $], $^X"); -diag(" add SU on AP tests"); +diag("51: AP tests when adding an SU to an AP"); my $cfg_file = File::Spec->catfile('t', 'tests.cfg'); -my ($cir, $mir) = (128, 256); +my ($cir, $mir, $new_mir) = (128, 256, 1024); SKIP: { - my $skipped = 11; + my $skipped = 16; my %cfg; if (-e $cfg_file) { if (open my $fh, $cfg_file) { @@ -66,7 +65,6 @@ ok($t->logged_in, "logged in"); - my $sudb; if ((!ok($sudb = $t->sudb_view, "Getting sudb")) && $t->last_error ) { @@ -97,18 +95,11 @@ } - my $result; - if ( (! ok($result = $t->sudb_add($su_id, 'reg', $cir, $mir, $su_mac), - "Adding su")) + if ( (! ok($t->sudb_add($su_id, 'reg', $cir, $mir, $su_mac), "Adding su")) && $t->last_error ) { diag('ERR: ' . $t->last_error); } - ok($result = $t->save_sudb, "Saving sudb"); - if ( (! $result ) && $t->last_error ) { - diag('ERR: ' . $t->last_error); - } - $sudb = []; if ((!ok($sudb = $t->sudb_view, "Getting sudb")) && $t->last_error ) { @@ -116,9 +107,11 @@ } $in_sudb = 0; + my $su_mir = 0; foreach my $su (@{ $sudb }) { if ($su_id == $su->{suid}) { if (lc($su_mac) eq lc($su->{mac})) { + $su_mir = $su->{mir}; $in_sudb = 1; } else { $in_sudb = -1; @@ -131,6 +124,39 @@ } is($in_sudb, 1, "Correct SU is in SUDB"); + + if ( (! ok($t->save_sudb, "Saving sudb")) + && $t->last_error ) { + diag('ERR: ' . $t->last_error); + } + + is($mir, $su_mir, "SU has correct mir"); + + if ( (! ok($t->sudb_modify($su_id, 'mir', $new_mir), "modifying su mir")) + && $t->last_error ) { + diag('ERR: ' . $t->last_error); + } + + $sudb = []; + if ((!ok($sudb = $t->sudb_view, "Getting sudb")) + && $t->last_error ) { + diag('ERR: ' . $t->last_error); + } + + $su_mir = 0; + foreach my $su (@{ $sudb }) { + if ($su_id == $su->{suid}) { + $su_mir = $su->{mir}; + last; + } + } + + is($new_mir, $su_mir, "SU has new mir"); + + if ( (! ok($t->save_sudb, "Saving sudb")) + && $t->last_error ) { + diag('ERR: ' . $t->last_error); + } ok($t->bye, "Goodbye"); }