From 3df72f6f10200762631e446a0b39ca97135ea583 Mon Sep 17 00:00:00 2001
From: dlichteblau <dlichteblau>
Date: Sun, 11 Dec 2005 18:30:45 +0000
Subject: [PATCH]  600/808 domimplementationfeaturecore.xml -TEST FAILED: The
 assertion DOMTEST-TESTS::|state| failed.  601/808
 domimplementationfeaturexmlversion2.xml -TEST FAILED: The assertion
 DOMTEST-TESTS::|state| failed.  602/808 domimplementationhasfeature01.xml
 -TEST FAILED: The assertion DOMTEST-TESTS::|success| failed.

---
 DOMTEST           |  5 +----
 test/domtest.lisp | 13 +++++++------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/DOMTEST b/DOMTEST
index 613aeb3..7b825af 100644
--- a/DOMTEST
+++ b/DOMTEST
@@ -630,11 +630,8 @@ implementationAttribute expandEntityReferences not supported, skipping test
 598/808 domimplementationcreatedocumenttype02.xml
 599/808 domimplementationcreatedocumenttype04.xml
 600/808 domimplementationfeaturecore.xml
-TEST FAILED: The assertion DOMTEST-TESTS::|state| failed.
 601/808 domimplementationfeaturexmlversion2.xml
-TEST FAILED: The assertion DOMTEST-TESTS::|state| failed.
 602/808 domimplementationhasfeature01.xml
-TEST FAILED: The assertion DOMTEST-TESTS::|success| failed.
 603/808 domimplementationhasfeature02.xml
 604/808 elementgetattributenodens01.xml
 605/808 elementgetattributenodens02.xml
@@ -877,4 +874,4 @@ TEST FAILED: expected exception INUSE_ATTRIBUTE_ERR
 803/808 setNamedItemNS04.xml
 804/808 setNamedItemNS05.xml
 805/808 systemId01.xml
-20/763 tests failed; 45 tests were skipped
\ No newline at end of file
+17/763 tests failed; 45 tests were skipped
\ No newline at end of file
diff --git a/test/domtest.lisp b/test/domtest.lisp
index 386f425..8453bb6 100644
--- a/test/domtest.lisp
+++ b/test/domtest.lisp
@@ -199,7 +199,6 @@
     ("equals" (translate-equals element))
     ("notEquals" (translate-not-equals element))
     ("contentType" (translate-content-type element))
-    ("hasFeature" (translate-has-feature element))
     ("implementationAttribute" (assert-have-implementation-attribute element))
     ("isNull" (translate-is-null element))
     ("not" (translate-is-null element))
@@ -403,11 +402,13 @@
         (error "oops")))))
 
 (defun translate-has-feature (element)
-  (with-attributes (|var| |feature| |version|) element
-    (maybe-setf (%intern |var|)
-                `(and (runes:rod-equal ,(parse-java-literal |feature|) #"XML")
-                      (or (zerop (length ,(parse-java-literal |version|)))
-                          (runes:rod-equal ,(parse-java-literal |version|) #"1.0"))))))
+  (with-attributes (|obj| |var| |feature| |version|) element
+    (if (nullify |obj|)
+	(translate-member element)
+	(maybe-setf (%intern |var|)
+		    `(dom:has-feature 'dom-impl::implementation
+				      ,(parse-java-literal |feature|)
+				      ,(parse-java-literal |version|))))))
 
 (defun translate-fail (element)
   (declare (ignore element))