Changeset 58 for php/trunk/unittest/rdftestcases/unittest.php

Timestamp:

Jul 18, 2011, 1:15:46 AM (14 years ago)

Author:

cla

Message:

rdfint

• reworked handling of RDF testcase results, results are now also ordered before comparing

File:

• php/trunk/unittest/rdftestcases/unittest.php (modified) (2 diffs)

php/trunk/unittest/rdftestcases/unittest.php

@@ -42 +42 @@
   // --------------------------------------------------------
 
-  private function _reIdentifyBlankNode( $data) {
-    return preg_replace( '/_:[^ ]*/', '_:a', $data);
+  private function _refineResult( $data) {
+    // replace all blank nodes by one ID
+    // NOTE: thi sis not accurate, but not much better
+    // possible without access to the triple data
+    $data = preg_replace( '/_:[^ ]*/', '_:a', $data);
+
+    // sort the data
+    $adata = explode( "\n", $data);
+    sort( &$adata);
+    $data = implode( "\n", $adata);
+
+    return $data;
   }
 
@@ -93 +103 @@
     $this->assertEquals( ($result !== false), true);
 
-    // rework blank node identifiers for coparison
-    $source = $this->_reIdentifyBlankNode( $source);
-    $result = $this->_reIdentifyBlankNode( $result);
-
+    // resolve problems with blnak node identifiers
+    // and different sorting of triples
+    $source = $this->_refineResult( $source);
+    $result = $this->_refineResult( $result);
 
     // check if results are equal