You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by tc...@apache.org on 2003/11/17 02:01:02 UTC
cvs commit: cocoon-2.1/src/test/org/apache/cocoon/xml AbstractXMLTestCase.java DefaultHandlerWrapper.java SaxBufferTestCase.java
tcurdt 2003/11/16 17:01:02
Modified: src/java/org/apache/cocoon/xml SaxBuffer.java
Added: src/test/org/apache/cocoon/components/sax
XMLByteStreamCompilerInterpreterTestCase.java
src/test/org/apache/cocoon/xml AbstractXMLTestCase.java
DefaultHandlerWrapper.java SaxBufferTestCase.java
Log:
some first testcases for the SAX capture/recall machinery,
also gives some comparable numbers,
made the SaxBuffer recylable
Revision Changes Path
1.3 +6 -1 cocoon-2.1/src/java/org/apache/cocoon/xml/SaxBuffer.java
Index: SaxBuffer.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/xml/SaxBuffer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SaxBuffer.java 13 Nov 2003 13:42:58 -0000 1.2
+++ SaxBuffer.java 17 Nov 2003 01:01:02 -0000 1.3
@@ -56,6 +56,7 @@
import org.xml.sax.Attributes;
import org.xml.sax.ext.LexicalHandler;
import org.apache.excalibur.xml.sax.XMLizable;
+import org.apache.avalon.excalibur.pool.Recyclable;
import java.util.ArrayList;
import java.util.Iterator;
@@ -74,7 +75,7 @@
* <p>Both ContentHandler and LexicalHandler are supported, the only exception is
* that the setDocumentLocator event is not recorded.
*/
-public class SaxBuffer implements ContentHandler, LexicalHandler, XMLizable {
+public class SaxBuffer implements ContentHandler, LexicalHandler, XMLizable, Recyclable {
private ArrayList saxbits = new ArrayList();
public void skippedEntity(String name) throws SAXException {
@@ -155,6 +156,10 @@
SaxBit saxbit = (SaxBit)saxbitsIt.next();
saxbit.send(contentHandler);
}
+ }
+
+ public void recycle() {
+ saxbits.clear();
}
interface SaxBit {
1.1 cocoon-2.1/src/test/org/apache/cocoon/components/sax/XMLByteStreamCompilerInterpreterTestCase.java
Index: XMLByteStreamCompilerInterpreterTestCase.java
===================================================================
/*
============================================================================
The Apache Software License, Version 1.1
============================================================================
Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
Redistribution and use in source and binary forms, with or without modifica-
tion, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
3. The end-user documentation included with the redistribution, if any, must
include the following acknowledgment: "This product includes software
developed by the Apache Software Foundation (http://www.apache.org/)."
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
4. The names "Apache Cocoon" and "Apache Software Foundation" must not be
used to endorse or promote products derived from this software without
prior written permission. For written permission, please contact
apache@apache.org.
5. Products derived from this software may not be called "Apache", nor may
"Apache" appear in their name, without prior written permission of the
Apache Software Foundation.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation and was originally created by
Stefano Mazzocchi <st...@apache.org>. For more information on the Apache
Software Foundation, please see <http://www.apache.org/>.
*/
package org.apache.cocoon.components.sax;
import org.xml.sax.helpers.DefaultHandler;
import org.xml.sax.ContentHandler;
import org.apache.cocoon.xml.dom.DOMBuilder;
import org.apache.cocoon.xml.AbstractXMLTestCase;
import org.apache.cocoon.xml.DefaultHandlerWrapper;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
import java.io.ByteArrayInputStream;
/**
* Testcase for XMLByteStreamCompiler and Interpreter
*
* @author <a href="mailto:tcurdt@apache.org">Torsten Curdt</a>
*/
public final class XMLByteStreamCompilerInterpreterTestCase extends AbstractXMLTestCase {
public XMLByteStreamCompilerInterpreterTestCase(String s) {
super(s);
}
public void testCompareDOM() throws Exception {
// reference
DOMBuilder in = new DOMBuilder();
generateSAX(in);
// capture events
XMLByteStreamCompiler xmlc = new XMLByteStreamCompiler();
generateSAX(xmlc);
// recall events and build a DOM from it
XMLByteStreamInterpreter xmli = new XMLByteStreamInterpreter();
DOMBuilder out = new DOMBuilder();
xmli.setConsumer(out);
xmli.deserialize(xmlc.getSAXFragment());
// compare DOMs
assertXMLEqual(in.getDocument(), out.getDocument());
}
public void testCompareByteArray() throws Exception {
// capture events
XMLByteStreamCompiler sa = new XMLByteStreamCompiler();
generateSAX(sa);
// serialize events
byte[] aa = (byte[]) sa.getSAXFragment();
// deserialize and capture
XMLByteStreamCompiler sb = new XMLByteStreamCompiler();
XMLByteStreamInterpreter xmli = new XMLByteStreamInterpreter();
xmli.setConsumer(sb);
xmli.deserialize(aa);
// serialize again
byte[] ab = (byte[]) sb.getSAXFragment();
assertTrue(aa.length == ab.length);
for (int i=0;i<aa.length;i++) {
assertEquals(aa[i],ab[i]);
}
}
public void testStressLoop() throws Exception {
XMLByteStreamCompiler xmlc = new XMLByteStreamCompiler();
long loop = 50000;
// simply consume documents
long start = System.currentTimeMillis();
for(int i=0;i<loop;i++) {
generateSAX(xmlc);
xmlc.recycle();
}
long stop = System.currentTimeMillis();
double r = 1000*loop/(stop-start);
System.out.println("consuming: "+ r + " documents per second");
}
public void testCompareToParsing() throws Exception {
DOMBuilder in = new DOMBuilder();
generateSAX(in);
SAXParserFactory pfactory = SAXParserFactory.newInstance();
SAXParser p = pfactory.newSAXParser();
XMLByteStreamCompiler xmlc = new XMLByteStreamCompiler();
DefaultHandlerWrapper wrapper = new DefaultHandlerWrapper(xmlc);
ByteArrayInputStream bis = new ByteArrayInputStream(generateByteArray());
long loop = 50000;
// parse documents
long start = System.currentTimeMillis();
for(int i=0;i<loop;i++) {
xmlc.recycle();
bis.reset();
p.parse(bis,wrapper);
}
long stop = System.currentTimeMillis();
double r = 1000*loop/(stop-start);
System.out.println("parsed: " + r + " documents per second");
XMLByteStreamInterpreter xmli = new XMLByteStreamInterpreter();
ContentHandler ch = new DefaultHandler();
// recall documents
start = System.currentTimeMillis();
for(int i=0;i<loop;i++) {
xmli.setContentHandler(ch);
xmli.deserialize(xmlc.getSAXFragment());
}
stop = System.currentTimeMillis();
r = 1000*loop/(stop-start);
System.out.println("recalling: " + r + " documents per second");
}
}
1.1 cocoon-2.1/src/test/org/apache/cocoon/xml/AbstractXMLTestCase.java
Index: AbstractXMLTestCase.java
===================================================================
/*
============================================================================
The Apache Software License, Version 1.1
============================================================================
Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
Redistribution and use in source and binary forms, with or without modifica-
tion, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
3. The end-user documentation included with the redistribution, if any, must
include the following acknowledgment: "This product includes software
developed by the Apache Software Foundation (http://www.apache.org/)."
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
4. The names "Apache Cocoon" and "Apache Software Foundation" must not be
used to endorse or promote products derived from this software without
prior written permission. For written permission, please contact
apache@apache.org.
5. Products derived from this software may not be called "Apache", nor may
"Apache" appear in their name, without prior written permission of the
Apache Software Foundation.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation and was originally created by
Stefano Mazzocchi <st...@apache.org>. For more information on the Apache
Software Foundation, please see <http://www.apache.org/>.
*/
package org.apache.cocoon.xml;
import org.custommonkey.xmlunit.XMLTestCase;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
import org.apache.cocoon.xml.dom.DOMBuilder;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.Transformer;
import javax.xml.transform.Source;
import javax.xml.transform.Result;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.dom.DOMSource;
import java.io.ByteArrayOutputStream;
/**
* general functions for XML related Testcases
*
* @author <a href="mailto:tcurdt@apache.org">Torsten Curdt</a>
*/
public abstract class AbstractXMLTestCase extends XMLTestCase {
public AbstractXMLTestCase(String s) {
super(s);
}
protected void generateSAX( ContentHandler consumer ) throws SAXException {
AttributesImpl atts = new AttributesImpl();
consumer.startDocument();
consumer.startElement("", "root", "root", atts);
consumer.characters("test".toCharArray(),0,4);
consumer.endElement("", "root", "root");
consumer.endDocument();
}
protected byte[] generateByteArray() throws Exception {
DOMBuilder in = new DOMBuilder();
generateSAX(in);
ByteArrayOutputStream bos = new ByteArrayOutputStream();
TransformerFactory tFactory = TransformerFactory.newInstance();
Transformer t = tFactory.newTransformer();
Source input = new DOMSource(in.getDocument());
Result output = new StreamResult(bos);
t.transform(input, output);
bos.close();
return bos.toByteArray();
}
}
1.1 cocoon-2.1/src/test/org/apache/cocoon/xml/DefaultHandlerWrapper.java
Index: DefaultHandlerWrapper.java
===================================================================
/*
============================================================================
The Apache Software License, Version 1.1
============================================================================
Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
Redistribution and use in source and binary forms, with or without modifica-
tion, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
3. The end-user documentation included with the redistribution, if any, must
include the following acknowledgment: "This product includes software
developed by the Apache Software Foundation (http://www.apache.org/)."
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
4. The names "Apache Cocoon" and "Apache Software Foundation" must not be
used to endorse or promote products derived from this software without
prior written permission. For written permission, please contact
apache@apache.org.
5. Products derived from this software may not be called "Apache", nor may
"Apache" appear in their name, without prior written permission of the
Apache Software Foundation.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation and was originally created by
Stefano Mazzocchi <st...@apache.org>. For more information on the Apache
Software Foundation, please see <http://www.apache.org/>.
*/
package org.apache.cocoon.xml;
import org.xml.sax.ContentHandler;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
import org.xml.sax.Attributes;
import org.xml.sax.helpers.DefaultHandler;
/**
* Wrap a ContentHandler in a DefaultHandler
*
* @author <a href="mailto:tcurdt@apache.org">Torsten Curdt</a>
*/
public final class DefaultHandlerWrapper extends DefaultHandler {
private final ContentHandler handler;
public DefaultHandlerWrapper( ContentHandler handler ) {
this.handler = handler;
}
public void setDocumentLocator(Locator locator) {
handler.setDocumentLocator(locator);
}
public void startDocument() throws SAXException {
handler.startDocument();
}
public void endDocument() throws SAXException {
handler.endDocument();
}
public void startPrefixMapping(String prefix, String uri) throws SAXException {
handler.startPrefixMapping(prefix,uri);
}
public void endPrefixMapping(String prefix) throws SAXException {
handler.endPrefixMapping(prefix);
}
public void startElement(String namespaceURI, String localName, String qName, Attributes atts) throws SAXException {
handler.startElement(namespaceURI,localName,qName,atts);
}
public void endElement(String namespaceURI, String localName, String qName) throws SAXException {
handler.endElement(namespaceURI,localName,qName);
}
public void characters(char ch[], int start, int length) throws SAXException {
handler.characters(ch,start,length);
}
public void ignorableWhitespace(char ch[], int start, int length) throws SAXException {
handler.ignorableWhitespace(ch,start, length);
}
public void processingInstruction(String target, String data) throws SAXException {
handler.processingInstruction(target,data);
}
public void skippedEntity(String name) throws SAXException {
handler.skippedEntity(name);
}
}
1.1 cocoon-2.1/src/test/org/apache/cocoon/xml/SaxBufferTestCase.java
Index: SaxBufferTestCase.java
===================================================================
/*
============================================================================
The Apache Software License, Version 1.1
============================================================================
Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
Redistribution and use in source and binary forms, with or without modifica-
tion, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
3. The end-user documentation included with the redistribution, if any, must
include the following acknowledgment: "This product includes software
developed by the Apache Software Foundation (http://www.apache.org/)."
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
4. The names "Apache Cocoon" and "Apache Software Foundation" must not be
used to endorse or promote products derived from this software without
prior written permission. For written permission, please contact
apache@apache.org.
5. Products derived from this software may not be called "Apache", nor may
"Apache" appear in their name, without prior written permission of the
Apache Software Foundation.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation and was originally created by
Stefano Mazzocchi <st...@apache.org>. For more information on the Apache
Software Foundation, please see <http://www.apache.org/>.
*/
package org.apache.cocoon.xml;
import org.custommonkey.xmlunit.XMLTestCase;
import org.xml.sax.helpers.AttributesImpl;
import org.xml.sax.helpers.DefaultHandler;
import org.xml.sax.SAXException;
import org.xml.sax.ContentHandler;
import org.apache.cocoon.xml.dom.DOMBuilder;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.Transformer;
import javax.xml.transform.Source;
import javax.xml.transform.Result;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.dom.DOMSource;
import javax.xml.parsers.SAXParserFactory;
import javax.xml.parsers.SAXParser;
import java.io.FileOutputStream;
import java.io.ByteArrayInputStream;
/**
* Testcase for SaxBuffer
*
* @author <a href="mailto:tcurdt@apache.org">Torsten Curdt</a>
*/
public final class SaxBufferTestCase extends AbstractXMLTestCase {
public SaxBufferTestCase(String s) {
super(s);
}
public void testCompareDOM() throws Exception {
DOMBuilder in = new DOMBuilder();
generateSAX(in);
SaxBuffer sb = new SaxBuffer();
generateSAX(sb);
DOMBuilder out = new DOMBuilder();
sb.toSAX(out);
assertXMLEqual(in.getDocument(), out.getDocument());
}
public void testStressLoop() throws Exception {
SaxBuffer sb = new SaxBuffer();
long loop = 50000;
// simply consume documents
long start = System.currentTimeMillis();
for(int i=0;i<loop;i++) {
generateSAX(sb);
sb.recycle();
}
long stop = System.currentTimeMillis();
double r = 1000*loop/(stop-start);
System.out.println("consuming: "+ r + " documents per second");
}
public void testCompareToParsing() throws Exception {
DOMBuilder in = new DOMBuilder();
generateSAX(in);
SAXParserFactory pfactory = SAXParserFactory.newInstance();
SAXParser p = pfactory.newSAXParser();
SaxBuffer b = new SaxBuffer();
DefaultHandlerWrapper wrapper = new DefaultHandlerWrapper(b);
ByteArrayInputStream bis = new ByteArrayInputStream(generateByteArray());
long loop = 50000;
long start = System.currentTimeMillis();
for(int i=0;i<loop;i++) {
b.recycle();
bis.reset();
p.parse(bis,wrapper);
}
long stop = System.currentTimeMillis();
double r = 1000*loop/(stop-start);
System.out.println("parsed:" + r + " documents per second");
ContentHandler ch = new DefaultHandler();
start = System.currentTimeMillis();
for(int i=0;i<loop;i++) {
b.toSAX(ch);
}
stop = System.currentTimeMillis();
r = 1000*loop/(stop-start);
System.out.println("recalling: " + r + " documents per second");
}
}