Navigation

← Previous Changeset
Next Changeset →

Changeset 129

Timestamp:

01/20/07 16:06:09 (2 years ago)

Author:

schst

Message:

Added implementation of stubXMLStreamWriter based on ext/xmlwriter,
changed behaviour of stubXMLStreamWriter to not append a trailing newline to the documents

Files:

trunk/src/main/php/net/stubbles/xml/stubDomXMLStreamWriter.php (modified) (2 diffs)
trunk/src/main/php/net/stubbles/xml/stubLibXmlXMLStreamWriter.php (added)
trunk/src/test/php/net/stubbles/xml/XMLTestSuite.php (modified) (1 diff)
trunk/src/test/php/net/stubbles/xml/stubDomXMLStreamWriterTestCase.php (modified) (10 diffs)
trunk/src/test/php/net/stubbles/xml/stubLibXmlXMLStreamWriterTestCase.php (added)
trunk/src/test/php/net/stubbles/xml/stubXMLSerializerTestCase.php (modified) (17 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/src/main/php/net/stubbles/xml/stubDomXMLStreamWriter.php

r97	r129
150	150	$parent->appendChild($element);
151	151	}
152
	152
153	153	}
154
	154
155	155	/**
156	156	* Import another stream
…	…
192	192	*/
193	193	public function asXML() {
194		return ~~$this->doc->saveXML(~~);
	194	return rtrim($this->doc->saveXML());
195	195	}
196	196	}

trunk/src/test/php/net/stubbles/xml/XMLTestSuite.php

r83	r129
22	22	$this->TestSuite('All XML tests');
23	23	$this->addTestFile(dirname(__FILE__) . '/stubDomXMLStreamWriterTestCase.php');
	24	$this->addTestFile(dirname(__FILE__) . '/stubLibXmlXMLStreamWriterTestCase.php');
24	25	$this->addTestFile(dirname(__FILE__) . '/stubXMLSerializerTestCase.php');
25	26	}

trunk/src/test/php/net/stubbles/xml/stubDomXMLStreamWriterTestCase.php

r98	r129
23	23	public function testEmptyDocument() {
24	24	$writer = new stubDomXMLStreamWriter();
25		$this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' ~~. "\n"~~, $writer->asXML());
	25	$this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>', $writer->asXML());
26	26	}
27	27
…	…
38	38	$writer->writeEndElement();
39	39
40		$this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n<root><foo/><bar/></root>\n" , $writer->asXML());
	40	$this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n<root><foo/><bar/></root>" , $writer->asXML());
41	41	}
42	42
…	…
48	48	$writer->writeElement('foo', array('att' => 'value'), 'content');
49	49
50		$this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<foo att="value">content</foo>' ~~. "\n"~~ , $writer->asXML());
	50	$this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<foo att="value">content</foo>', $writer->asXML());
51	51	}
52
	52
