Author: as
Date: Mon Nov 19 10:36:36 2007
New Revision: 6756
Log:
- Added the ATOM rules which link 'content', 'link' and 'summary' feed entry
sub-elements.
Added:
trunk/Feed/tests/atom/regression/generate/entry/content/content_empty_src_no_summary.in
trunk/Feed/tests/atom/regression/generate/entry/content/content_empty_src_no_summary.out
trunk/Feed/tests/atom/regression/generate/entry/content/content_src_type_zip_no_summary.in
trunk/Feed/tests/atom/regression/generate/entry/content/content_src_type_zip_no_summary.out
trunk/Feed/tests/atom/regression/generate/entry/content/content_type_png_no_summary.in
trunk/Feed/tests/atom/regression/generate/entry/content/content_type_png_no_summary.out
trunk/Feed/tests/atom/regression/generate/entry/entry_id+title+updated+alternate.in
trunk/Feed/tests/atom/regression/generate/entry/entry_id+title+updated+alternate.out
trunk/Feed/tests/atom/regression/generate/entry/entry_id+title+updated+content.in
trunk/Feed/tests/atom/regression/generate/entry/entry_id+title+updated+content.out
trunk/Feed/tests/atom/regression/generate/entry/entry_id+title+updated+summary.in
trunk/Feed/tests/atom/regression/generate/entry/entry_id+title+updated+summary.out
Modified:
trunk/Feed/src/processors/atom.php
trunk/Feed/tests/atom/regression/generate/entry/author/author_empty.in
trunk/Feed/tests/atom/regression/generate/entry/author/author_multiple.in
trunk/Feed/tests/atom/regression/generate/entry/author/author_multiple.out
trunk/Feed/tests/atom/regression/generate/entry/author/author_name+email+uri.in
trunk/Feed/tests/atom/regression/generate/entry/author/author_name+email+uri.out
trunk/Feed/tests/atom/regression/generate/entry/author/author_name+email.in
trunk/Feed/tests/atom/regression/generate/entry/author/author_name+email.out
trunk/Feed/tests/atom/regression/generate/entry/author/author_name.in
trunk/Feed/tests/atom/regression/generate/entry/author/author_name.out
trunk/Feed/tests/atom/regression/generate/entry/content/content_empty_src.in
trunk/Feed/tests/atom/regression/generate/entry/content/content_empty_src.out
trunk/Feed/tests/atom/regression/generate/entry/content/content_src_type_zip.in
trunk/Feed/tests/atom/regression/generate/entry/content/content_src_type_zip.out
trunk/Feed/tests/atom/regression/generate/entry/content/content_type_png.in
trunk/Feed/tests/atom/regression/generate/entry/content/content_type_png.out
trunk/Feed/tests/atom/regression/generate/entry/entry_id+title+updated.out
trunk/Feed/tests/atom/regression/generate/entry/link/link_empty.in
trunk/Feed/tests/atom/regression/generate/entry/link/link_href+rel+type+hreflang+title+length.in
trunk/Feed/tests/atom/regression/generate/entry/link/link_href+rel+type+hreflang+title+length.out
trunk/Feed/tests/atom/regression/generate/entry/link/link_href+rel+type+hreflang+title.in
trunk/Feed/tests/atom/regression/generate/entry/link/link_href+rel+type+hreflang+title.out
trunk/Feed/tests/atom/regression/generate/entry/link/link_href+rel+type+hreflang.in
trunk/Feed/tests/atom/regression/generate/entry/link/link_href+rel+type+hreflang.out
trunk/Feed/tests/atom/regression/generate/entry/link/link_href+rel+type.in
trunk/Feed/tests/atom/regression/generate/entry/link/link_href+rel+type.out
trunk/Feed/tests/atom/regression/generate/entry/link/link_href+rel.in
trunk/Feed/tests/atom/regression/generate/entry/link/link_href+rel.out
trunk/Feed/tests/atom/regression/generate/entry/link/link_href.in
trunk/Feed/tests/atom/regression/generate/entry/link/link_href.out
trunk/Feed/tests/atom/regression/generate/entry/link/link_multiple.in
trunk/Feed/tests/atom/regression/generate/entry/link/link_multiple.out
trunk/Feed/tests/atom/regression/generate/entry/link/link_multiple_alternate_broken.in
trunk/Feed/tests/atom/regression/generate/entry/link/link_multiple_alternate_correct.in
trunk/Feed/tests/atom/regression/generate/entry/link/link_multiple_alternate_correct.out
trunk/Feed/tests/atom/regression/generate/entry/summary/summary_empty.in
trunk/Feed/tests/atom/regression/generate/entry/summary/summary_empty.out
trunk/Feed/tests/atom/regression/generate/entry/summary/summary_type_absent.in
trunk/Feed/tests/atom/regression/generate/entry/summary/summary_type_absent.out
trunk/Feed/tests/atom/regression/generate/entry/summary/summary_type_html.in
trunk/Feed/tests/atom/regression/generate/entry/summary/summary_type_html.out
trunk/Feed/tests/atom/regression/generate/entry/summary/summary_type_text.in
trunk/Feed/tests/atom/regression/generate/entry/summary/summary_type_text.out
trunk/Feed/tests/atom/regression/generate/entry/summary/summary_type_xhtml.in
trunk/Feed/tests/atom/regression/generate/entry/summary/summary_type_xhtml.out
trunk/Feed/tests/atom/regression/generate/entry/title/type_absent.in
trunk/Feed/tests/atom/regression/generate/entry/title/type_absent.out
trunk/Feed/tests/atom/regression/generate/entry/title/type_html.in
trunk/Feed/tests/atom/regression/generate/entry/title/type_html.out
trunk/Feed/tests/atom/regression/generate/entry/title/type_text.in
trunk/Feed/tests/atom/regression/generate/entry/title/type_text.out
trunk/Feed/tests/atom/regression/generate/entry/title/type_xhtml.in
trunk/Feed/tests/atom/regression/generate/entry/title/type_xhtml.out
Modified: trunk/Feed/src/processors/atom.php
==============================================================================
--- trunk/Feed/src/processors/atom.php [iso-8859-1] (original)
+++ trunk/Feed/src/processors/atom.php [iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -633,6 +633,67 @@
break;
}
}
+
+ // ensure the ATOM rules are applied
+ $content = $entry->content;
+ if ( is_array( $content ) )
+ {
+ $content = $content[0];
+ }
+ $summary = $entry->summary;
+ $links = $entry->link;
+ $contentPresent = !is_null( $content );
+ $contentSrcPresent = $contentPresent && is_object( $content ) &&
!is_null( $content->src );
+ $contentBase64 = true;
+ if ( $contentPresent && is_object( $content )
+ && ( in_array( $content->type, array( 'text', 'html',
'xhtml', null ) )
+ || substr_compare( $content->type, '+xml', -4, 4, true )
=== 0
+ || substr_compare( $content->type, '/xml', -4, 4, true )
=== 0
+ || substr_compare( $content->type, 'text/', 0, 5, true )
=== 0 ) )
+ {
+ $contentBase64 = false;
+ }
+
+ $summaryPresent = !is_null( $summary );
+ $linkAlternatePresent = false;
+ if ( $links !== null )
+ {
+ foreach ( $links as $link )
+ {
+ if ( $link->rel === 'alternate' )
+ {
+ $linkAlternatePresent = true;
+ break;
+ }
+ }
+ }
+
+ if ( !$contentPresent )
+ {
+ if ( !$linkAlternatePresent && !$summaryPresent )
+ {
+ throw new ezcFeedRequiredMetaDataMissingException(
'content' );
+ }
+
+ if ( !$linkAlternatePresent )
+ {
+ throw new ezcFeedRequiredMetaDataMissingException( 'link
rel="alternate"' );
+ }
+
+ if ( !$summaryPresent )
+ {
+ throw new ezcFeedRequiredMetaDataMissingException(
'summary' );
+ }
+ }
+
+ if ( $contentPresent )
+ {
+ if ( ( $contentSrcPresent || $contentBase64 ) &&
!$summaryPresent )
+ {
+ throw new ezcFeedRequiredMetaDataMissingException(
'summary' );
+ }
+ }
+
foreach ( $this->schema->getOptional( $parent ) as $element )
{
Modified: trunk/Feed/tests/atom/regression/generate/entry/author/author_empty.in
==============================================================================
--- trunk/Feed/tests/atom/regression/generate/entry/author/author_empty.in
[iso-8859-1] (original)
+++ trunk/Feed/tests/atom/regression/generate/entry/author/author_empty.in
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -7,5 +7,6 @@
'item' => array( array( 'id' => 'Entry id',
'title' => 'Entry title',
'updated' => 'Entry updated',
+ 'content' => 'Entry content',
'author' => array( array() ) ) ) );
?>
Modified:
trunk/Feed/tests/atom/regression/generate/entry/author/author_multiple.in
==============================================================================
--- trunk/Feed/tests/atom/regression/generate/entry/author/author_multiple.in
[iso-8859-1] (original)
+++ trunk/Feed/tests/atom/regression/generate/entry/author/author_multiple.in
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -7,7 +7,8 @@
'item' => array( array( 'id' => 'Entry id',
'title' => 'Entry title',
'updated' => 'Entry updated',
- 'author' => array( array( 'name' =>
'Entry author name 1',
+ 'content' => 'Entry content',
+
'author' => array( array( 'name' => 'Entry author name 1',
'email' =>
'Entry author email 1',
'uri' =>
'Entry author uri 1' ),
array( 'name' =>
'Entry author name 2',
Modified:
trunk/Feed/tests/atom/regression/generate/entry/author/author_multiple.out
==============================================================================
--- trunk/Feed/tests/atom/regression/generate/entry/author/author_multiple.out
[iso-8859-1] (original)
+++ trunk/Feed/tests/atom/regression/generate/entry/author/author_multiple.out
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -20,5 +20,6 @@
<email>Entry author email 2</email>
<uri>Entry author uri 2</uri>
</author>
+ <content>Entry content</content>
</entry>
</feed>
Modified:
trunk/Feed/tests/atom/regression/generate/entry/author/author_name+email+uri.in
==============================================================================
---
trunk/Feed/tests/atom/regression/generate/entry/author/author_name+email+uri.in
[iso-8859-1] (original)
+++
trunk/Feed/tests/atom/regression/generate/entry/author/author_name+email+uri.in
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -7,6 +7,7 @@
'item' => array( array( 'id' => 'Entry id',
'title' => 'Entry title',
'updated' => 'Entry updated',
+ 'content' => 'Entry content',
'author' => array( array( 'name' =>
'Entry author name',
'email' =>
'Entry author email',
'uri' =>
'Entry author uri' ) ) ) ) );
Modified:
trunk/Feed/tests/atom/regression/generate/entry/author/author_name+email+uri.out
==============================================================================
---
trunk/Feed/tests/atom/regression/generate/entry/author/author_name+email+uri.out
[iso-8859-1] (original)
+++
trunk/Feed/tests/atom/regression/generate/entry/author/author_name+email+uri.out
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -15,5 +15,6 @@
<email>Entry author email</email>
<uri>Entry author uri</uri>
</author>
+ <content>Entry content</content>
</entry>
</feed>
Modified:
trunk/Feed/tests/atom/regression/generate/entry/author/author_name+email.in
==============================================================================
--- trunk/Feed/tests/atom/regression/generate/entry/author/author_name+email.in
[iso-8859-1] (original)
+++ trunk/Feed/tests/atom/regression/generate/entry/author/author_name+email.in
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -7,6 +7,7 @@
'item' => array( array( 'id' => 'Entry id',
'title' => 'Entry title',
'updated' => 'Entry updated',
+ 'content' => 'Entry content',
'author' => array( array( 'name' =>
'Entry author name',
'email' =>
'Entry author email' ) ) ) ) );
?>
Modified:
trunk/Feed/tests/atom/regression/generate/entry/author/author_name+email.out
==============================================================================
---
trunk/Feed/tests/atom/regression/generate/entry/author/author_name+email.out
[iso-8859-1] (original)
+++
trunk/Feed/tests/atom/regression/generate/entry/author/author_name+email.out
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -14,5 +14,6 @@
<name>Entry author name</name>
<email>Entry author email</email>
</author>
+ <content>Entry content</content>
</entry>
</feed>
Modified: trunk/Feed/tests/atom/regression/generate/entry/author/author_name.in
==============================================================================
--- trunk/Feed/tests/atom/regression/generate/entry/author/author_name.in
[iso-8859-1] (original)
+++ trunk/Feed/tests/atom/regression/generate/entry/author/author_name.in
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -7,5 +7,6 @@
'item' => array( array( 'id' => 'Entry id',
'title' => 'Entry title',
'updated' => 'Entry updated',
+ 'content' => 'Entry content',
'author' => array( array( 'name' =>
'Entry author name' ) ) ) ) );
?>
Modified: trunk/Feed/tests/atom/regression/generate/entry/author/author_name.out
==============================================================================
--- trunk/Feed/tests/atom/regression/generate/entry/author/author_name.out
[iso-8859-1] (original)
+++ trunk/Feed/tests/atom/regression/generate/entry/author/author_name.out
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -13,5 +13,6 @@
<author>
<name>Entry author name</name>
</author>
+ <content>Entry content</content>
</entry>
</feed>
Modified:
trunk/Feed/tests/atom/regression/generate/entry/content/content_empty_src.in
==============================================================================
---
trunk/Feed/tests/atom/regression/generate/entry/content/content_empty_src.in
[iso-8859-1] (original)
+++
trunk/Feed/tests/atom/regression/generate/entry/content/content_empty_src.in
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -6,5 +6,6 @@
'item' => array( array( 'id' => 'Entry id',
'title' => array( array( '#' => 'Entry
title' ) ),
'updated' => 'Entry updated',
- 'content' => array( array( 'src' =>
'http://ezcomponents.org/files/downloads/ezcomponents-1.0.zip' ) ) ) ) );
+ 'content' => array( array( 'src' =>
'http://ezcomponents.org/files/downloads/ezcomponents-1.0.zip' ) ),
+ 'summary' => 'Entry summary' ) ) );
?>
Modified:
trunk/Feed/tests/atom/regression/generate/entry/content/content_empty_src.out
==============================================================================
---
trunk/Feed/tests/atom/regression/generate/entry/content/content_empty_src.out
[iso-8859-1] (original)
+++
trunk/Feed/tests/atom/regression/generate/entry/content/content_empty_src.out
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -11,5 +11,6 @@
<title>Entry title</title>
<updated>XXX</updated>
<content
src="http://ezcomponents.org/files/downloads/ezcomponents-1.0.zip";></content>
+ <summary>Entry summary</summary>
</entry>
</feed>
Added:
trunk/Feed/tests/atom/regression/generate/entry/content/content_empty_src_no_summary.in
==============================================================================
---
trunk/Feed/tests/atom/regression/generate/entry/content/content_empty_src_no_summary.in
(added)
+++
trunk/Feed/tests/atom/regression/generate/entry/content/content_empty_src_no_summary.in
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -1,0 +1,10 @@
+<?php
+return array( 'id' => 'Feed id',
+ 'title' => array( array( '#' => 'Feed title' ) ),
+ 'updated' => 'Feed updated',
+ 'author' => array( array( 'name' => 'Author name' ) ),
+ 'item' => array( array( 'id' => 'Entry id',
+ 'title' => array( array( '#' => 'Entry
title' ) ),
+ 'updated' => 'Entry updated',
+ 'content' => array( array( 'src' =>
'http://ezcomponents.org/files/downloads/ezcomponents-1.0.zip' ) ) ) ) );
+?>
Added:
trunk/Feed/tests/atom/regression/generate/entry/content/content_empty_src_no_summary.out
==============================================================================
---
trunk/Feed/tests/atom/regression/generate/entry/content/content_empty_src_no_summary.out
(added)
+++
trunk/Feed/tests/atom/regression/generate/entry/content/content_empty_src_no_summary.out
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -1,0 +1,1 @@
+There was no data submitted for required channel attribute 'summary'.
Modified:
trunk/Feed/tests/atom/regression/generate/entry/content/content_src_type_zip.in
==============================================================================
---
trunk/Feed/tests/atom/regression/generate/entry/content/content_src_type_zip.in
[iso-8859-1] (original)
+++
trunk/Feed/tests/atom/regression/generate/entry/content/content_src_type_zip.in
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -7,5 +7,6 @@
'title' => array( array( '#' => 'Entry
title' ) ),
'updated' => 'Entry updated',
'content' => array( array( 'src' =>
'http://ezcomponents.org/files/downloads/ezcomponents-1.0.zip',
- 'type' =>
'application/x-zip' ) ) ) ) );
+ 'type' =>
'application/x-zip' ) ),
+ 'summary' => 'Entry summary' ) ) );
?>
Modified:
trunk/Feed/tests/atom/regression/generate/entry/content/content_src_type_zip.out
==============================================================================
---
trunk/Feed/tests/atom/regression/generate/entry/content/content_src_type_zip.out
[iso-8859-1] (original)
+++
trunk/Feed/tests/atom/regression/generate/entry/content/content_src_type_zip.out
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -12,5 +12,6 @@
<updated>XXX</updated>
<content type="application/x-zip"
src="http://ezcomponents.org/files/downloads/ezcomponents-1.0.zip";>
</content>
+ <summary>Entry summary</summary>
</entry>
</feed>
Added:
trunk/Feed/tests/atom/regression/generate/entry/content/content_src_type_zip_no_summary.in
==============================================================================
---
trunk/Feed/tests/atom/regression/generate/entry/content/content_src_type_zip_no_summary.in
(added)
+++
trunk/Feed/tests/atom/regression/generate/entry/content/content_src_type_zip_no_summary.in
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -1,0 +1,11 @@
+<?php
+return array( 'id' => 'Feed id',
+ 'title' => array( array( '#' => 'Feed title' ) ),
+ 'updated' => 'Feed updated',
+ 'author' => array( array( 'name' => 'Author name' ) ),
+ 'item' => array( array( 'id' => 'Entry id',
+ 'title' => array( array( '#' => 'Entry
title' ) ),
+ 'updated' => 'Entry updated',
+ 'content' => array( array( 'src' =>
'http://ezcomponents.org/files/downloads/ezcomponents-1.0.zip',
+ 'type' =>
'application/x-zip' ) ) ) ) );
+?>
Added:
trunk/Feed/tests/atom/regression/generate/entry/content/content_src_type_zip_no_summary.out
==============================================================================
---
trunk/Feed/tests/atom/regression/generate/entry/content/content_src_type_zip_no_summary.out
(added)
+++
trunk/Feed/tests/atom/regression/generate/entry/content/content_src_type_zip_no_summary.out
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -1,0 +1,1 @@
+There was no data submitted for required channel attribute 'summary'.
Modified:
trunk/Feed/tests/atom/regression/generate/entry/content/content_type_png.in
==============================================================================
--- trunk/Feed/tests/atom/regression/generate/entry/content/content_type_png.in
[iso-8859-1] (original)
+++ trunk/Feed/tests/atom/regression/generate/entry/content/content_type_png.in
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -7,5 +7,6 @@
'title' => array( array( '#' => 'Entry
title' ) ),
'updated' => 'Entry updated',
'content' => array( array( '#' =>
file_get_contents( dirname( __FILE__ ) . DIRECTORY_SEPARATOR .
'powered-by-141x32-white.png' ),
- 'type' =>
'image/png' ) ) ) ) );
+ 'type' =>
'image/png' ) ),
+ 'summary' => 'Entry summary' ) ) );
?>
Modified:
trunk/Feed/tests/atom/regression/generate/entry/content/content_type_png.out
==============================================================================
---
trunk/Feed/tests/atom/regression/generate/entry/content/content_type_png.out
[iso-8859-1] (original)
+++
trunk/Feed/tests/atom/regression/generate/entry/content/content_type_png.out
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -78,5 +78,6 @@
Zvfxuwia8vJybGxs1D3HIA/G7yJoBvnXMvhb7kH+KSQM/quRQe6T/wVxbgvu8Q7LOgAAAABJRU5E
rkJggg==
</content>
+ <summary>Entry summary</summary>
</entry>
</feed>
Added:
trunk/Feed/tests/atom/regression/generate/entry/content/content_type_png_no_summary.in
==============================================================================
---
trunk/Feed/tests/atom/regression/generate/entry/content/content_type_png_no_summary.in
(added)
+++
trunk/Feed/tests/atom/regression/generate/entry/content/content_type_png_no_summary.in
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -1,0 +1,11 @@
+<?php
+return array( 'id' => 'Feed id',
+ 'title' => array( array( '#' => 'Feed title' ) ),
+ 'updated' => 'Feed updated',
+ 'author' => array( array( 'name' => 'Author name' ) ),
+ 'item' => array( array( 'id' => 'Entry id',
+ 'title' => array( array( '#' => 'Entry
title' ) ),
+ 'updated' => 'Entry updated',
+ 'content' => array( array( '#' =>
file_get_contents( dirname( __FILE__ ) . DIRECTORY_SEPARATOR .
'powered-by-141x32-white.png' ),
+ 'type' =>
'image/png' ) ) ) ) );
+?>
Added:
trunk/Feed/tests/atom/regression/generate/entry/content/content_type_png_no_summary.out
==============================================================================
---
trunk/Feed/tests/atom/regression/generate/entry/content/content_type_png_no_summary.out
(added)
+++
trunk/Feed/tests/atom/regression/generate/entry/content/content_type_png_no_summary.out
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -1,0 +1,1 @@
+There was no data submitted for required channel attribute 'summary'.
Added:
trunk/Feed/tests/atom/regression/generate/entry/entry_id+title+updated+alternate.in
==============================================================================
---
trunk/Feed/tests/atom/regression/generate/entry/entry_id+title+updated+alternate.in
(added)
+++
trunk/Feed/tests/atom/regression/generate/entry/entry_id+title+updated+alternate.in
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -1,0 +1,12 @@
+<?php
+return array( 'id' => 'Feed id',
+ 'title' => array( array( '#' => 'Feed title',
+ 'type' => '' ) ),
+ 'updated' => 'Feed updated',
+ 'author' => array( array( 'name' => 'Author name' ) ),
+ 'item' => array( array( 'id' => 'Entry id',
+ 'title' => 'Entry title',
+ 'updated' => 'Entry updated',
+ 'link' => array( array( 'href' => 'Entry
link href',
+ 'rel' =>
'alternate' ) ) ) ) );
+?>
Added:
trunk/Feed/tests/atom/regression/generate/entry/entry_id+title+updated+alternate.out
==============================================================================
---
trunk/Feed/tests/atom/regression/generate/entry/entry_id+title+updated+alternate.out
(added)
+++
trunk/Feed/tests/atom/regression/generate/entry/entry_id+title+updated+alternate.out
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -1,0 +1,1 @@
+There was no data submitted for required channel attribute 'summary'.
Added:
trunk/Feed/tests/atom/regression/generate/entry/entry_id+title+updated+content.in
==============================================================================
---
trunk/Feed/tests/atom/regression/generate/entry/entry_id+title+updated+content.in
(added)
+++
trunk/Feed/tests/atom/regression/generate/entry/entry_id+title+updated+content.in
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -1,0 +1,11 @@
+<?php
+return array( 'id' => 'Feed id',
+ 'title' => array( array( '#' => 'Feed title',
+ 'type' => '' ) ),
+ 'updated' => 'Feed updated',
+ 'author' => array( array( 'name' => 'Author name' ) ),
+ 'item' => array( array( 'id' => 'Entry id',
+ 'title' => 'Entry title',
+ 'content' => 'Entry content',
+
'updated' => 'Entry updated' ) ) );
+?>
Added:
trunk/Feed/tests/atom/regression/generate/entry/entry_id+title+updated+content.out
==============================================================================
---
trunk/Feed/tests/atom/regression/generate/entry/entry_id+title+updated+content.out
(added)
+++
trunk/Feed/tests/atom/regression/generate/entry/entry_id+title+updated+content.out
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -1,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom";>
+ <id>Feed id</id>
+ <title type="text">Feed title</title>
+ <updated>XXX</updated>
+ <author>
+ <name>Author name</name>
+ </author>
+ <entry>
+ <id>Entry id</id>
+ <title>Entry title</title>
+ <updated>XXX</updated>
+ <content>Entry content</content>
+ </entry>
+</feed>
Added:
trunk/Feed/tests/atom/regression/generate/entry/entry_id+title+updated+summary.in
==============================================================================
---
trunk/Feed/tests/atom/regression/generate/entry/entry_id+title+updated+summary.in
(added)
+++
trunk/Feed/tests/atom/regression/generate/entry/entry_id+title+updated+summary.in
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -1,0 +1,11 @@
+<?php
+return array( 'id' => 'Feed id',
+ 'title' => array( array( '#' => 'Feed title',
+ 'type' => '' ) ),
+ 'updated' => 'Feed updated',
+ 'author' => array( array( 'name' => 'Author name' ) ),
+ 'item' => array( array( 'id' => 'Entry id',
+ 'title' => 'Entry title',
+ 'updated' => 'Entry updated',
+ 'summary' => 'Entry summary' ) ) );
+?>
Added:
trunk/Feed/tests/atom/regression/generate/entry/entry_id+title+updated+summary.out
==============================================================================
---
trunk/Feed/tests/atom/regression/generate/entry/entry_id+title+updated+summary.out
(added)
+++
trunk/Feed/tests/atom/regression/generate/entry/entry_id+title+updated+summary.out
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -1,0 +1,1 @@
+There was no data submitted for required channel attribute 'link
rel="alternate"'.
Modified:
trunk/Feed/tests/atom/regression/generate/entry/entry_id+title+updated.out
==============================================================================
--- trunk/Feed/tests/atom/regression/generate/entry/entry_id+title+updated.out
[iso-8859-1] (original)
+++ trunk/Feed/tests/atom/regression/generate/entry/entry_id+title+updated.out
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -1,14 +1,1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom";>
- <id>Feed id</id>
- <title type="text">Feed title</title>
- <updated>XXX</updated>
- <author>
- <name>Author name</name>
- </author>
- <entry>
- <id>Entry id</id>
- <title>Entry title</title>
- <updated>XXX</updated>
- </entry>
-</feed>
+There was no data submitted for required channel attribute 'content'.
Modified: trunk/Feed/tests/atom/regression/generate/entry/link/link_empty.in
==============================================================================
--- trunk/Feed/tests/atom/regression/generate/entry/link/link_empty.in
[iso-8859-1] (original)
+++ trunk/Feed/tests/atom/regression/generate/entry/link/link_empty.in
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -7,5 +7,6 @@
'item' => array( array( 'id' => 'Entry id',
'title' => 'Entry title',
'updated' => 'Entry updated',
+ 'content' => 'Entry content',
'link' => array( array() ), ) ) );
?>
Modified:
trunk/Feed/tests/atom/regression/generate/entry/link/link_href+rel+type+hreflang+title+length.in
==============================================================================
---
trunk/Feed/tests/atom/regression/generate/entry/link/link_href+rel+type+hreflang+title+length.in
[iso-8859-1] (original)
+++
trunk/Feed/tests/atom/regression/generate/entry/link/link_href+rel+type+hreflang+title+length.in
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -7,6 +7,7 @@
'item' => array( array( 'id' => 'Entry id',
'title' => 'Entry title',
'updated' => 'Entry updated',
+ 'content' => 'Entry content',
'link' => array( array( 'href' => 'Entry
link href',
'rel' => 'Entry
link rel',
'type' => 'Entry
link type',
Modified:
trunk/Feed/tests/atom/regression/generate/entry/link/link_href+rel+type+hreflang+title+length.out
==============================================================================
---
trunk/Feed/tests/atom/regression/generate/entry/link/link_href+rel+type+hreflang+title+length.out
[iso-8859-1] (original)
+++
trunk/Feed/tests/atom/regression/generate/entry/link/link_href+rel+type+hreflang+title+length.out
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -10,6 +10,7 @@
<id>Entry id</id>
<title>Entry title</title>
<updated>XXX</updated>
+ <content>Entry content</content>
<link href="Entry link href" rel="Entry link rel" type="Entry link type"
hreflang="Entry link hreflang" title="Entry link title" length="Entry link
length"/>
</entry>
</feed>
Modified:
trunk/Feed/tests/atom/regression/generate/entry/link/link_href+rel+type+hreflang+title.in
==============================================================================
---
trunk/Feed/tests/atom/regression/generate/entry/link/link_href+rel+type+hreflang+title.in
[iso-8859-1] (original)
+++
trunk/Feed/tests/atom/regression/generate/entry/link/link_href+rel+type+hreflang+title.in
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -7,6 +7,7 @@
'item' => array( array( 'id' => 'Entry id',
'title' => 'Entry title',
'updated' => 'Entry updated',
+ 'content' => 'Entry content',
'link' => array( array( 'href' => 'Entry
link href',
'rel' => 'Entry
link rel',
'type' => 'Entry
link type',
Modified:
trunk/Feed/tests/atom/regression/generate/entry/link/link_href+rel+type+hreflang+title.out
==============================================================================
---
trunk/Feed/tests/atom/regression/generate/entry/link/link_href+rel+type+hreflang+title.out
[iso-8859-1] (original)
+++
trunk/Feed/tests/atom/regression/generate/entry/link/link_href+rel+type+hreflang+title.out
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -10,6 +10,7 @@
<id>Entry id</id>
<title>Entry title</title>
<updated>XXX</updated>
+ <content>Entry content</content>
<link href="Entry link href" rel="Entry link rel" type="Entry link type"
hreflang="Entry link hreflang" title="Entry link title"/>
</entry>
</feed>
Modified:
trunk/Feed/tests/atom/regression/generate/entry/link/link_href+rel+type+hreflang.in
==============================================================================
---
trunk/Feed/tests/atom/regression/generate/entry/link/link_href+rel+type+hreflang.in
[iso-8859-1] (original)
+++
trunk/Feed/tests/atom/regression/generate/entry/link/link_href+rel+type+hreflang.in
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -7,6 +7,7 @@
'item' => array( array( 'id' => 'Entry id',
'title' => 'Entry title',
'updated' => 'Entry updated',
+ 'content' => 'Entry content',
'link' => array( array( 'href' => 'Entry
link href',
'rel' => 'Entry
link rel',
'type' => 'Entry
link type',
Modified:
trunk/Feed/tests/atom/regression/generate/entry/link/link_href+rel+type+hreflang.out
==============================================================================
---
trunk/Feed/tests/atom/regression/generate/entry/link/link_href+rel+type+hreflang.out
[iso-8859-1] (original)
+++
trunk/Feed/tests/atom/regression/generate/entry/link/link_href+rel+type+hreflang.out
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -10,6 +10,7 @@
<id>Entry id</id>
<title>Entry title</title>
<updated>XXX</updated>
+ <content>Entry content</content>
<link href="Entry link href" rel="Entry link rel" type="Entry link type"
hreflang="Entry link hreflang"/>
</entry>
</feed>
Modified:
trunk/Feed/tests/atom/regression/generate/entry/link/link_href+rel+type.in
==============================================================================
--- trunk/Feed/tests/atom/regression/generate/entry/link/link_href+rel+type.in
[iso-8859-1] (original)
+++ trunk/Feed/tests/atom/regression/generate/entry/link/link_href+rel+type.in
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -7,6 +7,7 @@
'item' => array( array( 'id' => 'Entry id',
'title' => 'Entry title',
'updated' => 'Entry updated',
+ 'content' => 'Entry content',
'link' => array( array( 'href' => 'Entry
link href',
'rel' => 'Entry
link rel',
'type' => 'Entry
link type' ) ), ) ) );
Modified:
trunk/Feed/tests/atom/regression/generate/entry/link/link_href+rel+type.out
==============================================================================
--- trunk/Feed/tests/atom/regression/generate/entry/link/link_href+rel+type.out
[iso-8859-1] (original)
+++ trunk/Feed/tests/atom/regression/generate/entry/link/link_href+rel+type.out
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -10,6 +10,7 @@
<id>Entry id</id>
<title>Entry title</title>
<updated>XXX</updated>
+ <content>Entry content</content>
<link href="Entry link href" rel="Entry link rel" type="Entry link type"/>
</entry>
</feed>
Modified: trunk/Feed/tests/atom/regression/generate/entry/link/link_href+rel.in
==============================================================================
--- trunk/Feed/tests/atom/regression/generate/entry/link/link_href+rel.in
[iso-8859-1] (original)
+++ trunk/Feed/tests/atom/regression/generate/entry/link/link_href+rel.in
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -7,6 +7,7 @@
'item' => array( array( 'id' => 'Entry id',
'title' => 'Entry title',
'updated' => 'Entry updated',
+ 'content' => 'Entry content',
'link' => array( array( 'href' => 'Entry
link href',
'rel' => 'Entry
link rel' ) ), ) ) );
?>
Modified: trunk/Feed/tests/atom/regression/generate/entry/link/link_href+rel.out
==============================================================================
--- trunk/Feed/tests/atom/regression/generate/entry/link/link_href+rel.out
[iso-8859-1] (original)
+++ trunk/Feed/tests/atom/regression/generate/entry/link/link_href+rel.out
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -10,6 +10,7 @@
<id>Entry id</id>
<title>Entry title</title>
<updated>XXX</updated>
+ <content>Entry content</content>
<link href="Entry link href" rel="Entry link rel"/>
</entry>
</feed>
Modified: trunk/Feed/tests/atom/regression/generate/entry/link/link_href.in
==============================================================================
--- trunk/Feed/tests/atom/regression/generate/entry/link/link_href.in
[iso-8859-1] (original)
+++ trunk/Feed/tests/atom/regression/generate/entry/link/link_href.in
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -7,5 +7,6 @@
'item' => array( array( 'id' => 'Entry id',
'title' => 'Entry title',
'updated' => 'Entry updated',
+ 'content' => 'Entry content',
'link' => array( array( 'href' => 'Entry
link href' ) ), ) ) );
?>
Modified: trunk/Feed/tests/atom/regression/generate/entry/link/link_href.out
==============================================================================
--- trunk/Feed/tests/atom/regression/generate/entry/link/link_href.out
[iso-8859-1] (original)
+++ trunk/Feed/tests/atom/regression/generate/entry/link/link_href.out
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -10,6 +10,7 @@
<id>Entry id</id>
<title>Entry title</title>
<updated>XXX</updated>
+ <content>Entry content</content>
<link href="Entry link href"/>
</entry>
</feed>
Modified: trunk/Feed/tests/atom/regression/generate/entry/link/link_multiple.in
==============================================================================
--- trunk/Feed/tests/atom/regression/generate/entry/link/link_multiple.in
[iso-8859-1] (original)
+++ trunk/Feed/tests/atom/regression/generate/entry/link/link_multiple.in
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -7,6 +7,7 @@
'item' => array( array( 'id' => 'Entry id',
'title' => 'Entry title',
'updated' => 'Entry updated',
+ 'content' => 'Entry content',
'link' => array( array( 'href' => 'Entry
link href 1',
'rel' => 'Entry
link rel 1',
'type' => 'Entry
link type 1',
Modified: trunk/Feed/tests/atom/regression/generate/entry/link/link_multiple.out
==============================================================================
--- trunk/Feed/tests/atom/regression/generate/entry/link/link_multiple.out
[iso-8859-1] (original)
+++ trunk/Feed/tests/atom/regression/generate/entry/link/link_multiple.out
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -10,6 +10,7 @@
<id>Entry id</id>
<title>Entry title</title>
<updated>XXX</updated>
+ <content>Entry content</content>
<link href="Entry link href 1" rel="Entry link rel 1" type="Entry link
type 1" hreflang="Entry link hreflang 1" title="Entry link title 1"
length="Entry link length 1"/>
<link href="Entry link href 2" rel="Entry link rel 2" type="Entry link
type 2" hreflang="Entry link hreflang 2" title="Entry link title 2"
length="Entry link length 2"/>
</entry>
Modified:
trunk/Feed/tests/atom/regression/generate/entry/link/link_multiple_alternate_broken.in
==============================================================================
---
trunk/Feed/tests/atom/regression/generate/entry/link/link_multiple_alternate_broken.in
[iso-8859-1] (original)
+++
trunk/Feed/tests/atom/regression/generate/entry/link/link_multiple_alternate_broken.in
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -7,6 +7,7 @@
'item' => array( array( 'id' => 'Entry id',
'title' => 'Entry title',
'updated' => 'Entry updated',
+ 'content' => 'Entry content',
'link' => array( array( 'href' => 'Entry
link href 1',
'rel' =>
'alternate',
'type' => 'SAME
TYPE',
Modified:
trunk/Feed/tests/atom/regression/generate/entry/link/link_multiple_alternate_correct.in
==============================================================================
---
trunk/Feed/tests/atom/regression/generate/entry/link/link_multiple_alternate_correct.in
[iso-8859-1] (original)
+++
trunk/Feed/tests/atom/regression/generate/entry/link/link_multiple_alternate_correct.in
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -7,6 +7,7 @@
'item' => array( array( 'id' => 'Entry id',
'title' => 'Entry title',
'updated' => 'Entry updated',
+ 'content' => 'Entry content',
'link' => array( array( 'href' => 'Entry
link href 1',
'rel' =>
'alternate',
'type' => 'Entry
link type 1',
Modified:
trunk/Feed/tests/atom/regression/generate/entry/link/link_multiple_alternate_correct.out
==============================================================================
---
trunk/Feed/tests/atom/regression/generate/entry/link/link_multiple_alternate_correct.out
[iso-8859-1] (original)
+++
trunk/Feed/tests/atom/regression/generate/entry/link/link_multiple_alternate_correct.out
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -10,6 +10,7 @@
<id>Entry id</id>
<title>Entry title</title>
<updated>XXX</updated>
+ <content>Entry content</content>
<link href="Entry link href 1" rel="alternate" type="Entry link type 1"
hreflang="Entry link hreflang 1" title="Entry link title 1" length="Entry link
length 1"/>
<link href="Entry link href 2" rel="alternate" type="Entry link type 2"
hreflang="Entry link hreflang 2" title="Entry link title 2" length="Entry link
length 2"/>
</entry>
Modified:
trunk/Feed/tests/atom/regression/generate/entry/summary/summary_empty.in
==============================================================================
--- trunk/Feed/tests/atom/regression/generate/entry/summary/summary_empty.in
[iso-8859-1] (original)
+++ trunk/Feed/tests/atom/regression/generate/entry/summary/summary_empty.in
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -6,5 +6,6 @@
'item' => array( array( 'id' => 'Entry id',
'title' => array( array( '#' => 'Entry
title' ) ),
'updated' => 'Entry updated',
+ 'content' => 'Entry content',
'summary' => array( array() ) ) ) );
?>
Modified:
trunk/Feed/tests/atom/regression/generate/entry/summary/summary_empty.out
==============================================================================
--- trunk/Feed/tests/atom/regression/generate/entry/summary/summary_empty.out
[iso-8859-1] (original)
+++ trunk/Feed/tests/atom/regression/generate/entry/summary/summary_empty.out
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -10,6 +10,7 @@
<id>Entry id</id>
<title>Entry title</title>
<updated>XXX</updated>
+ <content>Entry content</content>
<summary></summary>
</entry>
</feed>
Modified:
trunk/Feed/tests/atom/regression/generate/entry/summary/summary_type_absent.in
==============================================================================
---
trunk/Feed/tests/atom/regression/generate/entry/summary/summary_type_absent.in
[iso-8859-1] (original)
+++
trunk/Feed/tests/atom/regression/generate/entry/summary/summary_type_absent.in
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -6,5 +6,6 @@
'item' => array( array( 'id' => 'Entry id',
'title' => array( array( '#' => 'Entry
title' ) ),
'updated' => 'Entry updated',
+ 'content' => 'Entry content',
'summary' => array( array( '#' => 'Entry
summary' ) ) ) ) );
?>
Modified:
trunk/Feed/tests/atom/regression/generate/entry/summary/summary_type_absent.out
==============================================================================
---
trunk/Feed/tests/atom/regression/generate/entry/summary/summary_type_absent.out
[iso-8859-1] (original)
+++
trunk/Feed/tests/atom/regression/generate/entry/summary/summary_type_absent.out
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -10,6 +10,7 @@
<id>Entry id</id>
<title>Entry title</title>
<updated>XXX</updated>
+ <content>Entry content</content>
<summary>Entry summary</summary>
</entry>
</feed>
Modified:
trunk/Feed/tests/atom/regression/generate/entry/summary/summary_type_html.in
==============================================================================
---
trunk/Feed/tests/atom/regression/generate/entry/summary/summary_type_html.in
[iso-8859-1] (original)
+++
trunk/Feed/tests/atom/regression/generate/entry/summary/summary_type_html.in
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -6,6 +6,7 @@
'item' => array( array( 'id' => 'Entry id',
'title' => array( array( '#' => 'Entry
title' ) ),
'updated' => 'Entry updated',
+ 'content' => 'Entry content',
'summary' => array( array( '#' => 'Entry
summary',
'type' =>
'html' ) ) ) ) );
?>
Modified:
trunk/Feed/tests/atom/regression/generate/entry/summary/summary_type_html.out
==============================================================================
---
trunk/Feed/tests/atom/regression/generate/entry/summary/summary_type_html.out
[iso-8859-1] (original)
+++
trunk/Feed/tests/atom/regression/generate/entry/summary/summary_type_html.out
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -10,6 +10,7 @@
<id>Entry id</id>
<title>Entry title</title>
<updated>XXX</updated>
+ <content>Entry content</content>
<summary type="html">Entry summary</summary>
</entry>
</feed>
Modified:
trunk/Feed/tests/atom/regression/generate/entry/summary/summary_type_text.in
==============================================================================
---
trunk/Feed/tests/atom/regression/generate/entry/summary/summary_type_text.in
[iso-8859-1] (original)
+++
trunk/Feed/tests/atom/regression/generate/entry/summary/summary_type_text.in
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -6,6 +6,7 @@
'item' => array( array( 'id' => 'Entry id',
'title' => array( array( '#' => 'Entry
title' ) ),
'updated' => 'Entry updated',
+ 'content' => 'Entry content',
'summary' => array( array( '#' => 'Entry
summary',
'type' =>
'text' ) ) ) ) );
?>
Modified:
trunk/Feed/tests/atom/regression/generate/entry/summary/summary_type_text.out
==============================================================================
---
trunk/Feed/tests/atom/regression/generate/entry/summary/summary_type_text.out
[iso-8859-1] (original)
+++
trunk/Feed/tests/atom/regression/generate/entry/summary/summary_type_text.out
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -10,6 +10,7 @@
<id>Entry id</id>
<title>Entry title</title>
<updated>XXX</updated>
+ <content>Entry content</content>
<summary type="text">Entry summary</summary>
</entry>
</feed>
Modified:
trunk/Feed/tests/atom/regression/generate/entry/summary/summary_type_xhtml.in
==============================================================================
---
trunk/Feed/tests/atom/regression/generate/entry/summary/summary_type_xhtml.in
[iso-8859-1] (original)
+++
trunk/Feed/tests/atom/regression/generate/entry/summary/summary_type_xhtml.in
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -6,6 +6,7 @@
'item' => array( array( 'id' => 'Entry id',
'title' => array( array( '#' => 'Entry
title' ) ),
'updated' => 'Entry updated',
+ 'content' => 'Entry content',
'summary' => array( array( '#' => 'Entry
summary',
'type' =>
'xhtml' ) ) ) ) );
?>
Modified:
trunk/Feed/tests/atom/regression/generate/entry/summary/summary_type_xhtml.out
==============================================================================
---
trunk/Feed/tests/atom/regression/generate/entry/summary/summary_type_xhtml.out
[iso-8859-1] (original)
+++
trunk/Feed/tests/atom/regression/generate/entry/summary/summary_type_xhtml.out
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -10,6 +10,7 @@
<id>Entry id</id>
<title>Entry title</title>
<updated>XXX</updated>
+ <content>Entry content</content>
<summary type="xhtml" xmlns:xhtml="http://www.w3.org/1999/xhtml";>
<xhtml:div>Entry summary</xhtml:div>
</summary>
Modified: trunk/Feed/tests/atom/regression/generate/entry/title/type_absent.in
==============================================================================
--- trunk/Feed/tests/atom/regression/generate/entry/title/type_absent.in
[iso-8859-1] (original)
+++ trunk/Feed/tests/atom/regression/generate/entry/title/type_absent.in
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -5,5 +5,6 @@
'author' => array( array( 'name' => 'Author name' ) ),
'item' => array( array( 'id' => 'Entry id',
'title' => array( array( '#' => 'Entry
title' ) ),
- 'updated' => 'Entry updated' ) ) );
+ 'updated' => 'Entry updated',
+ 'content' => 'Entry content' ) ) );
?>
Modified: trunk/Feed/tests/atom/regression/generate/entry/title/type_absent.out
==============================================================================
--- trunk/Feed/tests/atom/regression/generate/entry/title/type_absent.out
[iso-8859-1] (original)
+++ trunk/Feed/tests/atom/regression/generate/entry/title/type_absent.out
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -10,5 +10,6 @@
<id>Entry id</id>
<title>Entry title</title>
<updated>XXX</updated>
+ <content>Entry content</content>
</entry>
</feed>
Modified: trunk/Feed/tests/atom/regression/generate/entry/title/type_html.in
==============================================================================
--- trunk/Feed/tests/atom/regression/generate/entry/title/type_html.in
[iso-8859-1] (original)
+++ trunk/Feed/tests/atom/regression/generate/entry/title/type_html.in
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -6,5 +6,6 @@
'item' => array( array( 'id' => 'Entry id',
'title' => array( array( '#' => 'Entry
title',
'type' =>
'html' ) ),
- 'updated' => 'Entry updated' ) ) );
+ 'updated' => 'Entry updated',
+ 'content' => 'Entry content' ) ) );
?>
Modified: trunk/Feed/tests/atom/regression/generate/entry/title/type_html.out
==============================================================================
--- trunk/Feed/tests/atom/regression/generate/entry/title/type_html.out
[iso-8859-1] (original)
+++ trunk/Feed/tests/atom/regression/generate/entry/title/type_html.out
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -10,5 +10,6 @@
<id>Entry id</id>
<title type="html">Entry title</title>
<updated>XXX</updated>
+ <content>Entry content</content>
</entry>
</feed>
Modified: trunk/Feed/tests/atom/regression/generate/entry/title/type_text.in
==============================================================================
--- trunk/Feed/tests/atom/regression/generate/entry/title/type_text.in
[iso-8859-1] (original)
+++ trunk/Feed/tests/atom/regression/generate/entry/title/type_text.in
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -6,5 +6,6 @@
'item' => array( array( 'id' => 'Entry id',
'title' => array( array( '#' => 'Entry
title',
'type' =>
'text' ) ),
- 'updated' => 'Entry updated' ) ) );
+ 'updated' => 'Entry updated',
+ 'content' => 'Entry content' ) ) );
?>
Modified: trunk/Feed/tests/atom/regression/generate/entry/title/type_text.out
==============================================================================
--- trunk/Feed/tests/atom/regression/generate/entry/title/type_text.out
[iso-8859-1] (original)
+++ trunk/Feed/tests/atom/regression/generate/entry/title/type_text.out
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -10,5 +10,6 @@
<id>Entry id</id>
<title type="text">Entry title</title>
<updated>XXX</updated>
+ <content>Entry content</content>
</entry>
</feed>
Modified: trunk/Feed/tests/atom/regression/generate/entry/title/type_xhtml.in
==============================================================================
--- trunk/Feed/tests/atom/regression/generate/entry/title/type_xhtml.in
[iso-8859-1] (original)
+++ trunk/Feed/tests/atom/regression/generate/entry/title/type_xhtml.in
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -6,5 +6,6 @@
'item' => array( array( 'id' => 'Entry id',
'title' => array( array( '#' => 'Entry
title',
'type' =>
'xhtml' ) ),
- 'updated' => 'Entry updated' ) ) );
+ 'updated' => 'Entry updated',
+ 'content' => 'Entry content' ) ) );
?>
Modified: trunk/Feed/tests/atom/regression/generate/entry/title/type_xhtml.out
==============================================================================
--- trunk/Feed/tests/atom/regression/generate/entry/title/type_xhtml.out
[iso-8859-1] (original)
+++ trunk/Feed/tests/atom/regression/generate/entry/title/type_xhtml.out
[iso-8859-1] Mon Nov 19 10:36:36 2007
@@ -12,5 +12,6 @@
<xhtml:div>Entry title</xhtml:div>
</title>
<updated>XXX</updated>
+ <content>Entry content</content>
</entry>
</feed>
--
svn-components mailing list
svn-components@lists.ez.no
http://lists.ez.no/mailman/listinfo/svn-components
