Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

enhancement: go mod update, change test #34

Merged
merged 1 commit into from
Feb 7, 2025
Merged

enhancement: go mod update, change test #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
test:
strategy:
matrix:
go-version: [ 1.22.x ]
go-version: [ 1.23.x ]
os: [ ubuntu-latest ]
name: Test
runs-on: ${{ matrix.os }}
Expand Down
94 changes: 34 additions & 60 deletions excelizeam_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ import (
"io"
"testing"

"golang.org/x/sync/errgroup"
"gotest.tools/assert"

"github.com/tomtwinkle/excelizeam"
"github.com/tomtwinkle/excelizeam/excelizestyle"

"github.com/stretchr/testify/assert"
"github.com/xuri/excelize/v2"
"golang.org/x/sync/errgroup"
)

func TestExcelizeam_Sync(t *testing.T) {
t.Parallel()
tests := map[string]struct {
testFunc func(w excelizeam.Excelizeam) error
wantErr error
Expand Down Expand Up @@ -334,43 +334,37 @@ func TestExcelizeam_Sync(t *testing.T) {
},
}

for n, v := range tests {
name := n
tt := v
for name, tt := range tests {
t.Run(name, func(t *testing.T) {
t.Parallel()
w, err := excelizeam.New("test")
assert.NoError(t, err)
assert.NilError(t, err)
err = tt.testFunc(w)
if tt.wantErr != nil {
assert.ErrorIs(t, err, tt.wantErr)
assert.ErrorContains(t, err, tt.wantErr.Error())
return
}
assert.NoError(t, err)
assert.NilError(t, err)
var buf bytes.Buffer
err = w.Write(&buf)
if !assert.NoError(t, err) {
return
}
assert.NilError(t, err)

//f, err := os.Create("testdata/sync/" + name + ".xlsx")
//assert.NoError(t, err)
//_, err = f.Write(buf.Bytes())
//assert.NoError(t, err)

expected, err := excelize.OpenFile("testdata/sync/" + name + ".xlsx")
if !assert.NoError(t, err) {
return
}
assert.NilError(t, err)
actual, err := excelize.OpenReader(&buf)
if !assert.NoError(t, err) {
return
}
assert.NilError(t, err)
Assert(t, expected, actual)
})
}
}

func TestExcelizeam_Async(t *testing.T) {
t.Parallel()
tests := map[string]struct {
testFunc func(w excelizeam.Excelizeam)
wantErr error
Expand Down Expand Up @@ -539,42 +533,36 @@ func TestExcelizeam_Async(t *testing.T) {
},
}

for n, v := range tests {
name := n
tt := v
for name, tt := range tests {
t.Run(name, func(t *testing.T) {
t.Parallel()
w, err := excelizeam.New("test")
assert.NoError(t, err)
assert.NilError(t, err)
tt.testFunc(w)
var buf bytes.Buffer
err = w.Write(&buf)
if tt.wantErr != nil {
assert.ErrorIs(t, err, tt.wantErr)
return
}
if !assert.NoError(t, err) {
assert.ErrorContains(t, err, tt.wantErr.Error())
return
}
assert.NilError(t, err)

//f, err := os.Create("testdata/async/" + name + ".xlsx")
//assert.NoError(t, err)
//_, err = f.Write(buf.Bytes())
//assert.NoError(t, err)

expected, err := excelize.OpenFile("testdata/async/" + name + ".xlsx")
if !assert.NoError(t, err) {
return
}
assert.NilError(t, err)
actual, err := excelize.OpenReader(&buf)
if !assert.NoError(t, err) {
return
}
assert.NilError(t, err)
Assert(t, expected, actual)
})
}
}

func TestExcelizeam_CSVRecords(t *testing.T) {
t.Parallel()
tests := map[string]struct {
testFunc func(w excelizeam.Excelizeam)
wantRecords [][]string
Expand Down Expand Up @@ -621,31 +609,19 @@ func TestExcelizeam_CSVRecords(t *testing.T) {
},
}

for n, v := range tests {
name := n
tt := v
for name, tt := range tests {
t.Run(name, func(t *testing.T) {
t.Parallel()
w, err := excelizeam.New("test")
assert.NoError(t, err)
assert.NilError(t, err)
tt.testFunc(w)
records, err := w.CSVRecords()
if tt.wantErr != nil {
assert.ErrorIs(t, err, tt.wantErr)
return
}
if !assert.NoError(t, err) {
assert.ErrorContains(t, err, tt.wantErr.Error())
return
}

if assert.Equal(t, len(tt.wantRecords), len(records)) {
for i, wantCols := range tt.wantRecords {
if assert.Equal(t, len(wantCols), len(records[i])) {
for ii, wantVal := range wantCols {
assert.Equal(t, wantVal, records[i][ii])
}
}
}
}
assert.NilError(t, err)
assert.DeepEqual(t, tt.wantRecords, records)
})
}
}
Expand Down Expand Up @@ -855,23 +831,21 @@ func Assert(t *testing.T, expected, actual *excelize.File) {
for rowIdx := 1; rowIdx <= 10; rowIdx++ {
for colIdx := 1; colIdx <= 10; colIdx++ {
cell, err := excelize.CoordinatesToCellName(colIdx, rowIdx)
if !assert.NoError(t, err) {
return
}
assert.NilError(t, err)

// Assert Value
expectedValue, err := expected.GetCellValue("test", cell)
if !assert.NoError(t, err) {
return
}
assert.NilError(t, err)
actualValue, err := actual.GetCellValue("test", cell)
if !assert.NoError(t, err) {
return
}
assert.NilError(t, err)
assert.Equal(t, expectedValue, actualValue)

// Assert Style
// TODO
// TODO: implement GetCellStyle test
//expectedStyle, err := expected.GetCellStyle("test", cell)
//assert.NilError(t, err)
//actualStyle, err := actual.GetCellStyle("test", cell)
//assert.DeepEqual(t, expectedStyle, actualStyle)
}
}
}
22 changes: 11 additions & 11 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
module github.com/tomtwinkle/excelizeam

go 1.22
go 1.23

require (
github.com/stretchr/testify v1.9.0
github.com/xuri/excelize/v2 v2.9.0
golang.org/x/sync v0.8.0
golang.org/x/sync v0.11.0
gotest.tools v2.2.0+incompatible
)

require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/richardlehane/mscfb v1.0.4 // indirect
github.com/richardlehane/msoleps v1.0.4 // indirect
github.com/xuri/efp v0.0.0-20240408161823-9ad904a10d6d // indirect
github.com/xuri/nfp v0.0.0-20240318013403-ab9948c2c4a7 // indirect
golang.org/x/crypto v0.28.0 // indirect
golang.org/x/net v0.30.0 // indirect
golang.org/x/text v0.19.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
github.com/stretchr/testify v1.9.0 // indirect
github.com/xuri/efp v0.0.0-20241211021726-c4e992084aa6 // indirect
github.com/xuri/nfp v0.0.0-20250111060730-82a408b9aa71 // indirect
golang.org/x/crypto v0.32.0 // indirect
golang.org/x/net v0.34.0 // indirect
golang.org/x/text v0.22.0 // indirect
)
32 changes: 18 additions & 14 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw=
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/richardlehane/mscfb v1.0.4 h1:WULscsljNPConisD5hR0+OyZjwK46Pfyr6mPu5ZawpM=
Expand All @@ -11,23 +15,23 @@ github.com/richardlehane/msoleps v1.0.4 h1:WuESlvhX3gH2IHcd8UqyCuFY5yiq/GR/yqaSM
github.com/richardlehane/msoleps v1.0.4/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTKbjLycmwiWUfWg=
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/xuri/efp v0.0.0-20240408161823-9ad904a10d6d h1:llb0neMWDQe87IzJLS4Ci7psK/lVsjIS2otl+1WyRyY=
github.com/xuri/efp v0.0.0-20240408161823-9ad904a10d6d/go.mod h1:ybY/Jr0T0GTCnYjKqmdwxyxn2BQf2RcQIIvex5QldPI=
github.com/xuri/efp v0.0.0-20241211021726-c4e992084aa6 h1:8m6DWBG+dlFNbx5ynvrE7NgI+Y7OlZVMVTpayoW+rCc=
github.com/xuri/efp v0.0.0-20241211021726-c4e992084aa6/go.mod h1:ybY/Jr0T0GTCnYjKqmdwxyxn2BQf2RcQIIvex5QldPI=
github.com/xuri/excelize/v2 v2.9.0 h1:1tgOaEq92IOEumR1/JfYS/eR0KHOCsRv/rYXXh6YJQE=
github.com/xuri/excelize/v2 v2.9.0/go.mod h1:uqey4QBZ9gdMeWApPLdhm9x+9o2lq4iVmjiLfBS5hdE=
github.com/xuri/nfp v0.0.0-20240318013403-ab9948c2c4a7 h1:hPVCafDV85blFTabnqKgNhDCkJX25eik94Si9cTER4A=
github.com/xuri/nfp v0.0.0-20240318013403-ab9948c2c4a7/go.mod h1:WwHg+CVyzlv/TX9xqBFXEZAuxOPxn2k1GNHwG41IIUQ=
golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw=
golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U=
github.com/xuri/nfp v0.0.0-20250111060730-82a408b9aa71 h1:hOh7aVDrvGJRxzXrQbDY8E+02oaI//5cHL+97oYpEPw=
github.com/xuri/nfp v0.0.0-20250111060730-82a408b9aa71/go.mod h1:WwHg+CVyzlv/TX9xqBFXEZAuxOPxn2k1GNHwG41IIUQ=
golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
golang.org/x/image v0.18.0 h1:jGzIakQa/ZXI1I0Fxvaa9W7yP25TqT6cHIHn+6CqvSQ=
golang.org/x/image v0.18.0/go.mod h1:4yyo5vMFQjVjUcVk4jEQcU9MGy/rulF5WvUILseCM2E=
golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=