Centralize logic for finding/opening sample files

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

1 files changed, 7 insertions, 12 deletions

diff --git a/src/ooxml/testcases/org/apache/poi/TestDetectAsOOXML.java b/src/ooxml/testcases/org/apache/poi/TestDetectAsOOXML.java
index dca593c3c7..2461f463dd 100644
--- a/src/ooxml/testcases/org/apache/poi/TestDetectAsOOXML.java
+++ b/src/ooxml/testcases/org/apache/poi/TestDetectAsOOXML.java
@@ -22,23 +22,18 @@ package org.apache.poi;
 import junit.framework.TestCase;
 import java.io.*;
 
+import org.apache.poi.hssf.HSSFTestDataSamples;
+import org.apache.poi.openxml4j.opc.OPCPackage;
+
 /**
  * Class to test that HXF correctly detects OOXML
  *  documents
  */
 public class TestDetectAsOOXML extends TestCase
 {
-	public String dirname;
-
-	public void setUp() {
-		dirname = System.getProperty("HSSF.testdata.path");
-	}
-
 	public void testOpensProperly() throws Exception
 	{
-		File f = new File(dirname + "/sample.xlsx");
-
-		POIXMLDocument.openPackage(f.toString());
+        OPCPackage.open(HSSFTestDataSamples.openSampleFileStream("sample.xlsx"));
 	}
 	
 	public void testDetectAsPOIFS() throws Exception {
@@ -46,19 +41,19 @@ public class TestDetectAsOOXML extends TestCase
 		
 		// ooxml file is
 		in = new PushbackInputStream(
-				new FileInputStream(dirname + "/SampleSS.xlsx"), 10
+				HSSFTestDataSamples.openSampleFileStream("SampleSS.xlsx"), 10
 		);
 		assertTrue(POIXMLDocument.hasOOXMLHeader(in));
 		
 		// xls file isn't
 		in = new PushbackInputStream(
-				new FileInputStream(dirname + "/SampleSS.xls"), 10
+				HSSFTestDataSamples.openSampleFileStream("SampleSS.xls"), 10
 		);
 		assertFalse(POIXMLDocument.hasOOXMLHeader(in));
 		
 		// text file isn't
 		in = new PushbackInputStream(
-				new FileInputStream(dirname + "/SampleSS.txt"), 10
+				HSSFTestDataSamples.openSampleFileStream("SampleSS.txt"), 10
 		);
 		assertFalse(POIXMLDocument.hasOOXMLHeader(in));
 	}