moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Fixed compiler warnings - unnecessary throws declaration

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@805552 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Josh Micich 2009-08-18 19:49:28 +00:00
parent c304173145
commit 9926c89006
122 changed files with 1723 additions and 1963 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/java/org/apache/poi/hpsf/extractor/HPSFPropertiesExtractor.java
View File

@ -14,9 +14,9 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
==================================================================== */ ==================================================================== */
package org.apache.poi.hpsf.extractor; package org.apache.poi.hpsf.extractor;
import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import java.util.Iterator; import java.util.Iterator;
@ -33,7 +33,7 @@ import org.apache.poi.util.LittleEndian;
/** /**
* Extracts all of the HPSF properties, both * Extracts all of the HPSF properties, both
* build in and custom, returning them in * build in and custom, returning them in
* textual form. * textual form.
*/ */
public class HPSFPropertiesExtractor extends POITextExtractor { public class HPSFPropertiesExtractor extends POITextExtractor {
@ -46,14 +46,14 @@ public class HPSFPropertiesExtractor extends POITextExtractor {
public HPSFPropertiesExtractor(POIFSFileSystem fs) { public HPSFPropertiesExtractor(POIFSFileSystem fs) {
super(new PropertiesOnlyDocument(fs)); super(new PropertiesOnlyDocument(fs));
} }
public String getDocumentSummaryInformationText() { public String getDocumentSummaryInformationText() {
DocumentSummaryInformation dsi = document.getDocumentSummaryInformation(); DocumentSummaryInformation dsi = document.getDocumentSummaryInformation();
StringBuffer text = new StringBuffer(); StringBuffer text = new StringBuffer();
// Normal properties // Normal properties
text.append( getPropertiesText(dsi) ); text.append( getPropertiesText(dsi) );
// Now custom ones // Now custom ones
CustomProperties cps = dsi.getCustomProperties(); CustomProperties cps = dsi.getCustomProperties();
if(cps != null) { if(cps != null) {
@ -64,38 +64,38 @@ public class HPSFPropertiesExtractor extends POITextExtractor {
text.append(key + " = " + val + "\n"); text.append(key + " = " + val + "\n");
} }
} }
// All done // All done
return text.toString(); return text.toString();
} }
public String getSummaryInformationText() { public String getSummaryInformationText() {
SummaryInformation si = document.getSummaryInformation(); SummaryInformation si = document.getSummaryInformation();
// Just normal properties // Just normal properties
return getPropertiesText(si); return getPropertiesText(si);
} }
private static String getPropertiesText(SpecialPropertySet ps) { private static String getPropertiesText(SpecialPropertySet ps) {
if(ps == null) { if(ps == null) {
// Not defined, oh well // Not defined, oh well
return ""; return "";
} }
StringBuffer text = new StringBuffer(); StringBuffer text = new StringBuffer();
PropertyIDMap idMap = ps.getPropertySetIDMap(); PropertyIDMap idMap = ps.getPropertySetIDMap();
Property[] props = ps.getProperties(); Property[] props = ps.getProperties();
for(int i=0; i<props.length; i++) { for(int i=0; i<props.length; i++) {
String type = Long.toString( props[i].getID() ); String type = Long.toString( props[i].getID() );
Object typeObj = idMap.get(props[i].getID()); Object typeObj = idMap.get(props[i].getID());
if(typeObj != null) { if(typeObj != null) {
type = typeObj.toString(); type = typeObj.toString();
} }
String val = getPropertyValueText( props[i].getValue() ); String val = getPropertyValueText( props[i].getValue() );
text.append(type + " = " + val + "\n"); text.append(type + " = " + val + "\n");
} }
return text.toString(); return text.toString();
} }
private static String getPropertyValueText(Object val) { private static String getPropertyValueText(Object val) {
@ -123,13 +123,13 @@ public class HPSFPropertiesExtractor extends POITextExtractor {
} }
/** /**
* Return the text of all the properties defined in * @return the text of all the properties defined in
* the document. * the document.
*/ */
public String getText() { public String getText() {
return getSummaryInformationText() + getDocumentSummaryInformationText(); return getSummaryInformationText() + getDocumentSummaryInformationText();
} }
/** /**
* Prevent recursion! * Prevent recursion!
*/ */
@ -138,15 +138,15 @@ public class HPSFPropertiesExtractor extends POITextExtractor {
} }
/** /**
* So we can get at the properties of any * So we can get at the properties of any
* random OLE2 document. * random OLE2 document.
*/ */
private static class PropertiesOnlyDocument extends POIDocument { private static final class PropertiesOnlyDocument extends POIDocument {
private PropertiesOnlyDocument(POIFSFileSystem fs) { public PropertiesOnlyDocument(POIFSFileSystem fs) {
super(fs); super(fs);
} }
public void write(OutputStream out) throws IOException { public void write(OutputStream out) {
throw new IllegalStateException("Unable to write, only for properties!"); throw new IllegalStateException("Unable to write, only for properties!");
} }
} }

61
src/java/org/apache/poi/poifs/filesystem/DocumentOutputStream.java
View File

@ -1,4 +1,3 @@
/* ==================================================================== /* ====================================================================
Licensed to the Apache Software Foundation (ASF) under one or more Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with contributor license agreements. See the NOTICE file distributed with
@ -15,7 +14,6 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
==================================================================== */ ==================================================================== */
package org.apache.poi.poifs.filesystem; package org.apache.poi.poifs.filesystem;
@ -30,12 +28,10 @@ import java.util.*;
* @author Marc Johnson (mjohnson at apache dot org) * @author Marc Johnson (mjohnson at apache dot org)
*/ */
public class DocumentOutputStream public final class DocumentOutputStream extends OutputStream {
extends OutputStream private final OutputStream _stream;
{ private final int _limit;
private OutputStream stream; private int _written;
private int limit;
private int written;
/** /**
* Create a DocumentOutputStream * Create a DocumentOutputStream
@ -44,12 +40,10 @@ public class DocumentOutputStream
* read * read
* @param limit the maximum number of bytes that can be written * @param limit the maximum number of bytes that can be written
*/ */
DocumentOutputStream(OutputStream stream, int limit) {
DocumentOutputStream(final OutputStream stream, final int limit) _stream = stream;
{ _limit = limit;
this.stream = stream; _written = 0;
this.limit = limit;
this.written = 0;
} }
/** /**
@ -64,12 +58,11 @@ public class DocumentOutputStream
* output stream has been closed, or if the * output stream has been closed, or if the
* writer tries to write too much data. * writer tries to write too much data.
*/ */
public void write(int b)
public void write(final int b)
throws IOException throws IOException
{ {
limitCheck(1); limitCheck(1);
stream.write(b); _stream.write(b);
} }
/** /**
@ -79,8 +72,7 @@ public class DocumentOutputStream
* @param b the data. * @param b the data.
* @exception IOException if an I/O error occurs. * @exception IOException if an I/O error occurs.
*/ */
public void write(byte b[])
public void write(final byte b[])
throws IOException throws IOException
{ {
write(b, 0, b.length); write(b, 0, b.length);
@ -106,12 +98,11 @@ public class DocumentOutputStream
* output stream is closed or if the writer * output stream is closed or if the writer
* tries to write too many bytes. * tries to write too many bytes.
*/ */
public void write(byte b[], int off, int len)
public void write(final byte b[], final int off, final int len)
throws IOException throws IOException
{ {
limitCheck(len); limitCheck(len);
stream.write(b, off, len); _stream.write(b, off, len);
} }
/** /**
@ -120,11 +111,10 @@ public class DocumentOutputStream
* *
* @exception IOException if an I/O error occurs. * @exception IOException if an I/O error occurs.
*/ */
public void flush() public void flush()
throws IOException throws IOException
{ {
stream.flush(); _stream.flush();
} }
/** /**
@ -135,10 +125,7 @@ public class DocumentOutputStream
* *
* @exception IOException if an I/O error occurs. * @exception IOException if an I/O error occurs.
*/ */
public void close() {
public void close()
throws IOException
{
// ignore this call // ignore this call
} }
@ -152,27 +139,25 @@ public class DocumentOutputStream
* *
* @exception IOException on I/O error * @exception IOException on I/O error
*/ */
void writeFiller(int totalLimit, byte fill)
void writeFiller(final int totalLimit, final byte fill)
throws IOException throws IOException
{ {
if (totalLimit > written) if (totalLimit > _written)
{ {
byte[] filler = new byte[ totalLimit - written ]; byte[] filler = new byte[ totalLimit - _written ];
Arrays.fill(filler, fill); Arrays.fill(filler, fill);
stream.write(filler); _stream.write(filler);
} }
} }
private void limitCheck(final int toBeWritten) private void limitCheck(int toBeWritten)
throws IOException throws IOException
{ {
if ((written + toBeWritten) > limit) if ((_written + toBeWritten) > _limit)
{ {
throw new IOException("tried to write too much data"); throw new IOException("tried to write too much data");
} }
written += toBeWritten; _written += toBeWritten;
} }
} // end public class DocumentOutputStream }

37
src/java/org/apache/poi/poifs/storage/SmallDocumentBlock.java
View File

@ -64,9 +64,8 @@ public final class SmallDocumentBlock implements BlockWritable, ListManagedBlock
* @return an array of SmallDocumentBlock instances, filled from * @return an array of SmallDocumentBlock instances, filled from
* the array * the array
*/ */
public static SmallDocumentBlock [] convert(byte [] array,
public static SmallDocumentBlock [] convert(final byte [] array, int size)
final int size)
{ {
SmallDocumentBlock[] rval = SmallDocumentBlock[] rval =
new SmallDocumentBlock[ (size + _block_size - 1) / _block_size ]; new SmallDocumentBlock[ (size + _block_size - 1) / _block_size ];
@ -103,8 +102,7 @@ public final class SmallDocumentBlock implements BlockWritable, ListManagedBlock
* *
* @return number of big blocks the list encompasses * @return number of big blocks the list encompasses
*/ */
public static int fill(List blocks)
public static int fill(final List blocks)
{ {
int count = blocks.size(); int count = blocks.size();
int big_block_count = (count + _blocks_per_big_block - 1) int big_block_count = (count + _blocks_per_big_block - 1)
@ -130,9 +128,8 @@ public final class SmallDocumentBlock implements BlockWritable, ListManagedBlock
* @exception ArrayIndexOutOfBoundsException if, somehow, the store * @exception ArrayIndexOutOfBoundsException if, somehow, the store
* contains less data than size indicates * contains less data than size indicates
*/ */
public static SmallDocumentBlock [] convert(BlockWritable [] store,
public static SmallDocumentBlock [] convert(final BlockWritable [] store, int size)
final int size)
throws IOException, ArrayIndexOutOfBoundsException throws IOException, ArrayIndexOutOfBoundsException
{ {
ByteArrayOutputStream stream = new ByteArrayOutputStream(); ByteArrayOutputStream stream = new ByteArrayOutputStream();
@ -159,10 +156,7 @@ public final class SmallDocumentBlock implements BlockWritable, ListManagedBlock
* data * data
* *
* @return a List of SmallDocumentBlock's extracted from the input * @return a List of SmallDocumentBlock's extracted from the input
*
* @exception IOException
*/ */
public static List extract(ListManagedBlock [] blocks) public static List extract(ListManagedBlock [] blocks)
throws IOException throws IOException
{ {
@ -193,7 +187,6 @@ public final class SmallDocumentBlock implements BlockWritable, ListManagedBlock
* *
* @return total size * @return total size
*/ */
public static int calcSize(int size) public static int calcSize(int size)
{ {
return size * _block_size; return size * _block_size;
@ -207,13 +200,11 @@ public final class SmallDocumentBlock implements BlockWritable, ListManagedBlock
return block; return block;
} }
private static int convertToBlockCount(final int size) private static int convertToBlockCount(int size)
{ {
return (size + _block_size - 1) / _block_size; return (size + _block_size - 1) / _block_size;
} }
/* ********** START implementation of BlockWritable ********** */
/** /**
* Write the storage to an OutputStream * Write the storage to an OutputStream
* *
@ -223,16 +214,12 @@ public final class SmallDocumentBlock implements BlockWritable, ListManagedBlock
* @exception IOException on problems writing to the specified * @exception IOException on problems writing to the specified
* stream * stream
*/ */
public void writeBlocks(OutputStream stream)
public void writeBlocks(final OutputStream stream)
throws IOException throws IOException
{ {
stream.write(_data); stream.write(_data);
} }
/* ********** END implementation of BlockWritable ********** */
/* ********** START implementation of ListManagedBlock ********** */
/** /**
* Get the data from the block * Get the data from the block
* *
@ -240,13 +227,7 @@ public final class SmallDocumentBlock implements BlockWritable, ListManagedBlock
* *
* @exception IOException if there is no data * @exception IOException if there is no data
*/ */
public byte [] getData() {
public byte [] getData()
throws IOException
{
return _data; return _data;
} }
}
/* ********** END implementation of ListManagedBlock ********** */
} // end public class SmallDocumentBlock

17
src/java/org/apache/poi/util/TempFile.java
View File

@ -14,10 +14,10 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
==================================================================== */ ==================================================================== */
package org.apache.poi.util; package org.apache.poi.util;
import java.io.File; import java.io.File;
import java.io.IOException;
import java.util.Random; import java.util.Random;
/** /**
@ -25,20 +25,18 @@ import java.util.Random;
* *
* @author Glen Stampoultzis * @author Glen Stampoultzis
*/ */
public class TempFile public final class TempFile {
{ private static File dir;
static File dir; private static final Random rnd = new Random();
static Random rnd = new Random();
/** /**
* Creates a temporary file. Files are collected into one directory and by default are * Creates a temporary file. Files are collected into one directory and by default are
* deleted on exit from the VM. Files can be kept by defining the system property * deleted on exit from the VM. Files can be kept by defining the system property
* <code>poi.keep.tmp.files</code>. * <code>poi.keep.tmp.files</code>.
* <p> * <p>
* Dont forget to close all files or it might not be possible to delete them. * Don't forget to close all files or it might not be possible to delete them.
*/ */
public static File createTempFile(String prefix, String suffix) throws IOException public static File createTempFile(String prefix, String suffix) {
{
if (dir == null) if (dir == null)
{ {
dir = new File(System.getProperty("java.io.tmpdir"), "poifiles"); dir = new File(System.getProperty("java.io.tmpdir"), "poifiles");
@ -52,7 +50,4 @@ public class TempFile
newFile.deleteOnExit(); newFile.deleteOnExit();
return newFile; return newFile;
} }
} }

2
src/ooxml/java/org/apache/poi/openxml4j/opc/ZipPackage.java
View File

@ -94,7 +94,7 @@ public final class ZipPackage extends Package {
* @throws InvalidFormatException * @throws InvalidFormatException
* If the content type part parsing encounters an error. * If the content type part parsing encounters an error.
*/ */
ZipPackage(String path, PackageAccess access) throws InvalidFormatException { ZipPackage(String path, PackageAccess access) {
super(access); super(access);
ZipFile zipFile = ZipHelper.openZipFile(path); ZipFile zipFile = ZipHelper.openZipFile(path);

37
src/ooxml/java/org/apache/poi/openxml4j/opc/internal/MemoryPackagePartOutputStream.java
View File

@ -25,22 +25,21 @@ import java.io.OutputStream;
* Build an output stream for MemoryPackagePart. * Build an output stream for MemoryPackagePart.
* *
* @author Julien Chable * @author Julien Chable
* @version 1.0
*/ */
public final class MemoryPackagePartOutputStream extends OutputStream { public final class MemoryPackagePartOutputStream extends OutputStream {
private MemoryPackagePart part; private MemoryPackagePart _part;
private ByteArrayOutputStream buff; private ByteArrayOutputStream _buff;
public MemoryPackagePartOutputStream(MemoryPackagePart part) { public MemoryPackagePartOutputStream(MemoryPackagePart part) {
this.part = part; this._part = part;
buff = new ByteArrayOutputStream(); _buff = new ByteArrayOutputStream();
} }
@Override @Override
public void write(int b) throws IOException { public void write(int b) {
buff.write(b); _buff.write(b);
} }
/** /**
@ -59,38 +58,38 @@ public final class MemoryPackagePartOutputStream extends OutputStream {
*/ */
@Override @Override
public void flush() throws IOException { public void flush() throws IOException {
buff.flush(); _buff.flush();
if (part.data != null) { if (_part.data != null) {
byte[] newArray = new byte[part.data.length + buff.size()]; byte[] newArray = new byte[_part.data.length + _buff.size()];
// copy the previous contents of part.data in newArray // copy the previous contents of part.data in newArray
System.arraycopy(part.data, 0, newArray, 0, part.data.length); System.arraycopy(_part.data, 0, newArray, 0, _part.data.length);
// append the newly added data // append the newly added data
byte[] buffArr = buff.toByteArray(); byte[] buffArr = _buff.toByteArray();
System.arraycopy(buffArr, 0, newArray, part.data.length, System.arraycopy(buffArr, 0, newArray, _part.data.length,
buffArr.length); buffArr.length);
// save the result as new data // save the result as new data
part.data = newArray; _part.data = newArray;
} else { } else {
// was empty, just fill it // was empty, just fill it
part.data = buff.toByteArray(); _part.data = _buff.toByteArray();
} }
/* /*
* Clear this streams buffer, in case flush() is called a second time * Clear this streams buffer, in case flush() is called a second time
* Fix bug 1921637 - provided by Rainer Schwarze * Fix bug 1921637 - provided by Rainer Schwarze
*/ */
buff.reset(); _buff.reset();
} }
@Override @Override
public void write(byte[] b, int off, int len) throws IOException { public void write(byte[] b, int off, int len) {
buff.write(b, off, len); _buff.write(b, off, len);
} }
@Override @Override
public void write(byte[] b) throws IOException { public void write(byte[] b) throws IOException {
buff.write(b); _buff.write(b);
} }
} }

1
src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PackagePropertiesPart.java
View File

@ -25,7 +25,6 @@ import java.util.Date;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException; import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.openxml4j.exceptions.InvalidOperationException; import org.apache.poi.openxml4j.exceptions.InvalidOperationException;
import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
import org.apache.poi.openxml4j.opc.ContentTypes; import org.apache.poi.openxml4j.opc.ContentTypes;
import org.apache.poi.openxml4j.opc.OPCPackage; import org.apache.poi.openxml4j.opc.OPCPackage;
import org.apache.poi.openxml4j.opc.PackagePart; import org.apache.poi.openxml4j.opc.PackagePart;

2
src/ooxml/java/org/apache/poi/util/PackageHelper.java
View File

@ -97,7 +97,7 @@ public final class PackageHelper {
/** /**
* Creates an empty file in the default temporary-file directory, * Creates an empty file in the default temporary-file directory,
*/ */
public static File createTempFile() throws IOException { public static File createTempFile() {
File file = TempFile.createTempFile("poi-ooxml-", ".tmp"); File file = TempFile.createTempFile("poi-ooxml-", ".tmp");
//there is no way to pass an existing file to Package.create(file), //there is no way to pass an existing file to Package.create(file),
//delete first, the file will be re-created in Packe.create(file) //delete first, the file will be re-created in Packe.create(file)

37
src/ooxml/testcases/org/apache/poi/TestPOIXMLDocument.java
View File

@ -1,4 +1,3 @@
/* ==================================================================== /* ====================================================================
Licensed to the Apache Software Foundation (ASF) under one or more Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with contributor license agreements. See the NOTICE file distributed with
@ -15,33 +14,30 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
==================================================================== */ ==================================================================== */
package org.apache.poi; package org.apache.poi;
import java.io.File; import java.io.File;
import java.io.IOException;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.util.List; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import junit.framework.TestCase;
import org.apache.poi.util.TempFile;
import org.apache.poi.openxml4j.opc.OPCPackage; import org.apache.poi.openxml4j.opc.OPCPackage;
import org.apache.poi.openxml4j.opc.PackagePart; import org.apache.poi.openxml4j.opc.PackagePart;
import org.apache.poi.openxml4j.opc.PackageRelationship; import org.apache.poi.openxml4j.opc.PackageRelationship;
import org.apache.poi.openxml4j.exceptions.OpenXML4JException; import org.apache.poi.util.TempFile;
import junit.framework.TestCase;
/** /**
* Test recursive read and write of OPC packages * Test recursive read and write of OPC packages
*/ */
public class TestPOIXMLDocument extends TestCase public final class TestPOIXMLDocument extends TestCase {
{
private static class OPCParser extends POIXMLDocument { private static class OPCParser extends POIXMLDocument {
public OPCParser(OPCPackage pkg) throws IOException { public OPCParser(OPCPackage pkg) {
super(pkg); super(pkg);
} }
@ -49,13 +45,16 @@ public class TestPOIXMLDocument extends TestCase
throw new RuntimeException("not supported"); throw new RuntimeException("not supported");
} }
public void parse(POIXMLFactory factory) throws OpenXML4JException, IOException{ public void parse(POIXMLFactory factory) throws IOException{
load(factory); load(factory);
} }
} }
private static class TestFactory extends POIXMLFactory { private static final class TestFactory extends POIXMLFactory {
public TestFactory() {
//
}
public POIXMLDocumentPart createDocumentPart(PackageRelationship rel, PackagePart part){ public POIXMLDocumentPart createDocumentPart(PackageRelationship rel, PackagePart part){
return new POIXMLDocumentPart(part, rel); return new POIXMLDocumentPart(part, rel);
} }
@ -70,16 +69,16 @@ public class TestPOIXMLDocument extends TestCase
* Recursively traverse a OOXML document and assert that same logical parts have the same physical instances * Recursively traverse a OOXML document and assert that same logical parts have the same physical instances
*/ */
private static void traverse(POIXMLDocumentPart part, HashMap<String,POIXMLDocumentPart> context) throws IOException{ private static void traverse(POIXMLDocumentPart part, HashMap<String,POIXMLDocumentPart> context) throws IOException{
context.put(part.getPackageRelationship().getTargetURI().toString(), part); context.put(part.getPackageRelationship().getTargetURI().toString(), part);
for(POIXMLDocumentPart p : part.getRelations()){ for(POIXMLDocumentPart p : part.getRelations()){
String uri = p.getPackageRelationship().getTargetURI().toString(); String uri = p.getPackageRelationship().getTargetURI().toString();
if (!context.containsKey(uri)) { if (!context.containsKey(uri)) {
traverse(p, context); traverse(p, context);
} else { } else {
POIXMLDocumentPart prev = context.get(uri); POIXMLDocumentPart prev = context.get(uri);
assertSame("Duplicate POIXMLDocumentPart instance for targetURI=" + uri, prev, p); assertSame("Duplicate POIXMLDocumentPart instance for targetURI=" + uri, prev, p);
} }
} }
} }
public void assertReadWrite(String path) throws Exception { public void assertReadWrite(String path) throws Exception {
@ -138,4 +137,4 @@ public class TestPOIXMLDocument extends TestCase
File file = new File(System.getProperty("OOXML.testdata.path"), "WordWithAttachments.docx"); File file = new File(System.getProperty("OOXML.testdata.path"), "WordWithAttachments.docx");
assertReadWrite(file.getAbsolutePath()); assertReadWrite(file.getAbsolutePath());
} }
} }

188
src/ooxml/testcases/org/apache/poi/TestPOIXMLProperties.java
View File

@ -32,10 +32,10 @@ import org.apache.poi.xwpf.usermodel.XWPFDocument;
/** /**
* Test setting extended and custom OOXML properties * Test setting extended and custom OOXML properties
*/ */
public class TestPOIXMLProperties extends TestCase { public final class TestPOIXMLProperties extends TestCase {
POIXMLProperties props; private POIXMLProperties _props;
CoreProperties coreProperties; private CoreProperties _coreProperties;
public void setUp() throws Exception{ public void setUp() throws Exception{
File sampleFile = new File( File sampleFile = new File(
System.getProperty("HWPF.testdata.path") + System.getProperty("HWPF.testdata.path") +
@ -46,139 +46,139 @@ public class TestPOIXMLProperties extends TestCase {
sampleDoc = new XWPFDocument( sampleDoc = new XWPFDocument(
POIXMLDocument.openPackage(sampleFile.toString()) POIXMLDocument.openPackage(sampleFile.toString())
); );
props = sampleDoc.getProperties(); _props = sampleDoc.getProperties();
coreProperties = props.getCoreProperties(); _coreProperties = _props.getCoreProperties();
assertNotNull(props); assertNotNull(_props);
} }
public void testWorkbookExtendedProperties() throws Exception {
XSSFWorkbook workbook = new XSSFWorkbook();
POIXMLProperties props = workbook.getProperties();
assertNotNull(props);
org.apache.poi.POIXMLProperties.ExtendedProperties properties = public void testWorkbookExtendedProperties() {
props.getExtendedProperties(); XSSFWorkbook workbook = new XSSFWorkbook();
POIXMLProperties props = workbook.getProperties();
assertNotNull(props);
org.openxmlformats.schemas.officeDocument.x2006.extendedProperties.CTProperties org.apache.poi.POIXMLProperties.ExtendedProperties properties =
ctProps = properties.getUnderlyingProperties(); props.getExtendedProperties();
org.openxmlformats.schemas.officeDocument.x2006.extendedProperties.CTProperties
ctProps = properties.getUnderlyingProperties();
String appVersion = "3.5 beta"; String appVersion = "3.5 beta";
String application = "POI"; String application = "POI";
ctProps.setApplication(application); ctProps.setApplication(application);
ctProps.setAppVersion(appVersion); ctProps.setAppVersion(appVersion);
ctProps = null; ctProps = null;
properties = null; properties = null;
props = null; props = null;
XSSFWorkbook newWorkbook = XSSFWorkbook newWorkbook =
XSSFTestDataSamples.writeOutAndReadBack(workbook); XSSFTestDataSamples.writeOutAndReadBack(workbook);
assertTrue(workbook != newWorkbook); assertTrue(workbook != newWorkbook);
POIXMLProperties newProps = newWorkbook.getProperties(); POIXMLProperties newProps = newWorkbook.getProperties();
assertNotNull(newProps); assertNotNull(newProps);
org.apache.poi.POIXMLProperties.ExtendedProperties newProperties = org.apache.poi.POIXMLProperties.ExtendedProperties newProperties =
newProps.getExtendedProperties(); newProps.getExtendedProperties();
org.openxmlformats.schemas.officeDocument.x2006.extendedProperties.CTProperties org.openxmlformats.schemas.officeDocument.x2006.extendedProperties.CTProperties
newCtProps = newProperties.getUnderlyingProperties(); newCtProps = newProperties.getUnderlyingProperties();
assertEquals(application, newCtProps.getApplication()); assertEquals(application, newCtProps.getApplication());
assertEquals(appVersion, newCtProps.getAppVersion()); assertEquals(appVersion, newCtProps.getAppVersion());
} }
public void testWorkbookCustomProperties() throws Exception { public void testWorkbookCustomProperties() {
XSSFWorkbook workbook = new XSSFWorkbook(); XSSFWorkbook workbook = new XSSFWorkbook();
POIXMLProperties props = workbook.getProperties(); POIXMLProperties props = workbook.getProperties();
assertNotNull(props); assertNotNull(props);
org.apache.poi.POIXMLProperties.CustomProperties properties = org.apache.poi.POIXMLProperties.CustomProperties properties =
props.getCustomProperties(); props.getCustomProperties();
org.openxmlformats.schemas.officeDocument.x2006.customProperties.CTProperties org.openxmlformats.schemas.officeDocument.x2006.customProperties.CTProperties
ctProps = properties.getUnderlyingProperties(); ctProps = properties.getUnderlyingProperties();
org.openxmlformats.schemas.officeDocument.x2006.customProperties.CTProperty org.openxmlformats.schemas.officeDocument.x2006.customProperties.CTProperty
property = ctProps.addNewProperty(); property = ctProps.addNewProperty();
String fmtid = String fmtid =
"{A1A1A1A1A1A1A1A1-A1A1A1A1-A1A1A1A1-A1A1A1A1-A1A1A1A1A1A1A1A1}"; "{A1A1A1A1A1A1A1A1-A1A1A1A1-A1A1A1A1-A1A1A1A1-A1A1A1A1A1A1A1A1}";
int pId = 1; int pId = 1;
String name = "testProperty"; String name = "testProperty";
String stringValue = "testValue"; String stringValue = "testValue";
property.setFmtid(fmtid); property.setFmtid(fmtid);
property.setPid(pId); property.setPid(pId);
property.setName(name); property.setName(name);
property.setBstr(stringValue); property.setBstr(stringValue);
property = null; property = null;
ctProps = null; ctProps = null;
properties = null; properties = null;
props = null; props = null;
XSSFWorkbook newWorkbook = XSSFWorkbook newWorkbook =
XSSFTestDataSamples.writeOutAndReadBack(workbook); XSSFTestDataSamples.writeOutAndReadBack(workbook);
assertTrue(workbook != newWorkbook); assertTrue(workbook != newWorkbook);
POIXMLProperties newProps = newWorkbook.getProperties(); POIXMLProperties newProps = newWorkbook.getProperties();
assertNotNull(newProps); assertNotNull(newProps);
org.apache.poi.POIXMLProperties.CustomProperties newProperties = org.apache.poi.POIXMLProperties.CustomProperties newProperties =
newProps.getCustomProperties(); newProps.getCustomProperties();
org.openxmlformats.schemas.officeDocument.x2006.customProperties.CTProperties org.openxmlformats.schemas.officeDocument.x2006.customProperties.CTProperties
newCtProps = newProperties.getUnderlyingProperties(); newCtProps = newProperties.getUnderlyingProperties();
assertEquals(1, newCtProps.getPropertyArray().length); assertEquals(1, newCtProps.getPropertyArray().length);
org.openxmlformats.schemas.officeDocument.x2006.customProperties.CTProperty org.openxmlformats.schemas.officeDocument.x2006.customProperties.CTProperty
newpProperty = newCtProps.getPropertyArray()[0]; newpProperty = newCtProps.getPropertyArray()[0];
assertEquals(fmtid, newpProperty.getFmtid()); assertEquals(fmtid, newpProperty.getFmtid());
assertEquals(pId, newpProperty.getPid()); assertEquals(pId, newpProperty.getPid());
assertEquals(name, newpProperty.getName()); assertEquals(name, newpProperty.getName());
assertEquals(stringValue, newpProperty.getBstr()); assertEquals(stringValue, newpProperty.getBstr());
} }
public void testDocumentProperties() { public void testDocumentProperties() {
String category = coreProperties.getCategory(); String category = _coreProperties.getCategory();
assertEquals("test", category); assertEquals("test", category);
String contentStatus = "Draft"; String contentStatus = "Draft";
coreProperties.setContentStatus(contentStatus); _coreProperties.setContentStatus(contentStatus);
assertEquals("Draft", contentStatus); assertEquals("Draft", contentStatus);
Date created = coreProperties.getCreated(); Date created = _coreProperties.getCreated();
SimpleDateFormat formatter = new SimpleDateFormat("EEE, MMM d, ''yy"); SimpleDateFormat formatter = new SimpleDateFormat("EEE, MMM d, ''yy");
assertEquals("Mon, Jul 20, '09", formatter.format(created)); assertEquals("Mon, Jul 20, '09", formatter.format(created));
String creator = coreProperties.getCreator(); String creator = _coreProperties.getCreator();
assertEquals("Paolo Mottadelli", creator); assertEquals("Paolo Mottadelli", creator);
String subject = coreProperties.getSubject(); String subject = _coreProperties.getSubject();
assertEquals("Greetings", subject); assertEquals("Greetings", subject);
String title = coreProperties.getTitle(); String title = _coreProperties.getTitle();
assertEquals("Hello World", title); assertEquals("Hello World", title);
} }
public void testGetSetRevision() { public void testGetSetRevision() {
String revision = coreProperties.getRevision(); String revision = _coreProperties.getRevision();
assertTrue("Revision number is 1", new Integer(coreProperties.getRevision()).intValue() > 1); assertTrue("Revision number is 1", new Integer(_coreProperties.getRevision()).intValue() > 1);
coreProperties.setRevision("20"); _coreProperties.setRevision("20");
assertEquals("20", coreProperties.getRevision()); assertEquals("20", _coreProperties.getRevision());
coreProperties.setRevision("20xx"); _coreProperties.setRevision("20xx");
assertEquals("20", coreProperties.getRevision()); assertEquals("20", _coreProperties.getRevision());
} }
} }

32
src/ooxml/testcases/org/apache/poi/TestXMLPropertiesTextExtractor.java
View File

@ -24,14 +24,14 @@ import org.apache.poi.openxml4j.opc.OPCPackage;
import junit.framework.TestCase; import junit.framework.TestCase;
public class TestXMLPropertiesTextExtractor extends TestCase { public final class TestXMLPropertiesTextExtractor extends TestCase {
private String dirname; private String dirname;
protected void setUp() throws Exception { protected void setUp() {
dirname = System.getProperty("OOXML.testdata.path"); dirname = System.getProperty("OOXML.testdata.path");
assertTrue( (new File(dirname)).exists() ); assertTrue( (new File(dirname)).exists() );
} }
public void testGetFromMainExtractor() throws Exception { public void testGetFromMainExtractor() throws Exception {
OPCPackage pkg = OPCPackage.open( OPCPackage pkg = OPCPackage.open(
(new File(dirname, "ExcelWithAttachments.xlsm")).toString() (new File(dirname, "ExcelWithAttachments.xlsm")).toString()
@ -40,15 +40,15 @@ public class TestXMLPropertiesTextExtractor extends TestCase {
XSSFExcelExtractor ext = new XSSFExcelExtractor(wb); XSSFExcelExtractor ext = new XSSFExcelExtractor(wb);
POIXMLPropertiesTextExtractor textExt = ext.getMetadataTextExtractor(); POIXMLPropertiesTextExtractor textExt = ext.getMetadataTextExtractor();
// Check basics // Check basics
assertNotNull(textExt); assertNotNull(textExt);
assertTrue(textExt.getText().length() > 0); assertTrue(textExt.getText().length() > 0);
// Check some of the content // Check some of the content
String text = textExt.getText(); String text = textExt.getText();
String cText = textExt.getCorePropertiesText(); String cText = textExt.getCorePropertiesText();
assertTrue(text.contains("LastModifiedBy = Yury Batrakov")); assertTrue(text.contains("LastModifiedBy = Yury Batrakov"));
assertTrue(cText.contains("LastModifiedBy = Yury Batrakov")); assertTrue(cText.contains("LastModifiedBy = Yury Batrakov"));
} }
@ -58,38 +58,38 @@ public class TestXMLPropertiesTextExtractor extends TestCase {
(new File(dirname, "ExcelWithAttachments.xlsm")).toString() (new File(dirname, "ExcelWithAttachments.xlsm")).toString()
); );
XSSFWorkbook wb = new XSSFWorkbook(pkg); XSSFWorkbook wb = new XSSFWorkbook(pkg);
POIXMLPropertiesTextExtractor ext = new POIXMLPropertiesTextExtractor(wb); POIXMLPropertiesTextExtractor ext = new POIXMLPropertiesTextExtractor(wb);
ext.getText(); ext.getText();
// Now check // Now check
String text = ext.getText(); String text = ext.getText();
String cText = ext.getCorePropertiesText(); String cText = ext.getCorePropertiesText();
assertTrue(text.contains("LastModifiedBy = Yury Batrakov")); assertTrue(text.contains("LastModifiedBy = Yury Batrakov"));
assertTrue(cText.contains("LastModifiedBy = Yury Batrakov")); assertTrue(cText.contains("LastModifiedBy = Yury Batrakov"));
} }
public void testExtended() throws Exception { public void testExtended() throws Exception {
OPCPackage pkg = OPCPackage.open( OPCPackage pkg = OPCPackage.open(
(new File(dirname, "ExcelWithAttachments.xlsm")).toString() (new File(dirname, "ExcelWithAttachments.xlsm")).toString()
); );
XSSFWorkbook wb = new XSSFWorkbook(pkg); XSSFWorkbook wb = new XSSFWorkbook(pkg);
POIXMLPropertiesTextExtractor ext = new POIXMLPropertiesTextExtractor(wb); POIXMLPropertiesTextExtractor ext = new POIXMLPropertiesTextExtractor(wb);
ext.getText(); ext.getText();
// Now check // Now check
String text = ext.getText(); String text = ext.getText();
String eText = ext.getExtendedPropertiesText(); String eText = ext.getExtendedPropertiesText();
assertTrue(text.contains("Application = Microsoft Excel")); assertTrue(text.contains("Application = Microsoft Excel"));
assertTrue(text.contains("Company = Mera")); assertTrue(text.contains("Company = Mera"));
assertTrue(eText.contains("Application = Microsoft Excel")); assertTrue(eText.contains("Application = Microsoft Excel"));
assertTrue(eText.contains("Company = Mera")); assertTrue(eText.contains("Company = Mera"));
} }
public void testCustom() throws Exception { public void testCustom() {
// TODO! // TODO!
} }
} }

66
src/ooxml/testcases/org/apache/poi/openxml4j/opc/internal/TestContentTypeManager.java
View File

@ -19,7 +19,13 @@ package org.apache.poi.openxml4j.opc.internal;
import junit.framework.TestCase; import junit.framework.TestCase;
import org.apache.poi.openxml4j.OpenXML4JTestDataSamples;
import org.apache.poi.openxml4j.opc.OPCPackage;
import org.apache.poi.openxml4j.opc.PackageAccess;
import org.apache.poi.openxml4j.opc.PackagePart;
import org.apache.poi.openxml4j.opc.PackagePartName; import org.apache.poi.openxml4j.opc.PackagePartName;
import org.apache.poi.openxml4j.opc.PackageRelationship;
import org.apache.poi.openxml4j.opc.PackageRelationshipTypes;
import org.apache.poi.openxml4j.opc.PackagingURIHelper; import org.apache.poi.openxml4j.opc.PackagingURIHelper;
public final class TestContentTypeManager extends TestCase { public final class TestContentTypeManager extends TestCase {
@ -27,25 +33,21 @@ public final class TestContentTypeManager extends TestCase {
/** /**
* Test the properties part content parsing. * Test the properties part content parsing.
*/ */
public void testContentType() throws Exception { public void disabled_testContentType() throws Exception {
// File originalFile = new File(testCore.getTestRootPath() + String filepath = OpenXML4JTestDataSamples.getSampleFileName("sample.docx");
// File.separator +
// "sample.docx"); // Retrieves core properties part
// OPCPackage p = OPCPackage.open(filepath, PackageAccess.READ);
// // Retrieves core properties part PackageRelationship corePropertiesRelationship = p
// Package p = Package.open(originalFile.getAbsolutePath(), .getRelationshipsByType(
// PackageAccess.READ); PackageRelationshipTypes.CORE_PROPERTIES)
// PackageRelationship corePropertiesRelationship = p .getRelationship(0);
// .getRelationshipsByType( PackagePart coreDocument = p.getPart(corePropertiesRelationship);
// PackageRelationshipTypes.CORE_PROPERTIES)
// .getRelationship(0); ContentTypeManager ctm = new ZipContentTypeManager(coreDocument.getInputStream(), p);
// PackagePart coreDocument = p.getPart(corePropertiesRelationship);
// // TODO - finish writing this test
// ContentTypeManager ctm = new ZipContentTypeManager(coreDocument fail();
// .getInputStream());
//
// // TODO
//fail();
} }
/** /**
@ -54,14 +56,10 @@ public final class TestContentTypeManager extends TestCase {
public void testContentTypeAddition() throws Exception { public void testContentTypeAddition() throws Exception {
ContentTypeManager ctm = new ZipContentTypeManager(null, null); ContentTypeManager ctm = new ZipContentTypeManager(null, null);
PackagePartName name1 = PackagingURIHelper PackagePartName name1 = PackagingURIHelper.createPartName("/foo/foo.XML");
.createPartName("/foo/foo.XML"); PackagePartName name2 = PackagingURIHelper.createPartName("/foo/foo2.xml");
PackagePartName name2 = PackagingURIHelper PackagePartName name3 = PackagingURIHelper.createPartName("/foo/doc.rels");
.createPartName("/foo/foo2.xml"); PackagePartName name4 = PackagingURIHelper.createPartName("/foo/doc.RELS");
PackagePartName name3 = PackagingURIHelper
.createPartName("/foo/doc.rels");
PackagePartName name4 = PackagingURIHelper
.createPartName("/foo/doc.RELS");
// Add content types // Add content types
ctm.addContentType(name1, "foo-type1"); ctm.addContentType(name1, "foo-type1");
@ -81,14 +79,10 @@ public final class TestContentTypeManager extends TestCase {
public void testContentTypeRemoval() throws Exception { public void testContentTypeRemoval() throws Exception {
ContentTypeManager ctm = new ZipContentTypeManager(null, null); ContentTypeManager ctm = new ZipContentTypeManager(null, null);
PackagePartName name1 = PackagingURIHelper PackagePartName name1 = PackagingURIHelper.createPartName("/foo/foo.xml");
.createPartName("/foo/foo.xml"); PackagePartName name2 = PackagingURIHelper.createPartName("/foo/foo2.xml");
PackagePartName name2 = PackagingURIHelper PackagePartName name3 = PackagingURIHelper.createPartName("/foo/doc.rels");
.createPartName("/foo/foo2.xml"); PackagePartName name4 = PackagingURIHelper.createPartName("/foo/doc.RELS");
PackagePartName name3 = PackagingURIHelper
.createPartName("/foo/doc.rels");
PackagePartName name4 = PackagingURIHelper
.createPartName("/foo/doc.RELS");
// Add content types // Add content types
ctm.addContentType(name1, "foo-type1"); ctm.addContentType(name1, "foo-type1");
@ -110,7 +104,7 @@ public final class TestContentTypeManager extends TestCase {
/** /**
* Test the addition then removal of content types in a package. * Test the addition then removal of content types in a package.
*/ */
public void testContentTypeRemovalPackage() throws Exception { public void testContentTypeRemovalPackage() {
// TODO // TODO
} }
} }

21
src/ooxml/testcases/org/apache/poi/ss/TestWorkbookFactory.java
View File

@ -14,6 +14,7 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
==================================================================== */ ==================================================================== */
package org.apache.poi.ss; package org.apache.poi.ss;
import java.io.File; import java.io.File;
@ -28,12 +29,12 @@ import org.apache.poi.openxml4j.opc.OPCPackage;
import junit.framework.TestCase; import junit.framework.TestCase;
public class TestWorkbookFactory extends TestCase { public final class TestWorkbookFactory extends TestCase {
private File xls; private File xls;
private File xlsx; private File xlsx;
private File txt; private File txt;
protected void setUp() throws Exception { protected void setUp() {
xls = new File( xls = new File(
System.getProperty("HSSF.testdata.path") + System.getProperty("HSSF.testdata.path") +
File.separator + "SampleSS.xls" File.separator + "SampleSS.xls"
@ -50,17 +51,17 @@ public class TestWorkbookFactory extends TestCase {
assertTrue(xlsx.exists()); assertTrue(xlsx.exists());
assertTrue(txt.exists()); assertTrue(txt.exists());
} }
public void testCreateNative() throws Exception { public void testCreateNative() throws Exception {
Workbook wb; Workbook wb;
// POIFS -> hssf // POIFS -> hssf
wb = WorkbookFactory.create( wb = WorkbookFactory.create(
new POIFSFileSystem(new FileInputStream(xls)) new POIFSFileSystem(new FileInputStream(xls))
); );
assertNotNull(wb); assertNotNull(wb);
assertTrue(wb instanceof HSSFWorkbook); assertTrue(wb instanceof HSSFWorkbook);
// Package -> xssf // Package -> xssf
wb = WorkbookFactory.create( wb = WorkbookFactory.create(
OPCPackage.open(xlsx.toString()) OPCPackage.open(xlsx.toString())
@ -68,7 +69,7 @@ public class TestWorkbookFactory extends TestCase {
assertNotNull(wb); assertNotNull(wb);
assertTrue(wb instanceof XSSFWorkbook); assertTrue(wb instanceof XSSFWorkbook);
} }
/** /**
* Creates the appropriate kind of Workbook, but * Creates the appropriate kind of Workbook, but
* checking the mime magic at the start of the * checking the mime magic at the start of the
@ -76,20 +77,20 @@ public class TestWorkbookFactory extends TestCase {
*/ */
public void testCreateGeneric() throws Exception { public void testCreateGeneric() throws Exception {
Workbook wb; Workbook wb;
// InputStream -> either // InputStream -> either
wb = WorkbookFactory.create( wb = WorkbookFactory.create(
new FileInputStream(xls) new FileInputStream(xls)
); );
assertNotNull(wb); assertNotNull(wb);
assertTrue(wb instanceof HSSFWorkbook); assertTrue(wb instanceof HSSFWorkbook);
wb = WorkbookFactory.create( wb = WorkbookFactory.create(
new FileInputStream(xlsx) new FileInputStream(xlsx)
); );
assertNotNull(wb); assertNotNull(wb);
assertTrue(wb instanceof XSSFWorkbook); assertTrue(wb instanceof XSSFWorkbook);
try { try {
wb = WorkbookFactory.create( wb = WorkbookFactory.create(
new FileInputStream(txt) new FileInputStream(txt)
@ -99,4 +100,4 @@ public class TestWorkbookFactory extends TestCase {
// Good // Good
} }
} }
} }

325
src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java
View File

@ -30,191 +30,150 @@ import org.apache.poi.xssf.usermodel.XSSFMap;
import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.apache.poi.xssf.usermodel.XSSFWorkbook;
/** /**
*
* @author Roberto Manicardi * @author Roberto Manicardi
*
*/ */
public class TestXSSFExportToXML extends TestCase{ public final class TestXSSFExportToXML extends TestCase {
public void testExportToXML() throws Exception{
XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("CustomXMLMappings.xlsx");
MapInfo mapInfo = null;
for(POIXMLDocumentPart p : wb.getRelations()){
if(p instanceof MapInfo){
mapInfo = (MapInfo) p;
XSSFMap map = mapInfo.getXSSFMapById(1);
XSSFExportToXml exporter = new XSSFExportToXml(map);
ByteArrayOutputStream os = new ByteArrayOutputStream();
exporter.exportToXML(os,true);
String xml = os.toString("UTF-8");
assertNotNull(xml);
assertTrue(!xml.equals(""));
String docente = xml.split("<DOCENTE>")[1].split("</DOCENTE>")[0].trim();
String nome = xml.split("<NOME>")[1].split("</NOME>")[0].trim();
String tutor = xml.split("<TUTOR>")[1].split("</TUTOR>")[0].trim();
String cdl = xml.split("<CDL>")[1].split("</CDL>")[0].trim();
String durata = xml.split("<DURATA>")[1].split("</DURATA>")[0].trim();
String argomento = xml.split("<ARGOMENTO>")[1].split("</ARGOMENTO>")[0].trim();
String progetto = xml.split("<PROGETTO>")[1].split("</PROGETTO>")[0].trim();
String crediti = xml.split("<CREDITI>")[1].split("</CREDITI>")[0].trim();
assertEquals("ro",docente);
assertEquals("ro",nome);
assertEquals("ds",tutor);
assertEquals("gs",cdl);
assertEquals("g",durata);
assertEquals("gvvv",argomento);
assertEquals("aaaa",progetto);
assertEquals("aa",crediti);
}
}
}
public void testExportToXMLInverseOrder() throws Exception{
XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("CustomXmlMappings-inverse-order.xlsx");
MapInfo mapInfo = null;
for(POIXMLDocumentPart p : wb.getRelations()){
if(p instanceof MapInfo){
mapInfo = (MapInfo) p;
XSSFMap map = mapInfo.getXSSFMapById(1);
XSSFExportToXml exporter = new XSSFExportToXml(map);
ByteArrayOutputStream os = new ByteArrayOutputStream();
exporter.exportToXML(os,true);
String xml = os.toString("UTF-8");
assertNotNull(xml);
assertTrue(!xml.equals(""));
String docente = xml.split("<DOCENTE>")[1].split("</DOCENTE>")[0].trim();
String nome = xml.split("<NOME>")[1].split("</NOME>")[0].trim();
String tutor = xml.split("<TUTOR>")[1].split("</TUTOR>")[0].trim();
String cdl = xml.split("<CDL>")[1].split("</CDL>")[0].trim();
String durata = xml.split("<DURATA>")[1].split("</DURATA>")[0].trim();
String argomento = xml.split("<ARGOMENTO>")[1].split("</ARGOMENTO>")[0].trim();
String progetto = xml.split("<PROGETTO>")[1].split("</PROGETTO>")[0].trim();
String crediti = xml.split("<CREDITI>")[1].split("</CREDITI>")[0].trim();
assertEquals("aa",nome);
assertEquals("aaaa",docente);
assertEquals("gvvv",tutor);
assertEquals("g",cdl);
assertEquals("gs",durata);
assertEquals("ds",argomento);
assertEquals("ro",progetto);
assertEquals("ro",crediti);
}
}
}
public void testXPathOrdering() throws Exception{
XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("CustomXmlMappings-inverse-order.xlsx");
MapInfo mapInfo = null;
for(POIXMLDocumentPart p : wb.getRelations()){
if(p instanceof MapInfo){
mapInfo = (MapInfo) p;
XSSFMap map = mapInfo.getXSSFMapById(1);
XSSFExportToXml exporter = new XSSFExportToXml(map);
assertEquals(1,exporter.compare("/CORSO/DOCENTE", "/CORSO/NOME"));
assertEquals(-1,exporter.compare("/CORSO/NOME", "/CORSO/DOCENTE"));
}
}
}
public void testExportToXML() throws Exception {
public void testMultiTable() throws Exception{
XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("CustomXMLMappings-complex-type.xlsx");
for(POIXMLDocumentPart p : wb.getRelations()){
if(p instanceof MapInfo){
MapInfo mapInfo = (MapInfo) p;
XSSFMap map = mapInfo.getXSSFMapById(2);
assertNotNull(map);
XSSFExportToXml exporter = new XSSFExportToXml(map);
ByteArrayOutputStream os = new ByteArrayOutputStream();
exporter.exportToXML(os,true);
String xml = os.toString("UTF-8");
assertNotNull(xml);
String[] regexConditions = { "<MapInfo",
"</MapInfo>",
"<Schema ID=\"1\" Namespace=\"\" SchemaRef=\"\"/>",
"<Schema ID=\"4\" Namespace=\"\" SchemaRef=\"\"/>",
"DataBinding",
"Map Append=\"false\" AutoFit=\"false\" ID=\"1\"",
"Map Append=\"false\" AutoFit=\"false\" ID=\"5\""
};
for(String condition : regexConditions){
Pattern pattern = Pattern.compile(condition);
Matcher matcher = pattern.matcher(xml);
assertTrue(matcher.find());
}
}
}
}
XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("CustomXMLMappings.xlsx");
for (POIXMLDocumentPart p : wb.getRelations()) {
if (!(p instanceof MapInfo)) {
continue;
}
MapInfo mapInfo = (MapInfo) p;
XSSFMap map = mapInfo.getXSSFMapById(1);
XSSFExportToXml exporter = new XSSFExportToXml(map);
ByteArrayOutputStream os = new ByteArrayOutputStream();
exporter.exportToXML(os, true);
String xml = os.toString("UTF-8");
assertNotNull(xml);
assertTrue(!xml.equals(""));
String docente = xml.split("<DOCENTE>")[1].split("</DOCENTE>")[0].trim();
String nome = xml.split("<NOME>")[1].split("</NOME>")[0].trim();
String tutor = xml.split("<TUTOR>")[1].split("</TUTOR>")[0].trim();
String cdl = xml.split("<CDL>")[1].split("</CDL>")[0].trim();
String durata = xml.split("<DURATA>")[1].split("</DURATA>")[0].trim();
String argomento = xml.split("<ARGOMENTO>")[1].split("</ARGOMENTO>")[0].trim();
String progetto = xml.split("<PROGETTO>")[1].split("</PROGETTO>")[0].trim();
String crediti = xml.split("<CREDITI>")[1].split("</CREDITI>")[0].trim();
assertEquals("ro", docente);
assertEquals("ro", nome);
assertEquals("ds", tutor);
assertEquals("gs", cdl);
assertEquals("g", durata);
assertEquals("gvvv", argomento);
assertEquals("aaaa", progetto);
assertEquals("aa", crediti);
}
}
public void testExportToXMLInverseOrder() throws Exception {
XSSFWorkbook wb = XSSFTestDataSamples
.openSampleWorkbook("CustomXmlMappings-inverse-order.xlsx");
MapInfo mapInfo = null;
for (POIXMLDocumentPart p : wb.getRelations()) {
if (!(p instanceof MapInfo)) {
continue;
}
mapInfo = (MapInfo) p;
XSSFMap map = mapInfo.getXSSFMapById(1);
XSSFExportToXml exporter = new XSSFExportToXml(map);
ByteArrayOutputStream os = new ByteArrayOutputStream();
exporter.exportToXML(os, true);
String xml = os.toString("UTF-8");
assertNotNull(xml);
assertTrue(!xml.equals(""));
String docente = xml.split("<DOCENTE>")[1].split("</DOCENTE>")[0].trim();
String nome = xml.split("<NOME>")[1].split("</NOME>")[0].trim();
String tutor = xml.split("<TUTOR>")[1].split("</TUTOR>")[0].trim();
String cdl = xml.split("<CDL>")[1].split("</CDL>")[0].trim();
String durata = xml.split("<DURATA>")[1].split("</DURATA>")[0].trim();
String argomento = xml.split("<ARGOMENTO>")[1].split("</ARGOMENTO>")[0].trim();
String progetto = xml.split("<PROGETTO>")[1].split("</PROGETTO>")[0].trim();
String crediti = xml.split("<CREDITI>")[1].split("</CREDITI>")[0].trim();
assertEquals("aa", nome);
assertEquals("aaaa", docente);
assertEquals("gvvv", tutor);
assertEquals("g", cdl);
assertEquals("gs", durata);
assertEquals("ds", argomento);
assertEquals("ro", progetto);
assertEquals("ro", crediti);
}
}
public void testXPathOrdering() {
XSSFWorkbook wb = XSSFTestDataSamples
.openSampleWorkbook("CustomXmlMappings-inverse-order.xlsx");
MapInfo mapInfo = null;
for (POIXMLDocumentPart p : wb.getRelations()) {
if (p instanceof MapInfo) {
mapInfo = (MapInfo) p;
XSSFMap map = mapInfo.getXSSFMapById(1);
XSSFExportToXml exporter = new XSSFExportToXml(map);
assertEquals(1, exporter.compare("/CORSO/DOCENTE", "/CORSO/NOME"));
assertEquals(-1, exporter.compare("/CORSO/NOME", "/CORSO/DOCENTE"));
}
}
}
public void testMultiTable() throws Exception {
XSSFWorkbook wb = XSSFTestDataSamples
.openSampleWorkbook("CustomXMLMappings-complex-type.xlsx");
for (POIXMLDocumentPart p : wb.getRelations()) {
if (p instanceof MapInfo) {
MapInfo mapInfo = (MapInfo) p;
XSSFMap map = mapInfo.getXSSFMapById(2);
assertNotNull(map);
XSSFExportToXml exporter = new XSSFExportToXml(map);
ByteArrayOutputStream os = new ByteArrayOutputStream();
exporter.exportToXML(os, true);
String xml = os.toString("UTF-8");
assertNotNull(xml);
String[] regexConditions = {
"<MapInfo", "</MapInfo>",
"<Schema ID=\"1\" Namespace=\"\" SchemaRef=\"\"/>",
"<Schema ID=\"4\" Namespace=\"\" SchemaRef=\"\"/>",
"DataBinding",
"Map Append=\"false\" AutoFit=\"false\" ID=\"1\"",
"Map Append=\"false\" AutoFit=\"false\" ID=\"5\"",
};
for (String condition : regexConditions) {
Pattern pattern = Pattern.compile(condition);
Matcher matcher = pattern.matcher(xml);
assertTrue(matcher.find());
}
}
}
}
} }

8
src/ooxml/testcases/org/apache/poi/xssf/model/TestCalculationChain.java
View File

@ -24,9 +24,9 @@ import org.openxmlformats.schemas.spreadsheetml.x2006.main.*;
import junit.framework.TestCase; import junit.framework.TestCase;
public class TestCalculationChain extends TestCase { public final class TestCalculationChain extends TestCase {
public void test46535() throws Exception { public void test46535() {
XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("46535.xlsx"); XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("46535.xlsx");
CalculationChain chain = wb.getCalculationChain(); CalculationChain chain = wb.getCalculationChain();
@ -42,7 +42,7 @@ public class TestCalculationChain extends TestCase {
assertEquals(XSSFCell.CELL_TYPE_FORMULA, cell.getCellType()); assertEquals(XSSFCell.CELL_TYPE_FORMULA, cell.getCellType());
cell.setCellFormula(null); cell.setCellFormula(null);
//the count of items is less by one //the count of items is less by one
c = chain.getCTCalcChain().getCArray(0); c = chain.getCTCalcChain().getCArray(0);
int cnt2 = chain.getCTCalcChain().getCArray().length; int cnt2 = chain.getCTCalcChain().getCArray().length;
assertEquals(cnt - 1, cnt2); assertEquals(cnt - 1, cnt2);
@ -56,4 +56,4 @@ public class TestCalculationChain extends TestCase {
} }
} }

11
src/ooxml/testcases/org/apache/poi/xssf/model/TestMapInfo.java
View File

@ -30,11 +30,10 @@ import junit.framework.TestCase;
/** /**
* @author Roberto Manicardi * @author Roberto Manicardi
*/ */
public class TestMapInfo extends TestCase { public final class TestMapInfo extends TestCase {
public void testMapInfoExists() throws Exception { public void testMapInfoExists() {
XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("CustomXMLMappings.xlsx"); XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("CustomXMLMappings.xlsx");
@ -72,13 +71,7 @@ public class TestMapInfo extends TestCase {
} }
} }
assertNotNull(mapInfo); assertNotNull(mapInfo);
assertNotNull(singleXMLCells); assertNotNull(singleXMLCells);
} }
} }

70
src/ooxml/testcases/org/apache/poi/xssf/model/TestStylesTable.java
View File

@ -25,10 +25,10 @@ import org.apache.poi.xssf.XSSFTestDataSamples;
import junit.framework.TestCase; import junit.framework.TestCase;
public class TestStylesTable extends TestCase { public final class TestStylesTable extends TestCase {
private File xml; private File xml;
protected void setUp() throws Exception { protected void setUp() {
xml = new File( xml = new File(
System.getProperty("HSSF.testdata.path") + System.getProperty("HSSF.testdata.path") +
File.separator + "Formatting.xlsx" File.separator + "Formatting.xlsx"
@ -36,92 +36,92 @@ public class TestStylesTable extends TestCase {
assertTrue(xml.exists()); assertTrue(xml.exists());
} }
public void testCreateNew() throws Exception { public void testCreateNew() {
StylesTable st = new StylesTable(); StylesTable st = new StylesTable();
// Check defaults // Check defaults
assertNotNull(st.getCTStylesheet()); assertNotNull(st.getCTStylesheet());
assertEquals(1, st._getXfsSize()); assertEquals(1, st._getXfsSize());
assertEquals(1, st._getStyleXfsSize()); assertEquals(1, st._getStyleXfsSize());
assertEquals(0, st._getNumberFormatSize()); assertEquals(0, st._getNumberFormatSize());
} }
public void testCreateSaveLoad() throws Exception { public void testCreateSaveLoad() {
XSSFWorkbook wb = new XSSFWorkbook(); XSSFWorkbook wb = new XSSFWorkbook();
StylesTable st = wb.getStylesSource(); StylesTable st = wb.getStylesSource();
assertNotNull(st.getCTStylesheet()); assertNotNull(st.getCTStylesheet());
assertEquals(1, st._getXfsSize()); assertEquals(1, st._getXfsSize());
assertEquals(1, st._getStyleXfsSize()); assertEquals(1, st._getStyleXfsSize());
assertEquals(0, st._getNumberFormatSize()); assertEquals(0, st._getNumberFormatSize());
st = XSSFTestDataSamples.writeOutAndReadBack(wb).getStylesSource(); st = XSSFTestDataSamples.writeOutAndReadBack(wb).getStylesSource();
assertNotNull(st.getCTStylesheet()); assertNotNull(st.getCTStylesheet());
assertEquals(1, st._getXfsSize()); assertEquals(1, st._getXfsSize());
assertEquals(1, st._getStyleXfsSize()); assertEquals(1, st._getStyleXfsSize());
assertEquals(0, st._getNumberFormatSize()); assertEquals(0, st._getNumberFormatSize());
} }
public void testLoadExisting() throws Exception { public void testLoadExisting() throws Exception {
XSSFWorkbook workbook = new XSSFWorkbook(xml.toString()); XSSFWorkbook workbook = new XSSFWorkbook(xml.toString());
assertNotNull(workbook.getStylesSource()); assertNotNull(workbook.getStylesSource());
StylesTable st = workbook.getStylesSource(); StylesTable st = workbook.getStylesSource();
doTestExisting(st); doTestExisting(st);
} }
public void testLoadSaveLoad() throws Exception { public void testLoadSaveLoad() throws Exception {
XSSFWorkbook workbook = new XSSFWorkbook(xml.toString()); XSSFWorkbook workbook = new XSSFWorkbook(xml.toString());
assertNotNull(workbook.getStylesSource()); assertNotNull(workbook.getStylesSource());
StylesTable st = workbook.getStylesSource(); StylesTable st = workbook.getStylesSource();
doTestExisting(st); doTestExisting(st);
st = XSSFTestDataSamples.writeOutAndReadBack(workbook).getStylesSource(); st = XSSFTestDataSamples.writeOutAndReadBack(workbook).getStylesSource();
doTestExisting(st); doTestExisting(st);
} }
public void doTestExisting(StylesTable st) throws Exception { public void doTestExisting(StylesTable st) {
// Check contents // Check contents
assertNotNull(st.getCTStylesheet()); assertNotNull(st.getCTStylesheet());
assertEquals(11, st._getXfsSize()); assertEquals(11, st._getXfsSize());
assertEquals(1, st._getStyleXfsSize()); assertEquals(1, st._getStyleXfsSize());
assertEquals(8, st._getNumberFormatSize()); assertEquals(8, st._getNumberFormatSize());
assertEquals(2, st.getFonts().size()); assertEquals(2, st.getFonts().size());
assertEquals(2, st.getFills().size()); assertEquals(2, st.getFills().size());
assertEquals(1, st.getBorders().size()); assertEquals(1, st.getBorders().size());
assertEquals("yyyy/mm/dd", st.getNumberFormatAt(165)); assertEquals("yyyy/mm/dd", st.getNumberFormatAt(165));
assertEquals("yy/mm/dd", st.getNumberFormatAt(167)); assertEquals("yy/mm/dd", st.getNumberFormatAt(167));
assertNotNull(st.getStyleAt(0)); assertNotNull(st.getStyleAt(0));
assertNotNull(st.getStyleAt(1)); assertNotNull(st.getStyleAt(1));
assertNotNull(st.getStyleAt(2)); assertNotNull(st.getStyleAt(2));
assertEquals(0, st.getStyleAt(0).getDataFormat()); assertEquals(0, st.getStyleAt(0).getDataFormat());
assertEquals(14, st.getStyleAt(1).getDataFormat()); assertEquals(14, st.getStyleAt(1).getDataFormat());
assertEquals(0, st.getStyleAt(2).getDataFormat()); assertEquals(0, st.getStyleAt(2).getDataFormat());
assertEquals(165, st.getStyleAt(3).getDataFormat()); assertEquals(165, st.getStyleAt(3).getDataFormat());
assertEquals("yyyy/mm/dd", st.getStyleAt(3).getDataFormatString()); assertEquals("yyyy/mm/dd", st.getStyleAt(3).getDataFormatString());
} }
public void testPopulateNew() throws Exception { public void testPopulateNew() {
XSSFWorkbook wb = new XSSFWorkbook(); XSSFWorkbook wb = new XSSFWorkbook();
StylesTable st = wb.getStylesSource(); StylesTable st = wb.getStylesSource();
assertNotNull(st.getCTStylesheet()); assertNotNull(st.getCTStylesheet());
assertEquals(1, st._getXfsSize()); assertEquals(1, st._getXfsSize());
assertEquals(1, st._getStyleXfsSize()); assertEquals(1, st._getStyleXfsSize());
assertEquals(0, st._getNumberFormatSize()); assertEquals(0, st._getNumberFormatSize());
int nf1 = st.putNumberFormat("yyyy-mm-dd"); int nf1 = st.putNumberFormat("yyyy-mm-dd");
int nf2 = st.putNumberFormat("yyyy-mm-DD"); int nf2 = st.putNumberFormat("yyyy-mm-DD");
assertEquals(nf1, st.putNumberFormat("yyyy-mm-dd")); assertEquals(nf1, st.putNumberFormat("yyyy-mm-dd"));
st.putStyle(new XSSFCellStyle(st)); st.putStyle(new XSSFCellStyle(st));
// Save and re-load // Save and re-load
st = XSSFTestDataSamples.writeOutAndReadBack(wb).getStylesSource(); st = XSSFTestDataSamples.writeOutAndReadBack(wb).getStylesSource();
@ -129,31 +129,31 @@ public class TestStylesTable extends TestCase {
assertEquals(2, st._getXfsSize()); assertEquals(2, st._getXfsSize());
assertEquals(1, st._getStyleXfsSize()); assertEquals(1, st._getStyleXfsSize());
assertEquals(2, st._getNumberFormatSize()); assertEquals(2, st._getNumberFormatSize());
assertEquals("yyyy-mm-dd", st.getNumberFormatAt(nf1)); assertEquals("yyyy-mm-dd", st.getNumberFormatAt(nf1));
assertEquals(nf1, st.putNumberFormat("yyyy-mm-dd")); assertEquals(nf1, st.putNumberFormat("yyyy-mm-dd"));
assertEquals(nf2, st.putNumberFormat("yyyy-mm-DD")); assertEquals(nf2, st.putNumberFormat("yyyy-mm-DD"));
} }
public void testPopulateExisting() throws Exception { public void testPopulateExisting() throws Exception {
XSSFWorkbook workbook = new XSSFWorkbook(xml.toString()); XSSFWorkbook workbook = new XSSFWorkbook(xml.toString());
assertNotNull(workbook.getStylesSource()); assertNotNull(workbook.getStylesSource());
StylesTable st = workbook.getStylesSource(); StylesTable st = workbook.getStylesSource();
assertEquals(11, st._getXfsSize()); assertEquals(11, st._getXfsSize());
assertEquals(1, st._getStyleXfsSize()); assertEquals(1, st._getStyleXfsSize());
assertEquals(8, st._getNumberFormatSize()); assertEquals(8, st._getNumberFormatSize());
int nf1 = st.putNumberFormat("YYYY-mm-dd"); int nf1 = st.putNumberFormat("YYYY-mm-dd");
int nf2 = st.putNumberFormat("YYYY-mm-DD"); int nf2 = st.putNumberFormat("YYYY-mm-DD");
assertEquals(nf1, st.putNumberFormat("YYYY-mm-dd")); assertEquals(nf1, st.putNumberFormat("YYYY-mm-dd"));
st = XSSFTestDataSamples.writeOutAndReadBack(workbook).getStylesSource(); st = XSSFTestDataSamples.writeOutAndReadBack(workbook).getStylesSource();
assertEquals(11, st._getXfsSize()); assertEquals(11, st._getXfsSize());
assertEquals(1, st._getStyleXfsSize()); assertEquals(1, st._getStyleXfsSize());
assertEquals(10, st._getNumberFormatSize()); assertEquals(10, st._getNumberFormatSize());
assertEquals("YYYY-mm-dd", st.getNumberFormatAt(nf1)); assertEquals("YYYY-mm-dd", st.getNumberFormatAt(nf1));
assertEquals(nf1, st.putNumberFormat("YYYY-mm-dd")); assertEquals(nf1, st.putNumberFormat("YYYY-mm-dd"));
assertEquals(nf2, st.putNumberFormat("YYYY-mm-DD")); assertEquals(nf2, st.putNumberFormat("YYYY-mm-DD"));

8
src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestSheetHiding.java
View File

@ -37,7 +37,7 @@ public final class TestSheetHiding extends TestCase {
* with the right text on them, no matter what * with the right text on them, no matter what
* the hidden flags are * the hidden flags are
*/ */
public void testTextSheets() throws Exception { public void testTextSheets() {
// Both should have two sheets // Both should have two sheets
assertEquals(2, wbH.getNumberOfSheets()); assertEquals(2, wbH.getNumberOfSheets());
assertEquals(2, wbU.getNumberOfSheets()); assertEquals(2, wbU.getNumberOfSheets());
@ -65,7 +65,7 @@ public final class TestSheetHiding extends TestCase {
* Check that we can get and set the hidden flags * Check that we can get and set the hidden flags
* as expected * as expected
*/ */
public void testHideUnHideFlags() throws Exception { public void testHideUnHideFlags() {
assertTrue(wbH.isSheetHidden(0)); assertTrue(wbH.isSheetHidden(0));
assertFalse(wbH.isSheetHidden(1)); assertFalse(wbH.isSheetHidden(1));
assertFalse(wbU.isSheetHidden(0)); assertFalse(wbU.isSheetHidden(0));
@ -76,7 +76,7 @@ public final class TestSheetHiding extends TestCase {
* Turn the sheet with none hidden into the one with * Turn the sheet with none hidden into the one with
* one hidden * one hidden
*/ */
public void testHide() throws Exception { public void testHide() {
wbU.setSheetHidden(0, true); wbU.setSheetHidden(0, true);
assertTrue(wbU.isSheetHidden(0)); assertTrue(wbU.isSheetHidden(0));
assertFalse(wbU.isSheetHidden(1)); assertFalse(wbU.isSheetHidden(1));
@ -89,7 +89,7 @@ public final class TestSheetHiding extends TestCase {
* Turn the sheet with one hidden into the one with * Turn the sheet with one hidden into the one with
* none hidden * none hidden
*/ */
public void testUnHide() throws Exception { public void testUnHide() {
wbH.setSheetHidden(0, false); wbH.setSheetHidden(0, false);
assertFalse(wbH.isSheetHidden(0)); assertFalse(wbH.isSheetHidden(0));
assertFalse(wbH.isSheetHidden(1)); assertFalse(wbH.isSheetHidden(1));

2
src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
View File

@ -45,7 +45,7 @@ public final class TestXSSFBugs extends BaseTestBugzillaIssues {
* Named ranges had the right reference, but * Named ranges had the right reference, but
* the wrong sheet name * the wrong sheet name
*/ */
public void test45430() throws Exception { public void test45430() {
XSSFWorkbook wb = getTestDataProvider().openSampleWorkbook("45430.xlsx"); XSSFWorkbook wb = getTestDataProvider().openSampleWorkbook("45430.xlsx");
assertFalse(wb.isMacroEnabled()); assertFalse(wb.isMacroEnabled());
assertEquals(3, wb.getNumberOfNames()); assertEquals(3, wb.getNumberOfNames());

11
src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFCell.java
View File

@ -35,7 +35,7 @@ public final class TestXSSFCell extends BaseTestCell {
* Bug 47026: trouble changing cell type when workbook doesn't contain * Bug 47026: trouble changing cell type when workbook doesn't contain
* Shared String Table * Shared String Table
*/ */
public void test47026_1() throws Exception { public void test47026_1() {
Workbook source = _testDataProvider.openSampleWorkbook("47026.xlsm"); Workbook source = _testDataProvider.openSampleWorkbook("47026.xlsm");
Sheet sheet = source.getSheetAt(0); Sheet sheet = source.getSheetAt(0);
Row row = sheet.getRow(0); Row row = sheet.getRow(0);
@ -44,7 +44,7 @@ public final class TestXSSFCell extends BaseTestCell {
cell.setCellValue("456"); cell.setCellValue("456");
} }
public void test47026_2() throws Exception { public void test47026_2() {
Workbook source = _testDataProvider.openSampleWorkbook("47026.xlsm"); Workbook source = _testDataProvider.openSampleWorkbook("47026.xlsm");
Sheet sheet = source.getSheetAt(0); Sheet sheet = source.getSheetAt(0);
Row row = sheet.getRow(0); Row row = sheet.getRow(0);
@ -60,7 +60,7 @@ public final class TestXSSFCell extends BaseTestCell {
* Some programs, for example, Microsoft Excel Driver for .xlsx insert inline string * Some programs, for example, Microsoft Excel Driver for .xlsx insert inline string
* instead of using the shared string table. See bug 47206 * instead of using the shared string table. See bug 47206
*/ */
public void testInlineString() throws Exception { public void testInlineString() {
XSSFWorkbook wb = (XSSFWorkbook)_testDataProvider.openSampleWorkbook("xlsx-jdbc.xlsx"); XSSFWorkbook wb = (XSSFWorkbook)_testDataProvider.openSampleWorkbook("xlsx-jdbc.xlsx");
XSSFSheet sheet = wb.getSheetAt(0); XSSFSheet sheet = wb.getSheetAt(0);
XSSFRow row = sheet.getRow(1); XSSFRow row = sheet.getRow(1);
@ -84,7 +84,7 @@ public final class TestXSSFCell extends BaseTestCell {
/** /**
* Bug 47278 - xsi:nil attribute for <t> tag caused Excel 2007 to fail to open workbook * Bug 47278 - xsi:nil attribute for <t> tag caused Excel 2007 to fail to open workbook
*/ */
public void test47278() throws Exception { public void test47278() {
XSSFWorkbook wb = (XSSFWorkbook)_testDataProvider.createWorkbook(); XSSFWorkbook wb = (XSSFWorkbook)_testDataProvider.createWorkbook();
XSSFSheet sheet = wb.createSheet(); XSSFSheet sheet = wb.createSheet();
XSSFRow row = sheet.createRow(0); XSSFRow row = sheet.createRow(0);
@ -105,5 +105,4 @@ public final class TestXSSFCell extends BaseTestCell {
assertEquals(0, sst.getCount()); assertEquals(0, sst.getCount());
assertEquals(XSSFCell.CELL_TYPE_BLANK, cell_1.getCellType()); assertEquals(XSSFCell.CELL_TYPE_BLANK, cell_1.getCellType());
} }
}
}

16
src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFCellStyle.java
View File

@ -46,9 +46,9 @@ public class TestXSSFCellStyle extends TestCase {
@Override @Override
protected void setUp() { protected void setUp() {
stylesTable = new StylesTable(); stylesTable = new StylesTable();
ctStylesheet = stylesTable.getCTStylesheet(); ctStylesheet = stylesTable.getCTStylesheet();
ctBorderA = CTBorder.Factory.newInstance(); ctBorderA = CTBorder.Factory.newInstance();
XSSFCellBorder borderA = new XSSFCellBorder(ctBorderA); XSSFCellBorder borderA = new XSSFCellBorder(ctBorderA);
long borderId = stylesTable.putBorder(borderA); long borderId = stylesTable.putBorder(borderA);
@ -71,7 +71,7 @@ public class TestXSSFCellStyle extends TestCase {
cellStyleXf.setBorderId(1); cellStyleXf.setBorderId(1);
cellStyleXf.setFillId(1); cellStyleXf.setFillId(1);
cellStyleXf.setFontId(1); cellStyleXf.setFontId(1);
cellXfs = ctStylesheet.addNewCellXfs(); cellXfs = ctStylesheet.addNewCellXfs();
cellXf = cellXfs.addNewXf(); cellXf = cellXfs.addNewXf();
cellXf.setXfId(1); cellXf.setXfId(1);
@ -419,7 +419,7 @@ public class TestXSSFCellStyle extends TestCase {
assertNull(cellStyle.getFillBackgroundXSSFColor()); assertNull(cellStyle.getFillBackgroundXSSFColor());
assertEquals(IndexedColors.AUTOMATIC.getIndex(), cellStyle.getFillBackgroundColor()); assertEquals(IndexedColors.AUTOMATIC.getIndex(), cellStyle.getFillBackgroundColor());
} }
public void testDefaultStyles() { public void testDefaultStyles() {
XSSFWorkbook wb1 = new XSSFWorkbook(); XSSFWorkbook wb1 = new XSSFWorkbook();
@ -445,7 +445,7 @@ public class TestXSSFCellStyle extends TestCase {
assertEquals(style2.getBorderRight(), style1.getBorderRight()); assertEquals(style2.getBorderRight(), style1.getBorderRight());
assertEquals(style2.getBorderTop(), style1.getBorderTop()); assertEquals(style2.getBorderTop(), style1.getBorderTop());
} }
public void testGetFillForegroundColor() { public void testGetFillForegroundColor() {
@ -481,7 +481,7 @@ public class TestXSSFCellStyle extends TestCase {
assertEquals(4, styles.getFills().size()); assertEquals(4, styles.getFills().size());
} }
} }
public void testGetFillPattern() { public void testGetFillPattern() {
assertEquals(CellStyle.NO_FILL, cellStyle.getFillPattern()); assertEquals(CellStyle.NO_FILL, cellStyle.getFillPattern());
@ -585,13 +585,13 @@ public class TestXSSFCellStyle extends TestCase {
/** /**
* Cloning one XSSFCellStyle onto Another, same XSSFWorkbook * Cloning one XSSFCellStyle onto Another, same XSSFWorkbook
*/ */
public void testCloneStyleSameWB() throws Exception { public void testCloneStyleSameWB() {
// TODO // TODO
} }
/** /**
* Cloning one XSSFCellStyle onto Another, different XSSFWorkbooks * Cloning one XSSFCellStyle onto Another, different XSSFWorkbooks
*/ */
public void testCloneStyleDiffWB() throws Exception { public void testCloneStyleDiffWB() {
// TODO // TODO
} }
} }

2
src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFComment.java
View File

@ -140,7 +140,7 @@ public class TestXSSFComment extends TestCase {
* file, save, load, and still see them * file, save, load, and still see them
* @throws Exception * @throws Exception
*/ */
public void testCreateSave() throws Exception { public void testCreateSave() {
XSSFWorkbook wb = new XSSFWorkbook(); XSSFWorkbook wb = new XSSFWorkbook();
XSSFSheet s1 = wb.createSheet(); XSSFSheet s1 = wb.createSheet();
Row r1 = s1.createRow(0); Row r1 = s1.createRow(0);

19
src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataFormat.java
View File

@ -27,14 +27,15 @@ import org.apache.poi.xssf.XSSFITestDataProvider;
*/ */
public final class TestXSSFDataFormat extends BaseTestDataFormat { public final class TestXSSFDataFormat extends BaseTestDataFormat {
@Override @Override
protected ITestDataProvider getTestDataProvider(){ protected ITestDataProvider getTestDataProvider() {
return XSSFITestDataProvider.getInstance(); return XSSFITestDataProvider.getInstance();
} }
/** /**
* Test setting and getting boolean values. * Test setting and getting boolean values.
*/ */
public void testBuiltinFormats() throws Exception { public void testBuiltinFormats() {
baseBuiltinFormats(); baseBuiltinFormats();
} }
} }

41
src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFDocument.java
View File

@ -14,6 +14,7 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
==================================================================== */ ==================================================================== */
package org.apache.poi.xwpf; package org.apache.poi.xwpf;
import java.io.File; import java.io.File;
@ -27,13 +28,13 @@ import org.apache.poi.openxml4j.opc.PackagePart;
import org.apache.poi.xwpf.usermodel.XWPFDocument; import org.apache.poi.xwpf.usermodel.XWPFDocument;
import org.apache.poi.xwpf.usermodel.XWPFRelation; import org.apache.poi.xwpf.usermodel.XWPFRelation;
public class TestXWPFDocument extends TestCase { public final class TestXWPFDocument extends TestCase {
private File sampleFile; private File sampleFile;
private File complexFile; private File complexFile;
protected void setUp() throws Exception { protected void setUp() throws Exception {
super.setUp(); super.setUp();
sampleFile = new File( sampleFile = new File(
System.getProperty("HWPF.testdata.path") + System.getProperty("HWPF.testdata.path") +
File.separator + "sample.docx" File.separator + "sample.docx"
@ -42,14 +43,14 @@ public class TestXWPFDocument extends TestCase {
System.getProperty("HWPF.testdata.path") + System.getProperty("HWPF.testdata.path") +
File.separator + "IllustrativeCases.docx" File.separator + "IllustrativeCases.docx"
); );
assertTrue(sampleFile.exists()); assertTrue(sampleFile.exists());
assertTrue(complexFile.exists()); assertTrue(complexFile.exists());
} }
public void testContainsMainContentType() throws Exception { public void testContainsMainContentType() throws Exception {
OPCPackage pack = POIXMLDocument.openPackage(sampleFile.toString()); OPCPackage pack = POIXMLDocument.openPackage(sampleFile.toString());
boolean found = false; boolean found = false;
for(PackagePart part : pack.getParts()) { for(PackagePart part : pack.getParts()) {
if(part.getContentType().equals(XWPFRelation.DOCUMENT.getContentType())) { if(part.getContentType().equals(XWPFRelation.DOCUMENT.getContentType())) {
@ -63,16 +64,16 @@ public class TestXWPFDocument extends TestCase {
public void testOpen() throws Exception { public void testOpen() throws Exception {
POIXMLDocument.openPackage(sampleFile.toString()); POIXMLDocument.openPackage(sampleFile.toString());
POIXMLDocument.openPackage(complexFile.toString()); POIXMLDocument.openPackage(complexFile.toString());
new XWPFDocument( new XWPFDocument(
POIXMLDocument.openPackage(sampleFile.toString()) POIXMLDocument.openPackage(sampleFile.toString())
); );
new XWPFDocument( new XWPFDocument(
POIXMLDocument.openPackage(complexFile.toString()) POIXMLDocument.openPackage(complexFile.toString())
); );
XWPFDocument xml; XWPFDocument xml;
// Simple file // Simple file
xml = new XWPFDocument( xml = new XWPFDocument(
POIXMLDocument.openPackage(sampleFile.toString()) POIXMLDocument.openPackage(sampleFile.toString())
@ -81,7 +82,7 @@ public class TestXWPFDocument extends TestCase {
assertNotNull(xml.getDocument()); assertNotNull(xml.getDocument());
assertNotNull(xml.getDocument().getBody()); assertNotNull(xml.getDocument().getBody());
assertNotNull(xml.getStyle()); assertNotNull(xml.getStyle());
// Complex file // Complex file
xml = new XWPFDocument( xml = new XWPFDocument(
POIXMLDocument.openPackage(complexFile.toString()) POIXMLDocument.openPackage(complexFile.toString())
@ -90,42 +91,42 @@ public class TestXWPFDocument extends TestCase {
assertNotNull(xml.getDocument().getBody()); assertNotNull(xml.getDocument().getBody());
assertNotNull(xml.getStyle()); assertNotNull(xml.getStyle());
} }
public void testMetadataBasics() throws Exception { public void testMetadataBasics() throws Exception {
XWPFDocument xml = new XWPFDocument( XWPFDocument xml = new XWPFDocument(
POIXMLDocument.openPackage(sampleFile.toString()) POIXMLDocument.openPackage(sampleFile.toString())
); );
assertNotNull(xml.getProperties().getCoreProperties()); assertNotNull(xml.getProperties().getCoreProperties());
assertNotNull(xml.getProperties().getExtendedProperties()); assertNotNull(xml.getProperties().getExtendedProperties());
assertEquals("Microsoft Office Word", xml.getProperties().getExtendedProperties().getUnderlyingProperties().getApplication()); assertEquals("Microsoft Office Word", xml.getProperties().getExtendedProperties().getUnderlyingProperties().getApplication());
assertEquals(1315, xml.getProperties().getExtendedProperties().getUnderlyingProperties().getCharacters()); assertEquals(1315, xml.getProperties().getExtendedProperties().getUnderlyingProperties().getCharacters());
assertEquals(10, xml.getProperties().getExtendedProperties().getUnderlyingProperties().getLines()); assertEquals(10, xml.getProperties().getExtendedProperties().getUnderlyingProperties().getLines());
assertEquals(null, xml.getProperties().getCoreProperties().getTitle()); assertEquals(null, xml.getProperties().getCoreProperties().getTitle());
assertEquals(null, xml.getProperties().getCoreProperties().getUnderlyingProperties().getSubjectProperty().getValue()); assertEquals(null, xml.getProperties().getCoreProperties().getUnderlyingProperties().getSubjectProperty().getValue());
} }
public void testMetadataComplex() throws Exception { public void testMetadataComplex() throws Exception {
XWPFDocument xml = new XWPFDocument( XWPFDocument xml = new XWPFDocument(
POIXMLDocument.openPackage(complexFile.toString()) POIXMLDocument.openPackage(complexFile.toString())
); );
assertNotNull(xml.getProperties().getCoreProperties()); assertNotNull(xml.getProperties().getCoreProperties());
assertNotNull(xml.getProperties().getExtendedProperties()); assertNotNull(xml.getProperties().getExtendedProperties());
assertEquals("Microsoft Office Outlook", xml.getProperties().getExtendedProperties().getUnderlyingProperties().getApplication()); assertEquals("Microsoft Office Outlook", xml.getProperties().getExtendedProperties().getUnderlyingProperties().getApplication());
assertEquals(5184, xml.getProperties().getExtendedProperties().getUnderlyingProperties().getCharacters()); assertEquals(5184, xml.getProperties().getExtendedProperties().getUnderlyingProperties().getCharacters());
assertEquals(0, xml.getProperties().getExtendedProperties().getUnderlyingProperties().getLines()); assertEquals(0, xml.getProperties().getExtendedProperties().getUnderlyingProperties().getLines());
assertEquals(" ", xml.getProperties().getCoreProperties().getTitle()); assertEquals(" ", xml.getProperties().getCoreProperties().getTitle());
assertEquals(" ", xml.getProperties().getCoreProperties().getUnderlyingProperties().getSubjectProperty().getValue()); assertEquals(" ", xml.getProperties().getCoreProperties().getUnderlyingProperties().getSubjectProperty().getValue());
} }
public void testWorkbookProperties() throws Exception { public void testWorkbookProperties() {
XWPFDocument doc = new XWPFDocument(); XWPFDocument doc = new XWPFDocument();
POIXMLProperties props = doc.getProperties(); POIXMLProperties props = doc.getProperties();
assertNotNull(props); assertNotNull(props);
assertEquals("Apache POI", props.getExtendedProperties().getUnderlyingProperties().getApplication()); assertEquals("Apache POI", props.getExtendedProperties().getUnderlyingProperties().getApplication());
} }
} }

70
src/ooxml/testcases/org/apache/poi/xwpf/model/TestXWPFHeaderFooterPolicy.java
View File

@ -33,46 +33,46 @@ public class TestXWPFHeaderFooterPolicy extends TestCase {
private XWPFDocument footer; private XWPFDocument footer;
private XWPFDocument oddEven; private XWPFDocument oddEven;
private XWPFDocument diffFirst; private XWPFDocument diffFirst;
protected void setUp() throws Exception { protected void setUp() throws Exception {
super.setUp(); super.setUp();
File file; File file;
file = new File( file = new File(
System.getProperty("HWPF.testdata.path") + System.getProperty("HWPF.testdata.path") +
File.separator + "NoHeadFoot.docx" File.separator + "NoHeadFoot.docx"
); );
assertTrue(file.exists()); assertTrue(file.exists());
noHeader = new XWPFDocument(POIXMLDocument.openPackage(file.toString())); noHeader = new XWPFDocument(POIXMLDocument.openPackage(file.toString()));
file = new File( file = new File(
System.getProperty("HWPF.testdata.path") + System.getProperty("HWPF.testdata.path") +
File.separator + "ThreeColHead.docx" File.separator + "ThreeColHead.docx"
); );
assertTrue(file.exists()); assertTrue(file.exists());
header = new XWPFDocument(POIXMLDocument.openPackage(file.toString())); header = new XWPFDocument(POIXMLDocument.openPackage(file.toString()));
file = new File( file = new File(
System.getProperty("HWPF.testdata.path") + System.getProperty("HWPF.testdata.path") +
File.separator + "SimpleHeadThreeColFoot.docx" File.separator + "SimpleHeadThreeColFoot.docx"
); );
assertTrue(file.exists()); assertTrue(file.exists());
headerFooter = new XWPFDocument(POIXMLDocument.openPackage(file.toString())); headerFooter = new XWPFDocument(POIXMLDocument.openPackage(file.toString()));
file = new File( file = new File(
System.getProperty("HWPF.testdata.path") + System.getProperty("HWPF.testdata.path") +
File.separator + "FancyFoot.docx" File.separator + "FancyFoot.docx"
); );
assertTrue(file.exists()); assertTrue(file.exists());
footer = new XWPFDocument(POIXMLDocument.openPackage(file.toString())); footer = new XWPFDocument(POIXMLDocument.openPackage(file.toString()));
file = new File( file = new File(
System.getProperty("HWPF.testdata.path") + System.getProperty("HWPF.testdata.path") +
File.separator + "PageSpecificHeadFoot.docx" File.separator + "PageSpecificHeadFoot.docx"
); );
assertTrue(file.exists()); assertTrue(file.exists());
oddEven = new XWPFDocument(POIXMLDocument.openPackage(file.toString())); oddEven = new XWPFDocument(POIXMLDocument.openPackage(file.toString()));
file = new File( file = new File(
System.getProperty("HWPF.testdata.path") + System.getProperty("HWPF.testdata.path") +
File.separator + "DiffFirstPageHeadFoot.docx" File.separator + "DiffFirstPageHeadFoot.docx"
@ -80,72 +80,72 @@ public class TestXWPFHeaderFooterPolicy extends TestCase {
assertTrue(file.exists()); assertTrue(file.exists());
diffFirst = new XWPFDocument(POIXMLDocument.openPackage(file.toString())); diffFirst = new XWPFDocument(POIXMLDocument.openPackage(file.toString()));
} }
public void testPolicy() throws Exception { public void testPolicy() {
XWPFHeaderFooterPolicy policy; XWPFHeaderFooterPolicy policy;
policy = noHeader.getHeaderFooterPolicy(); policy = noHeader.getHeaderFooterPolicy();
assertNull(policy.getDefaultHeader()); assertNull(policy.getDefaultHeader());
assertNull(policy.getDefaultFooter()); assertNull(policy.getDefaultFooter());
assertNull(policy.getHeader(1)); assertNull(policy.getHeader(1));
assertNull(policy.getHeader(2)); assertNull(policy.getHeader(2));
assertNull(policy.getHeader(3)); assertNull(policy.getHeader(3));
assertNull(policy.getFooter(1)); assertNull(policy.getFooter(1));
assertNull(policy.getFooter(2)); assertNull(policy.getFooter(2));
assertNull(policy.getFooter(3)); assertNull(policy.getFooter(3));
policy = header.getHeaderFooterPolicy(); policy = header.getHeaderFooterPolicy();
assertNotNull(policy.getDefaultHeader()); assertNotNull(policy.getDefaultHeader());
assertNull(policy.getDefaultFooter()); assertNull(policy.getDefaultFooter());
assertEquals(policy.getDefaultHeader(), policy.getHeader(1)); assertEquals(policy.getDefaultHeader(), policy.getHeader(1));
assertEquals(policy.getDefaultHeader(), policy.getHeader(2)); assertEquals(policy.getDefaultHeader(), policy.getHeader(2));
assertEquals(policy.getDefaultHeader(), policy.getHeader(3)); assertEquals(policy.getDefaultHeader(), policy.getHeader(3));
assertNull(policy.getFooter(1)); assertNull(policy.getFooter(1));
assertNull(policy.getFooter(2)); assertNull(policy.getFooter(2));
assertNull(policy.getFooter(3)); assertNull(policy.getFooter(3));
policy = footer.getHeaderFooterPolicy(); policy = footer.getHeaderFooterPolicy();
assertNull(policy.getDefaultHeader()); assertNull(policy.getDefaultHeader());
assertNotNull(policy.getDefaultFooter()); assertNotNull(policy.getDefaultFooter());
assertNull(policy.getHeader(1)); assertNull(policy.getHeader(1));
assertNull(policy.getHeader(2)); assertNull(policy.getHeader(2));
assertNull(policy.getHeader(3)); assertNull(policy.getHeader(3));
assertEquals(policy.getDefaultFooter(), policy.getFooter(1)); assertEquals(policy.getDefaultFooter(), policy.getFooter(1));
assertEquals(policy.getDefaultFooter(), policy.getFooter(2)); assertEquals(policy.getDefaultFooter(), policy.getFooter(2));
assertEquals(policy.getDefaultFooter(), policy.getFooter(3)); assertEquals(policy.getDefaultFooter(), policy.getFooter(3));
policy = headerFooter.getHeaderFooterPolicy(); policy = headerFooter.getHeaderFooterPolicy();
assertNotNull(policy.getDefaultHeader()); assertNotNull(policy.getDefaultHeader());
assertNotNull(policy.getDefaultFooter()); assertNotNull(policy.getDefaultFooter());
assertEquals(policy.getDefaultHeader(), policy.getHeader(1)); assertEquals(policy.getDefaultHeader(), policy.getHeader(1));
assertEquals(policy.getDefaultHeader(), policy.getHeader(2)); assertEquals(policy.getDefaultHeader(), policy.getHeader(2));
assertEquals(policy.getDefaultHeader(), policy.getHeader(3)); assertEquals(policy.getDefaultHeader(), policy.getHeader(3));
assertEquals(policy.getDefaultFooter(), policy.getFooter(1)); assertEquals(policy.getDefaultFooter(), policy.getFooter(1));
assertEquals(policy.getDefaultFooter(), policy.getFooter(2)); assertEquals(policy.getDefaultFooter(), policy.getFooter(2));
assertEquals(policy.getDefaultFooter(), policy.getFooter(3)); assertEquals(policy.getDefaultFooter(), policy.getFooter(3));
policy = oddEven.getHeaderFooterPolicy(); policy = oddEven.getHeaderFooterPolicy();
assertNotNull(policy.getDefaultHeader()); assertNotNull(policy.getDefaultHeader());
assertNotNull(policy.getDefaultFooter()); assertNotNull(policy.getDefaultFooter());
assertNotNull(policy.getEvenPageHeader()); assertNotNull(policy.getEvenPageHeader());
assertNotNull(policy.getEvenPageFooter()); assertNotNull(policy.getEvenPageFooter());
assertEquals(policy.getDefaultHeader(), policy.getHeader(1)); assertEquals(policy.getDefaultHeader(), policy.getHeader(1));
assertEquals(policy.getEvenPageHeader(), policy.getHeader(2)); assertEquals(policy.getEvenPageHeader(), policy.getHeader(2));
assertEquals(policy.getDefaultHeader(), policy.getHeader(3)); assertEquals(policy.getDefaultHeader(), policy.getHeader(3));
assertEquals(policy.getDefaultFooter(), policy.getFooter(1)); assertEquals(policy.getDefaultFooter(), policy.getFooter(1));
assertEquals(policy.getEvenPageFooter(), policy.getFooter(2)); assertEquals(policy.getEvenPageFooter(), policy.getFooter(2));
assertEquals(policy.getDefaultFooter(), policy.getFooter(3)); assertEquals(policy.getDefaultFooter(), policy.getFooter(3));
policy = diffFirst.getHeaderFooterPolicy(); policy = diffFirst.getHeaderFooterPolicy();
assertNotNull(policy.getDefaultHeader()); assertNotNull(policy.getDefaultHeader());
assertNotNull(policy.getDefaultFooter()); assertNotNull(policy.getDefaultFooter());
@ -153,7 +153,7 @@ public class TestXWPFHeaderFooterPolicy extends TestCase {
assertNotNull(policy.getFirstPageFooter()); assertNotNull(policy.getFirstPageFooter());
assertNull(policy.getEvenPageHeader()); assertNull(policy.getEvenPageHeader());
assertNull(policy.getEvenPageFooter()); assertNull(policy.getEvenPageFooter());
assertEquals(policy.getFirstPageHeader(), policy.getHeader(1)); assertEquals(policy.getFirstPageHeader(), policy.getHeader(1));
assertEquals(policy.getDefaultHeader(), policy.getHeader(2)); assertEquals(policy.getDefaultHeader(), policy.getHeader(2));
assertEquals(policy.getDefaultHeader(), policy.getHeader(3)); assertEquals(policy.getDefaultHeader(), policy.getHeader(3));
@ -161,32 +161,32 @@ public class TestXWPFHeaderFooterPolicy extends TestCase {
assertEquals(policy.getDefaultFooter(), policy.getFooter(2)); assertEquals(policy.getDefaultFooter(), policy.getFooter(2));
assertEquals(policy.getDefaultFooter(), policy.getFooter(3)); assertEquals(policy.getDefaultFooter(), policy.getFooter(3));
} }
public void testContents() throws Exception { public void testContents() {
XWPFHeaderFooterPolicy policy; XWPFHeaderFooterPolicy policy;
// Test a few simple bits off a simple header // Test a few simple bits off a simple header
policy = diffFirst.getHeaderFooterPolicy(); policy = diffFirst.getHeaderFooterPolicy();
assertEquals( assertEquals(
"I am the header on the first page, and I" + '\u2019' + "m nice and simple\n", "I am the header on the first page, and I" + '\u2019' + "m nice and simple\n",
policy.getFirstPageHeader().getText() policy.getFirstPageHeader().getText()
); );
assertEquals( assertEquals(
"First header column!\tMid header\tRight header!\n", "First header column!\tMid header\tRight header!\n",
policy.getDefaultHeader().getText() policy.getDefaultHeader().getText()
); );
// And a few bits off a more complex header // And a few bits off a more complex header
policy = oddEven.getHeaderFooterPolicy(); policy = oddEven.getHeaderFooterPolicy();
assertEquals( assertEquals(
"[]ODD Page Header text\n\n", "[]ODD Page Header text\n\n",
policy.getDefaultHeader().getText() policy.getDefaultHeader().getText()
); );
assertEquals( assertEquals(
"[This is an Even Page, with a Header]\n\n", "[This is an Even Page, with a Header]\n\n",
policy.getEvenPageHeader().getText() policy.getEvenPageHeader().getText()
); );
} }

3
src/scratchpad/src/org/apache/poi/hdf/extractor/NewOleFile.java
View File

@ -111,8 +111,7 @@ public final class NewOleFile extends RandomAccessFile
{ {
} }
} }
protected int[] readChain(int[] blockChain, int startBlock) throws IOException protected int[] readChain(int[] blockChain, int startBlock) {
{
int[] tempChain = new int[blockChain.length]; int[] tempChain = new int[blockChain.length];
tempChain[0] = startBlock; tempChain[0] = startBlock;

2
src/scratchpad/src/org/apache/poi/hdgf/HDGFDiagram.java
View File

@ -114,7 +114,7 @@ public final class HDGFDiagram extends POIDocument {
* Prints out some simple debug on the base contents of the file. * Prints out some simple debug on the base contents of the file.
* @see org.apache.poi.hdgf.dev.VSDDumper * @see org.apache.poi.hdgf.dev.VSDDumper
*/ */
public void debug() throws IOException { public void debug() {
System.err.println("Trailer is at " + trailerPointer.getOffset()); System.err.println("Trailer is at " + trailerPointer.getOffset());
System.err.println("Trailer has type " + trailerPointer.getType()); System.err.println("Trailer has type " + trailerPointer.getType());
System.err.println("Trailer has length " + trailerPointer.getLength()); System.err.println("Trailer has length " + trailerPointer.getLength());

310
src/scratchpad/src/org/apache/poi/hslf/extractor/PowerPointExtractor.java
View File

@ -32,8 +32,8 @@ import org.apache.poi.poifs.filesystem.DirectoryNode;
import org.apache.poi.poifs.filesystem.POIFSFileSystem; import org.apache.poi.poifs.filesystem.POIFSFileSystem;
/** /**
* This class can be used to extract text from a PowerPoint file. * This class can be used to extract text from a PowerPoint file. Can optionally
* Can optionally also get the notes from one. * also get the notes from one.
* *
* @author Nick Burch * @author Nick Burch
*/ */
@ -42,68 +42,74 @@ public final class PowerPointExtractor extends POIOLE2TextExtractor {
private SlideShow _show; private SlideShow _show;
private Slide[] _slides; private Slide[] _slides;
private boolean slidesByDefault = true; private boolean _slidesByDefault = true;
private boolean notesByDefault = false; private boolean _notesByDefault = false;
private boolean commentsByDefault = false; private boolean _commentsByDefault = false;
/** /**
* Basic extractor. Returns all the text, and optionally all the notes * Basic extractor. Returns all the text, and optionally all the notes
*/ */
public static void main(String args[]) throws IOException public static void main(String args[]) throws IOException {
{ if (args.length < 1) {
if(args.length < 1) { System.err.println("Useage:");
System.err.println("Useage:"); System.err.println("\tPowerPointExtractor [-notes] <file>");
System.err.println("\tPowerPointExtractor [-notes] <file>"); System.exit(1);
System.exit(1);
}
boolean notes = false;
boolean comments = false;
String file;
if(args.length > 1) {
notes = true;
file = args[1];
if(args.length > 2) {
comments = true;
} }
} else {
file = args[0];
}
PowerPointExtractor ppe = new PowerPointExtractor(file); boolean notes = false;
System.out.println(ppe.getText(true,notes,comments)); boolean comments = false;
} String file;
if (args.length > 1) {
notes = true;
file = args[1];
if (args.length > 2) {
comments = true;
}
} else {
file = args[0];
}
PowerPointExtractor ppe = new PowerPointExtractor(file);
System.out.println(ppe.getText(true, notes, comments));
}
/** /**
* Creates a PowerPointExtractor, from a file * Creates a PowerPointExtractor, from a file
*
* @param fileName The name of the file to extract from * @param fileName The name of the file to extract from
*/ */
public PowerPointExtractor(String fileName) throws IOException { public PowerPointExtractor(String fileName) throws IOException {
this(new FileInputStream(fileName)); this(new FileInputStream(fileName));
} }
/** /**
* Creates a PowerPointExtractor, from an Input Stream * Creates a PowerPointExtractor, from an Input Stream
*
* @param iStream The input stream containing the PowerPoint document * @param iStream The input stream containing the PowerPoint document
*/ */
public PowerPointExtractor(InputStream iStream) throws IOException { public PowerPointExtractor(InputStream iStream) throws IOException {
this(new POIFSFileSystem(iStream)); this(new POIFSFileSystem(iStream));
} }
/** /**
* Creates a PowerPointExtractor, from an open POIFSFileSystem * Creates a PowerPointExtractor, from an open POIFSFileSystem
*
* @param fs the POIFSFileSystem containing the PowerPoint document * @param fs the POIFSFileSystem containing the PowerPoint document
*/ */
public PowerPointExtractor(POIFSFileSystem fs) throws IOException { public PowerPointExtractor(POIFSFileSystem fs) throws IOException {
this(new HSLFSlideShow(fs)); this(new HSLFSlideShow(fs));
} }
public PowerPointExtractor(DirectoryNode dir, POIFSFileSystem fs) throws IOException { public PowerPointExtractor(DirectoryNode dir, POIFSFileSystem fs) throws IOException {
this(new HSLFSlideShow(dir, fs)); this(new HSLFSlideShow(dir, fs));
} }
/** /**
* Creates a PowerPointExtractor, from a HSLFSlideShow * Creates a PowerPointExtractor, from a HSLFSlideShow
*
* @param ss the HSLFSlideShow to extract text from * @param ss the HSLFSlideShow to extract text from
*/ */
public PowerPointExtractor(HSLFSlideShow ss) throws IOException { public PowerPointExtractor(HSLFSlideShow ss) {
super(ss); super(ss);
_hslfshow = ss; _hslfshow = ss;
_show = new SlideShow(_hslfshow); _show = new SlideShow(_hslfshow);
@ -111,159 +117,157 @@ public final class PowerPointExtractor extends POIOLE2TextExtractor {
} }
/** /**
* Should a call to getText() return slide text? * Should a call to getText() return slide text? Default is yes
* Default is yes
*/ */
public void setSlidesByDefault(boolean slidesByDefault) { public void setSlidesByDefault(boolean slidesByDefault) {
this.slidesByDefault = slidesByDefault; this._slidesByDefault = slidesByDefault;
}
/**
* Should a call to getText() return notes text?
* Default is no
*/
public void setNotesByDefault(boolean notesByDefault) {
this.notesByDefault = notesByDefault;
}
/**
* Should a call to getText() return comments text?
* Default is no
*/
public void setCommentsByDefault(boolean commentsByDefault) {
this.commentsByDefault = commentsByDefault;
} }
/** /**
* Fetches all the slide text from the slideshow, * Should a call to getText() return notes text? Default is no
* but not the notes, unless you've called */
* setSlidesByDefault() and setNotesByDefault() public void setNotesByDefault(boolean notesByDefault) {
* to change this this._notesByDefault = notesByDefault;
}
/**
* Should a call to getText() return comments text? Default is no
*/
public void setCommentsByDefault(boolean commentsByDefault) {
this._commentsByDefault = commentsByDefault;
}
/**
* Fetches all the slide text from the slideshow, but not the notes, unless
* you've called setSlidesByDefault() and setNotesByDefault() to change this
*/ */
public String getText() { public String getText() {
return getText(slidesByDefault,notesByDefault,commentsByDefault); return getText(_slidesByDefault, _notesByDefault, _commentsByDefault);
} }
/** /**
* Fetches all the notes text from the slideshow, but not the slide text * Fetches all the notes text from the slideshow, but not the slide text
*/ */
public String getNotes() { public String getNotes() {
return getText(false,true); return getText(false, true);
} }
public List<OLEShape> getOLEShapes() { public List<OLEShape> getOLEShapes() {
List<OLEShape> list = new ArrayList<OLEShape>(); List<OLEShape> list = new ArrayList<OLEShape>();
for (int i = 0; i < _slides.length; i++) { for (int i = 0; i < _slides.length; i++) {
Slide slide = _slides[i];
Shape[] shapes = slide.getShapes();
for (int j = 0; j < shapes.length; j++) {
if (shapes[j] instanceof OLEShape) {
list.add((OLEShape) shapes[j]);
}
}
}
return list;
}
/**
* Fetches text from the slideshow, be it slide text or note text.
* Because the final block of text in a TextRun normally have their
* last \n stripped, we add it back
* @param getSlideText fetch slide text
* @param getNoteText fetch note text
*/
public String getText(boolean getSlideText, boolean getNoteText) {
return getText(getSlideText, getNoteText, commentsByDefault);
}
public String getText(boolean getSlideText, boolean getNoteText, boolean getCommentText) {
StringBuffer ret = new StringBuffer();
if(getSlideText) {
for(int i=0; i<_slides.length; i++) {
Slide slide = _slides[i]; Slide slide = _slides[i];
// Slide header, if set Shape[] shapes = slide.getShapes();
HeadersFooters hf = slide.getHeadersFooters(); for (int j = 0; j < shapes.length; j++) {
if(hf != null && hf.isHeaderVisible() && hf.getHeaderText() != null) { if (shapes[j] instanceof OLEShape) {
ret.append(hf.getHeaderText() + "\n"); list.add((OLEShape) shapes[j]);
}
// Slide text
TextRun[] runs = slide.getTextRuns();
for(int j=0; j<runs.length; j++) {
TextRun run = runs[j];
if(run != null) {
String text = run.getText();
ret.append(text);
if(! text.endsWith("\n")) {
ret.append("\n");
}
}
}
// Slide footer, if set
if(hf != null && hf.isFooterVisible() && hf.getFooterText() != null) {
ret.append(hf.getFooterText() + "\n");
}
// Comments, if requested and present
if(getCommentText) {
Comment[] comments = slide.getComments();
for(int j=0; j<comments.length; j++) {
ret.append(
comments[j].getAuthor() +
" - " +
comments[j].getText() +
"\n"
);
} }
} }
} }
if(getNoteText) {
ret.append("\n"); return list;
}
} }
if(getNoteText) { /**
// Not currently using _notes, as that can have the notes of * Fetches text from the slideshow, be it slide text or note text. Because
// master sheets in. Grab Slide list, then work from there, * the final block of text in a TextRun normally have their last \n
// but ensure no duplicates * stripped, we add it back
HashSet seenNotes = new HashSet(); *
HeadersFooters hf = _show.getNotesHeadersFooters(); * @param getSlideText fetch slide text
* @param getNoteText fetch note text
*/
public String getText(boolean getSlideText, boolean getNoteText) {
return getText(getSlideText, getNoteText, _commentsByDefault);
}
for(int i=0; i<_slides.length; i++) { public String getText(boolean getSlideText, boolean getNoteText, boolean getCommentText) {
Notes notes = _slides[i].getNotesSheet(); StringBuffer ret = new StringBuffer();
if(notes == null) { continue; }
Integer id = new Integer(notes._getSheetNumber());
if(seenNotes.contains(id)) { continue; }
seenNotes.add(id);
// Repeat the Notes header, if set if (getSlideText) {
if(hf != null && hf.isHeaderVisible() && hf.getHeaderText() != null) { for (int i = 0; i < _slides.length; i++) {
ret.append(hf.getHeaderText() + "\n"); Slide slide = _slides[i];
}
// Notes text // Slide header, if set
TextRun[] runs = notes.getTextRuns(); HeadersFooters hf = slide.getHeadersFooters();
if(runs != null && runs.length > 0) { if (hf != null && hf.isHeaderVisible() && hf.getHeaderText() != null) {
for(int j=0; j<runs.length; j++) { ret.append(hf.getHeaderText() + "\n");
}
// Slide text
TextRun[] runs = slide.getTextRuns();
for (int j = 0; j < runs.length; j++) {
TextRun run = runs[j]; TextRun run = runs[j];
String text = run.getText(); if (run != null) {
ret.append(text); String text = run.getText();
if(! text.endsWith("\n")) { ret.append(text);
ret.append("\n"); if (!text.endsWith("\n")) {
ret.append("\n");
}
}
}
// Slide footer, if set
if (hf != null && hf.isFooterVisible() && hf.getFooterText() != null) {
ret.append(hf.getFooterText() + "\n");
}
// Comments, if requested and present
if (getCommentText) {
Comment[] comments = slide.getComments();
for (int j = 0; j < comments.length; j++) {
ret.append(comments[j].getAuthor() + " - " + comments[j].getText() + "\n");
} }
} }
} }
if (getNoteText) {
// Repeat the notes footer, if set ret.append("\n");
if(hf != null && hf.isFooterVisible() && hf.getFooterText() != null) {
ret.append(hf.getFooterText() + "\n");
} }
} }
}
return ret.toString(); if (getNoteText) {
} // Not currently using _notes, as that can have the notes of
// master sheets in. Grab Slide list, then work from there,
// but ensure no duplicates
HashSet seenNotes = new HashSet();
HeadersFooters hf = _show.getNotesHeadersFooters();
for (int i = 0; i < _slides.length; i++) {
Notes notes = _slides[i].getNotesSheet();
if (notes == null) {
continue;
}
Integer id = new Integer(notes._getSheetNumber());
if (seenNotes.contains(id)) {
continue;
}
seenNotes.add(id);
// Repeat the Notes header, if set
if (hf != null && hf.isHeaderVisible() && hf.getHeaderText() != null) {
ret.append(hf.getHeaderText() + "\n");
}
// Notes text
TextRun[] runs = notes.getTextRuns();
if (runs != null && runs.length > 0) {
for (int j = 0; j < runs.length; j++) {
TextRun run = runs[j];
String text = run.getText();
ret.append(text);
if (!text.endsWith("\n")) {
ret.append("\n");
}
}
}
// Repeat the notes footer, if set
if (hf != null && hf.isFooterVisible() && hf.getFooterText() != null) {
ret.append(hf.getFooterText() + "\n");
}
}
}
return ret.toString();
}
} }

44
src/scratchpad/src/org/apache/poi/hsmf/MAPIMessage.java
View File

@ -32,14 +32,14 @@ import org.apache.poi.poifs.filesystem.POIFSFileSystem;
/** /**
* Reads an Outlook MSG File in and provides hooks into its data structure. * Reads an Outlook MSG File in and provides hooks into its data structure.
* *
* @author Travis Ferguson * @author Travis Ferguson
*/ */
public class MAPIMessage { public class MAPIMessage {
private POIFSChunkParser chunkParser; private POIFSChunkParser chunkParser;
private POIFSFileSystem fs; private POIFSFileSystem fs;
private Chunks chunks; private Chunks chunks;
/** /**
* Constructor for creating new files. * Constructor for creating new files.
* *
@ -47,8 +47,8 @@ public class MAPIMessage {
public MAPIMessage() { public MAPIMessage() {
//TODO make writing possible //TODO make writing possible
} }
/** /**
* Constructor for reading MSG Files from the file system. * Constructor for reading MSG Files from the file system.
* @param filename * @param filename
@ -57,7 +57,7 @@ public class MAPIMessage {
public MAPIMessage(String filename) throws IOException { public MAPIMessage(String filename) throws IOException {
this(new FileInputStream(new File(filename))); this(new FileInputStream(new File(filename)));
} }
/** /**
* Constructor for reading MSG Files from an input stream. * Constructor for reading MSG Files from an input stream.
* @param in * @param in
@ -66,12 +66,12 @@ public class MAPIMessage {
public MAPIMessage(InputStream in) throws IOException { public MAPIMessage(InputStream in) throws IOException {
this.fs = new POIFSFileSystem(in); this.fs = new POIFSFileSystem(in);
chunkParser = new POIFSChunkParser(this.fs); chunkParser = new POIFSChunkParser(this.fs);
// Figure out the right string type, based on // Figure out the right string type, based on
// the chunks present // the chunks present
chunks = chunkParser.identifyChunks(); chunks = chunkParser.identifyChunks();
} }
/** /**
* Gets a string value based on the passed chunk. * Gets a string value based on the passed chunk.
@ -83,15 +83,15 @@ public class MAPIMessage {
StringChunk strchunk = (StringChunk)out; StringChunk strchunk = (StringChunk)out;
return strchunk.toString(); return strchunk.toString();
} }
/** /**
* Gets the plain text body of this Outlook Message * Gets the plain text body of this Outlook Message
* @return The string representation of the 'text' version of the body, if available. * @return The string representation of the 'text' version of the body, if available.
* @throws IOException * @throws IOException
* @throws ChunkNotFoundException * @throws ChunkNotFoundException
*/ */
public String getTextBody() throws IOException, ChunkNotFoundException { public String getTextBody() throws ChunkNotFoundException {
return getStringFromChunk(chunks.textBodyChunk); return getStringFromChunk(chunks.textBodyChunk);
} }
@ -102,8 +102,8 @@ public class MAPIMessage {
public String getSubject() throws ChunkNotFoundException { public String getSubject() throws ChunkNotFoundException {
return getStringFromChunk(chunks.subjectChunk); return getStringFromChunk(chunks.subjectChunk);
} }
/** /**
* Gets the display value of the "TO" line of the outlook message * Gets the display value of the "TO" line of the outlook message
* This is not the actual list of addresses/values that will be sent to if you click Reply in the email. * This is not the actual list of addresses/values that will be sent to if you click Reply in the email.
@ -112,7 +112,7 @@ public class MAPIMessage {
public String getDisplayTo() throws ChunkNotFoundException { public String getDisplayTo() throws ChunkNotFoundException {
return getStringFromChunk(chunks.displayToChunk); return getStringFromChunk(chunks.displayToChunk);
} }
/** /**
* Gets the display value of the "FROM" line of the outlook message * Gets the display value of the "FROM" line of the outlook message
* This is not the actual address that was sent from but the formated display of the user name. * This is not the actual address that was sent from but the formated display of the user name.
@ -121,7 +121,7 @@ public class MAPIMessage {
public String getDisplayFrom() throws ChunkNotFoundException { public String getDisplayFrom() throws ChunkNotFoundException {
return getStringFromChunk(chunks.displayFromChunk); return getStringFromChunk(chunks.displayFromChunk);
} }
/** /**
* Gets the display value of the "TO" line of the outlook message * Gets the display value of the "TO" line of the outlook message
* This is not the actual list of addresses/values that will be sent to if you click Reply in the email. * This is not the actual list of addresses/values that will be sent to if you click Reply in the email.
@ -130,7 +130,7 @@ public class MAPIMessage {
public String getDisplayCC() throws ChunkNotFoundException { public String getDisplayCC() throws ChunkNotFoundException {
return getStringFromChunk(chunks.displayCCChunk); return getStringFromChunk(chunks.displayCCChunk);
} }
/** /**
* Gets the display value of the "TO" line of the outlook message * Gets the display value of the "TO" line of the outlook message
* This is not the actual list of addresses/values that will be sent to if you click Reply in the email. * This is not the actual list of addresses/values that will be sent to if you click Reply in the email.
@ -154,19 +154,19 @@ public class MAPIMessage {
* Gets the message class of the parsed Outlook Message. * Gets the message class of the parsed Outlook Message.
* (Yes, you can use this to determine if a message is a calendar item, note, or actual outlook Message) * (Yes, you can use this to determine if a message is a calendar item, note, or actual outlook Message)
* For emails the class will be IPM.Note * For emails the class will be IPM.Note
* *
* @throws ChunkNotFoundException * @throws ChunkNotFoundException
*/ */
public String getMessageClass() throws ChunkNotFoundException { public String getMessageClass() throws ChunkNotFoundException {
return getStringFromChunk(chunks.messageClass); return getStringFromChunk(chunks.messageClass);
} }
/** /**
* Gets the message attachments. * Gets the message attachments.
* *
* @return a map containing attachment name (String) and data (ByteArrayInputStream) * @return a map containing attachment name (String) and data (ByteArrayInputStream)
*/ */
public Map getAttachmentFiles() { public Map getAttachmentFiles() {
return this.chunkParser.getAttachmentList(); return this.chunkParser.getAttachmentList();
} }
} }

8
src/scratchpad/src/org/apache/poi/hwpf/dev/HWPFLister.java
View File

@ -28,9 +28,9 @@ import org.apache.poi.hwpf.model.FileInformationBlock;
* use this program. * use this program.
*/ */
public final class HWPFLister { public final class HWPFLister {
private HWPFDocument doc; private final HWPFDocument _doc;
public HWPFLister(HWPFDocument doc) { public HWPFLister(HWPFDocument doc) {
this.doc = doc; _doc = doc;
} }
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
@ -46,8 +46,8 @@ public final class HWPFLister {
l.dumpFIB(); l.dumpFIB();
} }
public void dumpFIB() throws Exception { public void dumpFIB() {
FileInformationBlock fib = doc.getFileInformationBlock(); FileInformationBlock fib = _doc.getFileInformationBlock();
System.out.println(fib.toString()); System.out.println(fib.toString());
} }
} }

2
src/scratchpad/src/org/apache/poi/hwpf/extractor/WordExtractor.java
View File

@ -71,7 +71,7 @@ public final class WordExtractor extends POIOLE2TextExtractor {
* Create a new Word Extractor * Create a new Word Extractor
* @param doc The HWPFDocument to extract from * @param doc The HWPFDocument to extract from
*/ */
public WordExtractor(HWPFDocument doc) throws IOException { public WordExtractor(HWPFDocument doc) {
super(doc); super(doc);
this.doc = doc; this.doc = doc;
} }

6
src/scratchpad/src/org/apache/poi/hwpf/model/FIBLongHandler.java
View File

@ -17,8 +17,6 @@
package org.apache.poi.hwpf.model; package org.apache.poi.hwpf.model;
import java.io.IOException;
import org.apache.poi.util.LittleEndian; import org.apache.poi.util.LittleEndian;
/** /**
@ -78,9 +76,7 @@ public final class FIBLongHandler {
_longs[longCode] = value; _longs[longCode] = value;
} }
void serialize(byte[] mainStream, int offset) void serialize(byte[] mainStream, int offset) {
throws IOException
{
LittleEndian.putShort(mainStream, offset, (short)_longs.length); LittleEndian.putShort(mainStream, offset, (short)_longs.length);
offset += LittleEndian.SHORT_SIZE; offset += LittleEndian.SHORT_SIZE;

6
src/scratchpad/src/org/apache/poi/hwpf/model/FIBShortHandler.java
View File

@ -17,8 +17,6 @@
package org.apache.poi.hwpf.model; package org.apache.poi.hwpf.model;
import java.io.IOException;
import org.apache.poi.util.LittleEndian; import org.apache.poi.util.LittleEndian;
/** /**
@ -60,9 +58,7 @@ public final class FIBShortHandler {
return (_shorts.length * LittleEndian.SHORT_SIZE) + LittleEndian.SHORT_SIZE; return (_shorts.length * LittleEndian.SHORT_SIZE) + LittleEndian.SHORT_SIZE;
} }
void serialize(byte[] mainStream) void serialize(byte[] mainStream) {
throws IOException
{
int offset = START; int offset = START;
LittleEndian.putShort(mainStream, offset, (short)_shorts.length); LittleEndian.putShort(mainStream, offset, (short)_shorts.length);
offset += LittleEndian.SHORT_SIZE; offset += LittleEndian.SHORT_SIZE;

54
src/scratchpad/testcases/org/apache/poi/TestPOIDocumentScratchpad.java
View File

@ -49,7 +49,7 @@ public final class TestPOIDocumentScratchpad extends TestCase {
* Set things up, using a PowerPoint document and * Set things up, using a PowerPoint document and
* a Word Document for our testing * a Word Document for our testing
*/ */
public void setUp() throws Exception { public void setUp() throws Exception {
String dirnameHSLF = System.getProperty("HSLF.testdata.path"); String dirnameHSLF = System.getProperty("HSLF.testdata.path");
String filenameHSLF = dirnameHSLF + "/basic_test_ppt_file.ppt"; String filenameHSLF = dirnameHSLF + "/basic_test_ppt_file.ppt";
String dirnameHSSF = System.getProperty("HSSF.testdata.path"); String dirnameHSSF = System.getProperty("HSSF.testdata.path");
@ -66,39 +66,35 @@ public final class TestPOIDocumentScratchpad extends TestCase {
doc2 = new HWPFDocument(pfs2); doc2 = new HWPFDocument(pfs2);
} }
public void testReadProperties() throws Exception { public void testReadProperties() {
// We should have both sets // We should have both sets
assertNotNull(doc.getDocumentSummaryInformation()); assertNotNull(doc.getDocumentSummaryInformation());
assertNotNull(doc.getSummaryInformation()); assertNotNull(doc.getSummaryInformation());
// Check they are as expected for the test doc // Check they are as expected for the test doc
assertEquals("Hogwarts", doc.getSummaryInformation().getAuthor()); assertEquals("Hogwarts", doc.getSummaryInformation().getAuthor());
assertEquals(10598, doc.getDocumentSummaryInformation().getByteCount()); assertEquals(10598, doc.getDocumentSummaryInformation().getByteCount());
} }
public void testReadProperties2() throws Exception { public void testReadProperties2() {
// Check again on the word one // Check again on the word one
assertNotNull(doc2.getDocumentSummaryInformation()); assertNotNull(doc2.getDocumentSummaryInformation());
assertNotNull(doc2.getSummaryInformation()); assertNotNull(doc2.getSummaryInformation());
assertEquals("Hogwarts", doc2.getSummaryInformation().getAuthor()); assertEquals("Hogwarts", doc2.getSummaryInformation().getAuthor());
assertEquals("", doc2.getSummaryInformation().getKeywords()); assertEquals("", doc2.getSummaryInformation().getKeywords());
assertEquals(0, doc2.getDocumentSummaryInformation().getByteCount()); assertEquals(0, doc2.getDocumentSummaryInformation().getByteCount());
} }
public void testWriteProperties() throws Exception { public void testWriteProperties() throws Exception {
// Just check we can write them back out into a filesystem // Just check we can write them back out into a filesystem
POIFSFileSystem outFS = new POIFSFileSystem(); POIFSFileSystem outFS = new POIFSFileSystem();
doc.writeProperties(outFS); doc.writeProperties(outFS);
// Should now hold them // Should now hold them
assertNotNull( assertNotNull(outFS.createDocumentInputStream("\005SummaryInformation"));
outFS.createDocumentInputStream("\005SummaryInformation") assertNotNull(outFS.createDocumentInputStream("\005DocumentSummaryInformation"));
); }
assertNotNull(
outFS.createDocumentInputStream("\005DocumentSummaryInformation")
);
}
public void testWriteReadProperties() throws Exception { public void testWriteReadProperties() throws Exception {
ByteArrayOutputStream baos = new ByteArrayOutputStream(); ByteArrayOutputStream baos = new ByteArrayOutputStream();

2
src/scratchpad/testcases/org/apache/poi/hdgf/TestHDGFLZW.java
View File

@ -106,7 +106,7 @@ public final class TestHDGFLZW extends TestCase {
0, 0, 42, 1, 0, 0, 84, 0, 0, 0, 0, 0 0, 0, 42, 1, 0, 0, 84, 0, 0, 0, 0, 0
}; };
public void testFromToInt() throws Exception { public void testFromToInt() {
byte b255 = -1; byte b255 = -1;
assertEquals(255, HDGFLZW.fromByte(b255)); assertEquals(255, HDGFLZW.fromByte(b255));
assertEquals(-1, HDGFLZW.fromInt( HDGFLZW.fromByte(b255) )); assertEquals(-1, HDGFLZW.fromInt( HDGFLZW.fromByte(b255) ));

2
src/scratchpad/testcases/org/apache/poi/hdgf/extractor/TestVisioExtractor.java
View File

@ -30,7 +30,7 @@ import org.apache.poi.poifs.filesystem.POIFSFileSystem;
public final class TestVisioExtractor extends TestCase { public final class TestVisioExtractor extends TestCase {
private String dirname; private String dirname;
private String defFilename; private String defFilename;
protected void setUp() throws Exception { protected void setUp() {
dirname = System.getProperty("HDGF.testdata.path"); dirname = System.getProperty("HDGF.testdata.path");
defFilename = dirname + "/Test_Visio-Some_Random_Text.vsd"; defFilename = dirname + "/Test_Visio-Some_Random_Text.vsd";
} }

8
src/scratchpad/testcases/org/apache/poi/hdgf/pointers/TestPointerFactory.java
View File

@ -40,7 +40,7 @@ public final class TestPointerFactory extends TestCase {
-1, 0, 0, 0, -84, -1, 79, 1, 0, 0, 0, 0, 0, 0, 0, 0, 96, 0 -1, 0, 0, 0, -84, -1, 79, 1, 0, 0, 0, 0, 0, 0, 0, 0, 96, 0
}; };
public void testCreateV4() throws Exception { public void testCreateV4() {
PointerFactory pf = new PointerFactory(4); PointerFactory pf = new PointerFactory(4);
try { try {
pf.createPointer(new byte[]{}, 0); pf.createPointer(new byte[]{}, 0);
@ -50,7 +50,7 @@ public final class TestPointerFactory extends TestCase {
} }
} }
public void testCreateV5() throws Exception { public void testCreateV5() {
PointerFactory pf = new PointerFactory(5); PointerFactory pf = new PointerFactory(5);
try { try {
pf.createPointer(new byte[]{}, 0); pf.createPointer(new byte[]{}, 0);
@ -61,7 +61,7 @@ public final class TestPointerFactory extends TestCase {
} }
} }
public void testCreateV6() throws Exception { public void testCreateV6() {
PointerFactory pf = new PointerFactory(6); PointerFactory pf = new PointerFactory(6);
Pointer a = pf.createPointer(vp6_a, 0); Pointer a = pf.createPointer(vp6_a, 0);
@ -117,7 +117,7 @@ public final class TestPointerFactory extends TestCase {
assertFalse(d.destinationHasPointers()); assertFalse(d.destinationHasPointers());
} }
public void testCreateV6FromMid() throws Exception { public void testCreateV6FromMid() {
PointerFactory pf = new PointerFactory(11); PointerFactory pf = new PointerFactory(11);
// Create a from part way down the byte stream // Create a from part way down the byte stream

6
src/scratchpad/testcases/org/apache/poi/hdgf/streams/TestStreamBugs.java
View File

@ -52,17 +52,17 @@ public final class TestStreamBugs extends StreamTest {
filesystem.createDocumentInputStream("VisioDocument").read(contents); filesystem.createDocumentInputStream("VisioDocument").read(contents);
} }
public void testGetTrailer() throws Exception { public void testGetTrailer() {
Pointer trailerPointer = ptrFactory.createPointer(contents, 0x24); Pointer trailerPointer = ptrFactory.createPointer(contents, 0x24);
Stream.createStream(trailerPointer, contents, chunkFactory, ptrFactory); Stream.createStream(trailerPointer, contents, chunkFactory, ptrFactory);
} }
public void TOIMPLEMENTtestGetCertainChunks() throws Exception { public void TOIMPLEMENTtestGetCertainChunks() {
int offsetA = 3708; int offsetA = 3708;
int offsetB = 3744; int offsetB = 3744;
} }
public void testGetChildren() throws Exception { public void testGetChildren() {
Pointer trailerPointer = ptrFactory.createPointer(contents, 0x24); Pointer trailerPointer = ptrFactory.createPointer(contents, 0x24);
TrailerStream trailer = (TrailerStream) TrailerStream trailer = (TrailerStream)
Stream.createStream(trailerPointer, contents, chunkFactory, ptrFactory); Stream.createStream(trailerPointer, contents, chunkFactory, ptrFactory);

2
src/scratchpad/testcases/org/apache/poi/hdgf/streams/TestStreamComplex.java
View File

@ -205,7 +205,7 @@ public final class TestStreamComplex extends StreamTest {
assertTrue(s8451.getPointedToStreams()[1] instanceof StringsStream); assertTrue(s8451.getPointedToStreams()[1] instanceof StringsStream);
} }
public void testChunkWithText() throws Exception { public void testChunkWithText() {
// Parent ChunkStream is at 0x7194 // Parent ChunkStream is at 0x7194
// This is one of the last children of the trailer // This is one of the last children of the trailer
Pointer trailerPtr = ptrFactory.createPointer(contents, trailerPointerAt); Pointer trailerPtr = ptrFactory.createPointer(contents, trailerPointerAt);

2
src/scratchpad/testcases/org/apache/poi/hpbf/TestHPBFDocument.java
View File

@ -25,7 +25,7 @@ import junit.framework.TestCase;
public final class TestHPBFDocument extends TestCase { public final class TestHPBFDocument extends TestCase {
private String dir; private String dir;
protected void setUp() throws Exception { protected void setUp() {
dir = System.getProperty("HPBF.testdata.path"); dir = System.getProperty("HPBF.testdata.path");
} }

2
src/scratchpad/testcases/org/apache/poi/hpbf/extractor/TextPublisherTextExtractor.java
View File

@ -27,7 +27,7 @@ import junit.framework.TestCase;
public final class TextPublisherTextExtractor extends TestCase { public final class TextPublisherTextExtractor extends TestCase {
private String dir; private String dir;
protected void setUp() throws Exception { protected void setUp() {
dir = System.getProperty("HPBF.testdata.path"); dir = System.getProperty("HPBF.testdata.path");
} }

2
src/scratchpad/testcases/org/apache/poi/hpbf/model/TestEscherParts.java
View File

@ -27,7 +27,7 @@ import junit.framework.TestCase;
public final class TestEscherParts extends TestCase { public final class TestEscherParts extends TestCase {
private String dir; private String dir;
protected void setUp() throws Exception { protected void setUp() {
dir = System.getProperty("HPBF.testdata.path"); dir = System.getProperty("HPBF.testdata.path");
} }

2
src/scratchpad/testcases/org/apache/poi/hpbf/model/TestQuillContents.java
View File

@ -32,7 +32,7 @@ import junit.framework.TestCase;
public final class TestQuillContents extends TestCase { public final class TestQuillContents extends TestCase {
private String dir; private String dir;
protected void setUp() throws Exception { protected void setUp() {
dir = System.getProperty("HPBF.testdata.path"); dir = System.getProperty("HPBF.testdata.path");
} }

10
src/scratchpad/testcases/org/apache/poi/hslf/TestRecordCounts.java
View File

@ -31,13 +31,13 @@ public final class TestRecordCounts extends TestCase {
// HSLFSlideShow primed on the test data // HSLFSlideShow primed on the test data
private HSLFSlideShow ss; private HSLFSlideShow ss;
public TestRecordCounts() throws Exception { public TestRecordCounts() throws Exception {
String dirname = System.getProperty("HSLF.testdata.path"); String dirname = System.getProperty("HSLF.testdata.path");
String filename = dirname + "/basic_test_ppt_file.ppt"; String filename = dirname + "/basic_test_ppt_file.ppt";
ss = new HSLFSlideShow(filename); ss = new HSLFSlideShow(filename);
} }
public void testSheetsCount() throws Exception { public void testSheetsCount() {
// Top level // Top level
Record[] r = ss.getRecords(); Record[] r = ss.getRecords();
@ -51,7 +51,7 @@ public final class TestRecordCounts extends TestCase {
assertEquals(3,count); assertEquals(3,count);
} }
public void testNotesCount() throws Exception { public void testNotesCount() {
// Top level // Top level
Record[] r = ss.getRecords(); Record[] r = ss.getRecords();
@ -66,7 +66,7 @@ public final class TestRecordCounts extends TestCase {
assertEquals(3,count); assertEquals(3,count);
} }
public void testSlideListWithTextCount() throws Exception { public void testSlideListWithTextCount() {
// Second level // Second level
Record[] rt = ss.getRecords(); Record[] rt = ss.getRecords();
Record[] r = rt[0].getChildRecords(); Record[] r = rt[0].getChildRecords();

4
src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestCruddyExtractor.java
View File

@ -61,7 +61,7 @@ public final class TestCruddyExtractor extends TestCase {
te = new QuickButCruddyTextExtractor(filename); te = new QuickButCruddyTextExtractor(filename);
} }
public void testReadAsVector() throws Exception { public void testReadAsVector() {
// Extract the text from the file as a vector // Extract the text from the file as a vector
Vector foundTextV = te.getTextAsVector(); Vector foundTextV = te.getTextAsVector();
@ -73,7 +73,7 @@ public final class TestCruddyExtractor extends TestCase {
} }
} }
public void testReadAsString() throws Exception { public void testReadAsString() {
// Extract the text as a String // Extract the text as a String
String foundText = te.getTextAsString(); String foundText = te.getTextAsString();

2
src/scratchpad/testcases/org/apache/poi/hslf/model/TestBackground.java
View File

@ -35,7 +35,7 @@ public final class TestBackground extends TestCase {
/** /**
* Default background for slide, shape and slide master. * Default background for slide, shape and slide master.
*/ */
public void testDefaults() throws Exception { public void testDefaults() {
SlideShow ppt = new SlideShow(); SlideShow ppt = new SlideShow();
assertEquals(Fill.FILL_SOLID, ppt.getSlidesMasters()[0].getBackground().getFill().getFillType()); assertEquals(Fill.FILL_SOLID, ppt.getSlidesMasters()[0].getBackground().getFill().getFillType());

4
src/scratchpad/testcases/org/apache/poi/hslf/model/TestPPFont.java
View File

@ -20,8 +20,6 @@ package org.apache.poi.hslf.model;
import junit.framework.TestCase; import junit.framework.TestCase;
import org.apache.poi.hslf.usermodel.SlideShow; import org.apache.poi.hslf.usermodel.SlideShow;
import java.io.IOException;
/** /**
* Test adding fonts to the presenataion resources * Test adding fonts to the presenataion resources
* *
@ -29,7 +27,7 @@ import java.io.IOException;
*/ */
public final class TestPPFont extends TestCase{ public final class TestPPFont extends TestCase{
public void testCreate() throws IOException { public void testCreate() {
SlideShow ppt = new SlideShow(); SlideShow ppt = new SlideShow();
assertEquals(1, ppt.getNumberOfFonts()); assertEquals(1, ppt.getNumberOfFonts());
assertEquals("Arial", ppt.getFont(0).getFontName()); assertEquals("Arial", ppt.getFont(0).getFontName());

1
src/scratchpad/testcases/org/apache/poi/hslf/model/TestPicture.java
View File

@ -21,7 +21,6 @@ import java.awt.Graphics2D;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.io.File; import java.io.File;
import java.io.IOException;
import junit.framework.TestCase; import junit.framework.TestCase;

6
src/scratchpad/testcases/org/apache/poi/hslf/model/TestShapes.java
View File

@ -183,7 +183,7 @@ public final class TestShapes extends TestCase {
/** /**
* Test with an empty text box * Test with an empty text box
*/ */
public void testEmptyTextBox() throws Exception { public void testEmptyTextBox() {
assertEquals(2, pptB.getSlides().length); assertEquals(2, pptB.getSlides().length);
Slide s1 = pptB.getSlides()[0]; Slide s1 = pptB.getSlides()[0];
Slide s2 = pptB.getSlides()[1]; Slide s2 = pptB.getSlides()[1];
@ -310,7 +310,7 @@ public final class TestShapes extends TestCase {
assertEquals("expected 0 shaped in " + file, 0, sl.getShapes().length); assertEquals("expected 0 shaped in " + file, 0, sl.getShapes().length);
} }
public void testLineWidth() throws IOException { public void testLineWidth() {
SimpleShape sh = new AutoShape(ShapeTypes.RightTriangle); SimpleShape sh = new AutoShape(ShapeTypes.RightTriangle);
EscherOptRecord opt = (EscherOptRecord)SimpleShape.getEscherChild(sh.getSpContainer(), EscherOptRecord.RECORD_ID); EscherOptRecord opt = (EscherOptRecord)SimpleShape.getEscherChild(sh.getSpContainer(), EscherOptRecord.RECORD_ID);
@ -324,7 +324,7 @@ public final class TestShapes extends TestCase {
assertEquals(1.0, sh.getLineWidth()); assertEquals(1.0, sh.getLineWidth());
} }
public void testShapeId() throws IOException { public void testShapeId() {
SlideShow ppt = new SlideShow(); SlideShow ppt = new SlideShow();
Slide slide = ppt.createSlide(); Slide slide = ppt.createSlide();
Shape shape = null; Shape shape = null;

14
src/scratchpad/testcases/org/apache/poi/hslf/model/TestSheet.java
View File

@ -17,6 +17,7 @@
package org.apache.poi.hslf.model; package org.apache.poi.hslf.model;
import junit.framework.AssertionFailedError;
import junit.framework.TestCase; import junit.framework.TestCase;
import java.io.FileInputStream; import java.io.FileInputStream;
@ -34,7 +35,7 @@ import org.apache.poi.hslf.usermodel.SlideShow;
* *
* @author Yegor Kozlov * @author Yegor Kozlov
*/ */
public final class TestSheet extends TestCase{ public final class TestSheet extends TestCase {
/** /**
* For each ppt in the test directory check that all sheets are properly initialized * For each ppt in the test directory check that all sheets are properly initialized
@ -59,7 +60,7 @@ public final class TestSheet extends TestCase{
} }
} }
private void doSlideShow(SlideShow ppt) throws Exception { private void doSlideShow(SlideShow ppt) {
Slide[] slide = ppt.getSlides(); Slide[] slide = ppt.getSlides();
for (int i = 0; i < slide.length; i++) { for (int i = 0; i < slide.length; i++) {
verify(slide[i]); verify(slide[i]);
@ -89,19 +90,22 @@ public final class TestSheet extends TestCase{
assertTrue(sheet._getSheetRefId() != 0); assertTrue(sheet._getSheetRefId() != 0);
TextRun[] txt = sheet.getTextRuns(); TextRun[] txt = sheet.getTextRuns();
assertTrue(txt != null); if (txt == null) {
throw new AssertionFailedError("no text runs");
}
for (int i = 0; i < txt.length; i++) { for (int i = 0; i < txt.length; i++) {
assertNotNull(txt[i].getSheet()); assertNotNull(txt[i].getSheet());
} }
Shape[] shape = sheet.getShapes(); Shape[] shape = sheet.getShapes();
assertTrue(shape != null); if (shape == null) {
throw new AssertionFailedError("no shapes");
}
for (int i = 0; i < shape.length; i++) { for (int i = 0; i < shape.length; i++) {
assertNotNull(shape[i].getSpContainer()); assertNotNull(shape[i].getSpContainer());
assertNotNull(shape[i].getSheet()); assertNotNull(shape[i].getSheet());
assertNotNull(shape[i].getShapeName()); assertNotNull(shape[i].getShapeName());
assertNotNull(shape[i].getAnchor()); assertNotNull(shape[i].getAnchor());
} }
} }
} }

234
src/scratchpad/testcases/org/apache/poi/hslf/model/TestTextRun.java
View File

@ -18,6 +18,8 @@
package org.apache.poi.hslf.model; package org.apache.poi.hslf.model;
import java.io.IOException;
import junit.framework.TestCase; import junit.framework.TestCase;
import org.apache.poi.hslf.HSLFSlideShow; import org.apache.poi.hslf.HSLFSlideShow;
@ -37,27 +39,35 @@ public final class TestTextRun extends TestCase {
// SlideShow primed on the test data // SlideShow primed on the test data
private SlideShow ss; private SlideShow ss;
private SlideShow ssRich; private SlideShow ssRich;
private HSLFSlideShow hss;
private HSLFSlideShow hssRich;
protected void setUp() throws Exception { // TODO - use this or similar through rest of hslf tests
private static SlideShow openSampleSlideShow(String name) {
String dirname = System.getProperty("HSLF.testdata.path"); String dirname = System.getProperty("HSLF.testdata.path");
// Basic (non rich) test file // Basic (non rich) test file
String filename = dirname + "/basic_test_ppt_file.ppt"; String filename = dirname + "/" + name;
hss = new HSLFSlideShow(filename); HSLFSlideShow x;
ss = new SlideShow(hss); try {
x = new HSLFSlideShow(filename);
// Rich test file } catch (IOException e) {
filename = dirname + "/Single_Coloured_Page.ppt"; throw new RuntimeException(e);
hssRich = new HSLFSlideShow(filename); }
ssRich = new SlideShow(hssRich); return new SlideShow(x);
} }
/** protected void setUp() {
* Test to ensure that getting the text works correctly
*/ // Basic (non rich) test file
public void testGetText() throws Exception { ss = openSampleSlideShow("basic_test_ppt_file.ppt");
// Rich test file
ssRich = openSampleSlideShow("Single_Coloured_Page.ppt");
}
/**
* Test to ensure that getting the text works correctly
*/
public void testGetText() {
Slide slideOne = ss.getSlides()[0]; Slide slideOne = ss.getSlides()[0];
TextRun[] textRuns = slideOne.getTextRuns(); TextRun[] textRuns = slideOne.getTextRuns();
@ -81,12 +91,12 @@ public final class TestTextRun extends TestCase {
assertEquals("This is the subtitle, in bold\nThis bit is blue and italic\nThis bit is red (normal)", textRunsR[1].getText()); assertEquals("This is the subtitle, in bold\nThis bit is blue and italic\nThis bit is red (normal)", textRunsR[1].getText());
assertEquals("This is a title, it\u2019s in black", textRunsR[0].getRawText()); assertEquals("This is a title, it\u2019s in black", textRunsR[0].getRawText());
assertEquals("This is the subtitle, in bold\rThis bit is blue and italic\rThis bit is red (normal)", textRunsR[1].getRawText()); assertEquals("This is the subtitle, in bold\rThis bit is blue and italic\rThis bit is red (normal)", textRunsR[1].getRawText());
} }
/** /**
* Test to ensure changing non rich text bytes->bytes works correctly * Test to ensure changing non rich text bytes->bytes works correctly
*/ */
public void testSetText() throws Exception { public void testSetText() {
Slide slideOne = ss.getSlides()[0]; Slide slideOne = ss.getSlides()[0];
TextRun[] textRuns = slideOne.getTextRuns(); TextRun[] textRuns = slideOne.getTextRuns();
TextRun run = textRuns[0]; TextRun run = textRuns[0];
@ -102,13 +112,13 @@ public final class TestTextRun extends TestCase {
// Ensure trailing \n's get stripped // Ensure trailing \n's get stripped
run.setText(changeTo + "\n"); run.setText(changeTo + "\n");
assertEquals(changeTo, run.getText()); assertEquals(changeTo, run.getText());
} }
/** /**
* Test to ensure that changing non rich text between bytes and * Test to ensure that changing non rich text between bytes and
* chars works correctly * chars works correctly
*/ */
public void testAdvancedSetText() throws Exception { public void testAdvancedSetText() {
Slide slideOne = ss.getSlides()[0]; Slide slideOne = ss.getSlides()[0];
TextRun run = slideOne.getTextRuns()[0]; TextRun run = slideOne.getTextRuns()[0];
@ -116,7 +126,7 @@ public final class TestTextRun extends TestCase {
TextBytesAtom tba = run._byteAtom; TextBytesAtom tba = run._byteAtom;
TextCharsAtom tca = run._charAtom; TextCharsAtom tca = run._charAtom;
// Bytes -> Bytes // Bytes -> Bytes
assertNull(tca); assertNull(tca);
assertNotNull(tba); assertNotNull(tba);
assertFalse(run._isUnicode); assertFalse(run._isUnicode);
@ -132,7 +142,7 @@ public final class TestTextRun extends TestCase {
assertNull(tca); assertNull(tca);
assertNotNull(tba); assertNotNull(tba);
// Bytes -> Chars // Bytes -> Chars
assertNull(tca); assertNull(tca);
assertNotNull(tba); assertNotNull(tba);
assertFalse(run._isUnicode); assertFalse(run._isUnicode);
@ -148,7 +158,7 @@ public final class TestTextRun extends TestCase {
assertNotNull(tca); assertNotNull(tca);
assertNull(tba); assertNull(tba);
// Chars -> Chars // Chars -> Chars
assertNull(tba); assertNull(tba);
assertNotNull(tca); assertNotNull(tca);
assertTrue(run._isUnicode); assertTrue(run._isUnicode);
@ -163,13 +173,13 @@ public final class TestTextRun extends TestCase {
assertTrue(run._isUnicode); assertTrue(run._isUnicode);
assertNotNull(tca); assertNotNull(tca);
assertNull(tba); assertNull(tba);
} }
/** /**
* Tests to ensure that non rich text has the right default rich text run * Tests to ensure that non rich text has the right default rich text run
* set up for it * set up for it
*/ */
public void testGetRichTextNonRich() throws Exception { public void testGetRichTextNonRich() {
Slide slideOne = ss.getSlides()[0]; Slide slideOne = ss.getSlides()[0];
TextRun[] textRuns = slideOne.getTextRuns(); TextRun[] textRuns = slideOne.getTextRuns();
@ -191,12 +201,12 @@ public final class TestTextRun extends TestCase {
assertNull(rtrA._getRawParagraphStyle()); assertNull(rtrA._getRawParagraphStyle());
assertNull(rtrB._getRawCharacterStyle()); assertNull(rtrB._getRawCharacterStyle());
assertNull(rtrB._getRawParagraphStyle()); assertNull(rtrB._getRawParagraphStyle());
} }
/** /**
* Tests to ensure that the rich text runs are built up correctly * Tests to ensure that the rich text runs are built up correctly
*/ */
public void testGetRichText() throws Exception { public void testGetRichText() {
Slide slideOne = ssRich.getSlides()[0]; Slide slideOne = ssRich.getSlides()[0];
TextRun[] textRuns = slideOne.getTextRuns(); TextRun[] textRuns = slideOne.getTextRuns();
@ -236,13 +246,13 @@ public final class TestTextRun extends TestCase {
assertFalse( rtrB._getRawCharacterStyle().equals( rtrC._getRawCharacterStyle() )); assertFalse( rtrB._getRawCharacterStyle().equals( rtrC._getRawCharacterStyle() ));
assertFalse( rtrB._getRawCharacterStyle().equals( rtrD._getRawCharacterStyle() )); assertFalse( rtrB._getRawCharacterStyle().equals( rtrD._getRawCharacterStyle() ));
assertFalse( rtrC._getRawCharacterStyle().equals( rtrD._getRawCharacterStyle() )); assertFalse( rtrC._getRawCharacterStyle().equals( rtrD._getRawCharacterStyle() ));
} }
/** /**
* Tests to ensure that setting the text where the text isn't rich, * Tests to ensure that setting the text where the text isn't rich,
* ensuring that everything stays with the same default styling * ensuring that everything stays with the same default styling
*/ */
public void testSetTextWhereNotRich() throws Exception { public void testSetTextWhereNotRich() {
Slide slideOne = ss.getSlides()[0]; Slide slideOne = ss.getSlides()[0];
TextRun[] textRuns = slideOne.getTextRuns(); TextRun[] textRuns = slideOne.getTextRuns();
TextRun trB = textRuns[1]; TextRun trB = textRuns[1];
@ -260,13 +270,13 @@ public final class TestTextRun extends TestCase {
assertEquals("Test Foo Test", rtrB.getText()); assertEquals("Test Foo Test", rtrB.getText());
assertNull(rtrB._getRawCharacterStyle()); assertNull(rtrB._getRawCharacterStyle());
assertNull(rtrB._getRawParagraphStyle()); assertNull(rtrB._getRawParagraphStyle());
} }
/** /**
* Tests to ensure that setting the text where the text is rich * Tests to ensure that setting the text where the text is rich
* sets everything to the same styling * sets everything to the same styling
*/ */
public void testSetTextWhereRich() throws Exception { public void testSetTextWhereRich() {
Slide slideOne = ssRich.getSlides()[0]; Slide slideOne = ssRich.getSlides()[0];
TextRun[] textRuns = slideOne.getTextRuns(); TextRun[] textRuns = slideOne.getTextRuns();
TextRun trB = textRuns[1]; TextRun trB = textRuns[1];
@ -308,13 +318,13 @@ public final class TestTextRun extends TestCase {
assertNotNull(rtrB._getRawParagraphStyle()); assertNotNull(rtrB._getRawParagraphStyle());
assertEquals( tpBP, rtrB._getRawParagraphStyle() ); assertEquals( tpBP, rtrB._getRawParagraphStyle() );
assertEquals( tpBC, rtrB._getRawCharacterStyle() ); assertEquals( tpBC, rtrB._getRawCharacterStyle() );
} }
/** /**
* Test to ensure the right stuff happens if we change the text * Test to ensure the right stuff happens if we change the text
* in a rich text run, that doesn't happen to actually be rich * in a rich text run, that doesn't happen to actually be rich
*/ */
public void testChangeTextInRichTextRunNonRich() throws Exception { public void testChangeTextInRichTextRunNonRich() {
Slide slideOne = ss.getSlides()[0]; Slide slideOne = ss.getSlides()[0];
TextRun[] textRuns = slideOne.getTextRuns(); TextRun[] textRuns = slideOne.getTextRuns();
TextRun trB = textRuns[1]; TextRun trB = textRuns[1];
@ -333,13 +343,13 @@ public final class TestTextRun extends TestCase {
// Will now have dummy props // Will now have dummy props
assertNotNull(rtrB._getRawCharacterStyle()); assertNotNull(rtrB._getRawCharacterStyle());
assertNotNull(rtrB._getRawParagraphStyle()); assertNotNull(rtrB._getRawParagraphStyle());
} }
/** /**
* Tests to ensure changing the text within rich text runs works * Tests to ensure changing the text within rich text runs works
* correctly * correctly
*/ */
public void testChangeTextInRichTextRun() throws Exception { public void testChangeTextInRichTextRun() {
Slide slideOne = ssRich.getSlides()[0]; Slide slideOne = ssRich.getSlides()[0];
TextRun[] textRuns = slideOne.getTextRuns(); TextRun[] textRuns = slideOne.getTextRuns();
TextRun trB = textRuns[1]; TextRun trB = textRuns[1];
@ -409,7 +419,7 @@ public final class TestTextRun extends TestCase {
assertEquals(tpBC.getTextPropList(), ntpBC.getTextPropList()); assertEquals(tpBC.getTextPropList(), ntpBC.getTextPropList());
assertEquals(tpCC.getTextPropList(), ntpCC.getTextPropList()); assertEquals(tpCC.getTextPropList(), ntpCC.getTextPropList());
assertEquals(tpDC.getTextPropList(), ntpDC.getTextPropList()); assertEquals(tpDC.getTextPropList(), ntpDC.getTextPropList());
} }
/** /**
@ -419,10 +429,10 @@ public final class TestTextRun extends TestCase {
* of the wrong list of potential paragraph properties defined in StyleTextPropAtom. * of the wrong list of potential paragraph properties defined in StyleTextPropAtom.
* *
*/ */
public void testBug41015() throws Exception { public void testBug41015() {
RichTextRun[] rt; RichTextRun[] rt;
SlideShow ppt = new SlideShow(new HSLFSlideShow(System.getProperty("HSLF.testdata.path") + "/bug-41015.ppt")); SlideShow ppt = openSampleSlideShow("bug-41015.ppt");
Slide sl = ppt.getSlides()[0]; Slide sl = ppt.getSlides()[0];
TextRun[] txt = sl.getTextRuns(); TextRun[] txt = sl.getTextRuns();
assertEquals(2, txt.length); assertEquals(2, txt.length);
@ -436,61 +446,61 @@ public final class TestTextRun extends TestCase {
assertEquals(2, rt.length); assertEquals(2, rt.length);
assertEquals(0, rt[0].getIndentLevel()); assertEquals(0, rt[0].getIndentLevel());
assertEquals("Sdfsdfsdf\n" + assertEquals("Sdfsdfsdf\n" +
"Dfgdfg\n" + "Dfgdfg\n" +
"Dfgdfgdfg\n", rt[0].getText()); "Dfgdfgdfg\n", rt[0].getText());
assertEquals(1, rt[1].getIndentLevel()); assertEquals(1, rt[1].getIndentLevel());
assertEquals("Sdfsdfs\n" + assertEquals("Sdfsdfs\n" +
"Sdfsdf\n", rt[1].getText()); "Sdfsdf\n", rt[1].getText());
} }
/** /**
* Test creation of TextRun objects. * Test creation of TextRun objects.
*/ */
public void testAddTextRun() throws Exception{ public void testAddTextRun() {
SlideShow ppt = new SlideShow(); SlideShow ppt = new SlideShow();
Slide slide = ppt.createSlide(); Slide slide = ppt.createSlide();
assertNull(slide.getTextRuns()); assertNull(slide.getTextRuns());
TextBox shape1 = new TextBox(); TextBox shape1 = new TextBox();
TextRun run1 = shape1.getTextRun(); TextRun run1 = shape1.getTextRun();
assertSame(run1, shape1.createTextRun()); assertSame(run1, shape1.createTextRun());
run1.setText("Text 1"); run1.setText("Text 1");
slide.addShape(shape1); slide.addShape(shape1);
//The array of Slide's text runs must be updated when new text shapes are added. //The array of Slide's text runs must be updated when new text shapes are added.
TextRun[] runs = slide.getTextRuns(); TextRun[] runs = slide.getTextRuns();
assertNotNull(runs); assertNotNull(runs);
assertSame(run1, runs[0]); assertSame(run1, runs[0]);
TextBox shape2 = new TextBox(); TextBox shape2 = new TextBox();
TextRun run2 = shape2.getTextRun(); TextRun run2 = shape2.getTextRun();
assertSame(run2, shape2.createTextRun()); assertSame(run2, shape2.createTextRun());
run2.setText("Text 2"); run2.setText("Text 2");
slide.addShape(shape2); slide.addShape(shape2);
runs = slide.getTextRuns(); runs = slide.getTextRuns();
assertEquals(2, runs.length); assertEquals(2, runs.length);
assertSame(run1, runs[0]); assertSame(run1, runs[0]);
assertSame(run2, runs[1]); assertSame(run2, runs[1]);
//as getShapes() //as getShapes()
Shape[] sh = slide.getShapes(); Shape[] sh = slide.getShapes();
assertEquals(2, sh.length); assertEquals(2, sh.length);
assertTrue(sh[0] instanceof TextBox); assertTrue(sh[0] instanceof TextBox);
TextBox box1 = (TextBox)sh[0]; TextBox box1 = (TextBox)sh[0];
assertSame(run1, box1.getTextRun()); assertSame(run1, box1.getTextRun());
TextBox box2 = (TextBox)sh[1]; TextBox box2 = (TextBox)sh[1];
assertSame(run2, box2.getTextRun()); assertSame(run2, box2.getTextRun());
//test Table - a complex group of shapes containing text objects //test Table - a complex group of shapes containing text objects
Slide slide2 = ppt.createSlide(); Slide slide2 = ppt.createSlide();
assertNull(slide2.getTextRuns()); assertNull(slide2.getTextRuns());
Table table = new Table(2, 2); Table table = new Table(2, 2);
slide2.addShape(table); slide2.addShape(table);
runs = slide2.getTextRuns(); runs = slide2.getTextRuns();
assertNotNull(runs); assertNotNull(runs);
assertEquals(4, runs.length); assertEquals(4, runs.length);
} }
} }

6
src/scratchpad/testcases/org/apache/poi/hslf/record/TestCString.java
View File

@ -35,13 +35,13 @@ public final class TestCString extends TestCase {
0x43, 00, 0x6F, 00, 0x6D, 00, 0x6D, 00, 0x43, 00, 0x6F, 00, 0x6D, 00, 0x6D, 00,
0x65, 00, 0x6E, 00, 0x74, 00, 0x73, 00 }; 0x65, 00, 0x6E, 00, 0x74, 00, 0x73, 00 };
public void testRecordType() throws Exception { public void testRecordType() {
CString ca = new CString(data_a, 0, data_a.length); CString ca = new CString(data_a, 0, data_a.length);
assertEquals(4026l, ca.getRecordType()); assertEquals(4026l, ca.getRecordType());
CString cb = new CString(data_b, 0, data_a.length); CString cb = new CString(data_b, 0, data_a.length);
assertEquals(4026l, cb.getRecordType()); assertEquals(4026l, cb.getRecordType());
} }
public void testCount() throws Exception { public void testCount() {
CString ca = new CString(data_a, 0, data_a.length); CString ca = new CString(data_a, 0, data_a.length);
assertEquals(0, ca.getOptions()); assertEquals(0, ca.getOptions());
CString cb = new CString(data_b, 0, data_a.length); CString cb = new CString(data_b, 0, data_a.length);
@ -51,7 +51,7 @@ public final class TestCString extends TestCase {
assertEquals(28, ca.getOptions()); assertEquals(28, ca.getOptions());
} }
public void testText() throws Exception { public void testText() {
CString ca = new CString(data_a, 0, data_a.length); CString ca = new CString(data_a, 0, data_a.length);
assertEquals("Hogwarts", ca.getText()); assertEquals("Hogwarts", ca.getText());
CString cb = new CString(data_b, 0, data_a.length); CString cb = new CString(data_b, 0, data_a.length);

8
src/scratchpad/testcases/org/apache/poi/hslf/record/TestColorSchemeAtom.java
View File

@ -35,12 +35,12 @@ public final class TestColorSchemeAtom extends TestCase {
00, 0x99-256, 0x99-256, 00, 0x99-256, 0xCC-256, 00, 00 00, 0x99-256, 0x99-256, 00, 0x99-256, 0xCC-256, 00, 00
}; };
public void testRecordType() throws Exception { public void testRecordType() {
ColorSchemeAtom csa = new ColorSchemeAtom(data_a,0,data_a.length); ColorSchemeAtom csa = new ColorSchemeAtom(data_a,0,data_a.length);
assertEquals(2032l, csa.getRecordType()); assertEquals(2032l, csa.getRecordType());
} }
public void testToRGB() throws Exception { public void testToRGB() {
byte[] rgb = ColorSchemeAtom.splitRGB(3669760); byte[] rgb = ColorSchemeAtom.splitRGB(3669760);
assertEquals(3,rgb.length); assertEquals(3,rgb.length);
@ -49,7 +49,7 @@ public final class TestColorSchemeAtom extends TestCase {
assertEquals(55, rgb[2]); assertEquals(55, rgb[2]);
} }
public void testFromRGB() throws Exception { public void testFromRGB() {
byte[] rgb_a = new byte[] { 0, 255-256, 55 }; byte[] rgb_a = new byte[] { 0, 255-256, 55 };
byte[] rgb_b = new byte[] { 255-256, 127, 79 }; byte[] rgb_b = new byte[] { 255-256, 127, 79 };
@ -60,7 +60,7 @@ public final class TestColorSchemeAtom extends TestCase {
assertEquals( 5210111, ColorSchemeAtom.joinRGB( rgb_b[0], rgb_b[1], rgb_b[2] ) ); assertEquals( 5210111, ColorSchemeAtom.joinRGB( rgb_b[0], rgb_b[1], rgb_b[2] ) );
} }
public void testRGBs() throws Exception { public void testRGBs() {
ColorSchemeAtom csa = new ColorSchemeAtom(data_a,0,data_a.length); ColorSchemeAtom csa = new ColorSchemeAtom(data_a,0,data_a.length);
assertEquals( 16777215 , csa.getBackgroundColourRGB() ); assertEquals( 16777215 , csa.getBackgroundColourRGB() );

6
src/scratchpad/testcases/org/apache/poi/hslf/record/TestComment2000.java
View File

@ -84,16 +84,16 @@ public final class TestComment2000 extends TestCase {
private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
public void testRecordType() throws Exception { public void testRecordType() {
Comment2000 ca = new Comment2000(data_a, 0, data_a.length); Comment2000 ca = new Comment2000(data_a, 0, data_a.length);
assertEquals(12000l, ca.getRecordType()); assertEquals(12000l, ca.getRecordType());
} }
public void testAuthor() throws Exception { public void testAuthor() {
Comment2000 ca = new Comment2000(data_a, 0, data_a.length); Comment2000 ca = new Comment2000(data_a, 0, data_a.length);
assertEquals("Dumbledore", ca.getAuthor()); assertEquals("Dumbledore", ca.getAuthor());
assertEquals("D", ca.getAuthorInitials()); assertEquals("D", ca.getAuthorInitials());
} }
public void testText() throws Exception { public void testText() {
Comment2000 ca = new Comment2000(data_a, 0, data_a.length); Comment2000 ca = new Comment2000(data_a, 0, data_a.length);
assertEquals("Yes, they certainly are, aren't they!", ca.getText()); assertEquals("Yes, they certainly are, aren't they!", ca.getText());
} }

36
src/scratchpad/testcases/org/apache/poi/hslf/record/TestComment2000Atom.java
View File

@ -47,35 +47,35 @@ public final class TestComment2000Atom extends TestCase {
private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
public void testRecordType() throws Exception { public void testRecordType() {
Comment2000Atom ca = new Comment2000Atom(data_a, 0, data_a.length); Comment2000Atom ca = new Comment2000Atom(data_a, 0, data_a.length);
assertEquals(12001l, ca.getRecordType()); assertEquals(12001l, ca.getRecordType());
} }
public void testGetDate() throws Exception { public void testGetDate() throws Exception {
Comment2000Atom ca = new Comment2000Atom(data_a, 0, data_a.length); Comment2000Atom ca = new Comment2000Atom(data_a, 0, data_a.length);
Comment2000Atom cb = new Comment2000Atom(data_b, 0, data_b.length); Comment2000Atom cb = new Comment2000Atom(data_b, 0, data_b.length);
// A is 2006-01-24 (2nd day of week) 10:26:15.205 // A is 2006-01-24 (2nd day of week) 10:26:15.205
Date exp_a = sdf.parse("2006-01-24 10:26:15.205"); Date exp_a = sdf.parse("2006-01-24 10:26:15.205");
// B is 2006-01-24 (2nd day of week) 21:25:03.725 // B is 2006-01-24 (2nd day of week) 21:25:03.725
Date exp_b = sdf.parse("2006-01-24 21:25:03.725"); Date exp_b = sdf.parse("2006-01-24 21:25:03.725");
assertEquals(exp_a, ca.getDate()); assertEquals(exp_a, ca.getDate());
assertEquals(exp_b, cb.getDate()); assertEquals(exp_b, cb.getDate());
} }
public void testGetNums() throws Exception { public void testGetNums() {
Comment2000Atom ca = new Comment2000Atom(data_a, 0, data_a.length); Comment2000Atom ca = new Comment2000Atom(data_a, 0, data_a.length);
Comment2000Atom cb = new Comment2000Atom(data_b, 0, data_b.length); Comment2000Atom cb = new Comment2000Atom(data_b, 0, data_b.length);
// A is number 1 // A is number 1
assertEquals(1, ca.getNumber()); assertEquals(1, ca.getNumber());
// B is number 5 // B is number 5
assertEquals(5, cb.getNumber()); assertEquals(5, cb.getNumber());
} }
public void testGetPos() throws Exception { public void testGetPos() {
Comment2000Atom ca = new Comment2000Atom(data_a, 0, data_a.length); Comment2000Atom ca = new Comment2000Atom(data_a, 0, data_a.length);
Comment2000Atom cb = new Comment2000Atom(data_b, 0, data_b.length); Comment2000Atom cb = new Comment2000Atom(data_b, 0, data_b.length);
@ -86,7 +86,7 @@ public final class TestComment2000Atom extends TestCase {
// B is at 0x0A, 0x0E // B is at 0x0A, 0x0E
assertEquals(0x0A, cb.getXOffset()); assertEquals(0x0A, cb.getXOffset());
assertEquals(0x0E, cb.getYOffset()); assertEquals(0x0E, cb.getYOffset());
} }
public void testWrite() throws Exception { public void testWrite() throws Exception {
Comment2000Atom ca = new Comment2000Atom(data_a, 0, data_a.length); Comment2000Atom ca = new Comment2000Atom(data_a, 0, data_a.length);
@ -101,15 +101,15 @@ public final class TestComment2000Atom extends TestCase {
} }
// Create A from scratch // Create A from scratch
public void testCreate() throws Exception { public void testCreate() throws Exception {
Comment2000Atom a = new Comment2000Atom(); Comment2000Atom a = new Comment2000Atom();
// Set number, x and y // Set number, x and y
a.setNumber(1); a.setNumber(1);
a.setXOffset(0x92); a.setXOffset(0x92);
a.setYOffset(0x92); a.setYOffset(0x92);
// Set the date // Set the date
Date date_a = sdf.parse("2006-01-24 10:26:15.205"); Date date_a = sdf.parse("2006-01-24 10:26:15.205");
a.setDate(date_a); a.setDate(date_a);
@ -122,7 +122,7 @@ public final class TestComment2000Atom extends TestCase {
for(int i=0; i<data_a.length; i++) { for(int i=0; i<data_a.length; i++) {
assertEquals(data_a[i],b[i]); assertEquals(data_a[i],b[i]);
} }
} }
// Try to turn a into b // Try to turn a into b
public void testChange() throws Exception { public void testChange() throws Exception {

76
src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocument.java
View File

@ -17,7 +17,6 @@
package org.apache.poi.hslf.record; package org.apache.poi.hslf.record;
import junit.framework.TestCase; import junit.framework.TestCase;
import java.io.*; import java.io.*;
@ -25,8 +24,7 @@ import org.apache.poi.hslf.HSLFSlideShow;
import org.apache.poi.poifs.filesystem.*; import org.apache.poi.poifs.filesystem.*;
/** /**
* Tests that Document works properly * Tests that Document works properly (Also tests Environment while we're at it)
* (Also tests Environment while we're at it)
* *
* @author Nick Burch (nick at torchbox dot com) * @author Nick Burch (nick at torchbox dot com)
*/ */
@ -36,55 +34,49 @@ public final class TestDocument extends TestCase {
// POIFS primed on the test data // POIFS primed on the test data
private POIFSFileSystem pfs; private POIFSFileSystem pfs;
public TestDocument() throws Exception { public TestDocument() throws Exception {
String dirname = System.getProperty("HSLF.testdata.path"); String dirname = System.getProperty("HSLF.testdata.path");
String filename = dirname + "/basic_test_ppt_file.ppt"; String filename = dirname + "/basic_test_ppt_file.ppt";
FileInputStream fis = new FileInputStream(filename); FileInputStream fis = new FileInputStream(filename);
pfs = new POIFSFileSystem(fis); pfs = new POIFSFileSystem(fis);
ss = new HSLFSlideShow(pfs); ss = new HSLFSlideShow(pfs);
}
private Document getDocRecord() {
Record[] r = ss.getRecords();
for(int i=(r.length-1); i>=0; i--) {
if(r[i] instanceof Document) {
return (Document)r[i];
}
}
throw new IllegalStateException("No Document record found");
}
public void testRecordType() throws Exception {
Document dr = getDocRecord();
assertEquals(1000, dr.getRecordType());
} }
public void testChildRecords() throws Exception { private Document getDocRecord() {
Document dr = getDocRecord(); Record[] r = ss.getRecords();
assertNotNull(dr.getDocumentAtom()); for (int i = (r.length - 1); i >= 0; i--) {
assertTrue(dr.getDocumentAtom() instanceof DocumentAtom); if (r[i] instanceof Document) {
return (Document) r[i];
}
}
throw new IllegalStateException("No Document record found");
}
assertNotNull(dr.getEnvironment()); public void testRecordType() {
assertTrue(dr.getEnvironment() instanceof Environment); Document dr = getDocRecord();
assertEquals(1000, dr.getRecordType());
}
assertNotNull(dr.getSlideListWithTexts()); public void testChildRecords() {
assertEquals(3, dr.getSlideListWithTexts().length); Document dr = getDocRecord();
assertNotNull(dr.getSlideListWithTexts()[0]); assertNotNull(dr.getDocumentAtom());
assertTrue(dr.getSlideListWithTexts()[0] instanceof SlideListWithText);
assertNotNull(dr.getSlideListWithTexts()[1]);
assertTrue(dr.getSlideListWithTexts()[1] instanceof SlideListWithText);
assertNotNull(dr.getSlideListWithTexts()[2]);
assertTrue(dr.getSlideListWithTexts()[2] instanceof SlideListWithText);
}
public void testEnvironment() throws Exception { assertNotNull(dr.getEnvironment());
Document dr = getDocRecord();
Environment env = dr.getEnvironment();
assertEquals(1010, env.getRecordType()); assertNotNull(dr.getSlideListWithTexts());
assertNotNull(env.getFontCollection()); assertEquals(3, dr.getSlideListWithTexts().length);
assertTrue(env.getFontCollection() instanceof FontCollection); assertNotNull(dr.getSlideListWithTexts()[0]);
} assertNotNull(dr.getSlideListWithTexts()[1]);
assertNotNull(dr.getSlideListWithTexts()[2]);
}
// No need to check re-writing - hslf.TestReWrite does all that for us public void testEnvironment() {
Document dr = getDocRecord();
Environment env = dr.getEnvironment();
assertEquals(1010, env.getRecordType());
assertNotNull(env.getFontCollection());
}
// No need to check re-writing - hslf.TestReWrite does all that for us
} }

10
src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentAtom.java
View File

@ -34,11 +34,11 @@ public final class TestDocumentAtom extends TestCase {
0x05, 0, 0, 0, 0x0A, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0x05, 0, 0, 0, 0x0A, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0,
1, 0, 0, 0, 0, 0, 0, 1 }; 1, 0, 0, 0, 0, 0, 0, 1 };
public void testRecordType() throws Exception { public void testRecordType() {
DocumentAtom da = new DocumentAtom(data_a, 0, data_a.length); DocumentAtom da = new DocumentAtom(data_a, 0, data_a.length);
assertEquals(1001l, da.getRecordType()); assertEquals(1001l, da.getRecordType());
} }
public void testSizeAndZoom() throws Exception { public void testSizeAndZoom() {
DocumentAtom da = new DocumentAtom(data_a, 0, data_a.length); DocumentAtom da = new DocumentAtom(data_a, 0, data_a.length);
assertEquals(5760l, da.getSlideSizeX()); assertEquals(5760l, da.getSlideSizeX());
assertEquals(4320l, da.getSlideSizeY()); assertEquals(4320l, da.getSlideSizeY());
@ -48,17 +48,17 @@ public final class TestDocumentAtom extends TestCase {
assertEquals(5l, da.getServerZoomFrom()); assertEquals(5l, da.getServerZoomFrom());
assertEquals(10l, da.getServerZoomTo()); assertEquals(10l, da.getServerZoomTo());
} }
public void testMasterPersist() throws Exception { public void testMasterPersist() {
DocumentAtom da = new DocumentAtom(data_a, 0, data_a.length); DocumentAtom da = new DocumentAtom(data_a, 0, data_a.length);
assertEquals(2l, da.getNotesMasterPersist()); assertEquals(2l, da.getNotesMasterPersist());
assertEquals(0l, da.getHandoutMasterPersist()); assertEquals(0l, da.getHandoutMasterPersist());
} }
public void testSlideDetails() throws Exception { public void testSlideDetails() {
DocumentAtom da = new DocumentAtom(data_a, 0, data_a.length); DocumentAtom da = new DocumentAtom(data_a, 0, data_a.length);
assertEquals(1, da.getFirstSlideNum()); assertEquals(1, da.getFirstSlideNum());
assertEquals(0, da.getSlideSizeType()); assertEquals(0, da.getSlideSizeType());
} }
public void testBooleans() throws Exception { public void testBooleans() {
DocumentAtom da = new DocumentAtom(data_a, 0, data_a.length); DocumentAtom da = new DocumentAtom(data_a, 0, data_a.length);
assertEquals(false, da.getSaveWithFonts()); assertEquals(false, da.getSaveWithFonts());
assertEquals(false, da.getOmitTitlePlace()); assertEquals(false, da.getOmitTitlePlace());

67
src/scratchpad/testcases/org/apache/poi/hslf/record/TestExControl.java
View File

@ -69,23 +69,23 @@ public final class TestExControl extends TestCase {
0x65, 0x00, 0x63, 0x00, 0x74, 0x00 0x65, 0x00, 0x63, 0x00, 0x74, 0x00
}; };
public void testRead() throws Exception { public void testRead() {
ExControl record = new ExControl(data, 0, data.length); ExControl record = new ExControl(data, 0, data.length);
assertEquals(RecordTypes.ExControl.typeID, record.getRecordType()); assertEquals(RecordTypes.ExControl.typeID, record.getRecordType());
assertNotNull(record.getExControlAtom()); assertNotNull(record.getExControlAtom());
assertEquals(256, record.getExControlAtom().getSlideId()); assertEquals(256, record.getExControlAtom().getSlideId());
ExOleObjAtom oleObj = record.getExOleObjAtom(); ExOleObjAtom oleObj = record.getExOleObjAtom();
assertNotNull(oleObj); assertNotNull(oleObj);
assertEquals(oleObj.getDrawAspect(), ExOleObjAtom.DRAW_ASPECT_VISIBLE); assertEquals(oleObj.getDrawAspect(), ExOleObjAtom.DRAW_ASPECT_VISIBLE);
assertEquals(oleObj.getType(), ExOleObjAtom.TYPE_CONTROL); assertEquals(oleObj.getType(), ExOleObjAtom.TYPE_CONTROL);
assertEquals(oleObj.getSubType(), ExOleObjAtom.SUBTYPE_DEFAULT); assertEquals(oleObj.getSubType(), ExOleObjAtom.SUBTYPE_DEFAULT);
assertEquals("Shockwave Flash Object", record.getMenuName()); assertEquals("Shockwave Flash Object", record.getMenuName());
assertEquals("ShockwaveFlash.ShockwaveFlash.9", record.getProgId()); assertEquals("ShockwaveFlash.ShockwaveFlash.9", record.getProgId());
assertEquals("Shockwave Flash Object", record.getClipboardName()); assertEquals("Shockwave Flash Object", record.getClipboardName());
} }
public void testWrite() throws Exception { public void testWrite() throws Exception {
ExControl record = new ExControl(data, 0, data.length); ExControl record = new ExControl(data, 0, data.length);
@ -93,32 +93,31 @@ public final class TestExControl extends TestCase {
record.writeOut(baos); record.writeOut(baos);
byte[] b = baos.toByteArray(); byte[] b = baos.toByteArray();
assertTrue(Arrays.equals(data, b)); assertTrue(Arrays.equals(data, b));
} }
public void testNewRecord() throws Exception { public void testNewRecord() throws Exception {
ExControl record = new ExControl(); ExControl record = new ExControl();
ExControlAtom ctrl = record.getExControlAtom(); ExControlAtom ctrl = record.getExControlAtom();
ctrl.setSlideId(256); ctrl.setSlideId(256);
ExOleObjAtom oleObj = record.getExOleObjAtom(); ExOleObjAtom oleObj = record.getExOleObjAtom();
oleObj.setDrawAspect(ExOleObjAtom.DRAW_ASPECT_VISIBLE); oleObj.setDrawAspect(ExOleObjAtom.DRAW_ASPECT_VISIBLE);
oleObj.setType(ExOleObjAtom.TYPE_CONTROL); oleObj.setType(ExOleObjAtom.TYPE_CONTROL);
oleObj.setObjID(1); oleObj.setObjID(1);
oleObj.setSubType(ExOleObjAtom.SUBTYPE_DEFAULT); oleObj.setSubType(ExOleObjAtom.SUBTYPE_DEFAULT);
oleObj.setObjStgDataRef(2); oleObj.setObjStgDataRef(2);
oleObj.setOptions(1283584); oleObj.setOptions(1283584);
record.setMenuName("Shockwave Flash Object"); record.setMenuName("Shockwave Flash Object");
record.setProgId("ShockwaveFlash.ShockwaveFlash.9"); record.setProgId("ShockwaveFlash.ShockwaveFlash.9");
record.setClipboardName("Shockwave Flash Object"); record.setClipboardName("Shockwave Flash Object");
ByteArrayOutputStream baos = new ByteArrayOutputStream(); ByteArrayOutputStream baos = new ByteArrayOutputStream();
record.writeOut(baos); record.writeOut(baos);
byte[] b = baos.toByteArray(); byte[] b = baos.toByteArray();
assertEquals(data.length, b.length);
assertTrue(Arrays.equals(data, b));
}
assertEquals(data.length, b.length);
assertTrue(Arrays.equals(data, b));
}
} }

20
src/scratchpad/testcases/org/apache/poi/hslf/record/TestExVideoContainer.java
View File

@ -48,9 +48,9 @@ public final class TestExVideoContainer extends TestCase {
public void testRead() throws Exception { public void testRead() {
ExVideoContainer record = new ExVideoContainer(data, 0, data.length); ExVideoContainer record = new ExVideoContainer(data, 0, data.length);
assertEquals(RecordTypes.ExVideoContainer.typeID, record.getRecordType()); assertEquals(RecordTypes.ExVideoContainer.typeID, record.getRecordType());
ExMediaAtom exMedia = record.getExMediaAtom(); ExMediaAtom exMedia = record.getExMediaAtom();
assertEquals(1, exMedia.getObjectId()); assertEquals(1, exMedia.getObjectId());
@ -64,14 +64,14 @@ public final class TestExVideoContainer extends TestCase {
assertEquals("D:\\projects\\SchulerAG\\mcom_v_1_0_4\\view\\data\\tests\\images\\cards.mpg", path.getText()); assertEquals("D:\\projects\\SchulerAG\\mcom_v_1_0_4\\view\\data\\tests\\images\\cards.mpg", path.getText());
} }
public void testWrite() throws Exception { public void testWrite() throws Exception {
ExVideoContainer record = new ExVideoContainer(data, 0, data.length); ExVideoContainer record = new ExVideoContainer(data, 0, data.length);
ByteArrayOutputStream baos = new ByteArrayOutputStream(); ByteArrayOutputStream baos = new ByteArrayOutputStream();
record.writeOut(baos); record.writeOut(baos);
byte[] b = baos.toByteArray(); byte[] b = baos.toByteArray();
assertTrue(Arrays.equals(data, b)); assertTrue(Arrays.equals(data, b));
} }
public void testNewRecord() throws Exception { public void testNewRecord() throws Exception {
ExVideoContainer record = new ExVideoContainer(); ExVideoContainer record = new ExVideoContainer();

4
src/scratchpad/testcases/org/apache/poi/hslf/record/TestFontCollection.java
View File

@ -40,7 +40,7 @@ public final class TestFontCollection extends TestCase {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7C, 0xDA-256, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7C, 0xDA-256, 0x12, 0x00,
0x28, 0xDD-256, 0x0D, 0x30, 0x00, 0x00, 0x04, 0x00 }; 0x28, 0xDD-256, 0x0D, 0x30, 0x00, 0x00, 0x04, 0x00 };
public void testFonts() throws Exception { public void testFonts() {
FontCollection fonts = new FontCollection(data, 0, data.length); FontCollection fonts = new FontCollection(data, 0, data.length);
Record[] child = fonts.getChildRecords(); Record[] child = fonts.getChildRecords();
assertEquals(child.length, 1); assertEquals(child.length, 1);
@ -49,7 +49,7 @@ public final class TestFontCollection extends TestCase {
assertEquals(fnt.getFontName(), "Times New Roman"); assertEquals(fnt.getFontName(), "Times New Roman");
} }
public void testAddFont() throws Exception { public void testAddFont() {
FontCollection fonts = new FontCollection(data, 0, data.length); FontCollection fonts = new FontCollection(data, 0, data.length);
int idx = fonts.addFont("Times New Roman"); int idx = fonts.addFont("Times New Roman");
assertEquals(idx, 0); assertEquals(idx, 0);

5
src/scratchpad/testcases/org/apache/poi/hslf/record/TestHeadersFootersAtom.java
View File

@ -33,7 +33,7 @@ public final class TestHeadersFootersAtom extends TestCase {
0x00, 0x00, (byte)0xDA, 0x0F, 0x04, 0x00, 0x00, 00, 0x00, 0x00, (byte)0xDA, 0x0F, 0x04, 0x00, 0x00, 00,
0x00, 0x00, 0x23, 0x00 }; 0x00, 0x00, 0x23, 0x00 };
public void testRead() throws Exception { public void testRead() {
HeadersFootersAtom record = new HeadersFootersAtom(data, 0, data.length); HeadersFootersAtom record = new HeadersFootersAtom(data, 0, data.length);
assertEquals(RecordTypes.HeadersFootersAtom.typeID, record.getRecordType()); assertEquals(RecordTypes.HeadersFootersAtom.typeID, record.getRecordType());
@ -70,7 +70,7 @@ public final class TestHeadersFootersAtom extends TestCase {
assertTrue(Arrays.equals(data, b)); assertTrue(Arrays.equals(data, b));
} }
public void testFlags() throws Exception { public void testFlags() {
HeadersFootersAtom record = new HeadersFootersAtom(); HeadersFootersAtom record = new HeadersFootersAtom();
//in a new record all the bits are 0 //in a new record all the bits are 0
@ -87,6 +87,5 @@ public final class TestHeadersFootersAtom extends TestCase {
record.setFlag(HeadersFootersAtom.fHasTodayDate, false); record.setFlag(HeadersFootersAtom.fHasTodayDate, false);
assertFalse(record.getFlag(HeadersFootersAtom.fHasTodayDate)); assertFalse(record.getFlag(HeadersFootersAtom.fHasTodayDate));
} }
} }

4
src/scratchpad/testcases/org/apache/poi/hslf/record/TestHeadersFootersContainer.java
View File

@ -50,7 +50,7 @@ public final class TestHeadersFootersContainer extends TestCase {
0x6F, 0x00, 0x6F, 0x00, 0x74, 0x00, 0x65, 0x00, 0x72, 0x00 0x6F, 0x00, 0x6F, 0x00, 0x74, 0x00, 0x65, 0x00, 0x72, 0x00
}; };
public void testReadSlideHeadersFootersContainer() throws Exception { public void testReadSlideHeadersFootersContainer() {
HeadersFootersContainer record = new HeadersFootersContainer(slideData, 0, slideData.length); HeadersFootersContainer record = new HeadersFootersContainer(slideData, 0, slideData.length);
assertEquals(RecordTypes.HeadersFooters.typeID, record.getRecordType()); assertEquals(RecordTypes.HeadersFooters.typeID, record.getRecordType());
assertEquals(HeadersFootersContainer.SlideHeadersFootersContainer, record.getOptions()); assertEquals(HeadersFootersContainer.SlideHeadersFootersContainer, record.getOptions());
@ -103,7 +103,7 @@ public final class TestHeadersFootersContainer extends TestCase {
assertTrue(Arrays.equals(slideData, b)); assertTrue(Arrays.equals(slideData, b));
} }
public void testReadNotesHeadersFootersContainer() throws Exception { public void testReadNotesHeadersFootersContainer() {
HeadersFootersContainer record = new HeadersFootersContainer(notesData, 0, notesData.length); HeadersFootersContainer record = new HeadersFootersContainer(notesData, 0, notesData.length);
assertEquals(RecordTypes.HeadersFooters.typeID, record.getRecordType()); assertEquals(RecordTypes.HeadersFooters.typeID, record.getRecordType());
assertEquals(HeadersFootersContainer.NotesHeadersFootersContainer, record.getOptions()); assertEquals(HeadersFootersContainer.NotesHeadersFootersContainer, record.getOptions());

40
src/scratchpad/testcases/org/apache/poi/hslf/record/TestInteractiveInfo.java
View File

@ -15,7 +15,7 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
==================================================================== */ ==================================================================== */
package org.apache.poi.hslf.record; package org.apache.poi.hslf.record;
@ -38,19 +38,19 @@ public class TestInteractiveInfo extends TestCase {
00, 00, 00, 00, 01, 00, 00, 00, 00, 00, 00, 00, 01, 00, 00, 00,
04, 00, 00, 00, 8, 00, 00, 00 04, 00, 00, 00, 8, 00, 00, 00
}; };
public void testRecordType() throws Exception { public void testRecordType() {
InteractiveInfo ii = new InteractiveInfo(data_a, 0, data_a.length); InteractiveInfo ii = new InteractiveInfo(data_a, 0, data_a.length);
assertEquals(4082, ii.getRecordType()); assertEquals(4082, ii.getRecordType());
} }
public void testGetChildDetails() throws Exception { public void testGetChildDetails() {
InteractiveInfo ii = new InteractiveInfo(data_a, 0, data_a.length); InteractiveInfo ii = new InteractiveInfo(data_a, 0, data_a.length);
InteractiveInfoAtom ia = ii.getInteractiveInfoAtom(); InteractiveInfoAtom ia = ii.getInteractiveInfoAtom();
assertEquals(1, ia.getHyperlinkID()); assertEquals(1, ia.getHyperlinkID());
} }
public void testWrite() throws Exception { public void testWrite() throws Exception {
InteractiveInfo ii = new InteractiveInfo(data_a, 0, data_a.length); InteractiveInfo ii = new InteractiveInfo(data_a, 0, data_a.length);
ByteArrayOutputStream baos = new ByteArrayOutputStream(); ByteArrayOutputStream baos = new ByteArrayOutputStream();
@ -64,24 +64,24 @@ public class TestInteractiveInfo extends TestCase {
} }
// Create A from scratch // Create A from scratch
public void testCreate() throws Exception { public void testCreate() throws Exception {
InteractiveInfo ii = new InteractiveInfo(); InteractiveInfo ii = new InteractiveInfo();
InteractiveInfoAtom ia = ii.getInteractiveInfoAtom(); InteractiveInfoAtom ia = ii.getInteractiveInfoAtom();
// Set values // Set values
ia.setHyperlinkID(1); ia.setHyperlinkID(1);
ia.setSoundRef(0); ia.setSoundRef(0);
ia.setAction((byte)4); ia.setAction((byte)4);
ia.setHyperlinkType((byte)8); ia.setHyperlinkType((byte)8);
// Check it's now the same as a // Check it's now the same as a
ByteArrayOutputStream baos = new ByteArrayOutputStream(); ByteArrayOutputStream baos = new ByteArrayOutputStream();
ii.writeOut(baos); ii.writeOut(baos);
byte[] b = baos.toByteArray(); byte[] b = baos.toByteArray();
assertEquals(data_a.length, b.length); assertEquals(data_a.length, b.length);
for(int i=0; i<data_a.length; i++) { for(int i=0; i<data_a.length; i++) {
assertEquals(data_a[i],b[i]); assertEquals(data_a[i],b[i]);
} }
} }
} }

4
src/scratchpad/testcases/org/apache/poi/hslf/record/TestNotesAtom.java
View File

@ -31,11 +31,11 @@ public final class TestNotesAtom extends TestCase {
private byte[] data_a = new byte[] { 1, 0, 0xF1-256, 3, 8, 0, 0, 0, private byte[] data_a = new byte[] { 1, 0, 0xF1-256, 3, 8, 0, 0, 0,
0, 0, 0, 0x80-256, 0, 0, 0x0D, 0x30 }; 0, 0, 0, 0x80-256, 0, 0, 0x0D, 0x30 };
public void testRecordType() throws Exception { public void testRecordType() {
NotesAtom na = new NotesAtom(data_a, 0, data_a.length); NotesAtom na = new NotesAtom(data_a, 0, data_a.length);
assertEquals(1009l, na.getRecordType()); assertEquals(1009l, na.getRecordType());
} }
public void testFlags() throws Exception { public void testFlags() {
NotesAtom na = new NotesAtom(data_a, 0, data_a.length); NotesAtom na = new NotesAtom(data_a, 0, data_a.length);
assertEquals(0x80000000, na.getSlideID()); assertEquals(0x80000000, na.getSlideID());
assertEquals(false, na.getFollowMasterObjects()); assertEquals(false, na.getFollowMasterObjects());

8
src/scratchpad/testcases/org/apache/poi/hslf/record/TestRecordTypes.java
View File

@ -26,19 +26,19 @@ import junit.framework.TestCase;
* @author Nick Burch (nick at torchbox dot com) * @author Nick Burch (nick at torchbox dot com)
*/ */
public final class TestRecordTypes extends TestCase { public final class TestRecordTypes extends TestCase {
public void testPPTNameLookups() throws Exception { public void testPPTNameLookups() {
assertEquals("MainMaster", RecordTypes.recordName(1016)); assertEquals("MainMaster", RecordTypes.recordName(1016));
assertEquals("TextBytesAtom", RecordTypes.recordName(4008)); assertEquals("TextBytesAtom", RecordTypes.recordName(4008));
assertEquals("VBAInfo", RecordTypes.recordName(1023)); assertEquals("VBAInfo", RecordTypes.recordName(1023));
} }
public void testEscherNameLookups() throws Exception { public void testEscherNameLookups() {
assertEquals("EscherDggContainer", RecordTypes.recordName(0xf000)); assertEquals("EscherDggContainer", RecordTypes.recordName(0xf000));
assertEquals("EscherClientTextbox", RecordTypes.recordName(0xf00d)); assertEquals("EscherClientTextbox", RecordTypes.recordName(0xf00d));
assertEquals("EscherSelection", RecordTypes.recordName(0xf119)); assertEquals("EscherSelection", RecordTypes.recordName(0xf119));
} }
public void testPPTClassLookups() throws Exception { public void testPPTClassLookups() {
assertEquals(Slide.class, RecordTypes.recordHandlingClass(1006)); assertEquals(Slide.class, RecordTypes.recordHandlingClass(1006));
assertEquals(TextCharsAtom.class, RecordTypes.recordHandlingClass(4000)); assertEquals(TextCharsAtom.class, RecordTypes.recordHandlingClass(4000));
assertEquals(TextBytesAtom.class, RecordTypes.recordHandlingClass(4008)); assertEquals(TextBytesAtom.class, RecordTypes.recordHandlingClass(4008));
@ -49,7 +49,7 @@ public final class TestRecordTypes extends TestCase {
assertEquals(UnknownRecordPlaceholder.class, RecordTypes.recordHandlingClass(2019)); assertEquals(UnknownRecordPlaceholder.class, RecordTypes.recordHandlingClass(2019));
} }
public void testEscherClassLookups() throws Exception { public void testEscherClassLookups() {
// Should all come back with null, as DDF handles them // Should all come back with null, as DDF handles them
assertEquals(null, RecordTypes.recordHandlingClass(0xf000)); assertEquals(null, RecordTypes.recordHandlingClass(0xf000));
assertEquals(null, RecordTypes.recordHandlingClass(0xf001)); assertEquals(null, RecordTypes.recordHandlingClass(0xf001));

6
src/scratchpad/testcases/org/apache/poi/hslf/record/TestSlideAtom.java
View File

@ -33,11 +33,11 @@ public final class TestSlideAtom extends TestCase {
0, 0, 0, 0, 0x0F, 0x10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x80-256, 0, 0, 0, 0, 0x0F, 0x10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x80-256,
0, 1, 0, 0, 7, 0, 0x0C, 0x30 }; 0, 1, 0, 0, 7, 0, 0x0C, 0x30 };
public void testRecordType() throws Exception { public void testRecordType() {
SlideAtom sa = new SlideAtom(data_a, 0, data_a.length); SlideAtom sa = new SlideAtom(data_a, 0, data_a.length);
assertEquals(1007l, sa.getRecordType()); assertEquals(1007l, sa.getRecordType());
} }
public void testFlags() throws Exception { public void testFlags() {
SlideAtom sa = new SlideAtom(data_a, 0, data_a.length); SlideAtom sa = new SlideAtom(data_a, 0, data_a.length);
// First 12 bytes are a SSlideLayoutAtom, checked elsewhere // First 12 bytes are a SSlideLayoutAtom, checked elsewhere
@ -51,7 +51,7 @@ public final class TestSlideAtom extends TestCase {
assertEquals(true, sa.getFollowMasterScheme()); assertEquals(true, sa.getFollowMasterScheme());
assertEquals(true, sa.getFollowMasterBackground()); assertEquals(true, sa.getFollowMasterBackground());
} }
public void testSSlideLayoutAtom() throws Exception { public void testSSlideLayoutAtom() {
SlideAtom sa = new SlideAtom(data_a, 0, data_a.length); SlideAtom sa = new SlideAtom(data_a, 0, data_a.length);
SSlideLayoutAtom ssla = sa.getSSlideLayoutAtom(); SSlideLayoutAtom ssla = sa.getSSlideLayoutAtom();

4
src/scratchpad/testcases/org/apache/poi/hslf/record/TestSlidePersistAtom.java
View File

@ -32,11 +32,11 @@ public final class TestSlidePersistAtom extends TestCase {
4, 0, 0, 0, 4, 0, 0, 0, 2, 0, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 2, 0, 0, 0, 0,
1, 0, 0, 0, 0, 0, 0 }; 1, 0, 0, 0, 0, 0, 0 };
public void testRecordType() throws Exception { public void testRecordType() {
SlidePersistAtom spa = new SlidePersistAtom(data_a, 0, data_a.length); SlidePersistAtom spa = new SlidePersistAtom(data_a, 0, data_a.length);
assertEquals(1011l, spa.getRecordType()); assertEquals(1011l, spa.getRecordType());
} }
public void testFlags() throws Exception { public void testFlags() {
SlidePersistAtom spa = new SlidePersistAtom(data_a, 0, data_a.length); SlidePersistAtom spa = new SlidePersistAtom(data_a, 0, data_a.length);
assertEquals(4, spa.getRefID() ); assertEquals(4, spa.getRefID() );
assertEquals(true, spa.getHasShapesOtherThanPlaceholders() ); assertEquals(true, spa.getHasShapesOtherThanPlaceholders() );

33
src/scratchpad/testcases/org/apache/poi/hslf/record/TestStyleTextPropAtom.java
View File

@ -36,7 +36,7 @@ import org.apache.poi.util.HexDump;
*/ */
public final class TestStyleTextPropAtom extends TestCase { public final class TestStyleTextPropAtom extends TestCase {
/** From a real file: a paragraph with 4 different styles */ /** From a real file: a paragraph with 4 different styles */
private byte[] data_a = new byte[] { private static final byte[] data_a = new byte[] {
0, 0, 0xA1-256, 0x0F, 0x2A, 0, 0, 0, 0, 0, 0xA1-256, 0x0F, 0x2A, 0, 0, 0,
0x36, 00, 00, 00, // paragraph is 54 long 0x36, 00, 00, 00, // paragraph is 54 long
00, 00, // (paragraph reserved field) 00, 00, // (paragraph reserved field)
@ -50,7 +50,7 @@ public final class TestStyleTextPropAtom extends TestCase {
00, 00, 0x04, 00, // font.color only 00, 00, 0x04, 00, // font.color only
0xFF-256, 0x33, 00, 0xFE-256 // red 0xFF-256, 0x33, 00, 0xFE-256 // red
}; };
private int data_a_text_len = 0x36-1; private static final int data_a_text_len = 0x36-1;
/** /**
* From a real file: 4 paragraphs with text in 4 different styles: * From a real file: 4 paragraphs with text in 4 different styles:
@ -60,7 +60,7 @@ public final class TestStyleTextPropAtom extends TestCase {
* left aligned+underlined+larger font size (96) * left aligned+underlined+larger font size (96)
* left aligned+underlined+larger font size+red (1) * left aligned+underlined+larger font size+red (1)
*/ */
private byte[] data_b = new byte[] { private static final byte[] data_b = new byte[] {
0, 0, 0xA1-256, 0x0F, 0x80-256, 0, 0, 0, 0, 0, 0xA1-256, 0x0F, 0x80-256, 0, 0, 0,
0x1E, 00, 00, 00, // paragraph is 30 long 0x1E, 00, 00, 00, // paragraph is 30 long
00, 00, // paragraph reserved field 00, 00, // paragraph reserved field
@ -108,14 +108,14 @@ public final class TestStyleTextPropAtom extends TestCase {
0x18, 00, // font size 24 0x18, 00, // font size 24
0xFF-256, 0x33, 00, 0xFE-256 // colour red 0xFF-256, 0x33, 00, 0xFE-256 // colour red
}; };
private int data_b_text_len = 0xB3; private static final int data_b_text_len = 0xB3;
/** /**
* From a real file. Has a mask with more bits * From a real file. Has a mask with more bits
* set than it actually has data for. Shouldn't do, * set than it actually has data for. Shouldn't do,
* but some real files do :( * but some real files do :(
*/ */
private byte[] data_c = new byte[] { private static final byte[] data_c = new byte[] {
0, 0, -95, 15, 62, 0, 0, 0, 0, 0, -95, 15, 62, 0, 0, 0,
123, 0, 0, 0, 0, 0, 48, 8, 123, 0, 0, 0, 0, 0, 48, 8,
10, 0, 1, 0, 0, 0, 0, 0, 10, 0, 1, 0, 0, 0, 0, 0,
@ -131,15 +131,15 @@ public final class TestStyleTextPropAtom extends TestCase {
/** /**
* From a real file supplied for Bug 40143 by tales@great.ufc.br * From a real file supplied for Bug 40143 by tales@great.ufc.br
*/ */
private byte[] data_d = { private static final byte[] data_d = {
0x00, 0x00, 0xA1-256, 0x0F, 0x1E, 0x00, 0x00, 0x00, //header 0x00, 0x00, 0xA1-256, 0x0F, 0x1E, 0x00, 0x00, 0x00, //header
(byte)0xA0, 0x00 , 0x00 , 0x00 , 0x00 , 0x00 , 0x00 , 0x08 , 0x00 , 0x00 , (byte)0xA0, 0x00 , 0x00 , 0x00 , 0x00 , 0x00 , 0x00 , 0x08 , 0x00 , 0x00 ,
0x01 , 0x00, (byte)0xA0 , 0x00 , 0x00 , 0x00 , 0x01 , 0x00 , 0x63 , 0x00 , 0x01 , 0x00, (byte)0xA0 , 0x00 , 0x00 , 0x00 , 0x01 , 0x00 , 0x63 , 0x00 ,
0x01 , 0x00, 0x01 , 0x00 , 0x00, 0x00 , 0x01 , 0x00 , 0x14 , 0x00 0x01 , 0x00, 0x01 , 0x00 , 0x00, 0x00 , 0x01 , 0x00 , 0x14 , 0x00
}; };
private int data_d_text_len = 0xA0-1; private static final int data_d_text_len = 0xA0-1;
public void testRecordType() throws Exception { public void testRecordType() {
StyleTextPropAtom stpa = new StyleTextPropAtom(data_a,0,data_a.length); StyleTextPropAtom stpa = new StyleTextPropAtom(data_a,0,data_a.length);
StyleTextPropAtom stpb = new StyleTextPropAtom(data_b,0,data_b.length); StyleTextPropAtom stpb = new StyleTextPropAtom(data_b,0,data_b.length);
StyleTextPropAtom stpc = new StyleTextPropAtom(data_c,0,data_c.length); StyleTextPropAtom stpc = new StyleTextPropAtom(data_c,0,data_c.length);
@ -149,7 +149,7 @@ public final class TestStyleTextPropAtom extends TestCase {
} }
public void testCharacterStyleCounts() throws Exception { public void testCharacterStyleCounts() {
StyleTextPropAtom stpa = new StyleTextPropAtom(data_a,0,data_a.length); StyleTextPropAtom stpa = new StyleTextPropAtom(data_a,0,data_a.length);
StyleTextPropAtom stpb = new StyleTextPropAtom(data_b,0,data_b.length); StyleTextPropAtom stpb = new StyleTextPropAtom(data_b,0,data_b.length);
@ -223,7 +223,6 @@ public final class TestStyleTextPropAtom extends TestCase {
TextProp tp_1_1 = (TextProp)b_ch_1.getTextPropList().get(0); TextProp tp_1_1 = (TextProp)b_ch_1.getTextPropList().get(0);
TextProp tp_1_2 = (TextProp)b_ch_1.getTextPropList().get(1); TextProp tp_1_2 = (TextProp)b_ch_1.getTextPropList().get(1);
assertEquals(true, tp_1_1 instanceof CharFlagsTextProp); assertEquals(true, tp_1_1 instanceof CharFlagsTextProp);
assertEquals(true, tp_1_2 instanceof TextProp);
assertEquals("font.size", tp_1_2.getName()); assertEquals("font.size", tp_1_2.getName());
assertEquals(20, tp_1_2.getValue()); assertEquals(20, tp_1_2.getValue());
@ -233,8 +232,6 @@ public final class TestStyleTextPropAtom extends TestCase {
TextProp tp_2_2 = (TextProp)b_ch_2.getTextPropList().get(1); TextProp tp_2_2 = (TextProp)b_ch_2.getTextPropList().get(1);
TextProp tp_2_3 = (TextProp)b_ch_2.getTextPropList().get(2); TextProp tp_2_3 = (TextProp)b_ch_2.getTextPropList().get(2);
assertEquals(true, tp_2_1 instanceof CharFlagsTextProp); assertEquals(true, tp_2_1 instanceof CharFlagsTextProp);
assertEquals(true, tp_2_2 instanceof TextProp);
assertEquals(true, tp_2_3 instanceof TextProp);
assertEquals("font.size", tp_2_2.getName()); assertEquals("font.size", tp_2_2.getName());
assertEquals("font.color", tp_2_3.getName()); assertEquals("font.color", tp_2_3.getName());
assertEquals(20, tp_2_2.getValue()); assertEquals(20, tp_2_2.getValue());
@ -243,8 +240,6 @@ public final class TestStyleTextPropAtom extends TestCase {
assertEquals(2,b_ch_3.getTextPropList().size()); assertEquals(2,b_ch_3.getTextPropList().size());
TextProp tp_3_1 = (TextProp)b_ch_3.getTextPropList().get(0); TextProp tp_3_1 = (TextProp)b_ch_3.getTextPropList().get(0);
TextProp tp_3_2 = (TextProp)b_ch_3.getTextPropList().get(1); TextProp tp_3_2 = (TextProp)b_ch_3.getTextPropList().get(1);
assertEquals(true, tp_3_1 instanceof TextProp);
assertEquals(true, tp_3_2 instanceof TextProp);
assertEquals("font.size", tp_3_1.getName()); assertEquals("font.size", tp_3_1.getName());
assertEquals("font.color", tp_3_2.getName()); assertEquals("font.color", tp_3_2.getName());
assertEquals(20, tp_3_1.getValue()); assertEquals(20, tp_3_1.getValue());
@ -255,8 +250,6 @@ public final class TestStyleTextPropAtom extends TestCase {
TextProp tp_4_2 = (TextProp)b_ch_4.getTextPropList().get(1); TextProp tp_4_2 = (TextProp)b_ch_4.getTextPropList().get(1);
TextProp tp_4_3 = (TextProp)b_ch_4.getTextPropList().get(2); TextProp tp_4_3 = (TextProp)b_ch_4.getTextPropList().get(2);
assertEquals(true, tp_4_1 instanceof CharFlagsTextProp); assertEquals(true, tp_4_1 instanceof CharFlagsTextProp);
assertEquals(true, tp_4_2 instanceof TextProp);
assertEquals(true, tp_4_3 instanceof TextProp);
assertEquals("font.index", tp_4_2.getName()); assertEquals("font.index", tp_4_2.getName());
assertEquals("font.size", tp_4_3.getName()); assertEquals("font.size", tp_4_3.getName());
assertEquals(24, tp_4_3.getValue()); assertEquals(24, tp_4_3.getValue());
@ -276,8 +269,6 @@ public final class TestStyleTextPropAtom extends TestCase {
assertEquals(2,b_p_1.getTextPropList().size()); assertEquals(2,b_p_1.getTextPropList().size());
TextProp tp_1_1 = (TextProp)b_p_1.getTextPropList().get(0); TextProp tp_1_1 = (TextProp)b_p_1.getTextPropList().get(0);
TextProp tp_1_2 = (TextProp)b_p_1.getTextPropList().get(1); TextProp tp_1_2 = (TextProp)b_p_1.getTextPropList().get(1);
assertEquals(true, tp_1_1 instanceof TextProp);
assertEquals(true, tp_1_2 instanceof TextProp);
assertEquals("alignment", tp_1_1.getName()); assertEquals("alignment", tp_1_1.getName());
assertEquals("linespacing", tp_1_2.getName()); assertEquals("linespacing", tp_1_2.getName());
assertEquals(0, tp_1_1.getValue()); assertEquals(0, tp_1_1.getValue());
@ -286,8 +277,6 @@ public final class TestStyleTextPropAtom extends TestCase {
// 2nd is centre aligned (default) + normal line spacing // 2nd is centre aligned (default) + normal line spacing
assertEquals(1,b_p_2.getTextPropList().size()); assertEquals(1,b_p_2.getTextPropList().size());
TextProp tp_2_1 = (TextProp)b_p_2.getTextPropList().get(0); TextProp tp_2_1 = (TextProp)b_p_2.getTextPropList().get(0);
assertEquals(true, tp_2_1 instanceof TextProp);
assertEquals(true, tp_1_2 instanceof TextProp);
assertEquals("linespacing", tp_2_1.getName()); assertEquals("linespacing", tp_2_1.getName());
assertEquals(80, tp_2_1.getValue()); assertEquals(80, tp_2_1.getValue());
@ -295,8 +284,6 @@ public final class TestStyleTextPropAtom extends TestCase {
assertEquals(2,b_p_3.getTextPropList().size()); assertEquals(2,b_p_3.getTextPropList().size());
TextProp tp_3_1 = (TextProp)b_p_3.getTextPropList().get(0); TextProp tp_3_1 = (TextProp)b_p_3.getTextPropList().get(0);
TextProp tp_3_2 = (TextProp)b_p_3.getTextPropList().get(1); TextProp tp_3_2 = (TextProp)b_p_3.getTextPropList().get(1);
assertEquals(true, tp_3_1 instanceof TextProp);
assertEquals(true, tp_3_2 instanceof TextProp);
assertEquals("alignment", tp_3_1.getName()); assertEquals("alignment", tp_3_1.getName());
assertEquals("linespacing", tp_3_2.getName()); assertEquals("linespacing", tp_3_2.getName());
assertEquals(2, tp_3_1.getValue()); assertEquals(2, tp_3_1.getValue());
@ -306,8 +293,6 @@ public final class TestStyleTextPropAtom extends TestCase {
assertEquals(2,b_p_4.getTextPropList().size()); assertEquals(2,b_p_4.getTextPropList().size());
TextProp tp_4_1 = (TextProp)b_p_4.getTextPropList().get(0); TextProp tp_4_1 = (TextProp)b_p_4.getTextPropList().get(0);
TextProp tp_4_2 = (TextProp)b_p_4.getTextPropList().get(1); TextProp tp_4_2 = (TextProp)b_p_4.getTextPropList().get(1);
assertEquals(true, tp_4_1 instanceof TextProp);
assertEquals(true, tp_4_2 instanceof TextProp);
assertEquals("alignment", tp_4_1.getName()); assertEquals("alignment", tp_4_1.getName());
assertEquals("linespacing", tp_4_2.getName()); assertEquals("linespacing", tp_4_2.getName());
assertEquals(0, tp_4_1.getValue()); assertEquals(0, tp_4_1.getValue());

6
src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextBytesAtom.java
View File

@ -38,16 +38,16 @@ public final class TestTextBytesAtom extends TestCase {
0x74, 0x65, 0x73, 0x74, 0x20, 0x74, 0x69, 0x74, 0x6C, 0x65 }; 0x74, 0x65, 0x73, 0x74, 0x20, 0x74, 0x69, 0x74, 0x6C, 0x65 };
private String alt_text = "This is a test title"; private String alt_text = "This is a test title";
public void testRecordType() throws Exception { public void testRecordType() {
TextBytesAtom tba = new TextBytesAtom(data,0,data.length); TextBytesAtom tba = new TextBytesAtom(data,0,data.length);
assertEquals(4008l, tba.getRecordType()); assertEquals(4008l, tba.getRecordType());
} }
public void testTextA() throws Exception { public void testTextA() {
TextBytesAtom tba = new TextBytesAtom(data,0,data.length); TextBytesAtom tba = new TextBytesAtom(data,0,data.length);
assertEquals(data_text, tba.getText()); assertEquals(data_text, tba.getText());
} }
public void testTextB() throws Exception { public void testTextB() {
TextBytesAtom tba = new TextBytesAtom(alt_data,0,alt_data.length); TextBytesAtom tba = new TextBytesAtom(alt_data,0,alt_data.length);
assertEquals(alt_text, tba.getText()); assertEquals(alt_text, tba.getText());
} }

6
src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextCharsAtom.java
View File

@ -35,16 +35,16 @@ public final class TestTextCharsAtom extends TestCase {
0x54, 0x00, 0x68, 0x00, 0x69, 0x00, 0x73, 0x00, 0xa3-256, 0x01 }; 0x54, 0x00, 0x68, 0x00, 0x69, 0x00, 0x73, 0x00, 0xa3-256, 0x01 };
private String alt_text = "This\u01A3"; private String alt_text = "This\u01A3";
public void testRecordType() throws Exception { public void testRecordType() {
TextCharsAtom tca = new TextCharsAtom(data,0,data.length); TextCharsAtom tca = new TextCharsAtom(data,0,data.length);
assertEquals(4000l, tca.getRecordType()); assertEquals(4000l, tca.getRecordType());
} }
public void testTextA() throws Exception { public void testTextA() {
TextCharsAtom tca = new TextCharsAtom(data,0,data.length); TextCharsAtom tca = new TextCharsAtom(data,0,data.length);
assertEquals(data_text, tca.getText()); assertEquals(data_text, tca.getText());
} }
public void testTextB() throws Exception { public void testTextB() {
TextCharsAtom tca = new TextCharsAtom(alt_data,0,alt_data.length); TextCharsAtom tca = new TextCharsAtom(alt_data,0,alt_data.length);
assertEquals(alt_text, tca.getText()); assertEquals(alt_text, tca.getText());
} }

4
src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextHeaderAtom.java
View File

@ -32,11 +32,11 @@ public final class TestTextHeaderAtom extends TestCase {
private byte[] title_data = new byte[] { 0, 0, 0x9f-256, 0x0f, 4, 0, 0, 0, 0, 0, 0, 0 }; private byte[] title_data = new byte[] { 0, 0, 0x9f-256, 0x0f, 4, 0, 0, 0, 0, 0, 0, 0 };
private byte[] body_data = new byte[] { 0, 0, 0x9f-256, 0x0f, 4, 0, 0, 0, 1, 0, 0, 0 }; private byte[] body_data = new byte[] { 0, 0, 0x9f-256, 0x0f, 4, 0, 0, 0, 1, 0, 0, 0 };
public void testRecordType() throws Exception { public void testRecordType() {
TextHeaderAtom tha = new TextHeaderAtom(notes_data,0,12); TextHeaderAtom tha = new TextHeaderAtom(notes_data,0,12);
assertEquals(3999l, tha.getRecordType()); assertEquals(3999l, tha.getRecordType());
} }
public void testTypes() throws Exception { public void testTypes() {
TextHeaderAtom n_tha = new TextHeaderAtom(notes_data,0,12); TextHeaderAtom n_tha = new TextHeaderAtom(notes_data,0,12);
TextHeaderAtom t_tha = new TextHeaderAtom(title_data,0,12); TextHeaderAtom t_tha = new TextHeaderAtom(title_data,0,12);
TextHeaderAtom b_tha = new TextHeaderAtom(body_data,0,12); TextHeaderAtom b_tha = new TextHeaderAtom(body_data,0,12);

4
src/scratchpad/testcases/org/apache/poi/hslf/record/TestUserEditAtom.java
View File

@ -33,11 +33,11 @@ public final class TestUserEditAtom extends TestCase {
00, 00, 00, 00, 00, 0x18, 00, 00, 01, 00, 00, 00, 00, 00, 00, 00, 00, 0x18, 00, 00, 01, 00, 00, 00,
05, 00, 00, 00, 01, 00, 0xF6-256, 77 }; 05, 00, 00, 00, 01, 00, 0xF6-256, 77 };
public void testRecordType() throws Exception { public void testRecordType() {
UserEditAtom uea = new UserEditAtom(data_a, 0, data_a.length); UserEditAtom uea = new UserEditAtom(data_a, 0, data_a.length);
assertEquals(4085l, uea.getRecordType()); assertEquals(4085l, uea.getRecordType());
} }
public void testFlags() throws Exception { public void testFlags() {
UserEditAtom uea = new UserEditAtom(data_a, 0, data_a.length); UserEditAtom uea = new UserEditAtom(data_a, 0, data_a.length);
assertEquals(256, uea.getLastViewedSlideID() ); assertEquals(256, uea.getLastViewedSlideID() );

10
src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestCounts.java
View File

@ -31,16 +31,16 @@ public final class TestCounts extends TestCase {
// SlideShow primed on the test data // SlideShow primed on the test data
private SlideShow ss; private SlideShow ss;
public TestCounts() throws Exception { public TestCounts() throws Exception {
String dirname = System.getProperty("HSLF.testdata.path"); String dirname = System.getProperty("HSLF.testdata.path");
String filename = dirname + "/basic_test_ppt_file.ppt"; String filename = dirname + "/basic_test_ppt_file.ppt";
HSLFSlideShow hss = new HSLFSlideShow(filename); HSLFSlideShow hss = new HSLFSlideShow(filename);
ss = new SlideShow(hss); ss = new SlideShow(hss);
} }
public void testSheetsCount() throws Exception { public void testSheetsCount() {
Slide[] slides = ss.getSlides(); Slide[] slides = ss.getSlides();
// Two sheets - master sheet is seperate // Two sheets - master sheet is separate
assertEquals(2, slides.length); assertEquals(2, slides.length);
// They are slides 1+2 // They are slides 1+2
@ -56,7 +56,7 @@ public final class TestCounts extends TestCase {
assertEquals(257, slides[1]._getSheetNumber()); assertEquals(257, slides[1]._getSheetNumber());
} }
public void testNotesCount() throws Exception { public void testNotesCount() {
Notes[] notes = ss.getNotes(); Notes[] notes = ss.getNotes();
// Two sheets -> two notes // Two sheets -> two notes
// Note: there are also notes on the slide master // Note: there are also notes on the slide master

10
src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestMostRecentRecords.java
View File

@ -33,14 +33,14 @@ public final class TestMostRecentRecords extends TestCase {
// SlideShow primed on the test data // SlideShow primed on the test data
private SlideShow ss; private SlideShow ss;
public TestMostRecentRecords() throws Exception { public TestMostRecentRecords() throws Exception {
String dirname = System.getProperty("HSLF.testdata.path"); String dirname = System.getProperty("HSLF.testdata.path");
String filename = dirname + "/basic_test_ppt_file.ppt"; String filename = dirname + "/basic_test_ppt_file.ppt";
hss = new HSLFSlideShow(filename); hss = new HSLFSlideShow(filename);
ss = new SlideShow(hss); ss = new SlideShow(hss);
} }
public void testCount() throws Exception { public void testCount() {
// Most recent core records // Most recent core records
Record[] mrcr = ss.getMostRecentCoreRecords(); Record[] mrcr = ss.getMostRecentCoreRecords();
@ -48,7 +48,7 @@ public final class TestMostRecentRecords extends TestCase {
assertEquals(7, mrcr.length); assertEquals(7, mrcr.length);
} }
public void testRightRecordTypes() throws Exception { public void testRightRecordTypes() {
// Most recent core records // Most recent core records
Record[] mrcr = ss.getMostRecentCoreRecords(); Record[] mrcr = ss.getMostRecentCoreRecords();
@ -69,7 +69,7 @@ public final class TestMostRecentRecords extends TestCase {
assertEquals(1008, mrcr[6].getRecordType()); assertEquals(1008, mrcr[6].getRecordType());
} }
public void testCorrectRecords() throws Exception { public void testCorrectRecords() {
// Most recent core records // Most recent core records
Record[] mrcr = ss.getMostRecentCoreRecords(); Record[] mrcr = ss.getMostRecentCoreRecords();

10
src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNotesText.java
View File

@ -31,14 +31,14 @@ public final class TestNotesText extends TestCase {
// SlideShow primed on the test data // SlideShow primed on the test data
private SlideShow ss; private SlideShow ss;
public TestNotesText() throws Exception { public TestNotesText() throws Exception {
String dirname = System.getProperty("HSLF.testdata.path"); String dirname = System.getProperty("HSLF.testdata.path");
String filename = dirname + "/basic_test_ppt_file.ppt"; String filename = dirname + "/basic_test_ppt_file.ppt";
HSLFSlideShow hss = new HSLFSlideShow(filename); HSLFSlideShow hss = new HSLFSlideShow(filename);
ss = new SlideShow(hss); ss = new SlideShow(hss);
} }
public void testNotesOne() throws Exception { public void testNotesOne() {
Notes notes = ss.getNotes()[0]; Notes notes = ss.getNotes()[0];
String[] expectText = new String[] {"These are the notes for page 1"}; String[] expectText = new String[] {"These are the notes for page 1"};
@ -46,9 +46,9 @@ public final class TestNotesText extends TestCase {
for(int i=0; i<expectText.length; i++) { for(int i=0; i<expectText.length; i++) {
assertEquals(expectText[i], notes.getTextRuns()[i].getText()); assertEquals(expectText[i], notes.getTextRuns()[i].getText());
} }
} }
public void testNotesTwo() throws Exception { public void testNotesTwo() {
Notes notes = ss.getNotes()[1]; Notes notes = ss.getNotes()[1];
String[] expectText = new String[] {"These are the notes on page two, again lacking formatting"}; String[] expectText = new String[] {"These are the notes on page two, again lacking formatting"};
assertEquals(expectText.length, notes.getTextRuns().length); assertEquals(expectText.length, notes.getTextRuns().length);

2
src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestPictures.java
View File

@ -34,7 +34,7 @@ public final class TestPictures extends TestCase{
protected File cwd; protected File cwd;
public void setUp() throws Exception { public void setUp() {
cwd = new File(System.getProperty("HSLF.testdata.path")); cwd = new File(System.getProperty("HSLF.testdata.path"));
} }

42
src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRecordSetup.java
View File

@ -36,30 +36,30 @@ public final class TestRecordSetup extends TestCase {
private SlideShow ss; private SlideShow ss;
private HSLFSlideShow hss; private HSLFSlideShow hss;
public TestRecordSetup() throws Exception { public TestRecordSetup() throws Exception {
String dirname = System.getProperty("HSLF.testdata.path"); String dirname = System.getProperty("HSLF.testdata.path");
String filename = dirname + "/basic_test_ppt_file.ppt"; String filename = dirname + "/basic_test_ppt_file.ppt";
hss = new HSLFSlideShow(filename); hss = new HSLFSlideShow(filename);
ss = new SlideShow(hss); ss = new SlideShow(hss);
}
public void testHandleParentAwareRecords() throws Exception {
Record[] records = hss.getRecords();
for(int i=0; i<records.length; i++) {
ensureParentAware(records[i],null);
}
} }
private void ensureParentAware(Record r,RecordContainer parent) {
if(r instanceof ParentAwareRecord) { public void testHandleParentAwareRecords() {
ParentAwareRecord pr = (ParentAwareRecord)r; Record[] records = hss.getRecords();
assertEquals(parent, pr.getParentRecord()); for(int i=0; i<records.length; i++) {
} ensureParentAware(records[i],null);
if(r instanceof RecordContainer) { }
RecordContainer rc = (RecordContainer)r; }
Record[] children = rc.getChildRecords(); private void ensureParentAware(Record r,RecordContainer parent) {
for(int i=0; i<children.length; i++) { if(r instanceof ParentAwareRecord) {
ensureParentAware(children[i], rc); ParentAwareRecord pr = (ParentAwareRecord)r;
} assertEquals(parent, pr.getParentRecord());
} }
} if(r instanceof RecordContainer) {
RecordContainer rc = (RecordContainer)r;
Record[] children = rc.getChildRecords();
for(int i=0; i<children.length; i++) {
ensureParentAware(children[i], rc);
}
}
}
} }

12
src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSheetText.java
View File

@ -31,14 +31,14 @@ public final class TestSheetText extends TestCase {
// SlideShow primed on the test data // SlideShow primed on the test data
private SlideShow ss; private SlideShow ss;
public TestSheetText() throws Exception { public TestSheetText() throws Exception {
String dirname = System.getProperty("HSLF.testdata.path"); String dirname = System.getProperty("HSLF.testdata.path");
String filename = dirname + "/basic_test_ppt_file.ppt"; String filename = dirname + "/basic_test_ppt_file.ppt";
HSLFSlideShow hss = new HSLFSlideShow(filename); HSLFSlideShow hss = new HSLFSlideShow(filename);
ss = new SlideShow(hss); ss = new SlideShow(hss);
} }
public void testSheetOne() throws Exception { public void testSheetOne() {
Sheet slideOne = ss.getSlides()[0]; Sheet slideOne = ss.getSlides()[0];
String[] expectText = new String[] {"This is a test title","This is a test subtitle\nThis is on page 1"}; String[] expectText = new String[] {"This is a test title","This is a test subtitle\nThis is on page 1"};
@ -46,9 +46,9 @@ public final class TestSheetText extends TestCase {
for(int i=0; i<expectText.length; i++) { for(int i=0; i<expectText.length; i++) {
assertEquals(expectText[i], slideOne.getTextRuns()[i].getText()); assertEquals(expectText[i], slideOne.getTextRuns()[i].getText());
} }
} }
public void testSheetTwo() throws Exception { public void testSheetTwo() {
Sheet slideTwo = ss.getSlides()[1]; Sheet slideTwo = ss.getSlides()[1];
String[] expectText = new String[] {"This is the title on page 2","This is page two\nIt has several blocks of text\nNone of them have formatting"}; String[] expectText = new String[] {"This is the title on page 2","This is page two\nIt has several blocks of text\nNone of them have formatting"};
assertEquals(expectText.length, slideTwo.getTextRuns().length); assertEquals(expectText.length, slideTwo.getTextRuns().length);
@ -80,7 +80,7 @@ public final class TestSheetText extends TestCase {
"Can they co-exist?\n\n" + "Can they co-exist?\n\n" +
"Gay Harley\n" + "Gay Harley\n" +
"Clean Development Alliance\n" + "Clean Development Alliance\n" +
"COP 11 \u2013 MOP 1\n" + // special long hyphon "COP 11 \u2013 MOP 1\n" + // special long hyphen
"December 5, 2005\n"; "December 5, 2005\n";
assertEquals(1, s.getTextRuns().length); assertEquals(1, s.getTextRuns().length);

166
src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSlideOrdering.java
View File

@ -17,7 +17,6 @@
package org.apache.poi.hslf.usermodel; package org.apache.poi.hslf.usermodel;
import junit.framework.TestCase; import junit.framework.TestCase;
import org.apache.poi.hslf.*; import org.apache.poi.hslf.*;
import org.apache.poi.hslf.model.*; import org.apache.poi.hslf.model.*;
@ -33,7 +32,7 @@ public final class TestSlideOrdering extends TestCase {
// Complex slideshow, record order doesn't match slide order // Complex slideshow, record order doesn't match slide order
private SlideShow ssB; private SlideShow ssB;
public TestSlideOrdering() throws Exception { public TestSlideOrdering() throws Exception {
String dirname = System.getProperty("HSLF.testdata.path"); String dirname = System.getProperty("HSLF.testdata.path");
String filenameA = dirname + "/basic_test_ppt_file.ppt"; String filenameA = dirname + "/basic_test_ppt_file.ppt";
@ -43,112 +42,93 @@ public final class TestSlideOrdering extends TestCase {
String filenameB = dirname + "/incorrect_slide_order.ppt"; String filenameB = dirname + "/incorrect_slide_order.ppt";
HSLFSlideShow hssB = new HSLFSlideShow(filenameB); HSLFSlideShow hssB = new HSLFSlideShow(filenameB);
ssB = new SlideShow(hssB); ssB = new SlideShow(hssB);
} }
/** /**
* Test the simple case - record order matches slide order * Test the simple case - record order matches slide order
*/ */
public void testSimpleCase() throws Exception { public void testSimpleCase() {
assertEquals(2, ssA.getSlides().length); assertEquals(2, ssA.getSlides().length);
Slide s1 = ssA.getSlides()[0]; Slide s1 = ssA.getSlides()[0];
Slide s2 = ssA.getSlides()[1]; Slide s2 = ssA.getSlides()[1];
String[] firstTRs = new String[] { String[] firstTRs = new String[] { "This is a test title", "This is the title on page 2" };
"This is a test title",
"This is the title on page 2"
};
assertEquals(firstTRs[0], s1.getTextRuns()[0].getText()); assertEquals(firstTRs[0], s1.getTextRuns()[0].getText());
assertEquals(firstTRs[1], s2.getTextRuns()[0].getText()); assertEquals(firstTRs[1], s2.getTextRuns()[0].getText());
} }
/** /**
* Test the complex case - record order differs from slide order * Test the complex case - record order differs from slide order
*/ */
public void testComplexCase() throws Exception { public void testComplexCase() {
assertEquals(3, ssB.getSlides().length); assertEquals(3, ssB.getSlides().length);
Slide s1 = ssB.getSlides()[0]; Slide s1 = ssB.getSlides()[0];
Slide s2 = ssB.getSlides()[1]; Slide s2 = ssB.getSlides()[1];
Slide s3 = ssB.getSlides()[2]; Slide s3 = ssB.getSlides()[2];
String[] firstTRs = new String[] { String[] firstTRs = new String[] { "Slide 1", "Slide 2", "Slide 3" };
"Slide 1",
"Slide 2",
"Slide 3"
};
assertEquals(firstTRs[0], s1.getTextRuns()[0].getText()); assertEquals(firstTRs[0], s1.getTextRuns()[0].getText());
assertEquals(firstTRs[1], s2.getTextRuns()[0].getText()); assertEquals(firstTRs[1], s2.getTextRuns()[0].getText());
assertEquals(firstTRs[2], s3.getTextRuns()[0].getText()); assertEquals(firstTRs[2], s3.getTextRuns()[0].getText());
} }
/** /**
* Assert that the order of slides is correct. * Assert that the order of slides is correct.
* *
* @param filename file name of the slide show to assert * @param filename
* @param titles array of reference slide titles * file name of the slide show to assert
*/ * @param titles
protected void assertSlideOrdering(String filename, String[] titles) throws Exception { * array of reference slide titles
SlideShow ppt = new SlideShow(new HSLFSlideShow(filename)); */
Slide[] slide = ppt.getSlides(); protected void assertSlideOrdering(String filename, String[] titles) throws Exception {
SlideShow ppt = new SlideShow(new HSLFSlideShow(filename));
Slide[] slide = ppt.getSlides();
assertEquals(titles.length, slide.length); assertEquals(titles.length, slide.length);
for (int i = 0; i < slide.length; i++) { for (int i = 0; i < slide.length; i++) {
String title = slide[i].getTitle(); String title = slide[i].getTitle();
assertEquals("Wrong slide title in " + filename, titles[i], title); assertEquals("Wrong slide title in " + filename, titles[i], title);
} }
} }
public void testTitles() throws Exception{ public void testTitles() throws Exception {
String dirname = System.getProperty("HSLF.testdata.path"); String dirname = System.getProperty("HSLF.testdata.path");
assertSlideOrdering(dirname + "/basic_test_ppt_file.ppt", assertSlideOrdering(dirname + "/basic_test_ppt_file.ppt", new String[] {
new String[]{ "This is a test title", "This is the title on page 2" });
"This is a test title",
"This is the title on page 2"
});
assertSlideOrdering(dirname + "/incorrect_slide_order.ppt", assertSlideOrdering(dirname + "/incorrect_slide_order.ppt", new String[] { "Slide 1",
new String[]{ "Slide 2", "Slide 3" });
"Slide 1",
"Slide 2",
"Slide 3"
});
assertSlideOrdering(dirname + "/next_test_ppt_file.ppt", assertSlideOrdering(dirname + "/next_test_ppt_file.ppt", new String[] {
new String[]{ "This is a test title", "This is the title on page 2" });
"This is a test title",
"This is the title on page 2"
});
assertSlideOrdering(dirname + "/Single_Coloured_Page.ppt", assertSlideOrdering(dirname + "/Single_Coloured_Page.ppt",
new String[]{ new String[] { "This is a title, it" + (char) 0x2019 + "s in black" });
"This is a title, it" + (char)0x2019 +"s in black"
});
assertSlideOrdering(dirname + "/Single_Coloured_Page_With_Fonts_and_Alignments.ppt", assertSlideOrdering(dirname + "/Single_Coloured_Page_With_Fonts_and_Alignments.ppt",
new String[]{ new String[] { "This is a title, it" + (char) 0x2019 + "s in black" });
"This is a title, it"+ (char)0x2019 +"s in black"
});
assertSlideOrdering(dirname + "/ParagraphStylesShorterThanCharStyles.ppt", assertSlideOrdering(
new String[]{ dirname + "/ParagraphStylesShorterThanCharStyles.ppt",
"ROMANCE: AN ANALYSIS", new String[] {
"AGENDA", "ROMANCE: AN ANALYSIS",
"You are an important supplier of various items that I need", "AGENDA",
'\n' + "Although The Psycho set back my relationship process, recovery is luckily enough under way", "You are an important supplier of various items that I need",
"Since the time that we seriously go out together, you rank highly among existing relationships", '\n' + "Although The Psycho set back my relationship process, recovery is luckily enough under way",
"Although our personal interests are mostly compatible, the greatest gap exists in Sex and Shopping", "Since the time that we seriously go out together, you rank highly among existing relationships",
"Your physical characteristics are strong when compared with your competition", "Although our personal interests are mostly compatible, the greatest gap exists in Sex and Shopping",
"The combination of your high physical appearance and personality rank you highly, although your sister is also a top prospect", "Your physical characteristics are strong when compared with your competition",
"When people found out that we were going out, their responses have been mixed", "The combination of your high physical appearance and personality rank you highly, although your sister is also a top prospect",
"The benchmark of relationship lifecycles, suggests that we are on schedule", "When people found out that we were going out, their responses have been mixed",
"In summary we can say that we are on the right track, but we must remain aware of possible roadblocks ", "The benchmark of relationship lifecycles, suggests that we are on schedule",
"THE ANSWER", "In summary we can say that we are on the right track, but we must remain aware of possible roadblocks ",
"Unfortunately a huge disconnect exists between my needs and your existing service", "THE ANSWER",
"SUMMARY", "Unfortunately a huge disconnect exists between my needs and your existing service",
}); "SUMMARY", });
} }
} }

63
src/scratchpad/testcases/org/apache/poi/hsmf/model/TestBlankFileRead.java
View File

@ -27,107 +27,96 @@ import junit.framework.TestCase;
/** /**
* Tests to verify that the library can read blank msg files. * Tests to verify that the library can read blank msg files.
* *
* @author Travis Ferguson * @author Travis Ferguson
* *
*/ */
public class TestBlankFileRead extends TestCase { public final class TestBlankFileRead extends TestCase {
private MAPIMessage mapiMessage; private MAPIMessage mapiMessage;
/** /**
* Initialize this test, load up the blank.msg mapi message. * Initialize this test, load up the blank.msg mapi message.
* @throws IOException
*/ */
public TestBlankFileRead() throws IOException { public TestBlankFileRead() throws IOException {
String dirname = System.getProperty("HSMF.testdata.path"); String dirname = System.getProperty("HSMF.testdata.path");
this.mapiMessage = new MAPIMessage(dirname + "/blank.msg"); this.mapiMessage = new MAPIMessage(dirname + "/blank.msg");
} }
/** /**
* Check if we can read the body of the blank message, we expect "". * Check if we can read the body of the blank message, we expect "".
*
* @throws Exception
*/ */
public void testReadBody() throws Exception { public void testReadBody() throws Exception {
try { try {
mapiMessage.getTextBody(); mapiMessage.getTextBody();
} catch(ChunkNotFoundException exp) { } catch(ChunkNotFoundException exp) {
return; return;
} }
TestCase.fail("Should have thrown a ChunkNotFoundException but didn't"); TestCase.fail("Should have thrown a ChunkNotFoundException but didn't");
} }
/** /**
* Test to see if we can read the CC Chunk. * Test to see if we can read the CC Chunk.
* @throws ChunkNotFoundException
*
*/ */
public void testReadDisplayCC() throws ChunkNotFoundException { public void testReadDisplayCC() throws ChunkNotFoundException {
String obtained = mapiMessage.getDisplayCC(); String obtained = mapiMessage.getDisplayCC();
String expected = ""; String expected = "";
TestCase.assertEquals(expected, obtained); TestCase.assertEquals(expected, obtained);
} }
/** /**
* Test to see if we can read the CC Chunk. * Test to see if we can read the CC Chunk.
* @throws ChunkNotFoundException
*
*/ */
public void testReadDisplayTo() throws ChunkNotFoundException { public void testReadDisplayTo() throws ChunkNotFoundException {
String obtained = mapiMessage.getDisplayTo(); String obtained = mapiMessage.getDisplayTo();
String expected = ""; String expected = "";
TestCase.assertEquals(expected, obtained); TestCase.assertEquals(expected, obtained);
} }
/** /**
* Test to see if we can read the FROM Chunk. * Test to see if we can read the FROM Chunk.
* @throws ChunkNotFoundException
*
*/ */
public void testReadDisplayFrom() throws ChunkNotFoundException { public void testReadDisplayFrom() {
try { try {
mapiMessage.getDisplayFrom(); mapiMessage.getDisplayFrom();
} catch(ChunkNotFoundException exp) { } catch(ChunkNotFoundException exp) {
return; return;
} }
TestCase.fail("Should have thrown a ChunkNotFoundException but didn't"); TestCase.fail("Should have thrown a ChunkNotFoundException but didn't");
} }
/** /**
* Test to see if we can read the CC Chunk. * Test to see if we can read the CC Chunk.
* @throws ChunkNotFoundException
*
*/ */
public void testReadDisplayBCC() throws ChunkNotFoundException { public void testReadDisplayBCC() throws ChunkNotFoundException {
String obtained = mapiMessage.getDisplayBCC(); String obtained = mapiMessage.getDisplayBCC();
String expected = ""; String expected = "";
TestCase.assertEquals(expected, obtained); TestCase.assertEquals(expected, obtained);
} }
/** /**
* Check if we can read the subject line of the blank message, we expect "" * Check if we can read the subject line of the blank message, we expect ""
* *
* @throws Exception * @throws Exception
*/ */
public void testReadSubject() throws Exception { public void testReadSubject() throws Exception {
String obtained = mapiMessage.getSubject(); String obtained = mapiMessage.getSubject();
TestCase.assertEquals("", obtained); TestCase.assertEquals("", obtained);
} }
/** /**
* Check if we can read the subject line of the blank message, we expect "" * Check if we can read the subject line of the blank message, we expect ""
* *
* @throws Exception * @throws Exception
*/ */
public void testReadConversationTopic() throws Exception { public void testReadConversationTopic() {
try { try {
mapiMessage.getConversationTopic(); mapiMessage.getConversationTopic();
} catch(ChunkNotFoundException exp) { } catch(ChunkNotFoundException exp) {
@ -135,6 +124,6 @@ public class TestBlankFileRead extends TestCase {
} }
TestCase.fail("We shouldn't have a ConversationTopic node on the blank.msg file."); TestCase.fail("We shouldn't have a ConversationTopic node on the blank.msg file.");
} }
} }

57
src/scratchpad/testcases/org/apache/poi/hwpf/TestHWPFPictures.java
View File

@ -19,13 +19,14 @@ package org.apache.poi.hwpf;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.IOException;
import java.util.List; import java.util.List;
import junit.framework.TestCase;
import org.apache.poi.hwpf.model.PicturesTable; import org.apache.poi.hwpf.model.PicturesTable;
import org.apache.poi.hwpf.usermodel.Picture; import org.apache.poi.hwpf.usermodel.Picture;
import junit.framework.TestCase;
/** /**
* Test picture support in HWPF * Test picture support in HWPF
* @author nick * @author nick
@ -34,25 +35,25 @@ public final class TestHWPFPictures extends TestCase {
private String docAFile; private String docAFile;
private String docBFile; private String docBFile;
private String docCFile; private String docCFile;
private String docDFile; private String docDFile;
private String imgAFile; private String imgAFile;
private String imgBFile; private String imgBFile;
private String imgCFile; private String imgCFile;
private String imgDFile; private String imgDFile;
protected void setUp() throws Exception { protected void setUp() {
String dirname = System.getProperty("HWPF.testdata.path"); String dirname = System.getProperty("HWPF.testdata.path");
docAFile = dirname + "/testPictures.doc"; docAFile = dirname + "/testPictures.doc";
docBFile = dirname + "/two_images.doc"; docBFile = dirname + "/two_images.doc";
docCFile = dirname + "/vector_image.doc"; docCFile = dirname + "/vector_image.doc";
docDFile = dirname + "/GaiaTest.doc"; docDFile = dirname + "/GaiaTest.doc";
imgAFile = dirname + "/simple_image.jpg"; imgAFile = dirname + "/simple_image.jpg";
imgBFile = dirname + "/simple_image.png"; imgBFile = dirname + "/simple_image.png";
imgCFile = dirname + "/vector_image.emf"; imgCFile = dirname + "/vector_image.emf";
imgDFile = dirname + "/GaiaTestImg.png"; imgDFile = dirname + "/GaiaTestImg.png";
} }
/** /**
@ -134,21 +135,20 @@ public final class TestHWPFPictures extends TestCase {
* Pending the missing files being uploaded to * Pending the missing files being uploaded to
* bug #44937 * bug #44937
*/ */
public void BROKENtestEscherDrawing() throws Exception public void BROKENtestEscherDrawing() throws Exception {
{ HWPFDocument docD = new HWPFDocument(new FileInputStream(docDFile));
HWPFDocument docD = new HWPFDocument(new FileInputStream(docDFile)); List allPictures = docD.getPicturesTable().getAllPictures();
List allPictures = docD.getPicturesTable().getAllPictures();
assertEquals(1, allPictures.size()); assertEquals(1, allPictures.size());
Picture pic = (Picture) allPictures.get(0); Picture pic = (Picture) allPictures.get(0);
assertNotNull(pic); assertNotNull(pic);
byte[] picD = readFile(imgDFile); byte[] picD = readFile(imgDFile);
assertEquals(picD.length, pic.getContent().length); assertEquals(picD.length, pic.getContent().length);
assertBytesSame(picD, pic.getContent()); assertBytesSame(picD, pic.getContent());
} }
private void assertBytesSame(byte[] a, byte[] b) { private void assertBytesSame(byte[] a, byte[] b) {
assertEquals(a.length, b.length); assertEquals(a.length, b.length);
@ -157,17 +157,22 @@ public final class TestHWPFPictures extends TestCase {
} }
} }
private byte[] readFile(String file) throws Exception { private static byte[] readFile(String file) {
ByteArrayOutputStream baos = new ByteArrayOutputStream(); ByteArrayOutputStream baos = new ByteArrayOutputStream();
FileInputStream fis = new FileInputStream(file); try {
byte[] buffer = new byte[1024]; FileInputStream fis = new FileInputStream(file);
byte[] buffer = new byte[1024];
int read = 0; int read = 0;
while(read > -1) { while(read > -1) {
read = fis.read(buffer); read = fis.read(buffer);
if(read > 0) { if(read > 0) {
baos.write(buffer,0,read); baos.write(buffer,0,read);
}
} }
fis.close();
} catch (IOException e) {
throw new RuntimeException(e);
} }
return baos.toByteArray(); return baos.toByteArray();

20
src/scratchpad/testcases/org/apache/poi/hwpf/TestHWPFRangeParts.java
View File

@ -65,12 +65,12 @@ public final class TestHWPFRangeParts extends TestCase {
"The trick with this one is that it contains some Unicode based strings in it.\r" + "The trick with this one is that it contains some Unicode based strings in it.\r" +
"Firstly, some currency symbols:\r" + "Firstly, some currency symbols:\r" +
"\tGBP - \u00a3\r" + "\tGBP - \u00a3\r" +
"\tEUR - \u20ac\r" + "\tEUR - \u20ac\r" +
"Now, we\u2019ll have some French text, in bold and big:\r" + "Now, we\u2019ll have some French text, in bold and big:\r" +
"\tMoli\u00e8re\r" + "\tMoli\u00e8re\r" +
"And some normal French text:\r" + "And some normal French text:\r" +
"\tL'Avare ou l'\u00c9cole du mensonge\r" + "\tL'Avare ou l'\u00c9cole du mensonge\r" +
"That\u2019s it for page one\r" "That\u2019s it for page one\r"
; ;
private static final String u_page_2 = private static final String u_page_2 =
"This is page two. Les Pr\u00e9cieuses ridicules. The end.\r" "This is page two. Les Pr\u00e9cieuses ridicules. The end.\r"
@ -109,7 +109,7 @@ public final class TestHWPFRangeParts extends TestCase {
); );
} }
public void testBasics() throws Exception { public void testBasics() {
// First check the start and end bits // First check the start and end bits
assertEquals( assertEquals(
0, 0,
@ -142,7 +142,7 @@ public final class TestHWPFRangeParts extends TestCase {
); );
} }
public void testContents() throws Exception { public void testContents() {
Range r; Range r;
// Now check the real ranges // Now check the real ranges
@ -179,7 +179,7 @@ public final class TestHWPFRangeParts extends TestCase {
); );
} }
public void testBasicsUnicode() throws Exception { public void testBasicsUnicode() {
// First check the start and end bits // First check the start and end bits
assertEquals( assertEquals(
0, 0,
@ -213,7 +213,7 @@ public final class TestHWPFRangeParts extends TestCase {
); );
} }
public void testContentsUnicode() throws Exception { public void testContentsUnicode() {
Range r; Range r;
// Now check the real ranges // Now check the real ranges

2
src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractor.java
View File

@ -111,7 +111,7 @@ public final class TestWordExtractor extends TestCase {
/** /**
* Test textPieces based extraction * Test textPieces based extraction
*/ */
public void testExtractFromTextPieces() throws Exception { public void testExtractFromTextPieces() {
String text = extractor.getTextFromPieces(); String text = extractor.getTextFromPieces();
assertEquals(p_text1_block, text); assertEquals(p_text1_block, text);
} }

9
src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractorBugs.java
View File

@ -28,11 +28,11 @@ import junit.framework.TestCase;
*/ */
public final class TestWordExtractorBugs extends TestCase { public final class TestWordExtractorBugs extends TestCase {
private String dirname; private String dirname;
protected void setUp() throws Exception { protected void setUp() {
dirname = System.getProperty("HWPF.testdata.path"); dirname = System.getProperty("HWPF.testdata.path");
} }
public void testProblemMetadata() throws Exception { public void testProblemMetadata() throws Exception {
String filename = dirname + "/ProblemExtracting.doc"; String filename = dirname + "/ProblemExtracting.doc";
WordExtractor extractor = WordExtractor extractor =
new WordExtractor(new FileInputStream(filename)); new WordExtractor(new FileInputStream(filename));
@ -41,6 +41,5 @@ public final class TestWordExtractorBugs extends TestCase {
extractor.getText(); extractor.getText();
extractor.getParagraphText(); extractor.getParagraphText();
extractor.getTextFromPieces(); extractor.getTextFromPieces();
} }
} }

2
src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug46610.java
View File

@ -29,7 +29,7 @@ import org.apache.poi.hwpf.HWPFDocument;
public class TestBug46610 extends TestCase { public class TestBug46610 extends TestCase {
private String dirname; private String dirname;
protected void setUp() throws Exception { protected void setUp() {
dirname = System.getProperty("HWPF.testdata.path"); dirname = System.getProperty("HWPF.testdata.path");
} }

170
src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestHeaderStories.java
View File

@ -25,8 +25,7 @@ import junit.framework.TestCase;
import org.apache.poi.hwpf.HWPFDocument; import org.apache.poi.hwpf.HWPFDocument;
/** /**
* Tests for the handling of header stories into * Tests for the handling of header stories into headers, footers etc
* headers, footers etc
*/ */
public final class TestHeaderStories extends TestCase { public final class TestHeaderStories extends TestCase {
private HWPFDocument none; private HWPFDocument none;
@ -38,71 +37,60 @@ public final class TestHeaderStories extends TestCase {
private HWPFDocument unicode; private HWPFDocument unicode;
private HWPFDocument withFields; private HWPFDocument withFields;
protected void setUp() throws Exception { protected void setUp() throws Exception {
String dirname = System.getProperty("HWPF.testdata.path"); String dirname = System.getProperty("HWPF.testdata.path");
none = new HWPFDocument( none = new HWPFDocument(new FileInputStream(new File(dirname, "NoHeadFoot.doc")));
new FileInputStream(new File(dirname, "NoHeadFoot.doc")) header = new HWPFDocument(new FileInputStream(new File(dirname, "ThreeColHead.doc")));
); footer = new HWPFDocument(new FileInputStream(new File(dirname, "ThreeColFoot.doc")));
header = new HWPFDocument( headerFooter = new HWPFDocument(new FileInputStream(new File(dirname,
new FileInputStream(new File(dirname, "ThreeColHead.doc")) "SimpleHeadThreeColFoot.doc")));
); oddEven = new HWPFDocument(new FileInputStream(
footer = new HWPFDocument( new File(dirname, "PageSpecificHeadFoot.doc")));
new FileInputStream(new File(dirname, "ThreeColFoot.doc")) diffFirst = new HWPFDocument(new FileInputStream(new File(dirname,
); "DiffFirstPageHeadFoot.doc")));
headerFooter = new HWPFDocument(
new FileInputStream(new File(dirname, "SimpleHeadThreeColFoot.doc"))
);
oddEven = new HWPFDocument(
new FileInputStream(new File(dirname, "PageSpecificHeadFoot.doc"))
);
diffFirst = new HWPFDocument(
new FileInputStream(new File(dirname, "DiffFirstPageHeadFoot.doc"))
);
unicode = new HWPFDocument( unicode = new HWPFDocument(
new FileInputStream(new File(dirname, "HeaderFooterUnicode.doc")) new FileInputStream(new File(dirname, "HeaderFooterUnicode.doc")));
);
withFields = new HWPFDocument( withFields = new HWPFDocument(
new FileInputStream(new File(dirname, "HeaderWithMacros.doc")) new FileInputStream(new File(dirname, "HeaderWithMacros.doc")));
); }
}
public void testNone() throws Exception { public void testNone() {
HeaderStories hs = new HeaderStories(none); HeaderStories hs = new HeaderStories(none);
assertNull(hs.getPlcfHdd()); assertNull(hs.getPlcfHdd());
assertEquals(0, hs.getRange().text().length()); assertEquals(0, hs.getRange().text().length());
} }
public void testHeader() throws Exception { public void testHeader() {
HeaderStories hs = new HeaderStories(header); HeaderStories hs = new HeaderStories(header);
assertEquals(60, hs.getRange().text().length()); assertEquals(60, hs.getRange().text().length());
// Should have the usual 6 separaters // Should have the usual 6 separaters
// Then all 6 of the different header/footer kinds // Then all 6 of the different header/footer kinds
// Finally a terminater // Finally a terminater
assertEquals(13, hs.getPlcfHdd().length()); assertEquals(13, hs.getPlcfHdd().length());
assertEquals(215, hs.getRange().getStartOffset()); assertEquals(215, hs.getRange().getStartOffset());
assertEquals(0, hs.getPlcfHdd().getProperty(0).getStart()); assertEquals(0, hs.getPlcfHdd().getProperty(0).getStart());
assertEquals(3, hs.getPlcfHdd().getProperty(1).getStart()); assertEquals(3, hs.getPlcfHdd().getProperty(1).getStart());
assertEquals(6, hs.getPlcfHdd().getProperty(2).getStart()); assertEquals(6, hs.getPlcfHdd().getProperty(2).getStart());
assertEquals(6, hs.getPlcfHdd().getProperty(3).getStart()); assertEquals(6, hs.getPlcfHdd().getProperty(3).getStart());
assertEquals(9, hs.getPlcfHdd().getProperty(4).getStart()); assertEquals(9, hs.getPlcfHdd().getProperty(4).getStart());
assertEquals(12, hs.getPlcfHdd().getProperty(5).getStart()); assertEquals(12, hs.getPlcfHdd().getProperty(5).getStart());
assertEquals(12, hs.getPlcfHdd().getProperty(6).getStart()); assertEquals(12, hs.getPlcfHdd().getProperty(6).getStart());
assertEquals(12, hs.getPlcfHdd().getProperty(7).getStart()); assertEquals(12, hs.getPlcfHdd().getProperty(7).getStart());
assertEquals(59, hs.getPlcfHdd().getProperty(8).getStart()); assertEquals(59, hs.getPlcfHdd().getProperty(8).getStart());
assertEquals(59, hs.getPlcfHdd().getProperty(9).getStart()); assertEquals(59, hs.getPlcfHdd().getProperty(9).getStart());
assertEquals(59, hs.getPlcfHdd().getProperty(10).getStart()); assertEquals(59, hs.getPlcfHdd().getProperty(10).getStart());
assertEquals(59, hs.getPlcfHdd().getProperty(11).getStart()); assertEquals(59, hs.getPlcfHdd().getProperty(11).getStart());
assertEquals(59, hs.getPlcfHdd().getProperty(12).getStart()); assertEquals(59, hs.getPlcfHdd().getProperty(12).getStart());
assertEquals("\u0003\r\r", hs.getFootnoteSeparator()); assertEquals("\u0003\r\r", hs.getFootnoteSeparator());
assertEquals("\u0004\r\r", hs.getFootnoteContSeparator()); assertEquals("\u0004\r\r", hs.getFootnoteContSeparator());
assertEquals("", hs.getFootnoteContNote()); assertEquals("", hs.getFootnoteContNote());
assertEquals("\u0003\r\r", hs.getEndnoteSeparator()); assertEquals("\u0003\r\r", hs.getEndnoteSeparator());
@ -113,63 +101,65 @@ public final class TestHeaderStories extends TestCase {
assertEquals("", hs.getEvenHeader()); assertEquals("", hs.getEvenHeader());
assertEquals("First header column!\tMid header Right header!\r\r", hs.getOddHeader()); assertEquals("First header column!\tMid header Right header!\r\r", hs.getOddHeader());
assertEquals("", hs.getFirstFooter()); assertEquals("", hs.getFirstFooter());
assertEquals("", hs.getEvenFooter()); assertEquals("", hs.getEvenFooter());
assertEquals("", hs.getOddFooter()); assertEquals("", hs.getOddFooter());
} }
public void testFooter() throws Exception { public void testFooter() {
HeaderStories hs = new HeaderStories(footer); HeaderStories hs = new HeaderStories(footer);
assertEquals("", hs.getFirstHeader()); assertEquals("", hs.getFirstHeader());
assertEquals("", hs.getEvenHeader()); assertEquals("", hs.getEvenHeader());
assertEquals("", hs.getOddHeader()); // Was \r\r but gets emptied assertEquals("", hs.getOddHeader()); // Was \r\r but gets emptied
assertEquals("", hs.getFirstFooter()); assertEquals("", hs.getFirstFooter());
assertEquals("", hs.getEvenFooter()); assertEquals("", hs.getEvenFooter());
assertEquals("Footer Left\tFooter Middle Footer Right\r\r", hs.getOddFooter()); assertEquals("Footer Left\tFooter Middle Footer Right\r\r", hs.getOddFooter());
} }
public void testHeaderFooter() throws Exception { public void testHeaderFooter() {
HeaderStories hs = new HeaderStories(headerFooter); HeaderStories hs = new HeaderStories(headerFooter);
assertEquals("", hs.getFirstHeader()); assertEquals("", hs.getFirstHeader());
assertEquals("", hs.getEvenHeader()); assertEquals("", hs.getEvenHeader());
assertEquals("I am some simple header text here\r\r\r", hs.getOddHeader()); assertEquals("I am some simple header text here\r\r\r", hs.getOddHeader());
assertEquals("", hs.getFirstFooter()); assertEquals("", hs.getFirstFooter());
assertEquals("", hs.getEvenFooter()); assertEquals("", hs.getEvenFooter());
assertEquals("Footer Left\tFooter Middle Footer Right\r\r", hs.getOddFooter()); assertEquals("Footer Left\tFooter Middle Footer Right\r\r", hs.getOddFooter());
} }
public void testOddEven() throws Exception { public void testOddEven() {
HeaderStories hs = new HeaderStories(oddEven); HeaderStories hs = new HeaderStories(oddEven);
assertEquals("", hs.getFirstHeader()); assertEquals("", hs.getFirstHeader());
assertEquals("[This is an Even Page, with a Header]\u0007August 20, 2008\u0007\u0007\r\r", hs.getEvenHeader()); assertEquals("[This is an Even Page, with a Header]\u0007August 20, 2008\u0007\u0007\r\r",
assertEquals("August 20, 2008\u0007[ODD Page Header text]\u0007\u0007\r\r", hs.getOddHeader()); hs.getEvenHeader());
assertEquals("August 20, 2008\u0007[ODD Page Header text]\u0007\u0007\r\r", hs
.getOddHeader());
assertEquals("", hs.getFirstFooter()); assertEquals("", hs.getFirstFooter());
assertEquals("\u0007Page \u0013 PAGE \\* MERGEFORMAT \u00142\u0015\u0007\u0007\u0007\u0007\u0007\u0007\u0007This is a simple footer on the second page\r\r", hs.getEvenFooter()); assertEquals(
"\u0007Page \u0013 PAGE \\* MERGEFORMAT \u00142\u0015\u0007\u0007\u0007\u0007\u0007\u0007\u0007This is a simple footer on the second page\r\r",
hs.getEvenFooter());
assertEquals("Footer Left\tFooter Middle Footer Right\r\r", hs.getOddFooter()); assertEquals("Footer Left\tFooter Middle Footer Right\r\r", hs.getOddFooter());
assertEquals("Footer Left\tFooter Middle Footer Right\r\r", hs.getFooter(1)); assertEquals("Footer Left\tFooter Middle Footer Right\r\r", hs.getFooter(1));
assertEquals("\u0007Page \u0013 PAGE \\* MERGEFORMAT \u00142\u0015\u0007\u0007\u0007\u0007\u0007\u0007\u0007This is a simple footer on the second page\r\r", hs.getFooter(2)); assertEquals(
"\u0007Page \u0013 PAGE \\* MERGEFORMAT \u00142\u0015\u0007\u0007\u0007\u0007\u0007\u0007\u0007This is a simple footer on the second page\r\r",
hs.getFooter(2));
assertEquals("Footer Left\tFooter Middle Footer Right\r\r", hs.getFooter(3)); assertEquals("Footer Left\tFooter Middle Footer Right\r\r", hs.getFooter(3));
} }
public void testFirst() throws Exception { public void testFirst() {
HeaderStories hs = new HeaderStories(diffFirst); HeaderStories hs = new HeaderStories(diffFirst);
assertEquals("I am the header on the first page, and I\u2019m nice and simple\r\r", hs.getFirstHeader()); assertEquals("I am the header on the first page, and I\u2019m nice and simple\r\r", hs
.getFirstHeader());
assertEquals("", hs.getEvenHeader()); assertEquals("", hs.getEvenHeader());
assertEquals("First header column!\tMid header Right header!\r\r", hs.getOddHeader()); assertEquals("First header column!\tMid header Right header!\r\r", hs.getOddHeader());
assertEquals("The footer of the first page\r\r", hs.getFirstFooter()); assertEquals("The footer of the first page\r\r", hs.getFirstFooter());
assertEquals("", hs.getEvenFooter()); assertEquals("", hs.getEvenFooter());
assertEquals("Footer Left\tFooter Middle Footer Right\r\r", hs.getOddFooter()); assertEquals("Footer Left\tFooter Middle Footer Right\r\r", hs.getOddFooter());
@ -177,29 +167,31 @@ public final class TestHeaderStories extends TestCase {
assertEquals("The footer of the first page\r\r", hs.getFooter(1)); assertEquals("The footer of the first page\r\r", hs.getFooter(1));
assertEquals("Footer Left\tFooter Middle Footer Right\r\r", hs.getFooter(2)); assertEquals("Footer Left\tFooter Middle Footer Right\r\r", hs.getFooter(2));
assertEquals("Footer Left\tFooter Middle Footer Right\r\r", hs.getFooter(3)); assertEquals("Footer Left\tFooter Middle Footer Right\r\r", hs.getFooter(3));
} }
public void testUnicode() throws Exception { public void testUnicode() {
HeaderStories hs = new HeaderStories(unicode); HeaderStories hs = new HeaderStories(unicode);
assertEquals("", hs.getFirstHeader()); assertEquals("", hs.getFirstHeader());
assertEquals("", hs.getEvenHeader()); assertEquals("", hs.getEvenHeader());
assertEquals("This is a simple header, with a \u20ac euro symbol in it.\r\r\r", hs.getOddHeader()); assertEquals("This is a simple header, with a \u20ac euro symbol in it.\r\r\r", hs
.getOddHeader());
assertEquals("", hs.getFirstFooter()); assertEquals("", hs.getFirstFooter());
assertEquals("", hs.getEvenFooter()); assertEquals("", hs.getEvenFooter());
assertEquals("The footer, with Moli\u00e8re, has Unicode in it.\r\r", hs.getOddFooter()); assertEquals("The footer, with Moli\u00e8re, has Unicode in it.\r\r", hs.getOddFooter());
} }
public void testWithFields() throws Exception { public void testWithFields() {
HeaderStories hs = new HeaderStories(withFields); HeaderStories hs = new HeaderStories(withFields);
assertFalse(hs.areFieldsStripped()); assertFalse(hs.areFieldsStripped());
assertEquals("HEADER GOES HERE. 8/12/2008 \u0013 AUTHOR \\* MERGEFORMAT \u0014Eric Roch\u0015\r\r\r", hs.getOddHeader()); assertEquals(
"HEADER GOES HERE. 8/12/2008 \u0013 AUTHOR \\* MERGEFORMAT \u0014Eric Roch\u0015\r\r\r",
hs.getOddHeader());
// Now turn on stripping // Now turn on stripping
hs.setAreFieldsStripped(true); hs.setAreFieldsStripped(true);
assertEquals("HEADER GOES HERE. 8/12/2008 Eric Roch\r\r\r", hs.getOddHeader()); assertEquals("HEADER GOES HERE. 8/12/2008 Eric Roch\r\r\r", hs.getOddHeader());
} }
} }

2
src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRange.java
View File

@ -24,7 +24,7 @@ import junit.framework.TestCase;
* text replacement or textual contents * text replacement or textual contents
*/ */
public final class TestRange extends TestCase { public final class TestRange extends TestCase {
public void testFieldStripping() throws Exception { public void testFieldStripping() {
String exp = "This is some text."; String exp = "This is some text.";
String single = "This is some \u0013Blah!\u0015text."; String single = "This is some \u0013Blah!\u0015text.";

2
src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeDelete.java
View File

@ -47,7 +47,7 @@ public final class TestRangeDelete extends TestCase {
private String illustrativeDocFile; private String illustrativeDocFile;
protected void setUp() throws Exception { protected void setUp() {
String dirname = System.getProperty("HWPF.testdata.path"); String dirname = System.getProperty("HWPF.testdata.path");

2
src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeInsertion.java
View File

@ -39,7 +39,7 @@ public final class TestRangeInsertion extends TestCase {
private String illustrativeDocFile; private String illustrativeDocFile;
protected void setUp() throws Exception { protected void setUp() {
String dirname = System.getProperty("HWPF.testdata.path"); String dirname = System.getProperty("HWPF.testdata.path");

10
src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeProperties.java
View File

@ -79,7 +79,7 @@ public final class TestRangeProperties extends TestCase {
} }
public void testAsciiTextParagraphs() throws Exception { public void testAsciiTextParagraphs() {
Range r = a.getRange(); Range r = a.getRange();
assertEquals( assertEquals(
a_page_1 + a_page_1 +
@ -138,7 +138,7 @@ public final class TestRangeProperties extends TestCase {
); );
} }
public void testAsciiStyling() throws Exception { public void testAsciiStyling() {
Range r = a.getRange(); Range r = a.getRange();
Paragraph p1 = r.getParagraph(0); Paragraph p1 = r.getParagraph(0);
@ -160,7 +160,7 @@ public final class TestRangeProperties extends TestCase {
* Tests the raw definitions of the paragraphs of * Tests the raw definitions of the paragraphs of
* a unicode document * a unicode document
*/ */
public void testUnicodeParagraphDefinitions() throws Exception { public void testUnicodeParagraphDefinitions() {
Range r = u.getRange(); Range r = u.getRange();
String[] p1_parts = u_page_1.split("\r"); String[] p1_parts = u_page_1.split("\r");
String[] p2_parts = u_page_2.split("\r"); String[] p2_parts = u_page_2.split("\r");
@ -251,7 +251,7 @@ public final class TestRangeProperties extends TestCase {
/** /**
* Tests the paragraph text of a unicode document * Tests the paragraph text of a unicode document
*/ */
public void testUnicodeTextParagraphs() throws Exception { public void testUnicodeTextParagraphs() {
Range r = u.getRange(); Range r = u.getRange();
assertEquals( assertEquals(
u_page_1 + u_page_1 +
@ -281,7 +281,7 @@ public final class TestRangeProperties extends TestCase {
assertEquals(page_break + "\r", r.getParagraph(10).text()); assertEquals(page_break + "\r", r.getParagraph(10).text());
assertEquals(p2_parts[0] + "\r", r.getParagraph(11).text()); assertEquals(p2_parts[0] + "\r", r.getParagraph(11).text());
} }
public void testUnicodeStyling() throws Exception { public void testUnicodeStyling() {
Range r = u.getRange(); Range r = u.getRange();
String[] p1_parts = u_page_1.split("\r"); String[] p1_parts = u_page_1.split("\r");

2
src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeReplacement.java
View File

@ -42,7 +42,7 @@ public final class TestRangeReplacement extends TestCase {
private String illustrativeDocFile; private String illustrativeDocFile;
protected void setUp() throws Exception { protected void setUp() {
String dirname = System.getProperty("HWPF.testdata.path"); String dirname = System.getProperty("HWPF.testdata.path");

27
src/testcases/org/apache/poi/TestPOIDocumentMain.java
View File

@ -1,4 +1,3 @@
/* ==================================================================== /* ====================================================================
Licensed to the Apache Software Foundation (ASF) under one or more Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with contributor license agreements. See the NOTICE file distributed with
@ -30,7 +29,7 @@ import org.apache.poi.poifs.filesystem.POIFSFileSystem;
/** /**
* Tests that POIDocument correctly loads and saves the common * Tests that POIDocument correctly loads and saves the common
* (hspf) Document Properties. * (hspf) Document Properties.
* *
* This is part 1 of 2 of the tests - it only does the POIDocuments * This is part 1 of 2 of the tests - it only does the POIDocuments
* which are part of the Main (not scratchpad) * which are part of the Main (not scratchpad)
* *
@ -45,26 +44,26 @@ public final class TestPOIDocumentMain extends TestCase {
* Set things up, two spreadsheets for our testing * Set things up, two spreadsheets for our testing
*/ */
public void setUp() { public void setUp() {
doc = HSSFTestDataSamples.openSampleWorkbook("DateFormats.xls"); doc = HSSFTestDataSamples.openSampleWorkbook("DateFormats.xls");
doc2 = HSSFTestDataSamples.openSampleWorkbook("StringFormulas.xls"); doc2 = HSSFTestDataSamples.openSampleWorkbook("StringFormulas.xls");
} }
public void testReadProperties() throws Exception { public void testReadProperties() {
// We should have both sets // We should have both sets
assertNotNull(doc.getDocumentSummaryInformation()); assertNotNull(doc.getDocumentSummaryInformation());
assertNotNull(doc.getSummaryInformation()); assertNotNull(doc.getSummaryInformation());
// Check they are as expected for the test doc // Check they are as expected for the test doc
assertEquals("Administrator", doc.getSummaryInformation().getAuthor()); assertEquals("Administrator", doc.getSummaryInformation().getAuthor());
assertEquals(0, doc.getDocumentSummaryInformation().getByteCount()); assertEquals(0, doc.getDocumentSummaryInformation().getByteCount());
} }
public void testReadProperties2() throws Exception { public void testReadProperties2() {
// Check again on the word one // Check again on the word one
assertNotNull(doc2.getDocumentSummaryInformation()); assertNotNull(doc2.getDocumentSummaryInformation());
assertNotNull(doc2.getSummaryInformation()); assertNotNull(doc2.getSummaryInformation());
assertEquals("Avik Sengupta", doc2.getSummaryInformation().getAuthor()); assertEquals("Avik Sengupta", doc2.getSummaryInformation().getAuthor());
assertEquals(null, doc2.getSummaryInformation().getKeywords()); assertEquals(null, doc2.getSummaryInformation().getKeywords());
assertEquals(0, doc2.getDocumentSummaryInformation().getByteCount()); assertEquals(0, doc2.getDocumentSummaryInformation().getByteCount());
@ -75,7 +74,7 @@ public final class TestPOIDocumentMain extends TestCase {
POIFSFileSystem outFS = new POIFSFileSystem(); POIFSFileSystem outFS = new POIFSFileSystem();
doc.readProperties(); doc.readProperties();
doc.writeProperties(outFS); doc.writeProperties(outFS);
// Should now hold them // Should now hold them
assertNotNull( assertNotNull(
outFS.createDocumentInputStream("\005SummaryInformation") outFS.createDocumentInputStream("\005SummaryInformation")
@ -87,21 +86,21 @@ public final class TestPOIDocumentMain extends TestCase {
public void testWriteReadProperties() throws Exception { public void testWriteReadProperties() throws Exception {
ByteArrayOutputStream baos = new ByteArrayOutputStream(); ByteArrayOutputStream baos = new ByteArrayOutputStream();
// Write them out // Write them out
POIFSFileSystem outFS = new POIFSFileSystem(); POIFSFileSystem outFS = new POIFSFileSystem();
doc.readProperties(); doc.readProperties();
doc.writeProperties(outFS); doc.writeProperties(outFS);
outFS.writeFilesystem(baos); outFS.writeFilesystem(baos);
// Create a new version // Create a new version
ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray()); ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
POIFSFileSystem inFS = new POIFSFileSystem(bais); POIFSFileSystem inFS = new POIFSFileSystem(bais);
// Check they're still there // Check they're still there
doc.filesystem = inFS; doc.filesystem = inFS;
doc.readProperties(); doc.readProperties();
// Delegate test // Delegate test
testReadProperties(); testReadProperties();
} }

6
src/testcases/org/apache/poi/ddf/TestEscherBlipWMFRecord.java
View File

@ -21,13 +21,11 @@ import junit.framework.TestCase;
import org.apache.poi.util.HexDump; import org.apache.poi.util.HexDump;
import org.apache.poi.util.HexRead; import org.apache.poi.util.HexRead;
public class TestEscherBlipWMFRecord extends TestCase public final class TestEscherBlipWMFRecord extends TestCase {
{
private String dataStr; private String dataStr;
private byte[] data; private byte[] data;
protected void setUp() throws Exception protected void setUp() {
{
dataStr = "2C 15 18 F0 34 00 00 00 01 01 01 01 01 01 01 01 " + dataStr = "2C 15 18 F0 34 00 00 00 01 01 01 01 01 01 01 01 " +
"01 01 01 01 01 01 01 01 06 00 00 00 03 00 00 00 " + "01 01 01 01 01 01 01 01 06 00 00 00 03 00 00 00 " +
"01 00 00 00 04 00 00 00 02 00 00 00 0A 00 00 00 " + "01 00 00 00 04 00 00 00 02 00 00 00 0A 00 00 00 " +

10
src/testcases/org/apache/poi/ddf/TestEscherBoolProperty.java
View File

@ -1,4 +1,3 @@
/* ==================================================================== /* ====================================================================
Licensed to the Apache Software Foundation (ASF) under one or more Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with contributor license agreements. See the NOTICE file distributed with
@ -15,17 +14,14 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
==================================================================== */ ==================================================================== */
package org.apache.poi.ddf; package org.apache.poi.ddf;
import junit.framework.TestCase; import junit.framework.TestCase;
public class TestEscherBoolProperty extends TestCase public final class TestEscherBoolProperty extends TestCase {
{ public void testToString() {
public void testToString() throws Exception
{
EscherBoolProperty p = new EscherBoolProperty((short)1, 1); EscherBoolProperty p = new EscherBoolProperty((short)1, 1);
assertEquals("propNum: 1, RAW: 0x0001, propName: unknown, complex: false, blipId: false, value: 1 (0x00000001)", p.toString()); assertEquals("propNum: 1, RAW: 0x0001, propName: unknown, complex: false, blipId: false, value: 1 (0x00000001)", p.toString());
} }
} }

9
src/testcases/org/apache/poi/ddf/TestEscherChildAnchorRecord.java
View File

@ -21,8 +21,7 @@ import junit.framework.TestCase;
import org.apache.poi.util.HexDump; import org.apache.poi.util.HexDump;
import org.apache.poi.util.HexRead; import org.apache.poi.util.HexRead;
public class TestEscherChildAnchorRecord extends TestCase public final class TestEscherChildAnchorRecord extends TestCase {
{
public void testSerialize() { public void testSerialize() {
EscherChildAnchorRecord r = createRecord(); EscherChildAnchorRecord r = createRecord();
@ -38,8 +37,7 @@ public class TestEscherChildAnchorRecord extends TestCase
"04, 00, 00, 00]", HexDump.toHex( data ) ); "04, 00, 00, 00]", HexDump.toHex( data ) );
} }
public void testFillFields() throws Exception public void testFillFields() {
{
String hexData = "01 00 " + String hexData = "01 00 " +
"0F F0 " + "0F F0 " +
"10 00 00 00 " + "10 00 00 00 " +
@ -73,8 +71,7 @@ public class TestEscherChildAnchorRecord extends TestCase
assertEquals( expected, createRecord().toString() ); assertEquals( expected, createRecord().toString() );
} }
private static EscherChildAnchorRecord createRecord() private static EscherChildAnchorRecord createRecord() {
{
EscherChildAnchorRecord r = new EscherChildAnchorRecord(); EscherChildAnchorRecord r = new EscherChildAnchorRecord();
r.setRecordId( EscherChildAnchorRecord.RECORD_ID ); r.setRecordId( EscherChildAnchorRecord.RECORD_ID );
r.setOptions( (short) 0x0001 ); r.setOptions( (short) 0x0001 );

73
src/testcases/org/apache/poi/hpsf/extractor/TestHPSFPropertiesExtractor.java
View File

@ -14,41 +14,42 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
==================================================================== */ ==================================================================== */
package org.apache.poi.hpsf.extractor; package org.apache.poi.hpsf.extractor;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.IOException;
import junit.framework.TestCase;
import org.apache.poi.hssf.extractor.ExcelExtractor; import org.apache.poi.hssf.extractor.ExcelExtractor;
import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.poifs.filesystem.POIFSFileSystem; import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import junit.framework.TestCase; public final class TestHPSFPropertiesExtractor extends TestCase {
public class TestHPSFPropertiesExtractor extends TestCase {
private String dir; private String dir;
protected void setUp() throws Exception { protected void setUp() {
dir = System.getProperty("HPSF.testdata.path"); dir = System.getProperty("HPSF.testdata.path");
assertNotNull("HPSF.testdata.path not set", dir); assertNotNull("HPSF.testdata.path not set", dir);
} }
public void testNormalProperties() throws Exception { public void testNormalProperties() throws Exception {
POIFSFileSystem fs = new POIFSFileSystem( POIFSFileSystem fs = new POIFSFileSystem(new FileInputStream(
new FileInputStream(new File(dir, "TestMickey.doc")) new File(dir, "TestMickey.doc")));
);
HPSFPropertiesExtractor ext = new HPSFPropertiesExtractor(fs); HPSFPropertiesExtractor ext = new HPSFPropertiesExtractor(fs);
ext.getText(); ext.getText();
// Check each bit in turn // Check each bit in turn
String sinfText = ext.getSummaryInformationText(); String sinfText = ext.getSummaryInformationText();
String dinfText = ext.getDocumentSummaryInformationText(); String dinfText = ext.getDocumentSummaryInformationText();
assertTrue(sinfText.indexOf("TEMPLATE = Normal") > -1); assertTrue(sinfText.indexOf("TEMPLATE = Normal") > -1);
assertTrue(sinfText.indexOf("SUBJECT = sample subject") > -1); assertTrue(sinfText.indexOf("SUBJECT = sample subject") > -1);
assertTrue(dinfText.indexOf("MANAGER = sample manager") > -1); assertTrue(dinfText.indexOf("MANAGER = sample manager") > -1);
assertTrue(dinfText.indexOf("COMPANY = sample company") > -1); assertTrue(dinfText.indexOf("COMPANY = sample company") > -1);
// Now overall // Now overall
String text = ext.getText(); String text = ext.getText();
assertTrue(text.indexOf("TEMPLATE = Normal") > -1); assertTrue(text.indexOf("TEMPLATE = Normal") > -1);
@ -56,22 +57,22 @@ public class TestHPSFPropertiesExtractor extends TestCase {
assertTrue(text.indexOf("MANAGER = sample manager") > -1); assertTrue(text.indexOf("MANAGER = sample manager") > -1);
assertTrue(text.indexOf("COMPANY = sample company") > -1); assertTrue(text.indexOf("COMPANY = sample company") > -1);
} }
public void testNormalUnicodeProperties() throws Exception { public void testNormalUnicodeProperties() throws Exception {
POIFSFileSystem fs = new POIFSFileSystem( POIFSFileSystem fs = new POIFSFileSystem(new FileInputStream(new File(dir,
new FileInputStream(new File(dir, "TestUnicode.xls")) "TestUnicode.xls")));
);
HPSFPropertiesExtractor ext = new HPSFPropertiesExtractor(fs); HPSFPropertiesExtractor ext = new HPSFPropertiesExtractor(fs);
ext.getText(); ext.getText();
// Check each bit in turn // Check each bit in turn
String sinfText = ext.getSummaryInformationText(); String sinfText = ext.getSummaryInformationText();
String dinfText = ext.getDocumentSummaryInformationText(); String dinfText = ext.getDocumentSummaryInformationText();
assertTrue(sinfText.indexOf("AUTHOR = marshall") > -1); assertTrue(sinfText.indexOf("AUTHOR = marshall") > -1);
assertTrue(sinfText.indexOf("TITLE = Titel: \u00c4h") > -1); assertTrue(sinfText.indexOf("TITLE = Titel: \u00c4h") > -1);
assertTrue(dinfText.indexOf("COMPANY = Schreiner") > -1); assertTrue(dinfText.indexOf("COMPANY = Schreiner") > -1);
assertTrue(dinfText.indexOf("SCALE = false") > -1); assertTrue(dinfText.indexOf("SCALE = false") > -1);
// Now overall // Now overall
String text = ext.getText(); String text = ext.getText();
assertTrue(text.indexOf("AUTHOR = marshall") > -1); assertTrue(text.indexOf("AUTHOR = marshall") > -1);
@ -79,37 +80,41 @@ public class TestHPSFPropertiesExtractor extends TestCase {
assertTrue(text.indexOf("COMPANY = Schreiner") > -1); assertTrue(text.indexOf("COMPANY = Schreiner") > -1);
assertTrue(text.indexOf("SCALE = false") > -1); assertTrue(text.indexOf("SCALE = false") > -1);
} }
public void testCustomProperties() throws Exception { public void testCustomProperties() throws Exception {
POIFSFileSystem fs = new POIFSFileSystem( POIFSFileSystem fs = new POIFSFileSystem(new FileInputStream(
new FileInputStream(new File(dir, "TestMickey.doc")) new File(dir, "TestMickey.doc")));
);
HPSFPropertiesExtractor ext = new HPSFPropertiesExtractor(fs); HPSFPropertiesExtractor ext = new HPSFPropertiesExtractor(fs);
// Custom properties are part of the document info stream // Custom properties are part of the document info stream
String dinfText = ext.getDocumentSummaryInformationText(); String dinfText = ext.getDocumentSummaryInformationText();
assertTrue(dinfText.indexOf("Client = sample client") > -1); assertTrue(dinfText.indexOf("Client = sample client") > -1);
assertTrue(dinfText.indexOf("Division = sample division") > -1); assertTrue(dinfText.indexOf("Division = sample division") > -1);
String text = ext.getText(); String text = ext.getText();
assertTrue(text.indexOf("Client = sample client") > -1); assertTrue(text.indexOf("Client = sample client") > -1);
assertTrue(text.indexOf("Division = sample division") > -1); assertTrue(text.indexOf("Division = sample division") > -1);
} }
public void testConstructors() throws Exception { public void testConstructors() {
POIFSFileSystem fs = new POIFSFileSystem( POIFSFileSystem fs;
new FileInputStream(new File(dir, "TestUnicode.xls")) HSSFWorkbook wb;
); try {
HSSFWorkbook wb = new HSSFWorkbook(fs); fs = new POIFSFileSystem(new FileInputStream(new File(dir, "TestUnicode.xls")));
wb = new HSSFWorkbook(fs);
} catch (IOException e) {
throw new RuntimeException(e);
}
ExcelExtractor excelExt = new ExcelExtractor(wb); ExcelExtractor excelExt = new ExcelExtractor(wb);
String fsText = (new HPSFPropertiesExtractor(fs)).getText(); String fsText = (new HPSFPropertiesExtractor(fs)).getText();
String hwText = (new HPSFPropertiesExtractor(wb)).getText(); String hwText = (new HPSFPropertiesExtractor(wb)).getText();
String eeText = (new HPSFPropertiesExtractor(excelExt)).getText(); String eeText = (new HPSFPropertiesExtractor(excelExt)).getText();
assertEquals(fsText, hwText); assertEquals(fsText, hwText);
assertEquals(fsText, eeText); assertEquals(fsText, eeText);
assertTrue(fsText.indexOf("AUTHOR = marshall") > -1); assertTrue(fsText.indexOf("AUTHOR = marshall") > -1);
assertTrue(fsText.indexOf("TITLE = Titel: \u00c4h") > -1); assertTrue(fsText.indexOf("TITLE = Titel: \u00c4h") > -1);
} }
} }

20
src/testcases/org/apache/poi/hssf/model/TestDrawingManager.java
View File

@ -14,16 +14,15 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
==================================================================== */ ==================================================================== */
package org.apache.poi.hssf.model; package org.apache.poi.hssf.model;
import junit.framework.TestCase; import junit.framework.TestCase;
import org.apache.poi.ddf.EscherDggRecord; import org.apache.poi.ddf.EscherDggRecord;
import org.apache.poi.ddf.EscherDgRecord; import org.apache.poi.ddf.EscherDgRecord;
public class TestDrawingManager extends TestCase public final class TestDrawingManager extends TestCase {
{ public void testFindFreeSPIDBlock() {
public void testFindFreeSPIDBlock() throws Exception
{
EscherDggRecord dgg = new EscherDggRecord(); EscherDggRecord dgg = new EscherDggRecord();
DrawingManager dm = new DrawingManager( dgg ); DrawingManager dm = new DrawingManager( dgg );
dgg.setShapeIdMax( 1024 ); dgg.setShapeIdMax( 1024 );
@ -34,8 +33,7 @@ public class TestDrawingManager extends TestCase
assertEquals( 2048, dm.findFreeSPIDBlock() ); assertEquals( 2048, dm.findFreeSPIDBlock() );
} }
public void testFindNewDrawingGroupId() throws Exception public void testFindNewDrawingGroupId() {
{
EscherDggRecord dgg = new EscherDggRecord(); EscherDggRecord dgg = new EscherDggRecord();
dgg.setDrawingsSaved( 1 ); dgg.setDrawingsSaved( 1 );
dgg.setFileIdClusters( new EscherDggRecord.FileIdCluster[]{ dgg.setFileIdClusters( new EscherDggRecord.FileIdCluster[]{
@ -48,8 +46,7 @@ public class TestDrawingManager extends TestCase
assertEquals( 3, dm.findNewDrawingGroupId() ); assertEquals( 3, dm.findNewDrawingGroupId() );
} }
public void testDrawingGroupExists() throws Exception public void testDrawingGroupExists() {
{
EscherDggRecord dgg = new EscherDggRecord(); EscherDggRecord dgg = new EscherDggRecord();
dgg.setDrawingsSaved( 1 ); dgg.setDrawingsSaved( 1 );
dgg.setFileIdClusters( new EscherDggRecord.FileIdCluster[]{ dgg.setFileIdClusters( new EscherDggRecord.FileIdCluster[]{
@ -60,8 +57,7 @@ public class TestDrawingManager extends TestCase
assertFalse( dm.drawingGroupExists( (short) 3 ) ); assertFalse( dm.drawingGroupExists( (short) 3 ) );
} }
public void testCreateDgRecord() throws Exception public void testCreateDgRecord() {
{
EscherDggRecord dgg = new EscherDggRecord(); EscherDggRecord dgg = new EscherDggRecord();
dgg.setDrawingsSaved( 0 ); dgg.setDrawingsSaved( 0 );
dgg.setFileIdClusters( new EscherDggRecord.FileIdCluster[]{} ); dgg.setFileIdClusters( new EscherDggRecord.FileIdCluster[]{} );
@ -76,8 +72,7 @@ public class TestDrawingManager extends TestCase
assertEquals( 0, dm.getDgg().getFileIdClusters()[0].getNumShapeIdsUsed() ); assertEquals( 0, dm.getDgg().getFileIdClusters()[0].getNumShapeIdsUsed() );
} }
public void testAllocateShapeId() throws Exception public void testAllocateShapeId() {
{
EscherDggRecord dgg = new EscherDggRecord(); EscherDggRecord dgg = new EscherDggRecord();
dgg.setDrawingsSaved( 0 ); dgg.setDrawingsSaved( 0 );
dgg.setFileIdClusters( new EscherDggRecord.FileIdCluster[]{} ); dgg.setFileIdClusters( new EscherDggRecord.FileIdCluster[]{} );
@ -93,5 +88,4 @@ public class TestDrawingManager extends TestCase
assertEquals( 1024, dg.getLastMSOSPID() ); assertEquals( 1024, dg.getLastMSOSPID() );
assertEquals( 1, dg.getNumShapes() ); assertEquals( 1, dg.getNumShapes() );
} }
} }

48
src/testcases/org/apache/poi/hssf/model/TestDrawingManager2.java
View File

@ -1,40 +1,37 @@
/* /* ====================================================================
* Licensed to the Apache Software Foundation (ASF) under one or more Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership. this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0 The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0 http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and See the License for the specific language governing permissions and
* limitations under the License. limitations under the License.
*/ ==================================================================== */
package org.apache.poi.hssf.model; package org.apache.poi.hssf.model;
import junit.framework.TestCase; import junit.framework.TestCase;
import org.apache.poi.ddf.EscherDggRecord; import org.apache.poi.ddf.EscherDggRecord;
import org.apache.poi.ddf.EscherDgRecord; import org.apache.poi.ddf.EscherDgRecord;
public class TestDrawingManager2 extends TestCase public final class TestDrawingManager2 extends TestCase {
{
private DrawingManager2 drawingManager2; private DrawingManager2 drawingManager2;
private EscherDggRecord dgg; private EscherDggRecord dgg;
protected void setUp() throws Exception protected void setUp() {
{
super.setUp();
dgg = new EscherDggRecord(); dgg = new EscherDggRecord();
dgg.setFileIdClusters( new EscherDggRecord.FileIdCluster[0] ); dgg.setFileIdClusters( new EscherDggRecord.FileIdCluster[0] );
drawingManager2 = new DrawingManager2( dgg ); drawingManager2 = new DrawingManager2( dgg );
} }
public void testCreateDgRecord() throws Exception public void testCreateDgRecord() {
{
EscherDgRecord dgRecord1 = drawingManager2.createDgRecord(); EscherDgRecord dgRecord1 = drawingManager2.createDgRecord();
assertEquals( 1, dgRecord1.getDrawingGroupId() ); assertEquals( 1, dgRecord1.getDrawingGroupId() );
assertEquals( -1, dgRecord1.getLastMSOSPID() ); assertEquals( -1, dgRecord1.getLastMSOSPID() );
@ -49,8 +46,7 @@ public class TestDrawingManager2 extends TestCase
assertEquals( 0, dgg.getNumShapesSaved() ); assertEquals( 0, dgg.getNumShapesSaved() );
} }
public void testAllocateShapeId() throws Exception public void testAllocateShapeId() {
{
EscherDgRecord dgRecord1 = drawingManager2.createDgRecord(); EscherDgRecord dgRecord1 = drawingManager2.createDgRecord();
EscherDgRecord dgRecord2 = drawingManager2.createDgRecord(); EscherDgRecord dgRecord2 = drawingManager2.createDgRecord();
@ -79,4 +75,4 @@ public class TestDrawingManager2 extends TestCase
assertEquals( 4, dgg.getNumIdClusters() ); assertEquals( 4, dgg.getNumIdClusters() );
assertEquals( 1026, dgg.getNumShapesSaved() ); assertEquals( 1026, dgg.getNumShapesSaved() );
} }
} }

32
src/testcases/org/apache/poi/hssf/model/TestFormulaParserIf.java
View File

@ -41,11 +41,11 @@ public final class TestFormulaParserIf extends TestCase {
private static Ptg[] parseFormula(String formula) { private static Ptg[] parseFormula(String formula) {
return TestFormulaParser.parseFormula(formula); return TestFormulaParser.parseFormula(formula);
} }
private static Ptg[] confirmTokenClasses(String formula, Class[] expectedClasses) { private static Ptg[] confirmTokenClasses(String formula, Class<?>[] expectedClasses) {
return TestFormulaParser.confirmTokenClasses(formula, expectedClasses); return TestFormulaParser.confirmTokenClasses(formula, expectedClasses);
} }
private static void confirmAttrData(Ptg[] ptgs, int i, int expectedData) { private static void confirmAttrData(Ptg[] ptgs, int i, int expectedData) {
Ptg ptg = ptgs[i]; Ptg ptg = ptgs[i];
if (!(ptg instanceof AttrPtg)) { if (!(ptg instanceof AttrPtg)) {
@ -54,10 +54,10 @@ public final class TestFormulaParserIf extends TestCase {
AttrPtg attrPtg = (AttrPtg) ptg; AttrPtg attrPtg = (AttrPtg) ptg;
assertEquals(expectedData, attrPtg.getData()); assertEquals(expectedData, attrPtg.getData());
} }
public void testSimpleIf() { public void testSimpleIf() {
Class[] expClss; Class<?>[] expClss;
expClss = new Class[] { expClss = new Class[] {
RefPtg.class, RefPtg.class,
@ -77,8 +77,8 @@ public final class TestFormulaParserIf extends TestCase {
} }
public void testSimpleIfNoFalseParam() { public void testSimpleIfNoFalseParam() {
Class[] expClss; Class<?>[] expClss;
expClss = new Class[] { expClss = new Class[] {
RefPtg.class, RefPtg.class,
@ -95,8 +95,8 @@ public final class TestFormulaParserIf extends TestCase {
} }
public void testIfWithLargeParams() { public void testIfWithLargeParams() {
Class[] expClss; Class<?>[] expClss;
expClss = new Class[] { expClss = new Class[] {
RefPtg.class, RefPtg.class,
@ -110,11 +110,11 @@ public final class TestFormulaParserIf extends TestCase {
AddPtg.class, AddPtg.class,
FuncPtg.class, FuncPtg.class,
AttrPtg.class, // tAttrSkip AttrPtg.class, // tAttrSkip
RefPtg.class, RefPtg.class,
RefPtg.class, RefPtg.class,
FuncPtg.class, FuncPtg.class,
AttrPtg.class, // tAttrSkip AttrPtg.class, // tAttrSkip
FuncVarPtg.class, FuncVarPtg.class,
}; };
@ -125,10 +125,10 @@ public final class TestFormulaParserIf extends TestCase {
confirmAttrData(ptgs, 9, 20); confirmAttrData(ptgs, 9, 20);
confirmAttrData(ptgs, 13, 3); confirmAttrData(ptgs, 13, 3);
} }
public void testNestedIf() { public void testNestedIf() {
Class[] expClss; Class<?>[] expClss;
expClss = new Class[] { expClss = new Class[] {
@ -164,7 +164,7 @@ public final class TestFormulaParserIf extends TestCase {
confirmAttrData(ptgs, 15, 3); confirmAttrData(ptgs, 15, 3);
confirmAttrData(ptgs, 17, 3); confirmAttrData(ptgs, 17, 3);
} }
public void testEmbeddedIf() { public void testEmbeddedIf() {
Ptg[] ptgs = parseFormula("IF(3>=1,\"*\",IF(4<>1,\"first\",\"second\"))"); Ptg[] ptgs = parseFormula("IF(3>=1,\"*\",IF(4<>1,\"first\",\"second\"))");
assertEquals(17, ptgs.length); assertEquals(17, ptgs.length);

32
src/testcases/org/apache/poi/hssf/model/TestWorkbook.java
View File

@ -28,37 +28,37 @@ import junit.framework.TestCase;
* @author Glen Stampoultzis (glens at apache.org) * @author Glen Stampoultzis (glens at apache.org)
*/ */
public final class TestWorkbook extends TestCase { public final class TestWorkbook extends TestCase {
public void testFontStuff() throws Exception { public void testFontStuff() {
Workbook wb = (new HW()).getWorkbook(); Workbook wb = (new HW()).getWorkbook();
assertEquals(4, wb.getNumberOfFontRecords()); assertEquals(4, wb.getNumberOfFontRecords());
assertEquals(68, wb.getRecords().size()); assertEquals(68, wb.getRecords().size());
FontRecord f1 = wb.getFontRecordAt(0); FontRecord f1 = wb.getFontRecordAt(0);
FontRecord f4 = wb.getFontRecordAt(3); FontRecord f4 = wb.getFontRecordAt(3);
assertEquals(0, wb.getFontIndex(f1)); assertEquals(0, wb.getFontIndex(f1));
assertEquals(3, wb.getFontIndex(f4)); assertEquals(3, wb.getFontIndex(f4));
assertEquals(f1, wb.getFontRecordAt(0)); assertEquals(f1, wb.getFontRecordAt(0));
assertEquals(f4, wb.getFontRecordAt(3)); assertEquals(f4, wb.getFontRecordAt(3));
// There is no 4! new ones go in at 5 // There is no 4! new ones go in at 5
FontRecord n = wb.createNewFont(); FontRecord n = wb.createNewFont();
assertEquals(69, wb.getRecords().size()); assertEquals(69, wb.getRecords().size());
assertEquals(5, wb.getNumberOfFontRecords()); assertEquals(5, wb.getNumberOfFontRecords());
assertEquals(5, wb.getFontIndex(n)); assertEquals(5, wb.getFontIndex(n));
assertEquals(n, wb.getFontRecordAt(5)); assertEquals(n, wb.getFontRecordAt(5));
// And another // And another
FontRecord n6 = wb.createNewFont(); FontRecord n6 = wb.createNewFont();
assertEquals(70, wb.getRecords().size()); assertEquals(70, wb.getRecords().size());
assertEquals(6, wb.getNumberOfFontRecords()); assertEquals(6, wb.getNumberOfFontRecords());
assertEquals(6, wb.getFontIndex(n6)); assertEquals(6, wb.getFontIndex(n6));
assertEquals(n6, wb.getFontRecordAt(6)); assertEquals(n6, wb.getFontRecordAt(6));
// Now remove the one formerly at 5 // Now remove the one formerly at 5
assertEquals(70, wb.getRecords().size()); assertEquals(70, wb.getRecords().size());
wb.removeFontRecord(n); wb.removeFontRecord(n);
@ -68,13 +68,13 @@ public final class TestWorkbook extends TestCase {
assertEquals(5, wb.getNumberOfFontRecords()); assertEquals(5, wb.getNumberOfFontRecords());
assertEquals(5, wb.getFontIndex(n6)); assertEquals(5, wb.getFontIndex(n6));
assertEquals(n6, wb.getFontRecordAt(5)); assertEquals(n6, wb.getFontRecordAt(5));
// Check that the earlier ones are unchanged // Check that the earlier ones are unchanged
assertEquals(0, wb.getFontIndex(f1)); assertEquals(0, wb.getFontIndex(f1));
assertEquals(3, wb.getFontIndex(f4)); assertEquals(3, wb.getFontIndex(f4));
assertEquals(f1, wb.getFontRecordAt(0)); assertEquals(f1, wb.getFontRecordAt(0));
assertEquals(f4, wb.getFontRecordAt(3)); assertEquals(f4, wb.getFontRecordAt(3));
// Finally, add another one // Finally, add another one
FontRecord n7 = wb.createNewFont(); FontRecord n7 = wb.createNewFont();
assertEquals(70, wb.getRecords().size()); assertEquals(70, wb.getRecords().size());
@ -82,13 +82,13 @@ public final class TestWorkbook extends TestCase {
assertEquals(6, wb.getFontIndex(n7)); assertEquals(6, wb.getFontIndex(n7));
assertEquals(n7, wb.getFontRecordAt(6)); assertEquals(n7, wb.getFontRecordAt(6));
} }
private class HW extends HSSFWorkbook { private static final class HW extends HSSFWorkbook {
private HW() { public HW() {
super(); super();
} }
protected Workbook getWorkbook() { protected Workbook getWorkbook() {
return super.getWorkbook(); return super.getWorkbook();
} }
} }
} }

Some files were not shown because too many files have changed in this diff Show More