From 7f985ab0aaf65d57250d7184f609cb3c7c58e349 Mon Sep 17 00:00:00 2001
From: Josh Micich <josh@apache.org>
Date: Thu, 7 Aug 2008 20:32:25 +0000
Subject: [PATCH] Fix for bug 45582 - handle extra bytes after the EOFRecord

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@683706 13f79535-47bb-0310-9956-ffa450edef68
---
 src/documentation/content/xdocs/changes.xml   |   1 +
 src/documentation/content/xdocs/status.xml    |   1 +
 .../eventusermodel/EventWorkbookBuilder.java  |   2 +-
 src/java/org/apache/poi/hssf/model/Sheet.java |   2 +-
 .../org/apache/poi/hssf/model/Workbook.java   |  13 +-
 .../org/apache/poi/hssf/record/EOFRecord.java |  19 +-
 .../org/apache/poi/hssf/record/ObjRecord.java |  13 +-
 .../poi/hssf/record/RecordInputStream.java    |  46 +-
 src/java/org/apache/poi/util/ByteField.java   |  10 +-
 .../org/apache/poi/util/LittleEndian.java     | 107 ++---
 .../apache/poi/hssf/usermodel/HSSFChart.java  |   8 +-
 .../apache/poi/hssf/data/ex45582-22397.xls    | Bin 0 -> 37888 bytes
 .../eventmodel/TestEventRecordFactory.java    |   2 +-
 .../org/apache/poi/hssf/model/TestSheet.java  |   4 +-
 .../poi/hssf/usermodel/TestHSSFWorkbook.java  |  49 +-
 .../poi/hssf/usermodel/TestSanityChecker.java |  32 +-
 .../org/apache/poi/util/TestLittleEndian.java | 437 +++++++-----------
 .../org/apache/poi/util/TestLongField.java    |  56 +--
 18 files changed, 313 insertions(+), 489 deletions(-)
 create mode 100644 src/testcases/org/apache/poi/hssf/data/ex45582-22397.xls

diff --git a/src/documentation/content/xdocs/changes.xml b/src/documentation/content/xdocs/changes.xml
index 1119b76d0..dc2533283 100644
--- a/src/documentation/content/xdocs/changes.xml
+++ b/src/documentation/content/xdocs/changes.xml
@@ -37,6 +37,7 @@
 
 		<!-- Don't forget to update status.xml too! -->
         <release version="3.1.1-alpha1" date="2008-??-??">
+           <action dev="POI-DEVELOPERS" type="add">45582 - Fix for workbook streams with extra bytes trailing the EOFRecord</action>
            <action dev="POI-DEVELOPERS" type="add">45537 - Include headers and footers (of slides and notes) in the extracted text from HSLF</action>
            <action dev="POI-DEVELOPERS" type="fix">45472 - Fixed incorrect default row height in OpenOffice 2.3</action>
            <action dev="POI-DEVELOPERS" type="fix">44692 - HSSFPicture.resize() stretched image when there was a text next to it</action>
diff --git a/src/documentation/content/xdocs/status.xml b/src/documentation/content/xdocs/status.xml
index cf5dc669f..b0230d148 100644
--- a/src/documentation/content/xdocs/status.xml
+++ b/src/documentation/content/xdocs/status.xml
@@ -34,6 +34,7 @@
 	<!-- Don't forget to update changes.xml too! -->
     <changes>
         <release version="3.1.1-alpha1" date="2008-??-??">
+           <action dev="POI-DEVELOPERS" type="add">45582 - Fix for workbook streams with extra bytes trailing the EOFRecord</action>
            <action dev="POI-DEVELOPERS" type="add">45537 - Include headers and footers (of slides and notes) in the extracted text from HSLF</action>
            <action dev="POI-DEVELOPERS" type="fix">45472 - Fixed incorrect default row height in OpenOffice 2.3</action>
            <action dev="POI-DEVELOPERS" type="fix">44692 - HSSFPicture.resize() stretched image when there was a text next to it</action>
diff --git a/src/java/org/apache/poi/hssf/eventusermodel/EventWorkbookBuilder.java b/src/java/org/apache/poi/hssf/eventusermodel/EventWorkbookBuilder.java
index 0ae5f3f26..3c767dc25 100644
--- a/src/java/org/apache/poi/hssf/eventusermodel/EventWorkbookBuilder.java
+++ b/src/java/org/apache/poi/hssf/eventusermodel/EventWorkbookBuilder.java
@@ -96,7 +96,7 @@ public class EventWorkbookBuilder {
 		}
 		
 		// Finally we need an EoF record
-		wbRecords.add(new EOFRecord());
+		wbRecords.add(EOFRecord.instance);
 		
 		return Workbook.createWorkbook(wbRecords);
 	}
diff --git a/src/java/org/apache/poi/hssf/model/Sheet.java b/src/java/org/apache/poi/hssf/model/Sheet.java
index 3d74c9f88..fe14e550f 100644
--- a/src/java/org/apache/poi/hssf/model/Sheet.java
+++ b/src/java/org/apache/poi/hssf/model/Sheet.java
@@ -550,7 +550,7 @@ public final class Sheet implements Model {
         retval.setLoc(records.size() - 1);
         retval.selection = createSelection();
         records.add(retval.selection);
-        records.add(new EOFRecord());
+        records.add(EOFRecord.instance);
 
 
         retval.records = records;
diff --git a/src/java/org/apache/poi/hssf/model/Workbook.java b/src/java/org/apache/poi/hssf/model/Workbook.java
index 36510eb83..f80c41661 100644
--- a/src/java/org/apache/poi/hssf/model/Workbook.java
+++ b/src/java/org/apache/poi/hssf/model/Workbook.java
@@ -351,7 +351,7 @@ public class Workbook implements Model
         records.add( retval.sst );
         records.add( retval.createExtendedSST() );
 
-        records.add( retval.createEOF() );
+        records.add(EOFRecord.instance);
         if (log.check( POILogger.DEBUG ))
             log.log( DEBUG, "exit create new workbook from scratch" );
         return retval;
@@ -1857,17 +1857,6 @@ public class Workbook implements Model
         retval.setNumStringsPerBucket(( short ) 0x8);
         return retval;
     }
-
-    /**
-     * creates the EOF record
-     * @see org.apache.poi.hssf.record.EOFRecord
-     * @see org.apache.poi.hssf.record.Record
-     * @return record containing a EOFRecord
-     */
-
-    protected Record createEOF() {
-        return new EOFRecord();
-    }
     
     /**
      * lazy initialization
diff --git a/src/java/org/apache/poi/hssf/record/EOFRecord.java b/src/java/org/apache/poi/hssf/record/EOFRecord.java
index 0f6b87ad8..d658c6d83 100644
--- a/src/java/org/apache/poi/hssf/record/EOFRecord.java
+++ b/src/java/org/apache/poi/hssf/record/EOFRecord.java
@@ -1,4 +1,3 @@
-
 /* ====================================================================
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -15,7 +14,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
 
 package org.apache.poi.hssf.record;
 
@@ -31,14 +29,14 @@ import org.apache.poi.util.LittleEndian;
  * @author Jason Height (jheight at chariot dot net dot au)
  * @version 2.0-pre
  */
