Author: ks
Date: Tue Nov 20 14:43:13 2007
New Revision: 6775
Log:
- Added unit test plus minor fixes.
Added:
experimental/Document/tests/convert_ezp3_test.php
experimental/Document/tests/files/ezp4_sample.xml
Modified:
experimental/Document/docs/ezp32ezp4.php
experimental/Document/src/converters/ezp3_ezp4.xsl
experimental/Document/tests/suite.php
Modified: experimental/Document/docs/ezp32ezp4.php
==============================================================================
--- experimental/Document/docs/ezp32ezp4.php [iso-8859-1] (original)
+++ experimental/Document/docs/ezp32ezp4.php [iso-8859-1] Tue Nov 20 14:43:13
2007
@@ -9,7 +9,7 @@
$ezp3 = file_get_contents( $argv[1] );
-$docEzp3 = new ezcDocumentXML( 'ezp4', $ezp3 );
+$docEzp3 = new ezcDocumentXML( 'ezp3', $ezp3 );
$converter = new ezcDocumentEzp3ToEzp4( array( 'inline_custom_tags' => array(
'sub', 'sup', 'strike' ) ) );
$docEzp4 = $converter->convert( $docEzp3 );
Modified: experimental/Document/src/converters/ezp3_ezp4.xsl
==============================================================================
--- experimental/Document/src/converters/ezp3_ezp4.xsl [iso-8859-1] (original)
+++ experimental/Document/src/converters/ezp3_ezp4.xsl [iso-8859-1] Tue Nov 20
14:43:13 2007
@@ -86,7 +86,7 @@
<xsl:otherwise>
<xsl:copy>
<xsl:copy-of select="@*" />
- <xsl:apply-templates/>
+ <xsl:apply-templates mode='common'/>
</xsl:copy>
</xsl:otherwise>
</xsl:choose>
Added: experimental/Document/tests/convert_ezp3_test.php
==============================================================================
--- experimental/Document/tests/convert_ezp3_test.php (added)
+++ experimental/Document/tests/convert_ezp3_test.php [iso-8859-1] Tue Nov 20
14:43:13 2007
@@ -1,0 +1,39 @@
+<?php
+/**
+ * ezcDocumentConvertEzp3Test
+ *
+ * @package Document
+ * @version //autogen//
+ * @subpackage Tests
+ * @copyright Copyright (C) 2005-2007 eZ systems as. All rights reserved.
+ * @license http://ez.no/licenses/new_bsd New BSD License
+ */
+
+/**
+ * Test suite for class.
+ *
+ * @package Document
+ * @subpackage Tests
+ */
+class ezcDocumentConvertEzp3Test extends ezcTestCase
+{
+ public function testDocumentEzp3ToEzp4()
+ {
+ $converter = new ezcDocumentEzp3ToEzp4( array( 'inline_custom_tags' =>
array( 'sub', 'sup', 'strike' ) ) );
+
+ $ezp3 = file_get_contents( dirname( __FILE__ ) .
'/files/ezp3_sample.xml' );
+ $ezp4 = file_get_contents( dirname( __FILE__ ) .
'/files/ezp4_sample.xml' );
+
+ $docEzp3 = new ezcDocumentXML( 'ezp3', $ezp3 );
+ $docEzp4 = $converter->convert( $docEzp3 );
+ $result = $docEzp4->getXML();
+
+ self::assertEquals( $ezp4, $result, 'Converting Ezp3 to Ezp4 failed.'
);
+ }
+
+ public static function suite()
+ {
+ return new PHPUnit_Framework_TestSuite( "ezcDocumentConvertEzp3Test" );
+ }
+}
+?>
Added: experimental/Document/tests/files/ezp4_sample.xml
==============================================================================
--- experimental/Document/tests/files/ezp4_sample.xml (added)
+++ experimental/Document/tests/files/ezp4_sample.xml [iso-8859-1] Tue Nov 20
14:43:13 2007
@@ -1,0 +1,20 @@
+<?xml version="1.0"?>
+<document>
+
+ <h1>Header 1</h1>
+ <p class="pRed">abc
+ <strong>def</strong></p><embed src="eznode://123"/><p
class="pRed">ghi<strong>jkl</strong></p>
+
+ <h2>Header 1.1</h2>
+ <p>Text 1.1</p>
+
+
+
+ <h1>Header 2</h1>
+ <p>line 1<br/>line 2</p>
+ <p>Inline custom tag:</p><p> Block custom tag:</p><custom
name="factbox"/>
+ <p>Embed inline:<embed-inline src="eznode://123"/> Embed block:
</p><embed src="eznode://123"/>
+ <p><anchor name="self"/><link href="#self">linked</link></p>
+ <ol><li><ul><li><p>element 1.1</p></li><li><p>element
1.2</p></li></ul></li><li><p>element 2</p></li></ol>
+
+</document>
Modified: experimental/Document/tests/suite.php
==============================================================================
--- experimental/Document/tests/suite.php [iso-8859-1] (original)
+++ experimental/Document/tests/suite.php [iso-8859-1] Tue Nov 20 14:43:13 2007
@@ -15,6 +15,7 @@
/**
* Required test suites.
*/
+require_once 'convert_ezp3_test.php';
require_once 'convert_xhtml_test.php';
require_once 'document_basic_test.php';
@@ -26,6 +27,7 @@
parent::__construct();
$this->setName( "Document" );
$this->addTest( ezcDocumentConvertXhtmlTest::suite() );
+ $this->addTest( ezcDocumentConvertEzp3Test::suite() );
$this->addTest( ezcDocumentDocumentBasicTest::suite() );
}
--
svn-components mailing list
svn-components@lists.ez.no
http://lists.ez.no/mailman/listinfo/svn-components
