[prev in list] [next in list] [prev in thread] [next in thread] 

List:       pear-cvs
Subject:    [PEAR-CVS] cvs: pear /Structures_DataGrid package2-ds-xml.xml  /Structures_DataGrid/tests DataSource
From:       "Olivier Guilyardi" <olivierg () php ! net>
Date:       2008-05-28 10:57:07
Message-ID: cvsolivierg1211972227 () cvsserver
[Download RAW message or body]

olivierg		Wed May 28 10:57:07 2008 UTC

  Modified files:              
    /pear/Structures_DataGrid/tests	DataSourceXMLTest.php 
    /pear/Structures_DataGrid	package2-ds-xml.xml 
  Log:
  xml datasource: remove testDeeperNesting(), update dependencies for new DOM \
implementation  
http://cvs.php.net/viewvc.cgi/pear/Structures_DataGrid/tests/DataSourceXMLTest.php?r1=1.12&r2=1.13&diff_format=u
                
Index: pear/Structures_DataGrid/tests/DataSourceXMLTest.php
diff -u pear/Structures_DataGrid/tests/DataSourceXMLTest.php:1.12 \
                pear/Structures_DataGrid/tests/DataSourceXMLTest.php:1.13
--- pear/Structures_DataGrid/tests/DataSourceXMLTest.php:1.12	Mon May 26 14:34:19 \
                2008
+++ pear/Structures_DataGrid/tests/DataSourceXMLTest.php	Wed May 28 10:57:06 2008
@@ -34,9 +34,9 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * CVS file id: $Id: DataSourceXMLTest.php,v 1.12 2008/05/26 14:34:19 olivierg Exp $
+ * CVS file id: $Id: DataSourceXMLTest.php,v 1.13 2008/05/28 10:57:06 olivierg Exp $
  * 
- * @version  $Revision: 1.12 $
+ * @version  $Revision: 1.13 $
  * @package  Structures_DataGrid
  * @author   Olivier Guilyardi <olivier@samalyse.com>
  * @author   Mark Wiesemann <wiesemann@php.net>
@@ -273,44 +273,6 @@
         $this->assertEquals($expected, $this->datasource->fetch());
     }
 
-    function testDeeperNesting()
-    {
-        $xml = <<<XML
-<data>
-  <row>
-    <col0>Test0</col0>
-    <col1><x><a>Test1</a></x></col1>
-    <col2><y><b><c>Test2</c></b></y></col2>
-    <col3><z>Test3</z></col3>
-    <col4>Test4</col4>
-  </row>
-  <row>
-    <col0>Test0</col0>
-    <col1><x><a>Test1</a></x></col1>
-    <col2><y><b><c>Test2</c></b></y></col2>
-    <col3><z>Test3</z></col3>
-    <col4>Test4</col4>
-  </row>
-</data>
-XML;
-        $this->datasource->setOption('generate_columns', true);
-        $this->datasource->bind($xml);
-        $columns = $this->datasource->getColumns();
-        $this->assertEquals(5, count($columns));
-        if (count($columns) == 5) {
-            $this->assertEquals('col0',    $columns[0]->getLabel());
-            $this->assertEquals('col0',    $columns[0]->getField());
-            $this->assertEquals('col1xa',  $columns[1]->getLabel());
-            $this->assertEquals('col1xa',  $columns[1]->getField());
-            $this->assertEquals('col2ybc', $columns[2]->getLabel());
-            $this->assertEquals('col2ybc', $columns[2]->getField());
-            $this->assertEquals('col3z',   $columns[3]->getLabel());
-            $this->assertEquals('col3z',   $columns[3]->getField());
-            $this->assertEquals('col4',    $columns[4]->getLabel());
-            $this->assertEquals('col4',    $columns[4]->getField());
-        }
-    }
-
     function testOnlyOneRow()
     {
         $xml = <<<XML
http://cvs.php.net/viewvc.cgi/pear/Structures_DataGrid/package2-ds-xml.xml?r1=1.15&r2=1.16&diff_format=u
                
Index: pear/Structures_DataGrid/package2-ds-xml.xml
diff -u pear/Structures_DataGrid/package2-ds-xml.xml:1.15 \
                pear/Structures_DataGrid/package2-ds-xml.xml:1.16
--- pear/Structures_DataGrid/package2-ds-xml.xml:1.15	Fri May 23 10:54:00 2008
+++ pear/Structures_DataGrid/package2-ds-xml.xml	Wed May 28 10:57:06 2008
@@ -48,6 +48,8 @@
 - Fix handling of redundant fields under PHP5
 - Do not issue an error for empty data
 - Allow binding XML streams (http, etc...)
+- Removed dependencies on XML_Serializer and XML_XPath
+- Added optional dependencies on DOM and DOM XML (one of these is required)
  </notes>
  <contents>
   <dir name="/">
@@ -78,16 +80,12 @@
    </package>
   </required>
   <optional>
-   <package>
-    <name>XML_Serializer</name>
-    <channel>pear.php.net</channel>
-    <min>0.18.0</min>
-   </package>
-   <package>
-    <name>XML_XPath</name>
-    <channel>pear.php.net</channel>
-    <min>1.2.4</min>
-   </package>
+   <extension>
+    <name>dom</name>
+   </extension>
+   <extension>
+    <name>domxml</name>
+   </extension>
   </optional>
  </dependencies>
  <phprelease />



-- 
PEAR CVS Mailing List (http://pear.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php


[prev in list] [next in list] [prev in thread] [next in thread]