Fix autoFitColWidth overriding width with latest value instead of max value (#2274)

- Update unit tests

Author: hwo411

adjust_test.go

@@ -967,7 +967,7 @@ func TestAdjustFormula(t *testing.T) {
 		// Test adjust array formula with invalid range reference
 		formulaType, ref = STCellFormulaTypeArray, "E1:E2"
 		assert.NoError(t, f.SetCellFormula("Sheet1", "E1", "XFD1:XFD1", FormulaOpts{Ref: &ref, Type: &formulaType}))
-		assert.EqualError(t, f.InsertCols("Sheet1", "A", 1), "the column number must be greater than or equal to 1 and less than or equal to 16384")
+		assert.Equal(t, ErrColumnNumber, f.InsertCols("Sheet1", "A", 1))
 	})
 }
 
@@ -1271,7 +1271,7 @@ func TestAdjustDrawings(t *testing.T) {
 	f, err = OpenFile(wb)
 	assert.NoError(t, err)
 	f.Pkg.Store("xl/drawings/drawing1.xml", []byte(xml.Header+fmt.Sprintf(`<wsDr xmlns="http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing"><oneCellAnchor><from><col>%d</col><row>0</row></from><mc:AlternateContent xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"></mc:AlternateContent><clientData/></oneCellAnchor></wsDr>`, MaxColumns)))
-	assert.EqualError(t, f.InsertCols("Sheet1", "A", 1), "the column number must be greater than or equal to 1 and less than or equal to 16384")
+	assert.Equal(t, ErrColumnNumber, f.InsertCols("Sheet1", "A", 1))
 }
 
 func TestAdjustDefinedNames(t *testing.T) {

col.go

@@ -884,61 +884,52 @@ func (fnt *Font) calcRichTextWidth(runs []RichTextRun) float64 {
 
 // autoFitColWidth provides a function to auto fit columns width according to
 // their text content with default font size and font.
-func (f *File) autoFitColWidth(sheet string, from, to, rows int, defaultFnt *Font) error {
-	ws, err := f.workSheetReader(sheet)
-	if err != nil {
-		return err
-	}
-	for col := from; col <= to; col++ {
-		var width float64
-		for row := 1; row <= rows; row++ {
-			cell, _ := CoordinatesToCellName(col, row)
-			val, err := f.CalcCellValue(sheet, cell)
-			if err != nil && inStrSlice([]string{
-				formulaErrorDIV,
-				formulaErrorNAME,
-				formulaErrorNA,
-				formulaErrorNUM,
-				formulaErrorVALUE,
-				formulaErrorREF,
-				formulaErrorNULL,
-				formulaErrorSPILL,
-				formulaErrorCALC,
-				formulaErrorGETTINGDATA,
-			}, err.Error(), true) != -1 {
-				val = err.Error()
-			}
-			if val == "" {
-				continue
-			}
-			styleID, _ := f.GetCellStyle(sheet, cell)
-			fnt := defaultFnt
-			style, err := f.GetStyle(styleID)
-			if err != nil {
-				return err
-			}
-			if style != nil && style.Font != nil {
-				fnt = style.Font
-			}
-			if cellType, _ := f.GetCellType(sheet, cell); cellType == CellTypeInlineString || cellType == CellTypeSharedString {
-				runs, _ := f.GetCellRichText(sheet, cell)
-				width = fnt.calcRichTextWidth(runs)
-				continue
-			}
-			if w := fnt.calcTextWidth(val); w > width {
+func (f *File) autoFitColWidth(sheet string, col, rows int, defaultFnt *Font) (float64, error) {
+	var width float64
+	for row := 1; row <= rows; row++ {
+		cell, err := CoordinatesToCellName(col, row)
+		if err != nil {
+			return width, err
+		}
+		val, err := f.CalcCellValue(sheet, cell)
+		if err != nil && inStrSlice([]string{
+			formulaErrorDIV,
+			formulaErrorNAME,
+			formulaErrorNA,
+			formulaErrorNUM,
+			formulaErrorVALUE,
+			formulaErrorREF,
+			formulaErrorNULL,
+			formulaErrorSPILL,
+			formulaErrorCALC,
+			formulaErrorGETTINGDATA,
+		}, err.Error(), true) != -1 {
+			val = err.Error()
+		}
+		if val == "" {
+			continue
+		}
+		styleID, _ := f.GetCellStyle(sheet, cell)
+		fnt := defaultFnt
+		style, err := f.GetStyle(styleID)
+		if err != nil {
+			return width, err
+		}
+		if style != nil && style.Font != nil {
+			fnt = style.Font
+		}
+		if cellType, _ := f.GetCellType(sheet, cell); cellType == CellTypeInlineString || cellType == CellTypeSharedString {
+			runs, _ := f.GetCellRichText(sheet, cell)
+			if w := fnt.calcRichTextWidth(runs); w > width {
 				width = w
 			}
+			continue
 		}
-		if width > 0 {
-			width += 2
-			if width > MaxColumnWidth {
-				width = MaxColumnWidth
-			}
-			ws.setColWidth(col, col, width)
-			ws.setColVisible(col, col, true)
+		if w := fnt.calcTextWidth(val); w > width {
+			width = w
 		}
 	}
-	return nil
+	return width, nil
 }
 
 // AutoFitColWidth provides a function to auto fit columns width according to
@@ -980,5 +971,16 @@ func (f *File) AutoFitColWidth(sheet, columns string) error {
 			defaultFnt.Family = *font.Name.Val
 		}
 	}
-	return f.autoFitColWidth(sheet, minVal, maxVal, len(rows), defaultFnt)
+	ws, _ := f.workSheetReader(sheet)
+	for col := minVal; col <= maxVal; col++ {
+		if width, _ := f.autoFitColWidth(sheet, col, len(rows), defaultFnt); width > 0 {
+			width += 2
+			if width > MaxColumnWidth {
+				width = MaxColumnWidth
+			}
+			ws.setColVisible(col, col, true)
+			ws.setColWidth(col, col, width)
+		}
+	}
+	return err
 }

col_test.go

@@ -549,7 +549,8 @@ func TestAutoFitColWidth(t *testing.T) {
 
 	assert.Equal(t, f.AutoFitColWidth("Sheet1", ""), newInvalidColumnNameError(""))
 	assert.Equal(t, f.AutoFitColWidth("SheetN", "A"), ErrSheetNotExist{"SheetN"})
-	assert.Equal(t, f.autoFitColWidth("SheetN", 1, 1, 0, &Font{}), ErrSheetNotExist{"SheetN"})
+	_, err = f.autoFitColWidth("Sheet1", TotalRows, 1, &Font{})
+	assert.Equal(t, ErrColumnNumber, err)
 	assert.NoError(t, f.SaveAs(filepath.Join("test", "TestAutoFitColWidth.xlsx")))
 
 	f = NewFile()
@@ -563,5 +564,6 @@ func TestAutoFitColWidth(t *testing.T) {
 			{R: 1, C: []xlsxC{{R: "A1", S: 1, V: "Test"}}},
 		}},
 	})
-	assert.Equal(t, f.autoFitColWidth("Sheet1", 1, 1, 1, &Font{}), newInvalidStyleID(1))
+	_, err = f.autoFitColWidth("Sheet1", 1, 1, &Font{})
+	assert.Equal(t, err, newInvalidStyleID(1))
 }

sheet_test.go

@@ -819,7 +819,7 @@ func TestSheetDimension(t *testing.T) {
 		{"Sheet1", "123", "cannot convert cell \"123\" to coordinates: invalid cell name \"123\""},
 		{"Sheet1", "A:B", "cannot convert cell \"A\" to coordinates: invalid cell name \"A\""},
 		{"Sheet1", ":B10", "cannot convert cell \"\" to coordinates: invalid cell name \"\""},
-		{"Sheet1", "XFE1", "the column number must be greater than or equal to 1 and less than or equal to 16384"},
+		{"Sheet1", "XFE1", ErrColumnNumber.Error()},
 		{"Sheet1", "A1048577", "row number exceeds maximum limit"},
 		{"Sheet1", "ZZZ", "cannot convert cell \"ZZZ\" to coordinates: invalid cell name \"ZZZ\""},
 		{"SheetN", "A1", "sheet SheetN does not exist"},