-
-public class EOFRecord
-    extends Record
-{
+public final class EOFRecord extends Record {
     public final static short sid = 0x0A;
+	public static final int ENCODED_SIZE = 4;
 
-    public EOFRecord()
-    {
+	public static final EOFRecord instance = new EOFRecord();
+	
+    private EOFRecord() {
+    	// no data fields
     }
 
     /**
@@ -82,7 +80,7 @@ public class EOFRecord
 
     public int getRecordSize()
     {
-        return 4;
+        return ENCODED_SIZE;
     }
 
     public short getSid()
@@ -91,7 +89,6 @@ public class EOFRecord
     }
 
     public Object clone() {
-      EOFRecord rec = new EOFRecord();
-      return rec;
+      return instance;
     }
 }
diff --git a/src/java/org/apache/poi/hssf/record/ObjRecord.java b/src/java/org/apache/poi/hssf/record/ObjRecord.java
index 7d29654cd..0e424eed2 100644
--- a/src/java/org/apache/poi/hssf/record/ObjRecord.java
+++ b/src/java/org/apache/poi/hssf/record/ObjRecord.java
@@ -30,7 +30,7 @@ import org.apache.poi.util.LittleEndian;
  * @author Glen Stampoultzis (glens at apache.org)
  */
 public final class ObjRecord extends Record {
-    public final static short      sid                             = 0x5D;
+    public final static short      sid                             = 0x005D;
     private List subrecords;
 
     //00000000 15 00 12 00 01 00 01 00 11 60 00 00 00 00 00 0D .........`......
@@ -69,18 +69,27 @@ public final class ObjRecord extends Record {
 
     protected void fillFields(RecordInputStream in)
     {
+    	// TODO - problems with OBJ sub-records stream
+    	// MS spec says first sub-records is always CommonObjectDataSubRecord, and last is 
+    	// always EndSubRecord.  OOO spec does not mention ObjRecord(0x005D).
+    	// Existing POI test data seems to violate that rule.  Some test data seems to contain
+    	// garbage, and a crash is only averted by stopping at what looks like the 'EndSubRecord'
+    	
         subrecords = new ArrayList();
         //Check if this can be continued, if so then the
         //following wont work properly
         int subSize = 0;
         byte[] subRecordData = in.readRemainder();
-
+        
         RecordInputStream subRecStream = new RecordInputStream(new ByteArrayInputStream(subRecordData));
         while(subRecStream.hasNextRecord()) {
           subRecStream.nextRecord();
           Record subRecord = SubRecord.createSubRecord(subRecStream);
           subSize += subRecord.getRecordSize();
           subrecords.add(subRecord);
+          if (subRecord instanceof EndSubRecord) {
+        	  break;
+          }
         }
 
         /**
diff --git a/src/java/org/apache/poi/hssf/record/RecordInputStream.java b/src/java/org/apache/poi/hssf/record/RecordInputStream.java
index ba900b2a2..12c818b18 100755
--- a/src/java/org/apache/poi/hssf/record/RecordInputStream.java
+++ b/src/java/org/apache/poi/hssf/record/RecordInputStream.java
@@ -1,4 +1,3 @@
-
 /* ====================================================================
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +15,6 @@
    limitations under the License.
 ==================================================================== */
 
-
 package org.apache.poi.hssf.record;
 
 import org.apache.poi.util.LittleEndian;
@@ -31,16 +29,15 @@ import java.io.ByteArrayOutputStream;
  *
  * @author Jason Height (jheight @ apache dot org)
  */
-
-public class RecordInputStream extends InputStream
-{
+public class RecordInputStream extends InputStream {
   /** Maximum size of a single record (minus the 4 byte header) without a continue*/
   public final static short MAX_RECORD_DATA_SIZE = 8224;
-
+  private static final int INVALID_SID_VALUE = -1;
+  
   private InputStream in;
   protected short currentSid;
   protected short currentLength = -1;
-  protected short nextSid = -1;
+  protected short nextSid;
 
   protected byte[] data = new byte[MAX_RECORD_DATA_SIZE];
   protected short recordOffset;
@@ -60,7 +57,7 @@ public class RecordInputStream extends InputStream
   }
   
   /** This method will read a byte from the current record*/
-  public int read() throws IOException {
+  public int read() {
     checkRecordPosition();
 
     byte result = data[recordOffset];
@@ -86,7 +83,7 @@ public class RecordInputStream extends InputStream
   }
 
   public boolean hasNextRecord() {
-    return (nextSid != 0);
+    return nextSid != INVALID_SID_VALUE;
   }
   
   /** Moves to the next record in the stream.
@@ -110,7 +107,20 @@ public class RecordInputStream extends InputStream
       in.read(data, 0, currentLength);
 
       //Read the Sid of the next record
-      nextSid = LittleEndian.readShort(in);
+      if (in.available() < EOFRecord.ENCODED_SIZE) {
+          if (in.available() > 0) {
+              // some scrap left over?
+              // ex45582-22397.xls has one extra byte after the last record
+              // Excel reads that file OK
+          }
+          nextSid = INVALID_SID_VALUE;  
+      } else {
+          nextSid = LittleEndian.readShort(in);
+          if (nextSid == INVALID_SID_VALUE) {
+              throw new RecordFormatException("Found sid " + nextSid + " after record with sid 0x"
+                      + Integer.toHexString(currentSid).toUpperCase());
+          }
+      }      
     } catch (IOException ex) {
       throw new RecordFormatException("Error reading bytes", ex);
     }
@@ -179,11 +189,11 @@ public class RecordInputStream extends InputStream
    * Reads an 8 bit, unsigned value
    */
   public short readUByte() {
-	  short s = readByte();
-	  if(s < 0) {
-		  s += 256;
-	  }
-	  return s;
+      short s = readByte();
+      if(s < 0) {
+          s += 256;
+      }
+      return s;
   }
 
   /**
@@ -266,9 +276,9 @@ public class RecordInputStream extends InputStream
   }
     
   public String readCompressedUnicode(int length) {
-	if(length == 0) {
-		return "";
-	}
+    if(length == 0) {
+        return "";
+    }
     if ((length < 0) || ((remaining() < length) && !isContinueNext())) {
             throw new IllegalArgumentException("Illegal length " + length);
     }
diff --git a/src/java/org/apache/poi/util/ByteField.java b/src/java/org/apache/poi/util/ByteField.java
index 0b9f1e583..323fee8d6 100644
--- a/src/java/org/apache/poi/util/ByteField.java
+++ b/src/java/org/apache/poi/util/ByteField.java
@@ -22,6 +22,7 @@ package org.apache.poi.util;
 import org.apache.poi.util.LittleEndian.BufferUnderrunException;
 
 import java.io.*;
+import java.nio.BufferUnderflowException;
 
 /**
  * representation of a byte (8-bit) field at a fixed location within a
@@ -183,9 +184,12 @@ public class ByteField
     public void readFromStream(final InputStream stream)
         throws IOException, BufferUnderrunException
     {
-        _value =
-            (LittleEndian.readFromStream(stream,
-                                         LittleEndianConsts.BYTE_SIZE))[ 0 ];
+    	// TODO - are these ~Field used / necessary
+    	int ib = stream.read();
+    	if (ib < 0) {
+    		throw new BufferUnderflowException();
+    	}
+        _value = (byte) ib;
     }
 
     /**
diff --git a/src/java/org/apache/poi/util/LittleEndian.java b/src/java/org/apache/poi/util/LittleEndian.java
index 2278649cb..6838eb2aa 100644
--- a/src/java/org/apache/poi/util/LittleEndian.java
+++ b/src/java/org/apache/poi/util/LittleEndian.java
@@ -19,7 +19,6 @@ package org.apache.poi.util;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.Arrays;
 
 /**
  *  a utility class for handling little-endian numbers, which the 80x86 world is
@@ -29,16 +28,11 @@ import java.util.Arrays;
  *@author     Marc Johnson (mjohnson at apache dot org)
  *@author     Andrew Oliver (acoliver at apache dot org)
  */
+public final class LittleEndian implements LittleEndianConsts {
 
-public class LittleEndian
-         implements LittleEndianConsts {
-
-    // all methods are static, so an accessible constructor makes no
-    // sense
-    /**
-     *  Constructor for the LittleEndian object
-     */
-    private LittleEndian() { }
+    private LittleEndian() {
+    	// no instances of this class
+    }
 
 
     /**
@@ -385,12 +379,7 @@ public class LittleEndian
      *@author     Marc Johnson (mjohnson at apache dot org)
      */
 
-    public static class BufferUnderrunException
-             extends IOException {
-
-        /**
-         *  simple constructor
-         */
+    public static final class BufferUnderrunException extends IOException {
 
         BufferUnderrunException() {
             super("buffer underrun");
@@ -408,12 +397,21 @@ public class LittleEndian
      *@exception  BufferUnderrunException  if the stream cannot provide enough
      *      bytes
      */
+    public static short readShort(InputStream stream) throws IOException, BufferUnderrunException {
 
-    public static short readShort(final InputStream stream)
-             throws IOException, BufferUnderrunException {
-        return getShort(readFromStream(stream, SHORT_SIZE));
-    }
+		return (short) readUShort(stream);
+	}
 
+	public static int readUShort(InputStream stream) throws IOException, BufferUnderrunException {
+
+		int ch1 = stream.read();
+		int ch2 = stream.read();
+		if ((ch1 | ch2) < 0) {
+			throw new BufferUnderrunException();
+		}
+		return ((ch2 << 8) + (ch1 << 0));
+	}
+    
 
     /**
      *  get an int value from an InputStream
@@ -425,10 +423,16 @@ public class LittleEndian
      *@exception  BufferUnderrunException  if the stream cannot provide enough
      *      bytes
      */
-
     public static int readInt(final InputStream stream)
              throws IOException, BufferUnderrunException {
-        return getInt(readFromStream(stream, INT_SIZE));
+		int ch1 = stream.read();
+		int ch2 = stream.read();
+		int ch3 = stream.read();
+		int ch4 = stream.read();
+		if ((ch1 | ch2 | ch3 | ch4) < 0) {
+			throw new BufferUnderrunException();
+		}
+		return ((ch4 << 24) + (ch3<<16) + (ch2 << 8) + (ch1 << 0));
     }
 
 
@@ -445,46 +449,29 @@ public class LittleEndian
 
     public static long readLong(final InputStream stream)
              throws IOException, BufferUnderrunException {
-        return getLong(readFromStream(stream, LONG_SIZE));
+		int ch1 = stream.read();
+		int ch2 = stream.read();
+		int ch3 = stream.read();
+		int ch4 = stream.read();
+		int ch5 = stream.read();
+		int ch6 = stream.read();
+		int ch7 = stream.read();
+		int ch8 = stream.read();
+		if ((ch1 | ch2 | ch3 | ch4 | ch5 | ch6 | ch7 | ch8) < 0) {
+			throw new BufferUnderrunException();
+		}
+		
+		return 
+			((long)ch8 << 56) +
+            ((long)ch7 << 48) +
+            ((long)ch6 << 40) +
+            ((long)ch5 << 32) +
+            ((long)ch4 << 24) + // cast to long to preserve bit 31 (sign bit for ints)
+                  (ch3 << 16) +
+                  (ch2 <<  8) +
+                  (ch1 <<  0);
     }
 
-    /**
-     *  Read the appropriate number of bytes from the stream and return them to
-     *  the caller. <p>
-     *
-     *  However, for the purposes of the POI project, this risk is deemed
-     *  negligible. It is, however, so noted.
-     *
-     *@param  stream                       the InputStream we're reading from
-     *@param  size                         the number of bytes to read; in
-     *      99.99% of cases, this will be SHORT_SIZE, INT_SIZE, or LONG_SIZE --
-     *      but it doesn't have to be.
-     *@return                              the byte array containing the
-     *      required number of bytes. The array will contain all zero's on end
-     *      of stream
-     *@exception  IOException              will be propagated back to the caller
-     *@exception  BufferUnderrunException  if the stream cannot provide enough
-     *      bytes
-     */
-
-    public static byte[] readFromStream(final InputStream stream,
-            final int size)
-             throws IOException, BufferUnderrunException {
-        byte[] buffer = new byte[size];
-
-        int count = stream.read(buffer);
-
-        if (count == -1) {
-
-            // return a zero-filled buffer
-            Arrays.fill(buffer, (byte) 0);
-        } else if (count != size) {
-            throw new BufferUnderrunException();
-        }
-        return buffer;
-    }
-
-
     /**
      *  Gets the number attribute of the LittleEndian class
      *
diff --git a/src/scratchpad/src/org/apache/poi/hssf/usermodel/HSSFChart.java b/src/scratchpad/src/org/apache/poi/hssf/usermodel/HSSFChart.java
index ab7cc61ef..5f5995afb 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/usermodel/HSSFChart.java
+++ b/src/scratchpad/src/org/apache/poi/hssf/usermodel/HSSFChart.java
@@ -153,7 +153,7 @@ public final class HSSFChart {
 		records.add( createSeriesIndexRecord(2) );
 		records.add( createSeriesIndexRecord(1) );
 		records.add( createSeriesIndexRecord(3) );
-		records.add( createEOFRecord() );
+		records.add(EOFRecord.instance);
 
 
 
@@ -259,12 +259,6 @@ public final class HSSFChart {
 			throw new IllegalStateException("No chart title found to change");
 		}
 	}
-	
-
-	private EOFRecord createEOFRecord()
-	{
-		return new EOFRecord();
-	}
 
 	private SeriesIndexRecord createSeriesIndexRecord( int index )
 	{
diff --git a/src/testcases/org/apache/poi/hssf/data/ex45582-22397.xls b/src/testcases/org/apache/poi/hssf/data/ex45582-22397.xls
new file mode 100644
index 0000000000000000000000000000000000000000..2dc16f5e337c83758a7e70549aa64042477fa2ea
GIT binary patch
literal 37888
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

literal 0
HcmV?d00001

diff --git a/src/testcases/org/apache/poi/hssf/eventmodel/TestEventRecordFactory.java b/src/testcases/org/apache/poi/hssf/eventmodel/TestEventRecordFactory.java
index c4a5ec84b..88f620ca4 100644
--- a/src/testcases/org/apache/poi/hssf/eventmodel/TestEventRecordFactory.java
+++ b/src/testcases/org/apache/poi/hssf/eventmodel/TestEventRecordFactory.java
@@ -63,7 +63,7 @@ public final class TestEventRecordFactory extends TestCase {
         bof.setVersion((short)0x06);
         bof.setHistoryBitMask(BOFRecord.HISTORY_MASK);
         
-        EOFRecord eof = new EOFRecord();
+        EOFRecord eof = EOFRecord.instance;
     	byte[] bytes = new byte[bof.getRecordSize() + eof.getRecordSize()];
         int offset = 0;
         offset = bof.serialize(offset,bytes);
diff --git a/src/testcases/org/apache/poi/hssf/model/TestSheet.java b/src/testcases/org/apache/poi/hssf/model/TestSheet.java
index 22defb942..40b349a54 100644
--- a/src/testcases/org/apache/poi/hssf/model/TestSheet.java
+++ b/src/testcases/org/apache/poi/hssf/model/TestSheet.java
@@ -54,7 +54,7 @@ public final class TestSheet extends TestCase {
         List records = new ArrayList();
         records.add( new BOFRecord() );
         records.add( new DimensionsRecord() );
-        records.add( new EOFRecord() );
+        records.add(EOFRecord.instance);
         Sheet sheet = Sheet.createSheet( records, 0, 0 );
 
         int pos = 0;
@@ -396,7 +396,7 @@ public final class TestSheet extends TestCase {
         records.add(new BOFRecord());
         records.add(new UncalcedRecord());
         records.add(new DimensionsRecord());
-        records.add(new EOFRecord());
+        records.add(EOFRecord.instance);
         Sheet sheet = Sheet.createSheet(records, 0, 0);
 
         int estimatedSize = sheet.getSize();
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java
index 37359231f..d8b7cde29 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java
@@ -1,19 +1,19 @@
-/*
-* 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.
-*/
+/* ====================================================================
+   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.hssf.usermodel;
 
@@ -29,8 +29,10 @@ import org.apache.poi.hssf.HSSFTestDataSamples;
 import org.apache.poi.hssf.model.Sheet;
 import org.apache.poi.hssf.record.NameRecord;
 import org.apache.poi.hssf.record.Record;
+import org.apache.poi.hssf.record.RecordFormatException;
 import org.apache.poi.hssf.record.RecordInputStream;
 import org.apache.poi.hssf.record.formula.Area3DPtg;
+import org.apache.poi.util.LittleEndian;
 import org.apache.poi.util.TempFile;
 /**
  *
@@ -512,4 +514,17 @@ public final class TestHSSFWorkbook extends TestCase {
             return 8;
         }
     }
- }
+    
+    /**
+     * The sample file provided with bug 45582 seems to have one extra byte after the EOFRecord
+     */
+    public void testExtraDataAfterEOFRecord() {
+    	try {
+    		HSSFTestDataSamples.openSampleWorkbook("ex45582-22397.xls");
+    	} catch (RecordFormatException e) {
+    		if (e.getCause() instanceof LittleEndian.BufferUnderrunException) {
+    			throw new AssertionFailedError("Identified bug 45582");
+    		}
+    	}
+	}
+}
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestSanityChecker.java b/src/testcases/org/apache/poi/hssf/usermodel/TestSanityChecker.java
index d32c1a1b0..f2144700d 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestSanityChecker.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestSanityChecker.java
@@ -1,4 +1,3 @@
-
 /* ====================================================================
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -15,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
+
 package org.apache.poi.hssf.usermodel;
 
 import junit.framework.TestCase;
@@ -27,27 +26,20 @@ import java.util.ArrayList;
 import org.apache.poi.hssf.record.*;
 
 /**
+ * A Test case for a test utility class.<br/>
  * Okay, this may seem strange but I need to test my test logic.
  *
  * @author Glen Stampoultzis (glens at apache.org)
  */
-public class TestSanityChecker
-        extends TestCase
-{
-    public TestSanityChecker( String s )
-    {
-        super( s );
-    }
+public final class TestSanityChecker extends TestCase {
 
-    public void testCheckRecordOrder()
-            throws Exception
-    {
+    public void testCheckRecordOrder() {
         final SanityChecker c = new SanityChecker();
         List records = new ArrayList();
         records.add(new BOFRecord());
         records.add(new InterfaceHdrRecord());
         records.add(new BoundSheetRecord());
-        records.add(new EOFRecord());
+        records.add(EOFRecord.instance);
         final SanityChecker.CheckRecord[] check = {
             new SanityChecker.CheckRecord(BOFRecord.class, '1'),
             new SanityChecker.CheckRecord(InterfaceHdrRecord.class, '0'),
@@ -74,7 +66,7 @@ public class TestSanityChecker
                 records.add(new BOFRecord());
                 records.add(new BoundSheetRecord());
                 records.add(new InterfaceHdrRecord());
-                records.add(new EOFRecord());
+                records.add(EOFRecord.instance);
                 c.checkRecordOrder(records, check);
             }
         });
@@ -88,7 +80,7 @@ public class TestSanityChecker
                 records.add(new InterfaceHdrRecord());
                 records.add(new BoundSheetRecord());
                 records.add(new InterfaceHdrRecord());
-                records.add(new EOFRecord());
+                records.add(EOFRecord.instance);
                 c.checkRecordOrder(records, check);
             }
         });
@@ -101,7 +93,7 @@ public class TestSanityChecker
                 records.add(new BOFRecord());
                 records.add(new BoundSheetRecord());
                 records.add(new NameRecord());
-                records.add(new EOFRecord());
+                records.add(EOFRecord.instance);
                 records.add(new NameRecord());
                 c.checkRecordOrder(records, check);
             }
@@ -114,7 +106,7 @@ public class TestSanityChecker
                 List records = new ArrayList();
                 records.add(new InterfaceHdrRecord());
                 records.add(new BoundSheetRecord());
-                records.add(new EOFRecord());
+                records.add(EOFRecord.instance);
                 c.checkRecordOrder(records, check);
             }
         });
@@ -126,7 +118,7 @@ public class TestSanityChecker
                 List records = new ArrayList();
                 records.add(new BOFRecord());
                 records.add(new InterfaceHdrRecord());
-                records.add(new EOFRecord());
+                records.add(EOFRecord.instance);
                 c.checkRecordOrder(records, check);
             }
         });
@@ -139,7 +131,7 @@ public class TestSanityChecker
                 records.add(new InterfaceHdrRecord());
                 records.add(new BoundSheetRecord());
                 records.add(new BOFRecord());
-                records.add(new EOFRecord());
+                records.add(EOFRecord.instance);
                 c.checkRecordOrder(records, check);
             }
         });
@@ -152,7 +144,7 @@ public class TestSanityChecker
                 records.add(new BOFRecord());
                 records.add(new BoundSheetRecord());
                 records.add(new InterfaceHdrRecord());
-                records.add(new EOFRecord());
+                records.add(EOFRecord.instance);
                 c.checkRecordOrder(records, check);
             }
         });
