curcuru 00/11/20 14:15:26
Modified: test/java/src/org/apache/qetest/trax/stream
StreamResultAPITest.java StreamSourceAPITest.java
Log:
Update to last-minute API changes getByteStream->getInput/OutputStream;
getCharacterStream->getWriter
Revision Changes Path
1.2 +16 -14
xml-xalan/test/java/src/org/apache/qetest/trax/stream/StreamResultAPITest.java
Index: StreamResultAPITest.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/trax/stream/StreamResultAPITest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StreamResultAPITest.java 2000/11/16 00:42:41 1.1
+++ StreamResultAPITest.java 2000/11/20 22:15:24 1.2
@@ -96,7 +96,7 @@
/**
* API Coverage test for the StreamResult class of TRAX..
* @author [EMAIL PROTECTED]
- * @version $Id: StreamResultAPITest.java,v 1.1 2000/11/16 00:42:41 curcuru
Exp $
+ * @version $Id: StreamResultAPITest.java,v 1.2 2000/11/20 22:15:24 curcuru
Exp $
*/
public class StreamResultAPITest extends XSLProcessorTestBase
{
@@ -189,32 +189,34 @@
{
reporter.testCaseInit("Basic API coverage, constructor and set/get
methods");
+ reporter.logWarningMsg("public StreamResult(File f) not yet tested");
+
// Default no-arg ctor sets nothing
StreamResult defaultStream = new StreamResult();
- reporter.checkObject(defaultStream.getByteStream(), null, "Default
StreamResult should have null ByteStream");
- reporter.checkObject(defaultStream.getCharacterStream(), null,
"Default StreamResult should have null CharacterStream");
+ reporter.checkObject(defaultStream.getOutputStream(), null, "Default
StreamResult should have null ByteStream");
+ reporter.checkObject(defaultStream.getWriter(), null, "Default
StreamResult should have null CharacterStream");
reporter.check(defaultStream.getSystemId(), null, "Default
StreamResult should have null SystemId");
ByteArrayOutputStream baos = new ByteArrayOutputStream();
StreamResult byteResult1 = new StreamResult(baos);
- reporter.checkObject(byteResult1.getByteStream(), baos,
"StreamResult(os) has ByteStream " + byteResult1.getByteStream());
- reporter.checkObject(byteResult1.getCharacterStream(), null,
"StreamResult(os) should have null CharacterStream");
+ reporter.checkObject(byteResult1.getOutputStream(), baos,
"StreamResult(os) has ByteStream " + byteResult1.getOutputStream());
+ reporter.checkObject(byteResult1.getWriter(), null,
"StreamResult(os) should have null CharacterStream");
reporter.check(byteResult1.getSystemId(), null, "StreamResult(os)
should have null SystemId");
StringWriter strWriter = new StringWriter();
StreamResult readerResult1 = new StreamResult(strWriter);
- reporter.checkObject(readerResult1.getByteStream(), null,
"StreamResult(writer) should have null ByteStream");
- reporter.checkObject(readerResult1.getCharacterStream(), strWriter,
"StreamResult(writer) has CharacterStream " +
readerResult1.getCharacterStream());
+ reporter.checkObject(readerResult1.getOutputStream(), null,
"StreamResult(writer) should have null ByteStream");
+ reporter.checkObject(readerResult1.getWriter(), strWriter,
"StreamResult(writer) has CharacterStream " + readerResult1.getWriter());
reporter.check(readerResult1.getSystemId(), null,
"StreamResult(writer) should have null SystemId");
StreamResult wackyStream = new StreamResult();
- wackyStream.setByteStream(baos);
- OutputStream gotStream = wackyStream.getByteStream();
- reporter.checkObject(gotStream, baos, "set/getByteStream API
coverage");
-
- wackyStream.setCharacterStream(strWriter);
- Writer gotWriter = wackyStream.getCharacterStream();
- reporter.checkObject(gotWriter, strWriter, "set/getCharacterStream
API coverage");
+ wackyStream.setOutputStream(baos);
+ OutputStream gotStream = wackyStream.getOutputStream();
+ reporter.checkObject(gotStream, baos, "set/getOutputStream API
coverage");
+
+ wackyStream.setWriter(strWriter);
+ Writer gotWriter = wackyStream.getWriter();
+ reporter.checkObject(gotWriter, strWriter, "set/getWriter API
coverage");
wackyStream.setSystemId("new-system-id");
String gotSystemId = wackyStream.getSystemId();
1.3 +23 -20
xml-xalan/test/java/src/org/apache/qetest/trax/stream/StreamSourceAPITest.java
Index: StreamSourceAPITest.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/trax/stream/StreamSourceAPITest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StreamSourceAPITest.java 2000/11/15 22:17:28 1.2
+++ StreamSourceAPITest.java 2000/11/20 22:15:25 1.3
@@ -92,7 +92,7 @@
/**
* API Coverage test for the StreamSource class of TRAX..
* @author [EMAIL PROTECTED]
- * @version $Id: StreamSourceAPITest.java,v 1.2 2000/11/15 22:17:28 curcuru
Exp $
+ * @version $Id: StreamSourceAPITest.java,v 1.3 2000/11/20 22:15:25 curcuru
Exp $
*/
public class StreamSourceAPITest extends XSLProcessorTestBase
{
@@ -182,54 +182,57 @@
{
reporter.testCaseInit("Basic API coverage, constructor and set/get
methods");
+ reporter.logWarningMsg("public StreamSource(File f) not yet tested");
+ reporter.logWarningMsg("public void setSystemId(File f) not yet
tested");
+
// Default no-arg ctor sets nothing
StreamSource defaultStream = new StreamSource();
- reporter.checkObject(defaultStream.getByteStream(), null, "Default
StreamSource should have null ByteStream");
- reporter.checkObject(defaultStream.getCharacterStream(), null,
"Default StreamSource should have null CharacterStream");
+ reporter.checkObject(defaultStream.getInputStream(), null, "Default
StreamSource should have null ByteStream");
+ reporter.checkObject(defaultStream.getReader(), null, "Default
StreamSource should have null CharacterStream");
reporter.check(defaultStream.getPublicId(), null, "Default
StreamSource should have null PublicId");
reporter.check(defaultStream.getSystemId(), null, "Default
StreamSource should have null SystemId");
byte[] bytes = { 0, 0, 0, 0 }; // just a few zeroes, not really
needed
ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
StreamSource byteSource1 = new StreamSource(bais);
- reporter.checkObject(byteSource1.getByteStream(), bais,
"StreamSource(is) has ByteStream " + byteSource1.getByteStream());
- reporter.checkObject(byteSource1.getCharacterStream(), null,
"StreamSource(is) should have null CharacterStream");
+ reporter.checkObject(byteSource1.getInputStream(), bais,
"StreamSource(is) has ByteStream " + byteSource1.getInputStream());
+ reporter.checkObject(byteSource1.getReader(), null,
"StreamSource(is) should have null CharacterStream");
reporter.check(byteSource1.getPublicId(), null, "StreamSource(is)
should have null PublicId");
reporter.check(byteSource1.getSystemId(), null, "StreamSource(is)
should have null SystemId");
StreamSource byteSource2 = new StreamSource(bais, "some-system-id");
- reporter.checkObject(byteSource2.getByteStream(), bais,
"StreamSource(is, sysID) has ByteStream " + byteSource2.getByteStream());
- reporter.checkObject(byteSource2.getCharacterStream(), null,
"StreamSource(is, sysID) should have null CharacterStream");
+ reporter.checkObject(byteSource2.getInputStream(), bais,
"StreamSource(is, sysID) has ByteStream " + byteSource2.getInputStream());
+ reporter.checkObject(byteSource2.getReader(), null,
"StreamSource(is, sysID) should have null CharacterStream");
reporter.check(byteSource2.getPublicId(), null, "StreamSource(is,
sysID) should have null PublicId");
reporter.check(byteSource2.getSystemId(), "some-system-id",
"StreamSource(is, sysID) has SystemId " + byteSource2.getSystemId());
StringReader strReader = new StringReader("this is not your parent's
XML data");
StreamSource readerSource1 = new StreamSource(strReader);
- reporter.checkObject(readerSource1.getByteStream(), null,
"StreamSource(reader) should have null ByteStream");
- reporter.checkObject(readerSource1.getCharacterStream(), strReader,
"StreamSource(reader) has CharacterStream " +
readerSource1.getCharacterStream());
+ reporter.checkObject(readerSource1.getInputStream(), null,
"StreamSource(reader) should have null ByteStream");
+ reporter.checkObject(readerSource1.getReader(), strReader,
"StreamSource(reader) has CharacterStream " + readerSource1.getReader());
reporter.check(readerSource1.getPublicId(), null,
"StreamSource(reader) should have null PublicId");
reporter.check(readerSource1.getSystemId(), null,
"StreamSource(reader) should have null SystemId");
StreamSource readerSource2 = new StreamSource(strReader,
"some-system-id");
- reporter.checkObject(readerSource2.getByteStream(), null,
"StreamSource(reader, sysID) should have null ByteStream");
- reporter.checkObject(readerSource2.getCharacterStream(), strReader,
"StreamSource(reader, sysID) has CharacterStream " +
readerSource2.getCharacterStream());
+ reporter.checkObject(readerSource2.getInputStream(), null,
"StreamSource(reader, sysID) should have null ByteStream");
+ reporter.checkObject(readerSource2.getReader(), strReader,
"StreamSource(reader, sysID) has CharacterStream " + readerSource2.getReader());
reporter.check(readerSource2.getPublicId(), null,
"StreamSource(reader, sysID) should have null PublicId");
reporter.check(readerSource2.getSystemId(), "some-system-id",
"StreamSource(reader, sysID) has SystemId " + readerSource2.getSystemId());
StreamSource sysIDStream = new StreamSource("real-system-id");
- reporter.checkObject(sysIDStream.getByteStream(), null,
"StreamSource(sysID) should have null ByteStream");
- reporter.checkObject(sysIDStream.getCharacterStream(), null,
"StreamSource(sysID) should have null CharacterStream");
+ reporter.checkObject(sysIDStream.getInputStream(), null,
"StreamSource(sysID) should have null ByteStream");
+ reporter.checkObject(sysIDStream.getReader(), null,
"StreamSource(sysID) should have null CharacterStream");
reporter.check(sysIDStream.getPublicId(), null, "StreamSource(sysID)
should have null PublicId");
reporter.check(sysIDStream.getSystemId(), "real-system-id",
"StreamSource(sysID) has SystemId " + sysIDStream.getSystemId());
StreamSource wackyStream = new StreamSource();
- wackyStream.setByteStream(bais);
- InputStream gotStream = wackyStream.getByteStream();
- reporter.checkObject(gotStream, bais, "set/getByteStream API
coverage");
-
- wackyStream.setCharacterStream(strReader);
- Reader gotReader = wackyStream.getCharacterStream();
- reporter.checkObject(gotReader, strReader, "set/getCharacterStream
API coverage");
+ wackyStream.setInputStream(bais);
+ InputStream gotStream = wackyStream.getInputStream();
+ reporter.checkObject(gotStream, bais, "set/getInputStream API
coverage");
+
+ wackyStream.setReader(strReader);
+ Reader gotReader = wackyStream.getReader();
+ reporter.checkObject(gotReader, strReader, "set/getReader API
coverage");
wackyStream.setSystemId("new-system-id");
String gotSystemId = wackyStream.getSystemId();
