r31268 - /trunk/libxml-sax-perl/t/42entities.t
antonio-guest at users.alioth.debian.org
antonio-guest at users.alioth.debian.org
Sun Mar 1 10:36:05 UTC 2009
Author: antonio-guest
Date: Sun Mar 1 10:36:02 2009
New Revision: 31268
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=31268
Log:
unresolved merge which I forgot to fix
Modified:
trunk/libxml-sax-perl/t/42entities.t
Modified: trunk/libxml-sax-perl/t/42entities.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-sax-perl/t/42entities.t?rev=31268&op=diff
==============================================================================
--- trunk/libxml-sax-perl/t/42entities.t (original)
+++ trunk/libxml-sax-perl/t/42entities.t Sun Mar 1 10:36:02 2009
@@ -1,5 +1,3 @@
-<<<<<<< .working
-<<<<<<< .working
use strict;
use warnings;
@@ -37,81 +35,3 @@
$self->{_buf} .= "$attr->{$_}->{LocalName}=$attr->{$_}->{Value} ";
}
}
-=======
-use strict;
-use warnings;
-
-use Test;
-BEGIN { plan tests => 4 }
-
-use XML::SAX::PurePerl;
-
-my $handler = AttrHandler->new();
-ok($handler);
-
-my $parser = XML::SAX::PurePerl->new(Handler => $handler);
-ok($parser);
-
-$parser->parse_string('<code amp="&" x3E=">" num="A" />');
-ok(1); # parser didn't die
-
-my $expected = "amp=& num=A x3E=> ";
-ok($handler->attributes, $expected);
-
-exit;
-
-
-package AttrHandler;
-
-use base 'XML::SAX::Base';
-
-sub start_document { shift->{_buf} = ''; }
-sub attributes { shift->{_buf}; }
-
-sub start_element {
- my($self, $data) = @_;
- my $attr = $data->{Attributes};
- foreach (sort keys %$attr) {
- $self->{_buf} .= "$attr->{$_}->{LocalName}=$attr->{$_}->{Value} ";
- }
-}
->>>>>>> .merge-right.r31255
-=======
-use strict;
-use warnings;
-
-use Test;
-BEGIN { plan tests => 4 }
-
-use XML::SAX::PurePerl;
-
-my $handler = AttrHandler->new();
-ok($handler);
-
-my $parser = XML::SAX::PurePerl->new(Handler => $handler);
-ok($parser);
-
-$parser->parse_string('<code amp="&" x3E=">" num="A" />');
-ok(1); # parser didn't die
-
-my $expected = "amp=& num=A x3E=> ";
-ok($handler->attributes, $expected);
-
-exit;
-
-
-package AttrHandler;
-
-use base 'XML::SAX::Base';
-
-sub start_document { shift->{_buf} = ''; }
-sub attributes { shift->{_buf}; }
-
-sub start_element {
- my($self, $data) = @_;
- my $attr = $data->{Attributes};
- foreach (sort keys %$attr) {
- $self->{_buf} .= "$attr->{$_}->{LocalName}=$attr->{$_}->{Value} ";
- }
-}
->>>>>>> .merge-right.r31256
More information about the Pkg-perl-cvs-commits
mailing list