You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by ja...@apache.org on 2002/03/25 01:43:05 UTC
cvs commit: xml-xerces/perl/t TestUtils.pm
jasons 02/03/24 16:43:05
Modified: perl/t TestUtils.pm
Log:
* t/TestUtils.pm (Repository):
Added new document without XMLDECL
Added error()
Revision Changes Path
1.16 +24 -9 xml-xerces/perl/t/TestUtils.pm
Index: TestUtils.pm
===================================================================
RCS file: /home/cvs/xml-xerces/perl/t/TestUtils.pm,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- TestUtils.pm 3 Nov 2001 05:26:33 -0000 1.15
+++ TestUtils.pm 25 Mar 2002 00:43:05 -0000 1.16
@@ -7,7 +7,6 @@
@EXPORT_OK
$CATALOG
$DOM
- $IDOM
$PERSONAL
$PUBLIC_RESOLVER_FILE_NAME
$SYSTEM_RESOLVER_FILE_NAME
@@ -18,6 +17,8 @@
$PERSONAL_DTD_NAME
$PERSONAL_NO_DOCTYPE
$PERSONAL_NO_DOCTYPE_FILE_NAME
+ $PERSONAL_NO_XMLDECL_FILE_NAME
+ $PERSONAL_NO_XMLDECL
);
use Carp;
use Cwd;
@@ -27,8 +28,8 @@
@EXPORT_OK = qw(result
is_object
+ error
$DOM
- $IDOM
$CATALOG
$PERSONAL_FILE_NAME
$PUBLIC_RESOLVER_FILE_NAME
@@ -38,6 +39,8 @@
$PERSONAL_DTD_NAME
$PERSONAL_NO_DOCTYPE_FILE_NAME
$PERSONAL_NO_DOCTYPE
+ $PERSONAL_NO_XMLDECL_FILE_NAME
+ $PERSONAL_NO_XMLDECL
$SAMPLE_DIR
$PERSONAL);
@@ -46,20 +49,17 @@
$SIG{__WARN__} = 'IGNORE';
$DOM = new XML::Xerces::DOMParser;
- $DOM->setToCreateXMLDeclTypeNode(1);
- $IDOM = new XML::Xerces::IDOMParser;
my $ERROR_HANDLER = XML::Xerces::PerlErrorHandler->new();
$DOM->setErrorHandler($ERROR_HANDLER);
- $IDOM->setErrorHandler($ERROR_HANDLER);
my $cwd = cwd();
$cwd =~ s|/t/?$||;
$SAMPLE_DIR = "$cwd/samples";
- $PERSONAL_FILE_NAME = 'personal.xml';
- $PERSONAL_NO_DOCTYPE_FILE_NAME = 'personal-no-doctype.xml';
- $PERSONAL_FILE_NAME = "$SAMPLE_DIR/$PERSONAL_FILE_NAME";
- $PERSONAL_NO_DOCTYPE_FILE_NAME = "$SAMPLE_DIR/$PERSONAL_NO_DOCTYPE_FILE_NAME";
+ $PERSONAL_FILE_NAME = "$SAMPLE_DIR/personal.xml";
+ $PERSONAL_NO_DOCTYPE_FILE_NAME = "$SAMPLE_DIR/personal-no-doctype.xml";
+ $PERSONAL_NO_XMLDECL_FILE_NAME = "$SAMPLE_DIR/personal-no-xmldecl.xml";
+
$PERSONAL_DTD_NAME = $PERSONAL_FILE_NAME;
$PERSONAL_DTD_NAME =~ s/\.xml/\.dtd/;
$PERSONAL_SCHEMA_FILE_NAME = $PERSONAL_FILE_NAME;
@@ -82,6 +82,11 @@
$/ = undef;
$PERSONAL_NO_DOCTYPE = <PERSONAL>;
close PERSONAL;
+ open(PERSONAL, $PERSONAL_NO_XMLDECL_FILE_NAME)
+ or die "Couldn't open $PERSONAL_NO_XMLDECL_FILE_NAME for reading";
+ $/ = undef;
+ $PERSONAL_NO_XMLDECL = <PERSONAL>;
+ close PERSONAL;
}
sub is_object {
@@ -108,4 +113,14 @@
print STDOUT "\n";
$main::i++;
return $rc;
+}
+
+sub error {
+ my $error = shift;
+ print STDERR "Error in eval: ";
+ if (ref $error) {
+ print STDERR $error->getMessage();
+ } else {
+ print STDERR $error;
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org