Changeset 2342

Timestamp:

12/11/2007 01:33:26 AM (12 months ago)

Author:

tof

Message:

Clean up some unit tests to allow them run with PHPUnit 3.1+

Location:

trunk/tests/unit

Files:

• Web/UI/THtmlWriterTest.php (modified) (6 diffs)
• Xml/TXmlElementListTest.php (modified) (1 diff)

trunk/tests/unit/Web/UI/THtmlWriterTest.php

@@ -67 +67 @@
                 $writer->addAttributes(array ('type' => 'text', 'value' => 'Prado & Cie'));
                 // get the private var _attributes
-                $result=self::getAttribute($writer, '_attributes');
+                $result=self::readAttribute($writer, '_attributes');
                 self::assertEquals('text',$result['type']);
                 self::assertEquals(THttpUtility::htmlEncode('Prado & Cie'), $result['value']);
@@ -76 +76 @@
                 $writer->addAttribute('type','text');
                 $writer->addAttribute('value','Prado & Cie');
-                $result=self::getAttribute($writer, '_attributes');
+                $result=self::readAttribute($writer, '_attributes');
                 self::assertEquals('text',$result['type']);
                 self::assertEquals(THttpUtility::htmlEncode('Prado & Cie'), $result['value']);          
@@ -86 +86 @@
                 $writer->addAttribute('value','Prado & Cie');
                 $writer->removeAttribute('value');
-                $result=self::getAttribute($writer, '_attributes');
+                $result=self::readAttribute($writer, '_attributes');
                 // 'type' should be present, 'value' not
                 self::assertTrue(isset($result['type']));
@@ -95 +95 @@
                 $writer=new THtmlWriter(self::$output);
                 $writer->addStyleAttributes(array ('font-size' => '1em', 'background-image'=>'url(image.gif)'));
-                $result=self::getAttribute($writer, '_styles');
+                $result=self::readAttribute($writer, '_styles');
                 self::assertEquals('1em', $result['font-size']);
                 self::assertEquals(THttpUtility::htmlEncode('url(image.gif)'), $result['background-image']);
@@ -104 +104 @@
                 $writer->addStyleAttribute('font-size','1em');
                 $writer->addStyleAttribute('background-image','url(image.gif)');
-                $result=self::getAttribute($writer, '_styles');
+                $result=self::readAttribute($writer, '_styles');
                 self::assertEquals('1em', $result['font-size']);
                 self::assertEquals(THttpUtility::htmlEncode('url(image.gif)'), $result['background-image']);
@@ -114 +114 @@
                 $writer->addStyleAttribute('background-image','url(image.gif)');
                 $writer->removeStyleAttribute('font-size');
-                $result=self::getAttribute($writer, '_styles');
+                $result=self::readAttribute($writer, '_styles');
                 self::assertTrue(isset($result['background-image']));
                 self::assertFalse(isset($result['font-size']));

trunk/tests/unit/Xml/TXmlElementListTest.php

@@ -12 +12 @@
                 $element=new TXmlElement('tag');
                 $list=new TXmlElementList($element);
-                self::assertEquals($element,self::getAttribute($list, '_o'));
+                self::assertEquals($element,self::readAttribute($list, '_o'));
         }