Browse Source

Modify references to XLSX documents to reflect their move to a subdirectory.

Geoffrey J. Teale 11 years ago
parent
commit
6506e59a4d

+ 9 - 9
file_test.go

@@ -17,7 +17,7 @@ func (l *FileSuite) TestOpenFile(c *C) {
 	var xlsxFile *File
 	var error error
 
-	xlsxFile, error = OpenFile("testfile.xlsx")
+	xlsxFile, error = OpenFile("./testdocs/testfile.xlsx")
 	c.Assert(error, IsNil)
 	c.Assert(xlsxFile, NotNil)
 }
@@ -26,7 +26,7 @@ func (l *FileSuite) TestOpenFileWithoutStyleAndSharedStrings(c *C) {
 	var xlsxFile *File
 	var error error
 
-	xlsxFile, error = OpenFile("noStylesAndSharedStringsTest.xlsx")
+	xlsxFile, error = OpenFile("./testdocs/noStylesAndSharedStringsTest.xlsx")
 	c.Assert(error, IsNil)
 	c.Assert(xlsxFile, NotNil)
 }
@@ -37,7 +37,7 @@ func (l *FileSuite) TestOpenFileWithoutStyleAndSharedStrings(c *C) {
 func (l *FileSuite) TestReadSharedStringsFromZipFile(c *C) {
 	var xlsxFile *File
 	var err error
-	xlsxFile, err = OpenFile("testfile.xlsx")
+	xlsxFile, err = OpenFile("./testdocs/testfile.xlsx")
 	c.Assert(err, IsNil)
 	c.Assert(xlsxFile.referenceTable, NotNil)
 }
@@ -67,7 +67,7 @@ func (l *FileSuite) TestReadStylesFromZipFile(c *C) {
 	var border xlsxBorder
 	var xf xlsxXf
 
-	xlsxFile, err = OpenFile("testfile.xlsx")
+	xlsxFile, err = OpenFile("./testdocs/testfile.xlsx")
 	c.Assert(err, IsNil)
 	c.Assert(xlsxFile.styles, NotNil)
 
@@ -132,7 +132,7 @@ func (l *FileSuite) TestReadWorkbookRelationsFromZipFile(c *C) {
 	var xlsxFile *File
 	var err error
 
-	xlsxFile, err = OpenFile("testfile.xlsx")
+	xlsxFile, err = OpenFile("./testdocs/testfile.xlsx")
 	c.Assert(err, IsNil)
 	c.Assert(len(xlsxFile.Sheets), Equals, 3)
 	sheet, ok := xlsxFile.Sheet["Tabelle1"]
@@ -146,7 +146,7 @@ func (l *FileSuite) TestGetStyleFromZipFile(c *C) {
 	var err error
 	var style Style
 
-	xlsxFile, err = OpenFile("testfile.xlsx")
+	xlsxFile, err = OpenFile("./testdocs/testfile.xlsx")
 	c.Assert(err, IsNil)
 	sheetCount := len(xlsxFile.Sheets)
 	c.Assert(sheetCount, Equals, 3)
@@ -186,7 +186,7 @@ func (l *FileSuite) TestCreateSheet(c *C) {
 	var err error
 	var sheet *Sheet
 	var row *Row
-	xlsxFile, err = OpenFile("testfile.xlsx")
+	xlsxFile, err = OpenFile("./testdocs/testfile.xlsx")
 	c.Assert(err, IsNil)
 	c.Assert(xlsxFile, NotNil)
 	sheetLen := len(xlsxFile.Sheets)
@@ -418,13 +418,13 @@ type SliceReaderSuite struct{}
 var _ = Suite(&SliceReaderSuite{})
 
 func (s *SliceReaderSuite) TestFileToSlice(c *C) {
-	output, err := FileToSlice("testfile.xlsx")
+	output, err := FileToSlice("./testdocs/testfile.xlsx")
 	c.Assert(err, IsNil)
 	fileToSliceCheckOutput(c, output)
 }
 
 func (s *SliceReaderSuite) TestFileObjToSlice(c *C) {
-	f, err := OpenFile("testfile.xlsx")
+	f, err := OpenFile("./testdocs/testfile.xlsx")
 	output, err := f.ToSlice()
 	c.Assert(err, IsNil)
 	fileToSliceCheckOutput(c, output)

+ 1 - 1
googleDocsExcel_test.go

@@ -9,7 +9,7 @@ var _ = Suite(&GoogleDocsExcelSuite{})
 // Test that we can successfully read an XLSX file generated by
 // Google Docs.
 func (g *GoogleDocsExcelSuite) TestGoogleDocsExcel(c *C) {
-	xlsxFile, err := OpenFile("googleDocsTest.xlsx")
+	xlsxFile, err := OpenFile("./testdocs/googleDocsTest.xlsx")
 	c.Assert(err, IsNil)
 	c.Assert(xlsxFile, NotNil)
 }

+ 3 - 2
lib_test.go

@@ -4,8 +4,9 @@ import (
 	"bytes"
 	"encoding/xml"
 	// "strconv"
-	. "gopkg.in/check.v1"
 	"strings"
+
+	. "gopkg.in/check.v1"
 )
 
 type LibSuite struct{}
@@ -18,7 +19,7 @@ func (l *LibSuite) TestReadWorkbookRelationsFromZipFileWithFunnyNames(c *C) {
 	var xlsxFile *File
 	var err error
 
-	xlsxFile, err = OpenFile("testrels.xlsx")
+	xlsxFile, err = OpenFile("./testdocs/testrels.xlsx")
 	c.Assert(err, IsNil)
 	bob := xlsxFile.Sheet["Bob"]
 	row1 := bob.Rows[0]

+ 1 - 1
macExcel_test.go

@@ -13,7 +13,7 @@ var _ = Suite(&MacExcelSuite{})
 // respect the contents of workbook.xml.rels, which maps the sheet IDs
 // to their internal file names.
 func (m *MacExcelSuite) TestMacExcel(c *C) {
-	xlsxFile, err := OpenFile("macExcelTest.xlsx")
+	xlsxFile, err := OpenFile("./testdocs/macExcelTest.xlsx")
 	c.Assert(err, IsNil)
 	c.Assert(xlsxFile, NotNil)
 	s := xlsxFile.Sheet["普通技能"].Cell(0, 0).String()

+ 1 - 1
macNumbers_test.go

@@ -11,7 +11,7 @@ var _ = Suite(&MacNumbersSuite{})
 // Test that we can successfully read an XLSX file generated by
 // Numbers for Mac.
 func (m *MacNumbersSuite) TestMacNumbers(c *C) {
-	xlsxFile, err := OpenFile("macNumbersTest.xlsx")
+	xlsxFile, err := OpenFile("./testdocs/macNumbersTest.xlsx")
 	c.Assert(err, IsNil)
 	c.Assert(xlsxFile, NotNil)
 	sheet, ok := xlsxFile.Sheet["主动技能"]

+ 0 - 0
googleDocsTest.xlsx → testdocs/googleDocsTest.xlsx


+ 0 - 0
macExcelTest.xlsx → testdocs/macExcelTest.xlsx


+ 0 - 0
macNumbersTest.xlsx → testdocs/macNumbersTest.xlsx


+ 0 - 0
noStylesAndSharedStringsTest.xlsx → testdocs/noStylesAndSharedStringsTest.xlsx


+ 0 - 0
testfile.xlsx → testdocs/testfile.xlsx


+ 0 - 0
testrels.xlsx → testdocs/testrels.xlsx


+ 0 - 0
wpsBlankLineTest.xlsx → testdocs/wpsBlankLineTest.xlsx


+ 1 - 1
wpsBlankLine_test.go

@@ -11,7 +11,7 @@ var _ = Suite(&WorksheetSuite{})
 // Test that we can successfully read an XLSX file generated by
 // Wps on windows. you can download it freely from http://www.wps.cn/
 func (w *WpsBlankLineSuite) TestWpsBlankLine(c *C) {
-	xlsxFile, err := OpenFile("wpsBlankLineTest.xlsx")
+	xlsxFile, err := OpenFile("./testdocs/wpsBlankLineTest.xlsx")
 	c.Assert(err, IsNil)
 	c.Assert(xlsxFile, NotNil)
 	sheet := xlsxFile.Sheet["Sheet1"]