Simplify unit tests code

Author: xuri

col_test.go

@@ -86,6 +86,24 @@ func TestCols(t *testing.T) {
 	f.Pkg.Store("xl/worksheets/sheet1.xml", []byte(`<worksheet><sheetData><row r="2"><c r="A" t="inlineStr"><is><t>B</t></is></c></row></sheetData></worksheet>`))
 	_, err = f.Cols("Sheet1")
 	assert.EqualError(t, err, newCellNameToCoordinatesError("A", newInvalidCellNameError("A")).Error())
+
+	t.Run("with_invalid_worksheet_xml", func(t *testing.T) {
+		f := NewFile()
+		f.Sheet.Delete("xl/worksheets/sheet1.xml")
+		f.Pkg.Store("xl/worksheets/sheet1.xml", []byte(`<worksheet><sheetData><row r="1"><c r="A1"><v>1</v></c></row><row r="2"><c r="A"2><v>2</v></c></row></sheetData></worksheet>`))
+		cols, err := f.Cols("Sheet1")
+		assert.NoError(t, err)
+		cnt := 0
+		row := []string{}
+		for cols.Next() {
+			cnt++
+			row, err = cols.Rows()
+			assert.NoError(t, err)
+		}
+		assert.Equal(t, 1, cnt)
+		assert.Equal(t, []string{"1"}, row)
+		assert.NoError(t, f.Close())
+	})
 }
 
 func TestColumnsIterator(t *testing.T) {
@@ -164,38 +182,6 @@ func TestGetColsError(t *testing.T) {
 	assert.NoError(t, err)
 }
 
-func TestColsIteratorRetainsFilePointer(t *testing.T) {
-	// Regression for #2299: when worksheet XML is truncated before the
-	// </sheetData> close element, the SAX loop in Cols falls through to
-	// the final return. Prior to #2300 the *File pointer was only wired
-	// into the iterator inside the sheetData EndElement branch, so this
-	// path returned a Cols whose f field was nil, and a subsequent
-	// Cols.Rows call would nil-dereference on cols.f.getOptions. Make
-	// sure the iterator carries a live *File regardless of where the
-	// parse exits.
-	f := NewFile()
-	f.Sheet.Delete("xl/worksheets/sheet1.xml")
-	// Missing </sheetData> and </worksheet> close tags simulate the
-	// truncation seen by the fuzzer in #2299.
-	f.Pkg.Store("xl/worksheets/sheet1.xml", []byte(fmt.Sprintf(
-		`<worksheet xmlns="%s"><sheetData><row r="1"><c r="A1" t="inlineStr"><is><t>v</t></is></c></row>`,
-		NameSpaceSpreadSheet.Value)))
-	f.checked = sync.Map{}
-
-	cols, err := f.Cols("Sheet1")
-	require.NoError(t, err)
-	require.NotNil(t, cols)
-	assert.NotNil(t, cols.f, "cols.f must be set even when sheetData close element is missing")
-
-	// Walking the iterator must not panic, even though the XML is truncated.
-	assert.NotPanics(t, func() {
-		for cols.Next() {
-			_, _ = cols.Rows()
-		}
-	})
-	assert.NoError(t, f.Close())
-}
-
 func TestColsRows(t *testing.T) {
 	f := NewFile()