Browse Source

Update test for addTable

xuri 5 years ago
parent
commit
ca43c65115
4 changed files with 13 additions and 16 deletions
  1. 1 4
      lib.go
  2. 2 8
      table.go
  3. 6 0
      table_test.go
  4. 4 4
      xmlDrawing.go

+ 1 - 4
lib.go

@@ -396,10 +396,7 @@ func (f *File) addNameSpaces(path string, ns xml.Attr) {
 	if !exist {
 		f.xmlAttr[path] = append(f.xmlAttr[path], ns)
 		if !mc {
-			f.xmlAttr[path] = append(f.xmlAttr[path], xml.Attr{
-				Name:  xml.Name{Local: "mc", Space: "xmlns"},
-				Value: SourceRelationshipCompatibility,
-			})
+			f.xmlAttr[path] = append(f.xmlAttr[path], SourceRelationshipCompatibility)
 		}
 		if !ignore {
 			f.xmlAttr[path] = append(f.xmlAttr[path], xml.Attr{

+ 2 - 8
table.go

@@ -287,14 +287,8 @@ func (f *File) AutoFilter(sheet, hcell, vcell, format string) error {
 	}
 
 	formatSet, _ := parseAutoFilterSet(format)
-
-	var cellStart, cellEnd string
-	if cellStart, err = CoordinatesToCellName(hcol, hrow); err != nil {
-		return err
-	}
-	if cellEnd, err = CoordinatesToCellName(vcol, vrow); err != nil {
-		return err
-	}
+	cellStart, _ := CoordinatesToCellName(hcol, hrow)
+	cellEnd, _ := CoordinatesToCellName(vcol, vrow)
 	ref, filterDB := cellStart+":"+cellEnd, "_xlnm._FilterDatabase"
 	wb := f.workbookReader()
 	sheetID := f.GetSheetIndex(sheet)

+ 6 - 0
table_test.go

@@ -29,6 +29,8 @@ func TestAddTable(t *testing.T) {
 		t.FailNow()
 	}
 
+	// Test add table in not exist worksheet.
+	assert.EqualError(t, f.AddTable("SheetN", "B26", "A21", `{}`), "sheet SheetN is not exist")
 	// Test add table with illegal formatset.
 	assert.EqualError(t, f.AddTable("Sheet1", "B26", "A21", `{x}`), "invalid character 'x' looking for beginning of object key string")
 	// Test add table with illegal cell coordinates.
@@ -100,6 +102,10 @@ func TestAutoFilterError(t *testing.T) {
 		})
 	}
 
+	assert.EqualError(t, f.autoFilter("SheetN", "A1", 1, 1, &formatAutoFilter{
+		Column:     "A",
+		Expression: "",
+	}), "sheet SheetN is not exist")
 	assert.EqualError(t, f.autoFilter("Sheet1", "A1", 1, 1, &formatAutoFilter{
 		Column:     "-",
 		Expression: "-",

+ 4 - 4
xmlDrawing.go

@@ -15,9 +15,10 @@ import "encoding/xml"
 
 // Source relationship and namespace.
 var (
-	SourceRelationship      = xml.Attr{Name: xml.Name{Local: "r", Space: "xmlns"}, Value: "http://schemas.openxmlformats.org/officeDocument/2006/relationships"}
-	NameSpaceSpreadSheet    = xml.Attr{Name: xml.Name{Local: "xmlns"}, Value: "http://schemas.openxmlformats.org/spreadsheetml/2006/main"}
-	NameSpaceSpreadSheetX14 = xml.Attr{Name: xml.Name{Local: "x14", Space: "xmlns"}, Value: "http://schemas.microsoft.com/office/spreadsheetml/2009/9/main"}
+	SourceRelationship              = xml.Attr{Name: xml.Name{Local: "r", Space: "xmlns"}, Value: "http://schemas.openxmlformats.org/officeDocument/2006/relationships"}
+	SourceRelationshipCompatibility = xml.Attr{Name: xml.Name{Local: "mc", Space: "xmlns"}, Value: "http://schemas.openxmlformats.org/markup-compatibility/2006"}
+	NameSpaceSpreadSheet            = xml.Attr{Name: xml.Name{Local: "xmlns"}, Value: "http://schemas.openxmlformats.org/spreadsheetml/2006/main"}
+	NameSpaceSpreadSheetX14         = xml.Attr{Name: xml.Name{Local: "x14", Space: "xmlns"}, Value: "http://schemas.microsoft.com/office/spreadsheetml/2009/9/main"}
 )
 
 // Source relationship and namespace.
@@ -39,7 +40,6 @@ const (
 	SourceRelationshipChart201506                = "http://schemas.microsoft.com/office/drawing/2015/06/chart"
 	SourceRelationshipChart20070802              = "http://schemas.microsoft.com/office/drawing/2007/8/2/chart"
 	SourceRelationshipChart2014                  = "http://schemas.microsoft.com/office/drawing/2014/chart"
-	SourceRelationshipCompatibility              = "http://schemas.openxmlformats.org/markup-compatibility/2006"
 	NameSpaceDrawingML                           = "http://schemas.openxmlformats.org/drawingml/2006/main"
 	NameSpaceDrawingMLChart                      = "http://schemas.openxmlformats.org/drawingml/2006/chart"
 	NameSpaceDrawingMLSpreadSheet                = "http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing"