Changeset 420

Timestamp:

04/06/11 15:14:34 (14 years ago)

Author:

lgiessmann

Message:

TM-SPARQL: fixed the unit-tests test-module-14, test-module-15, and test-module-16

File:

• trunk/src/unit_tests/sparql_test.lisp (modified) (6 diffs)

trunk/src/unit_tests/sparql_test.lisp ¶

@@ -2230 +2230 @@
                                     (concat "<" *tms-player* ">"))
                               (getf item :result) :test #'string=)))
-                           ((string= (getf item :variable) "obj1")
+                           ((string= (getf item :variable) "subj1")
                             (is (= (length (getf item :result)) 4))
                             (is-false
@@ -2259 +2259 @@
                              (is-false (getf item :result)))
                             ((or (string= (getf item :variable) "subj2")
-                                 (string= (getf item :variable) "obj5"))
+                                 (string= (getf item :variable) "subj5"))
                              (is-false (getf item :result)))
                             ((or (string= (getf item :variable) "pred3")
@@ -2267 +2267 @@
                                           (concat "<" *tms-topicProperty* ">"))))
                             ((or (string= (getf item :variable) "subj3")
-                                 (string= (getf item :variable) "obj4"))
+                                 (string= (getf item :variable) "subj4"))
                              (is (= (length (getf item :result)) 1))
                              (is (string= (first (getf item :result))
@@ -2312 +2312 @@
                                           "http://some.where/ii/role-reifier"
                                           :revision 0) :revision 0))))))
-                              (getf item :result) :test #'string=))))
+                              (getf item :result) :test #'string=))
+                            (t
+                             (is-true (format t "bad variable-name found ~a"
+                                              (getf item :variable))))))
            r-1))))
-
 
 
@@ -2354 +2356 @@
                                                         :revision 0)))
                                       "http://some.where/tmsparql/author/goethe")
-                                return role)))))))))
+                                return role)))))))
+                       (t
+                        (is-true (format t "bad variable-name found ~a"
+                                         (getf item :variable))))))
            r-1))))
 
@@ -2365 +2370 @@
                  "SELECT * WHERE {
                    <http://some.where/tmsparql/author/goethe> ?pred1 ?obj1.
-                   #FILTER ?obj1 = 'von Goethe' || ?obj1 = 82
-                   FILTER ?obj1 = 'von Goethe'^^" *xml-string* " || ?obj1 = '82'^^" *xml-integer* "
-                   #FILTER (?obj1 = 'von Goethe' || 82 = ?obj1)
-                   #FILTER (?obj1 = 'von Goethe') || (82 = ?obj1)
-                   #FILTER ((?obj1 = 'von Goethe') || (82 = ?obj1))"
-                 "
-}"))
+                   FILTER ?obj1 = 'von Goethe' || ?obj1 = 82
+                   FILTER ?obj1 = 'von Goethe' || ?obj1 = '82'^^" *xml-integer* "
+                   FILTER (?obj1 = 'von Goethe'^^" *xml-string* " || 82 = ?obj1)
+                   FILTER (?obj1 = 'von Goethe') || (82 = ?obj1)
+                   FILTER ((?obj1 = 'von Goethe') || (82 = ?obj1))"
+                 "}"))
            (r-1 (tm-sparql:result (make-instance 'TM-SPARQL:SPARQL-Query :query q-1))))
-
       (is-true (= (length r-1) 2))
       (map 'list #'(lambda(item)
                      (cond
                        ((string= (getf item :variable) "pred1")
-                        nil)
+                        (is (= (length (getf item :result)) 2))
+                        (is (find "<http://some.where/tmsparql/last-name>"
+                                  (getf item :result) :test #'string=))
+                        (is (find "<http://some.where/tmsparql/years>"
+                                  (getf item :result) :test #'string=)))
                        ((string= (getf item :variable) "obj1")
-                        nil)))
-           r-1)
-      (format t "~a~%" r-1))))
+                        (is (= (length (getf item :result)) 2))
+                        (is (find 82 (getf item :result) :test #'tm-sparql::literal=))
+                        (is (find "von Goethe" (getf item :result)
+                                  :test #'tm-sparql::literal=)))
+                       (t
+                        (is-true (format t "bad variable-name found ~a"
+                                         (getf item :variable))))))
+                        
+           r-1))))
+
+
+