X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=t%2F22-emitter-utf8.t;h=6c185416d3847d2515d8236a604b9fdd7b6c60f1;hb=16fc0df47643288d3229f8671e339d89b159f155;hp=09df2d2f5b6486983f6bc109855244f5350ace73;hpb=f90efd6aef2e807ed35c07341456ce727d6668bc;p=perl%2Fmodules%2FBit-MorseSignals.git

diff --git a/t/22-emitter-utf8.t b/t/22-emitter-utf8.t
index 09df2d2..6c18541 100644
--- a/t/22-emitter-utf8.t
+++ b/t/22-emitter-utf8.t
@@ -7,37 +7,29 @@ use utf8;
 
 use Test::More 'no_plan';
 
-use Bit::MorseSignals qw/BM_DATA_PLAIN/;
+use Bit::MorseSignals qw<BM_DATA_PLAIN>;
 use Bit::MorseSignals::Emitter;
 
-my $deuce = new Bit::MorseSignals::Emitter utf8 => 'DO WANT';
-
-my $i;
-sub test_bit {
- my ($desc, $b, $e) = @_;
- ok(defined $b && $b == $e,
-    "$desc: bit $i : " . (defined $b ? "got $b, expected $e" : 'undef'));
- ++$i;
-}
+my $deuce = Bit::MorseSignals::Emitter->new(utf8 => 'DO WANT');
 
 sub test_msg {
  my ($desc, $exp) = @_;
  my $last = pop @$exp;
 
- $i = 0;
+ my $i = 0;
  for (@$exp) {
   my $b = $deuce->pop;
   ok($deuce->busy, "$desc: BME object is busy after pop $i");
-  test_bit $desc, $b, $_;
+  is($b, $_,       "$desc: bit $i is correct");
  }
 
  my $b = $deuce->pop;
  ok(!$deuce->busy, "$desc: BME object is no longer busy when over");
- test_bit $desc, $b, $last;
+ is($b, $last, "$desc: last bit is correct");
 }
 
 my $msg = 'é';
-my @exp = split //, '11110' . '010' . '11000011' . '10010101' . '01111';
+my @exp = split //, '11110' . '100' . '11000011' . '10010101' . '01111';
 
 my $ret = eval { $deuce->post($msg) };
 ok(!$@, "simple post doesn't croak ($@)");