svn commit: r733687 - in /incubator/shindig/trunk/php: src/gadgets/MessageBundleParser.php test/gadgets/MessageBundleParserTest.php

[chabotc]

Author: chabotc
Date: Mon Jan 12 03:13:52 2009
New Revision: 733687

URL: http://svn.apache.org/viewvc?rev=733687&view=rev
Log:
SHINDIG-839 by Pan Jie - Argument error when MessageBundleParser::parse parses 
an invalid xml document

Modified:
    incubator/shindig/trunk/php/src/gadgets/MessageBundleParser.php
    incubator/shindig/trunk/php/test/gadgets/MessageBundleParserTest.php

Modified: incubator/shindig/trunk/php/src/gadgets/MessageBundleParser.php
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/gadgets/MessageBundleParser.php?rev=733687&r1=733686&r2=733687&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/gadgets/MessageBundleParser.php (original)
+++ incubator/shindig/trunk/php/src/gadgets/MessageBundleParser.php Mon Jan 12 
03:13:52 2009
@@ -32,7 +32,7 @@
     return $this->getMessages($doc);
   }
 
-  public function getMessages(SimpleXMLElement $doc) {
+  public function getMessages($doc) {
     if (! $doc) {
       throw new Exception("Invalid XML structure in message bundle");
     }

Modified: incubator/shindig/trunk/php/test/gadgets/MessageBundleParserTest.php
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/php/test/gadgets/MessageBundleParserTest.php?rev=733687&r1=733686&r2=733687&view=diff
==============================================================================
--- incubator/shindig/trunk/php/test/gadgets/MessageBundleParserTest.php 
(original)
+++ incubator/shindig/trunk/php/test/gadgets/MessageBundleParserTest.php Mon 
Jan 12 03:13:52 2009
@@ -53,7 +53,6 @@
    * Tests MessageBundleParser->parse()
    */
   public function testParse() {
-    
     $xml = '<?xml version="1.0" encoding="UTF-8" ?>
 <doc>
        <msg name="name1">Message 1</msg>
@@ -69,6 +68,19 @@
     $this->assertEquals('Message 3', $this->MessageBundle['name3']);
     $this->assertEquals('Message 4', $this->MessageBundle['name4']);
   }
-
+  
+  /**
+   * Tests MessageBundleParser->parse() on error xml string.
+   */
+  public function testParseOnError() {
+    $xml = '<?xml version="1.0" encoding="UTF-8" ?>
+<doc>
+  <msg name="name1">Message 1</msg>
+  <msg name="name2">Message 2</msg>
+  <msg name="name3">Message 3</msg>
+  <msg name="name4">Message 4</msg>';
+    $this->setExpectedException('Exception');
+    $this->MessageBundle = $this->MessageBundleParser->parse($xml);    
+  }
 }