53	53	/**
54	54	* Test creating a document with attributes
…	…
62	62	$writer->writeEndElement();
63	63
64		$this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n". '<root><foo bar="42"/></root>' ~~. "\n"~~ , $writer->asXML());
	64	$this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n". '<root><foo bar="42"/></root>', $writer->asXML());
65	65	}
66	66
…	…
74	74	$writer->writeEndElement();
75	75
76		$this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n". '<root>This is text.</root>' ~~. "\n"~~ , $writer->asXML());
	76	$this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n". '<root>This is text.</root>', $writer->asXML());
77	77	}
78	78
…	…
86	86	$writer->writeEndElement();
87	87
88		$this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n". '<root><![CDATA[This is text.]]></root>' ~~. "\n"~~ , $writer->asXML());
	88	$this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n". '<root><![CDATA[This is text.]]></root>', $writer->asXML());
89	89	}
90	90
…	…
98	98	$writer->writeEndElement();
99	99
100		$this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n". '<root><!--This is a comment.--></root>' ~~. "\n"~~ , $writer->asXML());
	100	$this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n". '<root><!--This is a comment.--></root>', $writer->asXML());
101	101	}
102	102
…	…
110	110	$writer->writeEndElement();
111	111
112		$this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n". '<root><?php phpinfo();?></root>' ~~. "\n"~~ , $writer->asXML());
	112	$this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n". '<root><?php phpinfo();?></root>', $writer->asXML());
113	113	}
114	114
…	…
122	122	$writer->writeEndElement();
123	123
124		$this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n". '<root><foo bar="true"/></root>' ~~. "\n"~~ , $writer->asXML());
	124	$this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n". '<root><foo bar="true"/></root>', $writer->asXML());
125	125	}
126	126
…	…
142	142	$writer->writeEndElement();
143	143
144		$this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n". '<root><foo><bar/></foo></root>' ~~. "\n"~~ , $writer->asXML());
	144	$this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n". '<root><foo><bar/></foo></root>', $writer->asXML());
145	145	}
146	146	}

trunk/src/test/php/net/stubbles/xml/stubXMLSerializerTestCase.php

r98	r129
16	16	*/
17	17	class XMLSerializerFoo {
18
	18
19	19	/**
20	20	* Scalar property
…	…
48	48	*/
49	49	class XMLSerializerList {
50
	50
51	51	/**
52	52	* Scalar property
…	…
64	64	*/
65	65	class XMLSerializerMethods {
66
	66
67	67	/**
68	68	* Return a value
…	…
85	85	class stubXMLSerializerTestCase extends UnitTestCase
86	86	{
87
	87
88	88	/**
89	89	* The XMLSerializer to use
…	…
92	92	*/
93	93	protected $serializer;
94
	94
95	95	public function setUp() {
96	96	$this->serializer = new stubXMLSerializer();
97	97	}
98
	98
99	99	/**
100	100	* Test serializing a null value
…	…
103	103	$writer = new stubDomXMLStreamWriter();
104	104	$this->serializer->serialize(null, $writer, array(stubXMLSerializer::OPT_ROOT_TAG => 'root'));
105		$this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<root><null/></root>' ~~. "\n"~~, $writer->asXML());
	105	$this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<root><null/></root>', $writer->asXML());
106	106	}
107	107
…	…
112	112	$writer = new stubDomXMLStreamWriter();
113	113	$this->serializer->serialize('This is a string.', $writer, array(stubXMLSerializer::OPT_ROOT_TAG => 'root'));
114		$this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<root>This is a string.</root>' ~~. "\n"~~, $writer->asXML());
	114	$this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<root>This is a string.</root>', $writer->asXML());
115	115	}
116	116
…	…
121	121	$writer = new stubDomXMLStreamWriter();
122	122	$this->serializer->serialize(45, $writer, array(stubXMLSerializer::OPT_ROOT_TAG => 'root'));
123		$this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<root>45</root>' ~~. "\n"~~, $writer->asXML());
	123	$this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<root>45</root>', $writer->asXML());
124	124	}
125	125
…	…
130	130	$writer = new stubDomXMLStreamWriter();
131	131	$this->serializer->serialize(2.352, $writer, array(stubXMLSerializer::OPT_ROOT_TAG => 'root'));
132		$this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<root>2.352</root>' ~~. "\n"~~, $writer->asXML());
	132	$this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<root>2.352</root>', $writer->asXML());
133	133	}
134	134
…	…
139	139	$writer = new stubDomXMLStreamWriter();
140	140	$this->serializer->serialize(true, $writer, array(stubXMLSerializer::OPT_ROOT_TAG => 'root'));
141		$this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<root>true</root>' ~~. "\n"~~, $writer->asXML());
	141	$this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<root>true</root>', $writer->asXML());
142	142	}
143	143
…	…
152	152	);
153	153	$this->serializer->serialize($array, $writer, array(stubXMLSerializer::OPT_ROOT_TAG => 'root'));
154		$this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<root><one>two</one><three>four</three></root>' ~~. "\n"~~, $writer->asXML());
	154	$this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<root><one>two</one><three>four</three></root>', $writer->asXML());
155	155	}
156	156
…	…
162	162	$array = array('one', 'two', 'three');
163	163	$this->serializer->serialize($array, $writer, array(stubXMLSerializer::OPT_ROOT_TAG => 'root'));
164		$this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<root><string>one</string><string>two</string><string>three</string></root>' ~~. "\n"~~, $writer->asXML());
	164	$this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<root><string>one</string><string>two</string><string>three</string></root>', $writer->asXML());
165	165	}
166	166
…	…
175	175	);
176	176	$this->serializer->serialize($array, $writer, array(stubXMLSerializer::OPT_ROOT_TAG => 'root'));
177		$this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<root><one>two</one><three><four>five</four></three></root>' ~~. "\n"~~, $writer->asXML());
	177	$this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<root><one>two</one><three><four>five</four></three></root>', $writer->asXML());
178	178	}
179	179
…	…
185	185	$obj = new XMLSerializerFoo();
186	186	$this->serializer->serialize($obj, $writer);
187		$this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<foo bar="test"><bar>42</bar></foo>' ~~. "\n"~~, $writer->asXML());
	187	$this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<foo bar="test"><bar>42</bar></foo>', $writer->asXML());
188	188	}
189	189
…	…
196	196	$obj->bar = new XMLSerializerFoo();
197	197	$this->serializer->serialize($obj, $writer);
198		$this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<foo bar="test"><bar bar="test"><bar>42</bar></bar></foo>' ~~. "\n"~~, $writer->asXML());
	198	$this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<foo bar="test"><bar bar="test"><bar>42</bar></bar></foo>', $writer->asXML());
199	199	}
200	200
…	…
206	206	$obj = new XMLSerializerList();
207	207	$this->serializer->serialize($obj, $writer);
208		$this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<container><list><item>one</item><item>two</item><item>three</item></list></container>' ~~. "\n"~~, $writer->asXML());
	208	$this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<container><list><item>one</item><item>two</item><item>three</item></list></container>', $writer->asXML());
209	209	}
210	210
…	…
216	216	$obj = new XMLSerializerMethods();
217	217	$this->serializer->serialize($obj, $writer);
218		$this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<class method="returned"/>' ~~. "\n"~~, $writer->asXML());
	218	$this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<class method="returned"/>', $writer->asXML());
219	219	}
220	220	}