From 7b9ffe986afc627f4a901bafaa722a0abc32a814 Mon Sep 17 00:00:00 2001 From: Nick Burch Date: Mon, 27 Dec 2010 07:39:57 +0000 Subject: [PATCH] Add tests for the NPOIFS mini stream git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1053014 13f79535-47bb-0310-9956-ffa450edef68 --- .../poi/poifs/filesystem/NPOIFSMiniStore.java | 6 +- .../poifs/filesystem/TestNPOIFSMiniStore.java | 250 ++++++++++++++++++ 2 files changed, 254 insertions(+), 2 deletions(-) create mode 100644 src/testcases/org/apache/poi/poifs/filesystem/TestNPOIFSMiniStore.java diff --git a/src/java/org/apache/poi/poifs/filesystem/NPOIFSMiniStore.java b/src/java/org/apache/poi/poifs/filesystem/NPOIFSMiniStore.java index a34e97efd0..f2d0b5efd2 100644 --- a/src/java/org/apache/poi/poifs/filesystem/NPOIFSMiniStore.java +++ b/src/java/org/apache/poi/poifs/filesystem/NPOIFSMiniStore.java @@ -50,7 +50,7 @@ public class NPOIFSMiniStore extends BlockStore this._header = header; this._root = root; - this._mini_stream = new NPOIFSStream(filesystem); + this._mini_stream = new NPOIFSStream(filesystem, root.getStartBlock()); } /** @@ -70,7 +70,9 @@ public class NPOIFSMiniStore extends BlockStore ByteBuffer dataBlock = it.next(); // Skip forward to the right place - dataBlock.position(bigBlockOffset); + dataBlock.position( + dataBlock.position() + bigBlockOffset + ); // All done return dataBlock; diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestNPOIFSMiniStore.java b/src/testcases/org/apache/poi/poifs/filesystem/TestNPOIFSMiniStore.java new file mode 100644 index 0000000000..985ad015e4 --- /dev/null +++ b/src/testcases/org/apache/poi/poifs/filesystem/TestNPOIFSMiniStore.java @@ -0,0 +1,250 @@ +/* ==================================================================== + 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.poifs.filesystem; + +import java.nio.ByteBuffer; + +import junit.framework.TestCase; + +import org.apache.poi.POIDataSamples; +import org.apache.poi.poifs.common.POIFSConstants; + +/** + * Tests for the Mini Store in the NIO POIFS + */ +public final class TestNPOIFSMiniStore extends TestCase { + private static final POIDataSamples _inst = POIDataSamples.getPOIFSInstance(); + + /** + * Check that for a given mini block, we can correctly figure + * out what the next one is + */ + public void testNextBlock() throws Exception { + // It's the same on 512 byte and 4096 byte block files! + NPOIFSFileSystem fsA = new NPOIFSFileSystem(_inst.getFile("BlockSize512.zvi")); + NPOIFSFileSystem fsB = new NPOIFSFileSystem(_inst.openResourceAsStream("BlockSize512.zvi")); + NPOIFSFileSystem fsC = new NPOIFSFileSystem(_inst.getFile("BlockSize4096.zvi")); + NPOIFSFileSystem fsD = new NPOIFSFileSystem(_inst.openResourceAsStream("BlockSize4096.zvi")); + for(NPOIFSFileSystem fs : new NPOIFSFileSystem[] {fsA,fsB,fsC,fsD}) { + NPOIFSMiniStore ministore = fs.getMiniStore(); + + // 0 -> 51 is one stream + for(int i=0; i<50; i++) { + assertEquals(i+1, ministore.getNextBlock(i)); + } + assertEquals(POIFSConstants.END_OF_CHAIN, ministore.getNextBlock(50)); + + // 51 -> 103 is the next + for(int i=51; i<103; i++) { + assertEquals(i+1, ministore.getNextBlock(i)); + } + assertEquals(POIFSConstants.END_OF_CHAIN, ministore.getNextBlock(103)); + + // Then there are 3 one block ones + assertEquals(POIFSConstants.END_OF_CHAIN, ministore.getNextBlock(104)); + assertEquals(POIFSConstants.END_OF_CHAIN, ministore.getNextBlock(105)); + assertEquals(POIFSConstants.END_OF_CHAIN, ministore.getNextBlock(106)); + + // 107 -> 154 is the next + for(int i=107; i<154; i++) { + assertEquals(i+1, ministore.getNextBlock(i)); + } + assertEquals(POIFSConstants.END_OF_CHAIN, ministore.getNextBlock(154)); + + // 155 -> 160 is the next + for(int i=155; i<160; i++) { + assertEquals(i+1, ministore.getNextBlock(i)); + } + assertEquals(POIFSConstants.END_OF_CHAIN, ministore.getNextBlock(160)); + + // 161 -> 166 is the next + for(int i=161; i<166; i++) { + assertEquals(i+1, ministore.getNextBlock(i)); + } + assertEquals(POIFSConstants.END_OF_CHAIN, ministore.getNextBlock(166)); + + // 167 -> 172 is the next + for(int i=167; i<172; i++) { + assertEquals(i+1, ministore.getNextBlock(i)); + } + assertEquals(POIFSConstants.END_OF_CHAIN, ministore.getNextBlock(172)); + + // Now some short ones + assertEquals(174 , ministore.getNextBlock(173)); + assertEquals(POIFSConstants.END_OF_CHAIN, ministore.getNextBlock(174)); + + assertEquals(POIFSConstants.END_OF_CHAIN, ministore.getNextBlock(175)); + + assertEquals(177 , ministore.getNextBlock(176)); + assertEquals(POIFSConstants.END_OF_CHAIN, ministore.getNextBlock(177)); + + assertEquals(179 , ministore.getNextBlock(178)); + assertEquals(180 , ministore.getNextBlock(179)); + assertEquals(POIFSConstants.END_OF_CHAIN, ministore.getNextBlock(180)); + + // 181 onwards is free + for(int i=181; i