Improvements to OpenXML4J unit tests. Fixed class names. Refactored code for opening test data files. Changed test output to go to temp dir.

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@741002 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 12 insertions, 12 deletions

diff --git a/src/testcases/org/apache/poi/hssf/extractor/TestExcelExtractor.java b/src/testcases/org/apache/poi/hssf/extractor/TestExcelExtractor.java
index d715650528..c820f2c9bc 100644
--- a/src/testcases/org/apache/poi/hssf/extractor/TestExcelExtractor.java
+++ b/src/testcases/org/apache/poi/hssf/extractor/TestExcelExtractor.java
@@ -62,10 +62,10 @@ public final class TestExcelExtractor extends TestCase {
 		assertEquals(
 				"Sheet1\n" +
 				"1000.0\t1.0\t5.0\n" +
-				"2000.0\t2.0\t\n" +	
-				"3000.0\t3.0\t\n" +
-				"4000.0\t4.0\t\n" + 
-				"5000.0\t5.0\t\n" +
+				"2000.0\t2.0\n" +	
+				"3000.0\t3.0\n" +
+				"4000.0\t4.0\n" + 
+				"5000.0\t5.0\n" +
 				"Sheet2\nSheet3\n", 
 				extractor.getText()
 		);
@@ -75,10 +75,10 @@ public final class TestExcelExtractor extends TestCase {
 		assertEquals(
 				"Sheet1\n" +
 				"1000.0\t1.0\tSUMIF(A1:A5,\">4000\",B1:B5)\n" +
-				"2000.0\t2.0\t\n" +	
-				"3000.0\t3.0\t\n" +
-				"4000.0\t4.0\t\n" + 
-				"5000.0\t5.0\t\n" +
+				"2000.0\t2.0\n" +	
+				"3000.0\t3.0\n" +
+				"4000.0\t4.0\n" + 
+				"5000.0\t5.0\n" +
 				"Sheet2\nSheet3\n", 
 				extractor.getText()
 		);
@@ -196,15 +196,15 @@ public final class TestExcelExtractor extends TestCase {
 		assertTrue(def.startsWith(
 				"Sheet1\n" +
 				"&[TAB]\t\n" +
-				"Hello\t\n" +
-				"11.0\t23.0\t\n"
+				"Hello\n" +
+				"11.0\t23.0\n"
 		));
 		
 		assertTrue(padded.startsWith(
 				"Sheet1\n" +
 				"&[TAB]\t\n" +
-				"Hello\t\t\t\t\t\t\t\t\t\t\t\n" +
-				"11.0\t\t\t23.0\t\t\t\t\t\t\t\t\n"
+				"Hello\n" +
+				"11.0\t\t\t23.0\n"
 		));
 	}