diff --git a/src/testcases/org/apache/poi/util/TestLittleEndian.java b/src/testcases/org/apache/poi/util/TestLittleEndian.java
index 4ee659cc9..0ffcd189d 100644
--- a/src/testcases/org/apache/poi/util/TestLittleEndian.java
+++ b/src/testcases/org/apache/poi/util/TestLittleEndian.java
@@ -1,4 +1,3 @@
-
 /* ====================================================================
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -15,7 +14,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
 
 package org.apache.poi.util;
 
@@ -31,79 +29,54 @@ import java.io.InputStream;
  *
  * @author Marc Johnson
  */
-
-public class TestLittleEndian
-    extends TestCase
-{
-
-    /**
-     * Constructor TestLittleEndian
-     *
-     * @param name
-     */
-    public TestLittleEndian(String name)
-    {
-        super(name);
-    }
+public final class TestLittleEndian extends TestCase {
 
     /**
      * test the getShort() method
      */
-
-    public void testGetShort()
-    {
+    public void testGetShort() {
         byte[] testdata = new byte[ LittleEndian.SHORT_SIZE + 1 ];
 
-        testdata[ 0 ] = 0x01;
-        testdata[ 1 ] = ( byte ) 0xFF;
-        testdata[ 2 ] = 0x02;
-        short expected[] = new short[ 2 ];
+        testdata[0] = 0x01;
+        testdata[1] = (byte) 0xFF;
+        testdata[2] = 0x02;
+        short expected[] = new short[2];
 
-        expected[ 0 ] = ( short ) 0xFF01;
-        expected[ 1 ] = 0x02FF;
-        assertEquals(expected[ 0 ], LittleEndian.getShort(testdata));
-        assertEquals(expected[ 1 ], LittleEndian.getShort(testdata, 1));
+        expected[0] = ( short ) 0xFF01;
+        expected[1] = 0x02FF;
+        assertEquals(expected[0], LittleEndian.getShort(testdata));
+        assertEquals(expected[1], LittleEndian.getShort(testdata, 1));
     }
 
-    public void testGetUShort()
-    {
-        byte[] testdata = new byte[ LittleEndian.SHORT_SIZE + 1 ];
+    public void testGetUShort() {
+        byte[] testdata = {
+            (byte) 0x01,
+            (byte) 0xFF,
+            (byte) 0x02,
+        };
+        byte[] testdata2 = {
+            (byte) 0x0D,
+            (byte) 0x93,
+            (byte) 0xFF,
+        };
 
-        testdata[ 0 ] = 0x01;
-        testdata[ 1 ] = ( byte ) 0xFF;
-        testdata[ 2 ] = 0x02;
-
-        byte[] testdata2 = new byte[ LittleEndian.SHORT_SIZE + 1 ];
-        
-        testdata2[ 0 ] = 0x0D;
-        testdata2[ 1 ] = ( byte )0x93;
-        testdata2[ 2 ] = ( byte )0xFF;
-
-        int expected[] = new int[ 4 ];
-
-        expected[ 0 ] = 0xFF01;
-        expected[ 1 ] = 0x02FF;
-        expected[ 2 ] = 0x930D;
-        expected[ 3 ] = 0xFF93;
-        assertEquals(expected[ 0 ], LittleEndian.getUShort(testdata));
-        assertEquals(expected[ 1 ], LittleEndian.getUShort(testdata, 1));
-        assertEquals(expected[ 2 ], LittleEndian.getUShort(testdata2));
-        assertEquals(expected[ 3 ], LittleEndian.getUShort(testdata2, 1));
+        int expected0 = 0xFF01;
+        int expected1 = 0x02FF;
+        int expected2 = 0x930D;
+        int expected3 = 0xFF93;
+        assertEquals(expected0, LittleEndian.getUShort(testdata));
+        assertEquals(expected1, LittleEndian.getUShort(testdata, 1));
+        assertEquals(expected2, LittleEndian.getUShort(testdata2));
+        assertEquals(expected3, LittleEndian.getUShort(testdata2, 1));
 
         byte[] testdata3 = new byte[ LittleEndian.SHORT_SIZE + 1 ];
-        LittleEndian.putShort(testdata3, 0, ( short ) expected[2] );
-        LittleEndian.putShort(testdata3, 1, ( short ) expected[3] );
-        assertEquals(testdata3[ 0 ], 0x0D);
-        assertEquals(testdata3[ 1 ], (byte)0x93);
-        assertEquals(testdata3[ 2 ], (byte)0xFF);
-        assertEquals(expected[ 2 ], LittleEndian.getUShort(testdata3));
-        assertEquals(expected[ 3 ], LittleEndian.getUShort(testdata3, 1));
-        //System.out.println("TD[1][0]: "+LittleEndian.getUShort(testdata)+" expecting 65281");
-        //System.out.println("TD[1][1]: "+LittleEndian.getUShort(testdata, 1)+" expecting 767");
-        //System.out.println("TD[2][0]: "+LittleEndian.getUShort(testdata2)+" expecting 37645");
-        //System.out.println("TD[2][1]: "+LittleEndian.getUShort(testdata2, 1)+" expecting 65427");
-        //System.out.println("TD[3][0]: "+LittleEndian.getUShort(testdata3)+" expecting 37645");
-        //System.out.println("TD[3][1]: "+LittleEndian.getUShort(testdata3, 1)+" expecting 65427");
+        LittleEndian.putUShort(testdata3, 0, expected2);
+        LittleEndian.putUShort(testdata3, 1, expected3);
+        assertEquals(testdata3[0], 0x0D);
+        assertEquals(testdata3[1], (byte)0x93);
+        assertEquals(testdata3[2], (byte)0xFF);
+        assertEquals(expected2, LittleEndian.getUShort(testdata3));
+        assertEquals(expected3, LittleEndian.getUShort(testdata3, 1));
         
     }
 
@@ -123,19 +96,15 @@ public class TestLittleEndian
     /**
      * test the getDouble() method
      */
-
-    public void testGetDouble()
-    {
-        assertEquals(_doubles[ 0 ], LittleEndian.getDouble(_double_array), 0.000001 );
-        assertEquals(_doubles[ 1 ], LittleEndian.getDouble( _double_array, LittleEndian.DOUBLE_SIZE), 0.000001);
+    public void testGetDouble() {
+        assertEquals(_doubles[0], LittleEndian.getDouble(_double_array), 0.000001 );
+        assertEquals(_doubles[1], LittleEndian.getDouble( _double_array, LittleEndian.DOUBLE_SIZE), 0.000001);
         assertTrue(Double.isNaN(LittleEndian.getDouble(_nan_double_array)));
 
         double nan = LittleEndian.getDouble(_nan_double_array);
         byte[] data = new byte[8];
         LittleEndian.putDouble(data, nan);
-        for ( int i = 0; i < data.length; i++ )
-        {
-            byte b = data[i];
+        for ( int i = 0; i < data.length; i++ ) {
             assertEquals(data[i], _nan_double_array[i]);
         }
     }
@@ -143,192 +112,154 @@ public class TestLittleEndian
     /**
      * test the getInt() method
      */
+    public void testGetInt() {
+        // reading 4 byte data from a 5 byte buffer
+        byte[] testdata = {
+                (byte) 0x01,
+                (byte) 0xFF,
+                (byte) 0xFF,
+                (byte) 0xFF,
+                (byte) 0x02,
+        };
 
-    public void testGetInt()
-    {
-        byte[] testdata = new byte[ LittleEndian.INT_SIZE + 1 ];
-
-        testdata[ 0 ] = 0x01;
-        testdata[ 1 ] = ( byte ) 0xFF;
-        testdata[ 2 ] = ( byte ) 0xFF;
-        testdata[ 3 ] = ( byte ) 0xFF;
-        testdata[ 4 ] = 0x02;
-        int expected[] = new int[ 2 ];
-
-        expected[ 0 ] = 0xFFFFFF01;
-        expected[ 1 ] = 0x02FFFFFF;
-        assertEquals(expected[ 0 ], LittleEndian.getInt(testdata));
-        assertEquals(expected[ 1 ], LittleEndian.getInt(testdata, 1));
+        assertEquals(0xFFFFFF01, LittleEndian.getInt(testdata));
+        assertEquals(0x02FFFFFF, LittleEndian.getInt(testdata, 1));
     }
 
     /**
      * test the getLong method
      */
+    public void testGetLong() {
 
-    public void testGetLong()
-    {
-        byte[] testdata = new byte[ LittleEndian.LONG_SIZE + 1 ];
+        // reading 8 byte values from a 9 byte buffer
+        byte[] testdata = {
+            (byte) 0x01,
+            (byte) 0xFF,
+            (byte) 0xFF,
+            (byte) 0xFF,
+            (byte) 0xFF,
+            (byte) 0xFF,
+            (byte) 0xFF,
+            (byte) 0xFF,
+            (byte) 0x02,
+        };
 
-        testdata[ 0 ] = 0x01;
-        testdata[ 1 ] = ( byte ) 0xFF;
-        testdata[ 2 ] = ( byte ) 0xFF;
-        testdata[ 3 ] = ( byte ) 0xFF;
-        testdata[ 4 ] = ( byte ) 0xFF;
-        testdata[ 5 ] = ( byte ) 0xFF;
-        testdata[ 6 ] = ( byte ) 0xFF;
-        testdata[ 7 ] = ( byte ) 0xFF;
-        testdata[ 8 ] = 0x02;
-        long expected[] = new long[ 2 ];
-
-        expected[ 0 ] = 0xFFFFFFFFFFFFFF01L;
-        expected[ 1 ] = 0x02FFFFFFFFFFFFFFL;
-        assertEquals(expected[ 0 ], LittleEndian.getLong(testdata));
-        assertEquals(expected[ 1 ], LittleEndian.getLong(testdata, 1));
+        assertEquals(0xFFFFFFFFFFFFFF01L, LittleEndian.getLong(testdata));
+        assertEquals(0x02FFFFFFFFFFFFFFL, LittleEndian.getLong(testdata, 1));
     }
 
     /**
      * test the PutShort method
      */
-
-    public void testPutShort()
-    {
+    public void testPutShort() {
         byte[] expected = new byte[ LittleEndian.SHORT_SIZE + 1 ];
 
-        expected[ 0 ] = 0x01;
-        expected[ 1 ] = ( byte ) 0xFF;
-        expected[ 2 ] = 0x02;
+        expected[0] = 0x01;
+        expected[1] = (byte) 0xFF;
+        expected[2] = 0x02;
         byte[] received   = new byte[ LittleEndian.SHORT_SIZE + 1 ];
-        short  testdata[] = new short[ 2 ];
+        short  testdata[] = new short[2];
 
-        testdata[ 0 ] = ( short ) 0xFF01;
-        testdata[ 1 ] = 0x02FF;
-        LittleEndian.putShort(received, testdata[ 0 ]);
-        assertTrue(ba_equivalent(received, expected, 0,
-                                 LittleEndian.SHORT_SIZE));
-        LittleEndian.putShort(received, 1, testdata[ 1 ]);
-        assertTrue(ba_equivalent(received, expected, 1,
-                                 LittleEndian.SHORT_SIZE));
+        testdata[0] = ( short ) 0xFF01;
+        testdata[1] = 0x02FF;
+        LittleEndian.putShort(received, testdata[0]);
+        assertTrue(compareByteArrays(received, expected, 0, LittleEndian.SHORT_SIZE));
+        LittleEndian.putShort(received, 1, testdata[1]);
+        assertTrue(compareByteArrays(received, expected, 1, LittleEndian.SHORT_SIZE));
     }
 
     /**
      * test the putInt method
      */
+    public void testPutInt() {
+        // writing 4 byte data to a 5 byte buffer
+        byte[] expected = {
+                (byte) 0x01,
+                (byte) 0xFF,
+                (byte) 0xFF,
+                (byte) 0xFF,
+                (byte) 0x02,
+        };
+        byte[] received = new byte[ LittleEndian.INT_SIZE + 1 ];
 
-    public void testPutInt()
-    {
-        byte[] expected = new byte[ LittleEndian.INT_SIZE + 1 ];
-
-        expected[ 0 ] = 0x01;
-        expected[ 1 ] = ( byte ) 0xFF;
-        expected[ 2 ] = ( byte ) 0xFF;
-        expected[ 3 ] = ( byte ) 0xFF;
-        expected[ 4 ] = 0x02;
-        byte[] received   = new byte[ LittleEndian.INT_SIZE + 1 ];
-        int    testdata[] = new int[ 2 ];
-
-        testdata[ 0 ] = 0xFFFFFF01;
-        testdata[ 1 ] = 0x02FFFFFF;
-        LittleEndian.putInt(received, testdata[ 0 ]);
-        assertTrue(ba_equivalent(received, expected, 0,
-                                 LittleEndian.INT_SIZE));
-        LittleEndian.putInt(received, 1, testdata[ 1 ]);
-        assertTrue(ba_equivalent(received, expected, 1,
-                                 LittleEndian.INT_SIZE));
+        LittleEndian.putInt(received, 0xFFFFFF01);
+        assertTrue(compareByteArrays(received, expected, 0, LittleEndian.INT_SIZE));
+        LittleEndian.putInt(received, 1, 0x02FFFFFF);
+        assertTrue(compareByteArrays(received, expected, 1, LittleEndian.INT_SIZE));
     }
 
     /**
      * test the putDouble methods
      */
-
-    public void testPutDouble()
-    {
+    public void testPutDouble() {
         byte[] received = new byte[ LittleEndian.DOUBLE_SIZE + 1 ];
 
-        LittleEndian.putDouble(received, _doubles[ 0 ]);
-        assertTrue(ba_equivalent(received, _double_array, 0,
-                                 LittleEndian.DOUBLE_SIZE));
-        LittleEndian.putDouble(received, 1, _doubles[ 1 ]);
+        LittleEndian.putDouble(received, _doubles[0]);
+        assertTrue(compareByteArrays(received, _double_array, 0, LittleEndian.DOUBLE_SIZE));
+        LittleEndian.putDouble(received, 1, _doubles[1]);
         byte[] expected = new byte[ LittleEndian.DOUBLE_SIZE + 1 ];
 
         System.arraycopy(_double_array, LittleEndian.DOUBLE_SIZE, expected,
                          1, LittleEndian.DOUBLE_SIZE);
-        assertTrue(ba_equivalent(received, expected, 1,
-                                 LittleEndian.DOUBLE_SIZE));
+        assertTrue(compareByteArrays(received, expected, 1, LittleEndian.DOUBLE_SIZE));
     }
 
     /**
      * test the putLong method
      */
-
-    public void testPutLong()
-    {
-        byte[] expected = new byte[ LittleEndian.LONG_SIZE + 1 ];
-
-        expected[ 0 ] = 0x01;
-        expected[ 1 ] = ( byte ) 0xFF;
-        expected[ 2 ] = ( byte ) 0xFF;
-        expected[ 3 ] = ( byte ) 0xFF;
-        expected[ 4 ] = ( byte ) 0xFF;
-        expected[ 5 ] = ( byte ) 0xFF;
-        expected[ 6 ] = ( byte ) 0xFF;
-        expected[ 7 ] = ( byte ) 0xFF;
-        expected[ 8 ] = 0x02;
+    public void testPutLong() {
+        // writing 8 byte values to a 9 byte buffer
+        byte[] expected = {
+            (byte) 0x01,
+            (byte) 0xFF,
+            (byte) 0xFF,
+            (byte) 0xFF,
+            (byte) 0xFF,
+            (byte) 0xFF,
+            (byte) 0xFF,
+            (byte) 0xFF,
+            (byte) 0x02,
+        };
         byte[] received   = new byte[ LittleEndian.LONG_SIZE + 1 ];
-        long   testdata[] = new long[ 2 ];
 
-        testdata[ 0 ] = 0xFFFFFFFFFFFFFF01L;
-        testdata[ 1 ] = 0x02FFFFFFFFFFFFFFL;
-        LittleEndian.putLong(received, testdata[ 0 ]);
-        assertTrue(ba_equivalent(received, expected, 0,
-                                 LittleEndian.LONG_SIZE));
-        LittleEndian.putLong(received, 1, testdata[ 1 ]);
-        assertTrue(ba_equivalent(received, expected, 1,
-                                 LittleEndian.LONG_SIZE));
+        long testdata0 = 0xFFFFFFFFFFFFFF01L;
+        long testdata1 = 0x02FFFFFFFFFFFFFFL;
+        LittleEndian.putLong(received, testdata0);
+        assertTrue(compareByteArrays(received, expected, 0, LittleEndian.LONG_SIZE));
+        LittleEndian.putLong(received, 1, testdata1);
+        assertTrue(compareByteArrays(received, expected, 1, LittleEndian.LONG_SIZE));
     }
 
-    private static byte[] _good_array =
-    {
-        0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
-        0x02, 0x01, 0x02, 0x01, 0x02
+    private static byte[] _good_array = {
+        0x01, 0x02, 0x01, 0x02, 
+        0x01, 0x02, 0x01, 0x02, 
+        0x01, 0x02, 0x01, 0x02,
+        0x01, 0x02, 0x01, 0x02,
     };
-    private static byte[] _bad_array  =
-    {
+    private static byte[] _bad_array  = {
         0x01
     };
 
     /**
      * test the readShort method
      */
-
-    public void testReadShort()
-        throws IOException
-    {
+    public void testReadShort() throws IOException {
         short       expected_value = 0x0201;
         InputStream stream         = new ByteArrayInputStream(_good_array);
         int         count          = 0;
 
-        while (true)
-        {
+        while (stream.available() > 0) {
             short value = LittleEndian.readShort(stream);
-
-            if (value == 0)
-            {
-                break;
-            }
             assertEquals(value, expected_value);
             count++;
         }
         assertEquals(count,
                      _good_array.length / LittleEndianConsts.SHORT_SIZE);
         stream = new ByteArrayInputStream(_bad_array);
-        try
-        {
+        try {
             LittleEndian.readShort(stream);
             fail("Should have caught BufferUnderrunException");
-        }
-        catch (BufferUnderrunException ignored)
-        {
-
+        } catch (BufferUnderrunException ignored) {
             // as expected
         }
     }
@@ -336,34 +267,22 @@ public class TestLittleEndian
     /**
      * test the readInt method
      */
-
-    public void testReadInt()
-        throws IOException
-    {
+    public void testReadInt() throws IOException {
         int         expected_value = 0x02010201;
         InputStream stream         = new ByteArrayInputStream(_good_array);
         int         count          = 0;
 
-        while (true)
-        {
+        while (stream.available() > 0) {
             int value = LittleEndian.readInt(stream);
-
-            if (value == 0)
-            {
-                break;
-            }
             assertEquals(value, expected_value);
             count++;
         }
         assertEquals(count, _good_array.length / LittleEndianConsts.INT_SIZE);
         stream = new ByteArrayInputStream(_bad_array);
-        try
-        {
+        try {
             LittleEndian.readInt(stream);
             fail("Should have caught BufferUnderrunException");
-        }
-        catch (BufferUnderrunException ignored)
-        {
+        } catch (BufferUnderrunException ignored) {
 
             // as expected
         }
@@ -372,104 +291,60 @@ public class TestLittleEndian
     /**
      * test the readLong method
      */
-
-    public void testReadLong()
-        throws IOException
-    {
+    public void testReadLong() throws IOException {
         long        expected_value = 0x0201020102010201L;
         InputStream stream         = new ByteArrayInputStream(_good_array);
         int         count          = 0;
 
-        while (true)
-        {
+        while (stream.available() > 0) {
             long value = LittleEndian.readLong(stream);
-
-            if (value == 0)
-            {
-                break;
-            }
             assertEquals(value, expected_value);
             count++;
         }
         assertEquals(count,
                      _good_array.length / LittleEndianConsts.LONG_SIZE);
         stream = new ByteArrayInputStream(_bad_array);
-        try
-        {
+        try {
             LittleEndian.readLong(stream);
             fail("Should have caught BufferUnderrunException");
-        }
-        catch (BufferUnderrunException ignored)
-        {
-
+        } catch (BufferUnderrunException ignored) {
             // as expected
         }
     }
 
-    /**
-     * test the readFromStream method
-     */
+//    public void testReadFromStream() throws IOException {
+//        int actual;
+//        actual = LittleEndian.readUShort(new ByteArrayInputStream(new byte[] { 5, -128, }));
+//        assertEquals(32773, actual);
+//        
+//        actual = LittleEndian.readUShort(new ByteArrayInputStream(new byte[] { 1, 2, 3, 4, }));
+//        assertEquals(513, actual);
+//
+//        try {
+//            LittleEndian.readInt(new ByteArrayInputStream(new byte[] { 1, 2, 3, }));
+//            fail("Should have caught BufferUnderrunException");
+//        } catch (BufferUnderrunException ignored) {
+//            // as expected
+//        }
+//    }
 
-    public void testReadFromStream()
-        throws IOException
-    {
-        InputStream stream = new ByteArrayInputStream(_good_array);
-        byte[]      value  = LittleEndian.readFromStream(stream,
-                                 _good_array.length);
-
-        assertTrue(ba_equivalent(value, _good_array, 0, _good_array.length));
-        stream = new ByteArrayInputStream(_good_array);
-        try
-        {
-            value = LittleEndian.readFromStream(stream,
-                                                _good_array.length + 1);
-            fail("Should have caught BufferUnderrunException");
-        }
-        catch (BufferUnderrunException ignored)
-        {
-
-            // as expected
-        }
-    }
-
-    public void testUnsignedByteToInt()
-            throws Exception
-    {
+    public void testUnsignedByteToInt() {
         assertEquals(255, LittleEndian.ubyteToInt((byte)255));
     }
 
-    private boolean ba_equivalent(byte [] received, byte [] expected,
-                                  int offset, int size)
-    {
-        boolean result = true;
+    private static boolean compareByteArrays(byte [] received, byte [] expected,
+                                  int offset, int size) {
 
-        for (int j = offset; j < offset + size; j++)
-        {
-            if (received[ j ] != expected[ j ])
-            {
+        for (int j = offset; j < offset + size; j++) {
+            if (received[j] != expected[j]) {
                 System.out.println("difference at index " + j);
-                result = false;
-                break;
+                return false;
             }
         }
-        return result;
+        return true;
     }
 
-    public void testUnsignedShort()
-            throws Exception
-    {
+    public void testUnsignedShort() {
         assertEquals(0xffff, LittleEndian.getUShort(new byte[] { (byte)0xff, (byte)0xff }, 0));
     }
-
-    /**
-     * main method to run the unit tests
-     *
-     * @param ignored_args
-     */
-
-    public static void main(String [] ignored_args)
-    {
-        System.out.println("Testing util.LittleEndian functionality");
-        junit.textui.TestRunner.run(TestLittleEndian.class);
-    }
 }
diff --git a/src/testcases/org/apache/poi/util/TestLongField.java b/src/testcases/org/apache/poi/util/TestLongField.java
index 05ba965f9..a37e88ed3 100644
--- a/src/testcases/org/apache/poi/util/TestLongField.java
+++ b/src/testcases/org/apache/poi/util/TestLongField.java
@@ -1,4 +1,3 @@
-
 /* ====================================================================
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -15,7 +14,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
 
 package org.apache.poi.util;
 
@@ -28,31 +26,13 @@ import java.io.*;
  *
  * @author  Marc Johnson (mjohnson at apache dot org)
  */
-
-public class TestLongField
-    extends TestCase
-{
-
-    /**
-     * Constructor
-     *
-     * @param name
-     */
-
-    public TestLongField(String name)
-    {
-        super(name);
-    }
+public final class TestLongField extends TestCase {
 
     static private final long[] _test_array =
     {
         Long.MIN_VALUE, -1L, 0L, 1L, Long.MAX_VALUE
     };
 
-    /**
-     * Test constructors.
-     */
-
     public void testConstructors()
     {
         try
@@ -121,10 +101,6 @@ public class TestLongField
         }
     }
 
-    /**
-     * Test set() methods
-     */
-
     public void testSet()
     {
         LongField field = new LongField(0);
@@ -163,10 +139,6 @@ public class TestLongField
         }
     }
 
-    /**
-     * Test readFromBytes
-     */
-
     public void testReadFromBytes()
     {
         LongField field = new LongField(1);
@@ -198,12 +170,6 @@ public class TestLongField
         }
     }
 
-    /**
-     * Test readFromStream
-     *
-     * @exception IOException
-     */
-
     public void testReadFromStream()
         throws IOException
     {
@@ -212,8 +178,8 @@ public class TestLongField
 
         for (int j = 0; j < _test_array.length; j++)
         {
-            buffer[ (j * 8) + 0 ] = ( byte ) (_test_array[ j ] % 256);
-            buffer[ (j * 8) + 1 ] = ( byte ) ((_test_array[ j ] >> 8) % 256);
+            buffer[ (j * 8) + 0 ] = ( byte ) ((_test_array[ j ] >>  0) % 256);
+            buffer[ (j * 8) + 1 ] = ( byte ) ((_test_array[ j ] >>  8) % 256);
             buffer[ (j * 8) + 2 ] = ( byte ) ((_test_array[ j ] >> 16) % 256);
             buffer[ (j * 8) + 3 ] = ( byte ) ((_test_array[ j ] >> 24) % 256);
             buffer[ (j * 8) + 4 ] = ( byte ) ((_test_array[ j ] >> 32) % 256);
@@ -230,10 +196,6 @@ public class TestLongField
         }
     }
 
-    /**
-     * test writeToBytes
-     */
-
     public void testWriteToBytes()
     {
         LongField field = new LongField(0);
@@ -256,16 +218,4 @@ public class TestLongField
             assertEquals("testing ", _test_array[ j ], val);
         }
     }
-
-    /**
-     * Main
-     *
-     * @param args
-     */
-
-    public static void main(String [] args)
-    {
-        System.out.println("Testing util.LongField functionality");
-        junit.textui.TestRunner.run(TestLongField.class);
-    }
 }