Changeset 1750

Timestamp:

07/30/08 00:56:06 (4 months ago)

Author:

mikey

Message:

fix imports
throw exception in net::stubbles::xml::unserializer::stubXMLUnserializer::unserializeFile() if file can not be found

Files:

• framework/trunk/src/main/php/net/stubbles/xml/unserializer/stubXMLUnserializer.php (modified) (2 diffs, 1 prop)
• framework/trunk/src/test/php/net/stubbles/xml/unserializer/stubXMLUnserializerTestCase.php (modified) (2 diffs, 1 prop)

framework/trunk/src/main/php/net/stubbles/xml/unserializer/stubXMLUnserializer.php

@@ -6 +6 @@
- * @package     stubbles
- * @subpackage  xml_unserializer
+ * @version     $Id$
- */
-
+
+
+
+
-/**
- * Class to read XML files and turn them into simple PHP types.
@@ -60 +64 @@
-     * @param   string  $fileName
-     * @return  mixed
+     * @throws  stubFileNotFoundException
-     * @throws  stubXMLException
-     */
-    public function unserializeFile($fileName)
-    {
+        if (file_exists($fileName) === false) {
+            throw new stubFileNotFoundException($fileName);
+        }
+        
-        $reader = $this->initParser();
-        if ($reader->open($fileName, $this->options[stubXMLUnserializerOption::ENCODING_SOURCE]) === false) {

framework/trunk/src/test/php/net/stubbles/xml/unserializer/stubXMLUnserializerTestCase.php

@@ -6 +6 @@
- * @package     stubbles
- * @subpackage  xml_unserializer_test
+ * @version     $Id$
- */
-stubClassLoader::load('net::stubbles::xml::unserializer::stubXMLUnserializer');
@@ -287 +288 @@
-        $this->assertEquals(array('string' => utf8_encode('A string containing german umlauts: &ￜￜￜ')), $unserializer->unserialize($xml));
-    }
+
+    /**
+     * test unserializing a non-existing file
+     *
+     * @test
+     * @expectedException  stubFileNotFoundException
+     */
+    public function unserializeNonExistingFile()
+    {
+        $unserializer = new stubXMLUnserializer();
+        $unserializer->unserializeFile(TEST_SRC_PATH . '/resources/doesNotExist.xml');
+    }
-}
-?>