|
From: <nma...@us...> - 2006-03-13 10:28:15
|
Revision: 22 Author: nmarkgraf Date: 2006-03-13 02:27:58 -0800 (Mon, 13 Mar 2006) ViewCVS: http://svn.sourceforge.net/opendocumentphp/?rev=22&view=rev Log Message: ----------- After making some new test cases for OpenDocumentManifest, I found and fix some tiny bugs. Modified Paths: -------------- poc/src/OpenDocumentManifest.php poc/src/OpenDocumentManifestTest.php Modified: poc/src/OpenDocumentManifest.php =================================================================== --- poc/src/OpenDocumentManifest.php 2006-03-13 10:13:38 UTC (rev 21) +++ poc/src/OpenDocumentManifest.php 2006-03-13 10:27:58 UTC (rev 22) @@ -82,8 +82,8 @@ */ final public function addEntryToManifest( $fullpath, $mimetype, $size=-1, $encrypt=0 ) { $node = $this->dom->createElementNS( self::NS_MANIFEST, "manifest:file-entry" ); - $node->setAttributeNS( self::NS_MANIFEST, "manifest:mediatype", $mimetype ); - $node->setAttributeNS( self::NS_MANIFEST, "manifest:full-path", $filename ); + $node->setAttributeNS( self::NS_MANIFEST, "manifest:media-type", $mimetype ); + $node->setAttributeNS( self::NS_MANIFEST, "manifest:full-path", $fullpath ); if ( $size >= 0 ) { $node->setAttributeNS( self::NS_MANIFEST, "manifest:size", $size ); } Modified: poc/src/OpenDocumentManifestTest.php =================================================================== --- poc/src/OpenDocumentManifestTest.php 2006-03-13 10:13:38 UTC (rev 21) +++ poc/src/OpenDocumentManifestTest.php 2006-03-13 10:27:58 UTC (rev 22) @@ -17,49 +17,87 @@ require_once "OpenDocumentManifest.php"; class OpenDocumentManifestTest extends PHPUnit2_Framework_TestCase { - const PathToRNG = "./etc/test/"; - const ManifestRNG = "OpenDocument-manifest-schema-v1.0-os.rng"; + const PathToRNG = "./etc/test/"; + const ManifestRNG = "OpenDocument-manifest-schema-v1.0-os.rng"; - function testConstructionWithOutMimeType() { + /** + * @since 0.4.0 + */ + function testConstructionWithOutMimeType() { - /** - * @since 0.4.0 - */ $ODM = new OpenDocumentManifest(); $this->assertNotNull( $ODM, "Error constructing OpenDocumentManifest without a given mimetype." ); + } + + /** + * @since 0.4.2 + */ + function testConstructionWithMimeType() { + $ODMMT = new OpenDocumentManifest( "alternateMimeType" ); + $this->assertNotNull( $ODMMT, "Error constructing OpenDocumentManifest with a given mimetype." ); + } + + /** + * @since 0.4.2 + */ + function testEmptyManifest() { + $ODM = new OpenDocumentManifest(); + + $this->assertNotNull( $ODM, "Error constructing OpenDocumentManifest without a given mimetype." ); + + $Document = $ODM->get(); + + $this->assertNotNull( $Document, "Returned value of OpenDocumentManifest->get() is NULL." ); + + $RelaxNG = self::PathToRNG . self::ManifestRNG; + + $this->assertTrue( $Document->relaxNGValidate( $RelaxNG ), + "Manifest does not match Manifest Relax NG schema." ); + } - /** - * @since 0.4.2 - */ - function testConstructionWithMimeType() { - $ODMMT = new OpenDocumentManifest( "alternateMimeType" ); + /** + * @since 0.4.2 + */ + function testEntryToManifest() { + $ODM = new OpenDocumentManifest(); - $this->assertNotNull( $ODMMT, "Error constructing OpenDocumentManifest with a given mimetype." ); + $this->assertNotNull( $ODM, "Error constructing OpenDocumentManifest without a given mimetype." ); + + $ODM->addEntryToManifest( "content.xml", "application/vnd.oasis.opendocument.text" ); + + $Document = $ODM->get(); + + $this->assertNotNull( $Document, "Returned value of OpenDocumentManifest->get() is NULL." ); + + $RelaxNG = self::PathToRNG . self::ManifestRNG; + + $this->assertTrue( $Document->relaxNGValidate( $RelaxNG ), + "Manifest does not match Manifest Relax NG schema." ); + } + + /** + * @since 0.4.2 + */ + function testEntryToManifestWithSize() { + $ODM = new OpenDocumentManifest(); - } + $this->assertNotNull( $ODM, "Error constructing OpenDocumentManifest without a given mimetype." ); - /** - * @since 0.4.2 - */ - function testEmptyManifest() { - $ODM = new OpenDocumentManifest(); - - $this->assertNotNull( $ODM, "Error constructing OpenDocumentManifest without a given mimetype." ); + $ODM->addEntryToManifest( "content.xml", "application/vnd.oasis.opendocument.text", "12345" ); - $Document = $ODM->get(); + $Document = $ODM->get(); - $this->assertNotNull( $Document, "Returned value of OpenDocumentManifest->get() is NULL." ); + $this->assertNotNull( $Document, "Returned value of OpenDocumentManifest->get() is NULL." ); - $RelaxNG = self::PathToRNG . self::ManifestRNG; + $RelaxNG = self::PathToRNG . self::ManifestRNG; - $this->assertTrue( $Document->relaxNGValidate( $RelaxNG ), "Manifest does not match Manifest Relax NG schema." ); - - } - - + $this->assertTrue( $Document->relaxNGValidate( $RelaxNG ), + "Manifest does not match Manifest Relax NG schema." ); + } + } ?> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |