Author: as
Date: Thu Nov 15 10:27:55 2007
New Revision: 6731
Log:
- Use var_export() for comparing objects.
# Needed for the deep structures of the ATOM feed.
Modified:
trunk/Feed/tests/atom/atom_regression_parse_test.php
trunk/Feed/tests/atom/regression/parse/optional/category/category_scheme+label.in
trunk/Feed/tests/atom/regression/parse/optional/generator/generator_empty.out
trunk/Feed/tests/atom/regression/parse/optional/generator/generator_empty_uri+version.out
trunk/Feed/tests/atom/regression/parse/optional/generator/generator_empty_uri.out
trunk/Feed/tests/atom/regression/parse/optional/generator/generator_empty_version.out
trunk/Feed/tests/atom/regression/parse/optional/icon/icon_empty.out
trunk/Feed/tests/atom/regression/parse/optional/logo/logo_empty.out
trunk/Feed/tests/atom/regression/parse/optional/rights/rights_empty.out
trunk/Feed/tests/atom/regression/parse/optional/subtitle/subtitle_empty.out
trunk/Feed/tests/atom/regression/parse/required/id/id_empty.out
trunk/Feed/tests/atom/regression/parse/required/title/title_empty.out
Modified: trunk/Feed/tests/atom/atom_regression_parse_test.php
==============================================================================
--- trunk/Feed/tests/atom/atom_regression_parse_test.php [iso-8859-1] (original)
+++ trunk/Feed/tests/atom/atom_regression_parse_test.php [iso-8859-1] Thu Nov
15 10:27:55 2007
@@ -61,7 +61,7 @@
$parsed = $e->getMessage();
$expected = trim( file_get_contents( $outFile ) );
}
- $this->assertEquals( $expected, $parsed, "The " . basename( $outFile )
. " is not the same as the parsed feed from " . basename( $file ) . "." );
+ $this->assertEquals( var_export( $expected, true ), var_export(
$parsed, true ), "The " . basename( $outFile ) . " is not the same as the
parsed feed from " . basename( $file ) . "." );
}
}
?>
Modified:
trunk/Feed/tests/atom/regression/parse/optional/category/category_scheme+label.in
==============================================================================
---
trunk/Feed/tests/atom/regression/parse/optional/category/category_scheme+label.in
[iso-8859-1] (original)
+++
trunk/Feed/tests/atom/regression/parse/optional/category/category_scheme+label.in
[iso-8859-1] Thu Nov 15 10:27:55 2007
@@ -3,5 +3,5 @@
<id>Feed id</id>
<title type="text">Feed title</title>
<updated>Feed updated</updated>
- <category label="Category label" scheme="Category scheme"/>
+ <category scheme="Category scheme" label="Category label"/>
</feed>
Modified:
trunk/Feed/tests/atom/regression/parse/optional/generator/generator_empty.out
==============================================================================
---
trunk/Feed/tests/atom/regression/parse/optional/generator/generator_empty.out
[iso-8859-1] (original)
+++
trunk/Feed/tests/atom/regression/parse/optional/generator/generator_empty.out
[iso-8859-1] Thu Nov 15 10:27:55 2007
@@ -6,7 +6,7 @@
$feed->title->type = 'text';
$feed->updated = 'Feed updated';
-$feed->generator = null;
+$feed->generator = '';
return $feed;
?>
Modified:
trunk/Feed/tests/atom/regression/parse/optional/generator/generator_empty_uri+version.out
==============================================================================
---
trunk/Feed/tests/atom/regression/parse/optional/generator/generator_empty_uri+version.out
[iso-8859-1] (original)
+++
trunk/Feed/tests/atom/regression/parse/optional/generator/generator_empty_uri+version.out
[iso-8859-1] Thu Nov 15 10:27:55 2007
@@ -6,7 +6,7 @@
$feed->title->type = 'text';
$feed->updated = 'Feed updated';
-$feed->generator = null;
+$feed->generator = '';
$feed->generator->uri = 'Generator uri';
$feed->generator->version = 'Generator version';
Modified:
trunk/Feed/tests/atom/regression/parse/optional/generator/generator_empty_uri.out
==============================================================================
---
trunk/Feed/tests/atom/regression/parse/optional/generator/generator_empty_uri.out
[iso-8859-1] (original)
+++
trunk/Feed/tests/atom/regression/parse/optional/generator/generator_empty_uri.out
[iso-8859-1] Thu Nov 15 10:27:55 2007
@@ -6,7 +6,7 @@
$feed->title->type = 'text';
$feed->updated = 'Feed updated';
-$feed->generator = null;
+$feed->generator = '';
$feed->generator->uri = 'Generator uri';
return $feed;
Modified:
trunk/Feed/tests/atom/regression/parse/optional/generator/generator_empty_version.out
==============================================================================
---
trunk/Feed/tests/atom/regression/parse/optional/generator/generator_empty_version.out
[iso-8859-1] (original)
+++
trunk/Feed/tests/atom/regression/parse/optional/generator/generator_empty_version.out
[iso-8859-1] Thu Nov 15 10:27:55 2007
@@ -6,7 +6,7 @@
$feed->title->type = 'text';
$feed->updated = 'Feed updated';
-$feed->generator = null;
+$feed->generator = '';
$feed->generator->version = 'Generator version';
return $feed;
Modified: trunk/Feed/tests/atom/regression/parse/optional/icon/icon_empty.out
==============================================================================
--- trunk/Feed/tests/atom/regression/parse/optional/icon/icon_empty.out
[iso-8859-1] (original)
+++ trunk/Feed/tests/atom/regression/parse/optional/icon/icon_empty.out
[iso-8859-1] Thu Nov 15 10:27:55 2007
@@ -6,7 +6,7 @@
$feed->title->type = 'text';
$feed->updated = 'Feed updated';
-$feed->icon = null;
+$feed->icon = '';
return $feed;
?>
Modified: trunk/Feed/tests/atom/regression/parse/optional/logo/logo_empty.out
==============================================================================
--- trunk/Feed/tests/atom/regression/parse/optional/logo/logo_empty.out
[iso-8859-1] (original)
+++ trunk/Feed/tests/atom/regression/parse/optional/logo/logo_empty.out
[iso-8859-1] Thu Nov 15 10:27:55 2007
@@ -6,7 +6,7 @@
$feed->title->type = 'text';
$feed->updated = 'Feed updated';
-$feed->image = null;
+$feed->image = '';
return $feed;
?>
Modified:
trunk/Feed/tests/atom/regression/parse/optional/rights/rights_empty.out
==============================================================================
--- trunk/Feed/tests/atom/regression/parse/optional/rights/rights_empty.out
[iso-8859-1] (original)
+++ trunk/Feed/tests/atom/regression/parse/optional/rights/rights_empty.out
[iso-8859-1] Thu Nov 15 10:27:55 2007
@@ -6,7 +6,7 @@
$feed->title->type = 'text';
$feed->updated = 'Feed updated';
-$feed->copyright = null;
+$feed->copyright = '';
return $feed;
?>
Modified:
trunk/Feed/tests/atom/regression/parse/optional/subtitle/subtitle_empty.out
==============================================================================
--- trunk/Feed/tests/atom/regression/parse/optional/subtitle/subtitle_empty.out
[iso-8859-1] (original)
+++ trunk/Feed/tests/atom/regression/parse/optional/subtitle/subtitle_empty.out
[iso-8859-1] Thu Nov 15 10:27:55 2007
@@ -6,7 +6,7 @@
$feed->title->type = 'text';
$feed->updated = 'Feed updated';
-$feed->description = null;
+$feed->description = '';
return $feed;
?>
Modified: trunk/Feed/tests/atom/regression/parse/required/id/id_empty.out
==============================================================================
--- trunk/Feed/tests/atom/regression/parse/required/id/id_empty.out
[iso-8859-1] (original)
+++ trunk/Feed/tests/atom/regression/parse/required/id/id_empty.out
[iso-8859-1] Thu Nov 15 10:27:55 2007
@@ -1,5 +1,5 @@
<?php
$feed = new ezcFeed( 'atom' );
-$feed->id = null;
+$feed->id = '';
return $feed;
?>
Modified: trunk/Feed/tests/atom/regression/parse/required/title/title_empty.out
==============================================================================
--- trunk/Feed/tests/atom/regression/parse/required/title/title_empty.out
[iso-8859-1] (original)
+++ trunk/Feed/tests/atom/regression/parse/required/title/title_empty.out
[iso-8859-1] Thu Nov 15 10:27:55 2007
@@ -1,5 +1,5 @@
<?php
$feed = new ezcFeed( 'atom' );
-$feed->title = null;
+$feed->title = '';
return $feed;
?>
--
svn-components mailing list
svn-components@lists.ez.no
http://lists.ez.no/mailman/listinfo/svn-components
