Changeset 334

Timestamp:

03/01/08 22:38:45 (4 years ago)

Author:

nperriault

Message:

refs #40 - base xml related test case utilities

Location:

cleversvg/trunk/tests

Files:

• csBaseTestCase.class.php (modified) (3 diffs)
• csDocumentTest.php (modified) (2 diffs)

cleversvg/trunk/tests/csBaseTestCase.class.php

@@ -27 +27 @@
 
   /**
-   * Checks if an attribute xpath query matches given value for given doc. I
-   * know the code is a bit weird, but it is as weird as the php5 DOM XML
-   * namespace handling.
+   * Checks if an attribute xpath query matches given value for given doc.
    *
    * @param  csDocument $doc
@@ -38 +36 @@
   protected function assertAttrValueEquals($doc, $xpath_query, $value)
   {
-    $dom = $doc->getDomDocument();
-    $dom = DOMDocument::loadXML($doc->toXML()); // yeah, I *must* reload the xml
-    $xpath = new DOMXPath($dom);
-    $xpath->registerNamespace("svg", "http://www.w3.org/2000/svg"); // uh oh
-    $result = $xpath->query($xpath_query, $dom);
+    $result = $this->documentXpath($doc, $xpath_query);
     $attr = $result->item(0); // First match
     if (!$attr) // Attribute not found
@@ -60 +54 @@
   }
 
+  protected function assertTextNodeEquals($doc, $xpath_query, $value)
+  {
+    $result = $this->documentXpath($doc, $xpath_query);
+    if ($result->item(0)->nodeValue != $value)
+    {
+      throw new PHPUnit_Framework_ExpectationFailedException(
+        sprintf('XPath query "%s" does not match value "%s". Source: %s',
+                $xpath_query, $value, "\n".$doc->toXML()));
+    }
+    return true;
+  }
+
+  /**
+   * Run an xpath query on csDocument resulting XML. I
+   * know the code is a bit weird, but it is as weird as the php5 DOM XML
+   * namespace handling.
+   *
+   * @param  csDocument $doc
+   * @param  string $xpath_query
+   * @return mixed
+   */
+  private function documentXpath(csDocument $doc, $xpath_query)
+  {
+    $dom = DOMDocument::loadXML($doc->toXML()); // yeah, I *must* reload the xml
+    $xpath = new DOMXPath($dom);
+    $xpath->registerNamespace("svg", "http://www.w3.org/2000/svg"); // uh oh
+    return $xpath->query($xpath_query, $dom);
+  }
+
 }

cleversvg/trunk/tests/csDocumentTest.php

@@ -15 +15 @@
     $doc = $this->generateTestDoc();
     $doc->setDescription('Added description');
-    $xml = $doc->toXML();
-    $this->assertEquals(preg_match('#<desc>Added description</desc>#si', $xml), 1, $xml);
+    $this->assertTextNodeEquals($doc, '/svg:svg/svg:desc', 'Added description');
+    $doc->setDescription('Changed description');
+    $this->assertTextNodeEquals($doc, '/svg:svg/svg:desc', 'Changed description');
   }
 
@@ -22 +23 @@
   {
     $doc = $this->generateTestDoc();
+    $doc->setTitle('Added title');
+    $this->assertTextNodeEquals($doc, '/svg:svg/svg:title', 'Added title');
     $doc->setTitle('Changed title');
-    $xml = $doc->toXML();
-    $this->assertEquals(preg_match('#<title>Changed title</title>#si', $xml), 1, $xml);
+    $this->assertTextNodeEquals($doc, '/svg:svg/svg:title', 'Changed title');
   }