You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ni...@apache.org on 2010/01/07 17:49:12 UTC
svn commit: r896923 - in /poi/trunk/src/scratchpad: src/org/apache/poi/hsmf/
src/org/apache/poi/hsmf/datatypes/ src/org/apache/poi/hsmf/parsers/
testcases/org/apache/poi/hsmf/ testcases/org/apache/poi/hsmf/datatypes/
testcases/org/apache/poi/hsmf/model...
Author: nick
Date: Thu Jan 7 16:47:09 2010
New Revision: 896923
URL: http://svn.apache.org/viewvc?rev=896923&view=rev
Log:
Shuffle where some of the HSMF tests live to better match package names, and stub out a few more tests
Added:
poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestBlankFileRead.java
- copied, changed from r896914, poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/model/TestBlankFileRead.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestFileWithAttachmentsRead.java
- copied, changed from r896914, poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/model/TestFileWithAttachmentsRead.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestOutlook30FileRead.java
- copied, changed from r896914, poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/model/TestOutlook30FileRead.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestSimpleFileRead.java
- copied, changed from r896914, poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/model/TestSimpleFileRead.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/
- copied from r896914, poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/model/
poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/parsers/
poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/parsers/TestPOIFSChunkParser.java
Removed:
poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestBlankFileRead.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestFileWithAttachmentsRead.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestOutlook30FileRead.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestSimpleFileRead.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/model/
Modified:
poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/MAPIMessage.java
poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/AttachmentChunks.java
poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/parsers/POIFSChunkParser.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/AllHSMFTests.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestChunkData.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestTypes.java
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/MAPIMessage.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/MAPIMessage.java?rev=896923&r1=896922&r2=896923&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/MAPIMessage.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/MAPIMessage.java Thu Jan 7 16:47:09 2010
@@ -22,10 +22,8 @@
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
-import java.util.Map;
import org.apache.poi.hsmf.datatypes.AttachmentChunks;
-import org.apache.poi.hsmf.datatypes.Chunk;
import org.apache.poi.hsmf.datatypes.ChunkGroup;
import org.apache.poi.hsmf.datatypes.Chunks;
import org.apache.poi.hsmf.datatypes.NameIdChunks;
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/AttachmentChunks.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/AttachmentChunks.java?rev=896923&r1=896922&r2=896923&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/AttachmentChunks.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/AttachmentChunks.java Thu Jan 7 16:47:09 2010
@@ -37,10 +37,20 @@
public StringChunk attachFileName;
public StringChunk attachLongFileName;
public StringChunk attachMimeTag;
+
+ /**
+ * What the POIFS name of this attachment is.
+ */
+ private String poifsName;
/** Holds all the chunks that were found. */
private List<Chunk> allChunks = new ArrayList<Chunk>();
+
+ public AttachmentChunks(String poifsName) {
+ this.poifsName = poifsName;
+ }
+
public Chunk[] getAll() {
return allChunks.toArray(new Chunk[allChunks.size()]);
}
@@ -48,6 +58,10 @@
return getAll();
}
+ public String getPOIFSName() {
+ return poifsName;
+ }
+
/**
* Called by the parser whenever a chunk is found.
*/
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/parsers/POIFSChunkParser.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/parsers/POIFSChunkParser.java?rev=896923&r1=896922&r2=896923&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/parsers/POIFSChunkParser.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/parsers/POIFSChunkParser.java Thu Jan 7 16:47:09 2010
@@ -60,7 +60,7 @@
// Do we know what to do with it?
if(dir.getName().startsWith(AttachmentChunks.PREFIX)) {
- group = new AttachmentChunks();
+ group = new AttachmentChunks(dir.getName());
}
if(dir.getName().startsWith(NameIdChunks.PREFIX)) {
group = new NameIdChunks();
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/AllHSMFTests.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/AllHSMFTests.java?rev=896923&r1=896922&r2=896923&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/AllHSMFTests.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/AllHSMFTests.java Thu Jan 7 16:47:09 2010
@@ -20,7 +20,8 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.poi.hsmf.model.*;
+import org.apache.poi.hsmf.datatypes.*;
+import org.apache.poi.hsmf.parsers.*;
public final class AllHSMFTests {
@@ -29,9 +30,13 @@
suite.addTestSuite(TestBlankFileRead.class);
suite.addTestSuite(TestSimpleFileRead.class);
suite.addTestSuite(TestOutlook30FileRead.class);
- suite.addTestSuite(TestChunkData.class);
suite.addTestSuite(TestFileWithAttachmentsRead.class);
+
+ suite.addTestSuite(TestChunkData.class);
+ suite.addTestSuite(TestTypes.class);
+ suite.addTestSuite(TestPOIFSChunkParser.class);
+
return suite;
}
}
Copied: poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestBlankFileRead.java (from r896914, poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/model/TestBlankFileRead.java)
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestBlankFileRead.java?p2=poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestBlankFileRead.java&p1=poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/model/TestBlankFileRead.java&r1=896914&r2=896923&rev=896923&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/model/TestBlankFileRead.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestBlankFileRead.java Thu Jan 7 16:47:09 2010
@@ -15,7 +15,7 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.hsmf.model;
+package org.apache.poi.hsmf;
import java.io.IOException;
Copied: poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestFileWithAttachmentsRead.java (from r896914, poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/model/TestFileWithAttachmentsRead.java)
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestFileWithAttachmentsRead.java?p2=poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestFileWithAttachmentsRead.java&p1=poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/model/TestFileWithAttachmentsRead.java&r1=896914&r2=896923&rev=896923&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/model/TestFileWithAttachmentsRead.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestFileWithAttachmentsRead.java Thu Jan 7 16:47:09 2010
@@ -15,7 +15,7 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.hsmf.model;
+package org.apache.poi.hsmf;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
Copied: poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestOutlook30FileRead.java (from r896914, poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/model/TestOutlook30FileRead.java)
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestOutlook30FileRead.java?p2=poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestOutlook30FileRead.java&p1=poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/model/TestOutlook30FileRead.java&r1=896914&r2=896923&rev=896923&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/model/TestOutlook30FileRead.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestOutlook30FileRead.java Thu Jan 7 16:47:09 2010
@@ -15,7 +15,7 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.hsmf.model;
+package org.apache.poi.hsmf;
import java.io.IOException;
Copied: poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestSimpleFileRead.java (from r896914, poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/model/TestSimpleFileRead.java)
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestSimpleFileRead.java?p2=poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestSimpleFileRead.java&p1=poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/model/TestSimpleFileRead.java&r1=896914&r2=896923&rev=896923&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/model/TestSimpleFileRead.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestSimpleFileRead.java Thu Jan 7 16:47:09 2010
@@ -15,7 +15,7 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.hsmf.model;
+package org.apache.poi.hsmf;
import java.io.IOException;
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestChunkData.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestChunkData.java?rev=896923&r1=896914&r2=896923&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestChunkData.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestChunkData.java Thu Jan 7 16:47:09 2010
@@ -15,7 +15,7 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.hsmf.model;
+package org.apache.poi.hsmf.datatypes;
import org.apache.poi.hsmf.datatypes.Chunk;
import org.apache.poi.hsmf.datatypes.Chunks;
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestTypes.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestTypes.java?rev=896923&r1=896914&r2=896923&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestTypes.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestTypes.java Thu Jan 7 16:47:09 2010
@@ -15,7 +15,7 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.hsmf.model;
+package org.apache.poi.hsmf.datatypes;
import org.apache.poi.hsmf.datatypes.Types;
Added: poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/parsers/TestPOIFSChunkParser.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/parsers/TestPOIFSChunkParser.java?rev=896923&view=auto
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/parsers/TestPOIFSChunkParser.java (added)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/parsers/TestPOIFSChunkParser.java Thu Jan 7 16:47:09 2010
@@ -0,0 +1,56 @@
+/* ====================================================================
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ 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 obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+==================================================================== */
+
+package org.apache.poi.hsmf.parsers;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+
+import org.apache.poi.poifs.filesystem.POIFSFileSystem;
+import org.apache.poi.POIDataSamples;
+
+import junit.framework.TestCase;
+
+/**
+ * Tests to verify that the chunk parser works properly
+ */
+public final class TestPOIFSChunkParser extends TestCase {
+ private POIDataSamples samples;
+
+ public TestPOIFSChunkParser() throws IOException {
+ samples = POIDataSamples.getHSMFInstance();
+ }
+
+ public void testFindsRecips() throws IOException {
+
+ }
+
+ public void testFindsAttachments() throws IOException {
+ POIFSFileSystem with = new POIFSFileSystem(
+ new FileInputStream(samples.getFile("attachment_test_msg.msg"))
+ );
+ POIFSFileSystem without = new POIFSFileSystem(
+ new FileInputStream(samples.getFile("simple_test_msg.msg"))
+ );
+
+ // Check details on the one with
+
+ // One with, from the top
+
+ // One without, from the top
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org