making the parser quiet, fixing exception names

tenderlove · Aug 31, 2008 · c28bfab · c28bfab
1 parent b953845
commit c28bfab
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/ruby/helper.rb b/ruby/helper.rb
@@ -25,9 +25,10 @@ def preload(content_type, doc_uri, will_be_modified)
     end
 
     def load_document(doc_uri, will_be_modified)
-      options = self.class.name =~ /attrdefaultvalue/i ? 13 : 5 
+      options = self.class.name =~ /attrdefaultvalue/i ? 15 : 3
+      options |= (1 << 5 | 1 << 6)
       file = File.join(BASE,'tests','level1','core','files',"#{doc_uri}.xml")
-      Nokogiri::XML.parse(File.read(file), file, nil, options)
+      Nokogiri.parse(File.read(file), file, nil, options)
     end
   end
 end

diff --git a/transforms/test-to-ruby.xsl b/transforms/test-to-ruby.xsl
@@ -1378,7 +1378,7 @@ require 'helper'
             <xsl:text>.size()</xsl:text>
         </xsl:when>
         <xsl:otherwise>
-            <xsl:text>.getLength()</xsl:text>
+            <xsl:text>.length</xsl:text>
         </xsl:otherwise>
     </xsl:choose>
     <xsl:text>)
@@ -1620,7 +1620,7 @@ require 'helper'
       begin
          <xsl:apply-templates mode="body">
              <xsl:with-param name="vardefs" select="$vardefs"/>
-           </xsl:apply-templates>   rescue DOMException => ex
+           </xsl:apply-templates>   rescue Nokogiri::XML::DOMException => ex
         # allow to fall through and fail test
       rescue EventException => ex
         # allow to fall through and fail test
@@ -1640,8 +1640,8 @@ require 'helper'
       begin
         <xsl:apply-templates select="*/*" mode="body">
         <xsl:with-param name="vardefs" select="$vardefs"/>
-        </xsl:apply-templates>rescue DOMException => ex
-        success = (ex.code == DOMException::<xsl:value-of select="name(*)"/>)
+        </xsl:apply-templates>rescue Nokogiri::XML::DOMException => ex
+        success = (ex.code == Nokogiri::XML::DOMException::<xsl:value-of select="name(*)"/>)
       end 
       assert(success, "<xsl:value-of select="@id"/>")
     end