diff --git a/cmd/gdu/main.go b/cmd/gdu/main.go index 5ac5e1935..0c28296c5 100644 --- a/cmd/gdu/main.go +++ b/cmd/gdu/main.go @@ -171,10 +171,6 @@ func runE(command *cobra.Command, args []string) error { if err != nil { return fmt.Errorf("Error creating screen: %w", err) } - err = screen.Init() - if err != nil { - return fmt.Errorf("Error initializing screen: %w", err) - } defer screen.Clear() defer screen.Fini() diff --git a/go.mod b/go.mod index aa14c6c12..f9b8a14bf 100644 --- a/go.mod +++ b/go.mod @@ -4,30 +4,30 @@ go 1.18 require ( github.com/fatih/color v1.15.0 - github.com/gdamore/tcell/v2 v2.5.3 + github.com/gdamore/tcell/v2 v2.6.0 github.com/maruel/natural v1.1.0 - github.com/mattn/go-isatty v0.0.17 + github.com/mattn/go-isatty v0.0.19 github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 - github.com/rivo/tview v0.0.0-20220916081518-2e69b7385a37 - github.com/sirupsen/logrus v1.9.0 - github.com/spf13/cobra v1.5.0 + github.com/rivo/tview v0.0.0-20230530133550-8bd761dda819 + github.com/sirupsen/logrus v1.9.2 + github.com/spf13/cobra v1.7.0 github.com/stretchr/testify v1.8.0 - golang.org/x/sys v0.6.0 + golang.org/x/sys v0.8.0 gopkg.in/yaml.v3 v3.0.1 ) require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/gdamore/encoding v1.0.0 // indirect - github.com/inconshreveable/mousetrap v1.0.1 // indirect + github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/kr/pretty v0.3.0 // indirect github.com/lucasb-eyer/go-colorful v1.2.0 // indirect github.com/mattn/go-colorable v0.1.13 // indirect - github.com/mattn/go-runewidth v0.0.13 // indirect + github.com/mattn/go-runewidth v0.0.14 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/rivo/uniseg v0.4.2 // indirect + github.com/rivo/uniseg v0.4.4 // indirect github.com/spf13/pflag v1.0.5 // indirect - golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 // indirect - golang.org/x/text v0.3.8 // indirect + golang.org/x/term v0.8.0 // indirect + golang.org/x/text v0.9.0 // indirect gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect ) diff --git a/go.sum b/go.sum index c87fc8498..244b99325 100644 --- a/go.sum +++ b/go.sum @@ -7,11 +7,10 @@ github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs= github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw= github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdko= github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg= -github.com/gdamore/tcell/v2 v2.5.3 h1:b9XQrT6QGbgI7JvZOJXFNczOQeIYbo8BfeSMzt2sAV0= -github.com/gdamore/tcell/v2 v2.5.3/go.mod h1:wSkrPaXoiIWZqW/g7Px4xc79di6FTcpB8tvaKJ6uGBo= -github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc= -github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= +github.com/gdamore/tcell/v2 v2.6.0 h1:OKbluoP9VYmJwZwq/iLb4BxwKcwGthaa1YNBJIyCySg= +github.com/gdamore/tcell/v2 v2.6.0/go.mod h1:be9omFATkdr0D9qewWW3d+MEvl5dha+Etb5y65J2H8Y= +github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= +github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= @@ -26,26 +25,27 @@ github.com/maruel/natural v1.1.0/go.mod h1:eFVhYCcUOfZFxXoDZam8Ktya72wa79fNC3lc/ github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng= -github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU= -github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= +github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= +github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU= +github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 h1:onHthvaw9LFnH4t2DcNVpwGmV9E1BkGknEliJkfwQj0= github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58/go.mod h1:DXv8WO4yhMYhSNPKjeNKa5WY9YCIEBRbNzFFPJbWO6Y= 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/rivo/tview v0.0.0-20220916081518-2e69b7385a37 h1:cTzFg1FfTXwXuODi7Doz70hsW+dAye1OBwAFWHCqmww= -github.com/rivo/tview v0.0.0-20220916081518-2e69b7385a37/go.mod h1:YX2wUZOcJGOIycErz2s9KvDaP0jnWwRCirQMPLPpQ+Y= +github.com/rivo/tview v0.0.0-20230530133550-8bd761dda819 h1:qRMCGgwKl66uWe7Hnzl5bCvZlfrLNIxOx7K00j5XeNc= +github.com/rivo/tview v0.0.0-20230530133550-8bd761dda819/go.mod h1:nVwGv4MP47T0jvlk7KuTTjjuSmrGO4JF0iaiNt4bufE= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= -github.com/rivo/uniseg v0.4.2 h1:YwD0ulJSJytLpiaWua0sBDusfsCZohxjxzVTYjwxfV8= -github.com/rivo/uniseg v0.4.2/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= +github.com/rivo/uniseg v0.4.3/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= +github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis= +github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k= github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= -github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= -github.com/spf13/cobra v1.5.0 h1:X+jTBEBqF0bHN+9cSMgmfuvv2VHJ9ezmFNf9Y/XstYU= -github.com/spf13/cobra v1.5.0/go.mod h1:dWXEIy2H428czQCjInthrTRUg7yKbok+2Qi/yBIJoUM= +github.com/sirupsen/logrus v1.9.2 h1:oxx1eChJGI6Uks2ZC4W1zpLlVgqB8ner4EuQwV4Ik1Y= +github.com/sirupsen/logrus v1.9.2/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= +github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= +github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -54,26 +54,46 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20220318055525-2edf467146b5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 h1:Q5284mrmYTpACcm+eAKjKJH48BBwSyfJqmmGDTtT8Vc= -golang.org/x/term v0.0.0-20220722155259-a9ba230a4035/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.8.0 h1:n5xxQn2i3PC0yLAbjTpNT85q/Kgzcr2gIoX9OrJUols= +golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY= -golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/internal/testapp/app.go b/internal/testapp/app.go index f4d67570a..5678fdc6f 100644 --- a/internal/testapp/app.go +++ b/internal/testapp/app.go @@ -10,22 +10,17 @@ import ( ) // CreateSimScreen returns tcell.SimulationScreen -func CreateSimScreen(width, height int) tcell.SimulationScreen { +func CreateSimScreen() tcell.SimulationScreen { screen := tcell.NewSimulationScreen("UTF-8") - err := screen.Init() - if err != nil { - panic(err) - } - screen.SetSize(width, height) - return screen } // CreateTestAppWithSimScreen returns app with simulation screen for tests func CreateTestAppWithSimScreen(width, height int) (*tview.Application, tcell.SimulationScreen) { app := tview.NewApplication() - screen := CreateSimScreen(width, height) + screen := CreateSimScreen() app.SetScreen(screen) + screen.SetSize(width, height) return app, screen } diff --git a/tui/actions_test.go b/tui/actions_test.go index 86e82fca7..59c36a570 100644 --- a/tui/actions_test.go +++ b/tui/actions_test.go @@ -56,7 +56,7 @@ func TestShowDevicesBW(t *testing.T) { } func TestDeviceSelected(t *testing.T) { - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(false) @@ -106,7 +106,7 @@ func TestAnalyzePathWithParentDir(t *testing.T) { Files: make([]fs.Item, 0, 1), } - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(true) @@ -132,7 +132,7 @@ func TestAnalyzePathWithParentDir(t *testing.T) { } func TestReadAnalysis(t *testing.T) { - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() input, err := os.OpenFile("../internal/testdata/test.json", os.O_RDONLY, 0644) @@ -155,7 +155,7 @@ func TestReadAnalysis(t *testing.T) { } func TestReadAnalysisWithWrongFile(t *testing.T) { - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() input, err := os.OpenFile("../internal/testdata/wrong.json", os.O_RDONLY, 0644) @@ -178,7 +178,7 @@ func TestReadAnalysisWithWrongFile(t *testing.T) { } func TestViewDirContents(t *testing.T) { - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(true) @@ -201,7 +201,7 @@ func TestViewDirContents(t *testing.T) { } func TestViewFileWithoutCurrentDir(t *testing.T) { - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(true) @@ -214,7 +214,7 @@ func TestViewFileWithoutCurrentDir(t *testing.T) { } func TestViewContentsOfNotExistingFile(t *testing.T) { - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(true) @@ -244,7 +244,7 @@ func TestViewContentsOfNotExistingFile(t *testing.T) { func TestViewFile(t *testing.T) { fin := testdir.CreateTestDir() defer fin() - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(true) @@ -275,7 +275,7 @@ func TestViewFile(t *testing.T) { func TestChangeCwd(t *testing.T) { fin := testdir.CreateTestDir() defer fin() - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() cwd := "" @@ -310,7 +310,7 @@ func TestChangeCwd(t *testing.T) { func TestChangeCwdWithErr(t *testing.T) { fin := testdir.CreateTestDir() defer fin() - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() cwd := "" @@ -345,7 +345,7 @@ func TestChangeCwdWithErr(t *testing.T) { func TestShowInfo(t *testing.T) { fin := testdir.CreateTestDir() defer fin() - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(true) @@ -375,7 +375,7 @@ func TestShowInfo(t *testing.T) { func TestShowInfoBW(t *testing.T) { fin := testdir.CreateTestDir() defer fin() - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(true) @@ -405,7 +405,7 @@ func TestShowInfoBW(t *testing.T) { func TestShowInfoWithHardlinks(t *testing.T) { fin := testdir.CreateTestDir() defer fin() - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(true) @@ -447,7 +447,7 @@ func TestShowInfoWithHardlinks(t *testing.T) { func TestShowInfoWithoutCurrentDir(t *testing.T) { fin := testdir.CreateTestDir() defer fin() - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(true) @@ -462,7 +462,7 @@ func TestShowInfoWithoutCurrentDir(t *testing.T) { func TestExitViewFile(t *testing.T) { fin := testdir.CreateTestDir() defer fin() - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(true) diff --git a/tui/filter_test.go b/tui/filter_test.go index 17474380d..562a5806c 100644 --- a/tui/filter_test.go +++ b/tui/filter_test.go @@ -13,7 +13,7 @@ import ( ) func TestFiltering(t *testing.T) { - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(false) @@ -47,7 +47,7 @@ func TestFiltering(t *testing.T) { } func TestFilteringWithoutCurrentDir(t *testing.T) { - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(false) @@ -63,7 +63,7 @@ func TestFilteringWithoutCurrentDir(t *testing.T) { func TestSwitchToTable(t *testing.T) { fin := testdir.CreateTestDir() defer fin() - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(false) @@ -106,7 +106,7 @@ func TestSwitchToTable(t *testing.T) { func TestExitFiltering(t *testing.T) { fin := testdir.CreateTestDir() defer fin() - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(false) diff --git a/tui/format_test.go b/tui/format_test.go index 729cd5b9f..9b9fa8b4c 100644 --- a/tui/format_test.go +++ b/tui/format_test.go @@ -10,7 +10,7 @@ import ( ) func TestFormatSize(t *testing.T) { - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(true) @@ -27,7 +27,7 @@ func TestFormatSize(t *testing.T) { } func TestFormatSizeDec(t *testing.T) { - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(true) @@ -44,7 +44,7 @@ func TestFormatSizeDec(t *testing.T) { } func TestFormatCount(t *testing.T) { - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(true) @@ -57,7 +57,7 @@ func TestFormatCount(t *testing.T) { } func TestEscapeName(t *testing.T) { - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(true) @@ -79,7 +79,7 @@ func TestEscapeName(t *testing.T) { } func TestMarked(t *testing.T) { - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(true) diff --git a/tui/keys_test.go b/tui/keys_test.go index 35be99ba9..eb52d1340 100644 --- a/tui/keys_test.go +++ b/tui/keys_test.go @@ -17,7 +17,7 @@ import ( ) func TestShowHelp(t *testing.T) { - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(false) @@ -29,7 +29,7 @@ func TestShowHelp(t *testing.T) { } func TestCloseHelp(t *testing.T) { - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(false) @@ -44,7 +44,7 @@ func TestCloseHelp(t *testing.T) { } func TestCloseHelpWithQuestionMark(t *testing.T) { - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(false) @@ -59,7 +59,7 @@ func TestCloseHelpWithQuestionMark(t *testing.T) { } func TestKeyWhileDeleting(t *testing.T) { - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(false) @@ -73,7 +73,7 @@ func TestKeyWhileDeleting(t *testing.T) { } func TestLeftRightKeyWhileConfirm(t *testing.T) { - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(false) @@ -91,7 +91,7 @@ func TestLeftRightKeyWhileConfirm(t *testing.T) { func TestMoveLeftRight(t *testing.T) { fin := testdir.CreateTestDir() defer fin() - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(false) @@ -137,7 +137,7 @@ func TestMoveLeftRight(t *testing.T) { func TestMoveRightOnDevice(t *testing.T) { fin := testdir.CreateTestDir() defer fin() - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(false) @@ -168,7 +168,7 @@ func TestMoveRightOnDevice(t *testing.T) { } func TestStop(t *testing.T) { - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(false) @@ -181,7 +181,7 @@ func TestStop(t *testing.T) { func TestStopWithPrintingPath(t *testing.T) { fin := testdir.CreateTestDir() defer fin() - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(false) @@ -207,7 +207,7 @@ func TestStopWithPrintingPath(t *testing.T) { func TestSpawnShell(t *testing.T) { fin := testdir.CreateTestDir() defer fin() - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(false) @@ -237,7 +237,7 @@ func TestSpawnShell(t *testing.T) { func TestSpawnShellWithoutDir(t *testing.T) { fin := testdir.CreateTestDir() defer fin() - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(false) @@ -259,7 +259,7 @@ func TestSpawnShellWithoutDir(t *testing.T) { func TestSpawnShellWithWrongDir(t *testing.T) { fin := testdir.CreateTestDir() defer fin() - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(false) @@ -284,7 +284,7 @@ func TestSpawnShellWithWrongDir(t *testing.T) { func TestSpawnShellWithError(t *testing.T) { fin := testdir.CreateTestDir() defer fin() - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(false) @@ -307,7 +307,7 @@ func TestSpawnShellWithError(t *testing.T) { } func TestShowConfirm(t *testing.T) { - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(true) @@ -337,7 +337,7 @@ func TestShowConfirm(t *testing.T) { } func TestDeleteEmpty(t *testing.T) { - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(true) @@ -349,7 +349,7 @@ func TestDeleteEmpty(t *testing.T) { } func TestMarkEmpty(t *testing.T) { - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(true) @@ -363,7 +363,7 @@ func TestMarkEmpty(t *testing.T) { func TestDelete(t *testing.T) { fin := testdir.CreateTestDir() defer fin() - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(true) @@ -399,7 +399,7 @@ func TestDelete(t *testing.T) { func TestDeleteMarked(t *testing.T) { fin := testdir.CreateTestDir() defer fin() - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(true) @@ -437,7 +437,7 @@ func TestDeleteMarked(t *testing.T) { func TestDeleteParent(t *testing.T) { fin := testdir.CreateTestDir() defer fin() - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(true) @@ -467,7 +467,7 @@ func TestDeleteParent(t *testing.T) { func TestMarkParent(t *testing.T) { fin := testdir.CreateTestDir() defer fin() - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(true) @@ -497,7 +497,7 @@ func TestMarkParent(t *testing.T) { func TestEmptyDir(t *testing.T) { fin := testdir.CreateTestDir() defer fin() - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(true) @@ -534,7 +534,7 @@ func TestEmptyDir(t *testing.T) { func TestMarkedEmptyDir(t *testing.T) { fin := testdir.CreateTestDir() defer fin() - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(true) @@ -573,7 +573,7 @@ func TestMarkedEmptyDir(t *testing.T) { func TestEmptyFile(t *testing.T) { fin := testdir.CreateTestDir() defer fin() - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(true) @@ -614,7 +614,7 @@ func TestEmptyFile(t *testing.T) { func TestMarkedEmptyFile(t *testing.T) { fin := testdir.CreateTestDir() defer fin() - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(true) @@ -655,7 +655,7 @@ func TestMarkedEmptyFile(t *testing.T) { } func TestSortByApparentSize(t *testing.T) { - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(true) @@ -679,7 +679,7 @@ func TestSortByApparentSize(t *testing.T) { } func TestShowFileCount(t *testing.T) { - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(true) @@ -703,7 +703,7 @@ func TestShowFileCount(t *testing.T) { } func TestShowFileCountBW(t *testing.T) { - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(true) @@ -727,7 +727,7 @@ func TestShowFileCountBW(t *testing.T) { } func TestShowMtime(t *testing.T) { - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(true) @@ -751,7 +751,7 @@ func TestShowMtime(t *testing.T) { } func TestShowMtimeBW(t *testing.T) { - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(true) @@ -775,7 +775,7 @@ func TestShowMtimeBW(t *testing.T) { } func TestShowRelativeBar(t *testing.T) { - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(true) @@ -813,7 +813,7 @@ func TestRescan(t *testing.T) { }, } - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(true) @@ -840,7 +840,7 @@ func TestRescan(t *testing.T) { } func TestSorting(t *testing.T) { - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(true) @@ -871,7 +871,7 @@ func TestSorting(t *testing.T) { func TestShowFile(t *testing.T) { fin := testdir.CreateTestDir() defer fin() - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(true) @@ -898,7 +898,7 @@ func TestShowFile(t *testing.T) { func TestShowInfoAndMoveAround(t *testing.T) { fin := testdir.CreateTestDir() defer fin() - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(true) diff --git a/tui/mouse_test.go b/tui/mouse_test.go index 85246963b..12980e8b1 100644 --- a/tui/mouse_test.go +++ b/tui/mouse_test.go @@ -16,7 +16,7 @@ import ( func TestDoubleClick(t *testing.T) { fin := testdir.CreateTestDir() defer fin() - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(false) @@ -50,7 +50,7 @@ func TestDoubleClick(t *testing.T) { } func TestScroll(t *testing.T) { - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(true) @@ -76,7 +76,7 @@ func TestScroll(t *testing.T) { } func TestScrollWhenPageOpened(t *testing.T) { - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(true) @@ -102,7 +102,7 @@ func TestScrollWhenPageOpened(t *testing.T) { } func TestEmptyEvent(t *testing.T) { - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(true) @@ -114,7 +114,7 @@ func TestEmptyEvent(t *testing.T) { } func TestMouseMove(t *testing.T) { - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(true) diff --git a/tui/sort_test.go b/tui/sort_test.go index d0a85284b..ff29af448 100644 --- a/tui/sort_test.go +++ b/tui/sort_test.go @@ -124,7 +124,7 @@ func TestSetSorting(t *testing.T) { } func TestSetDEfaultSorting(t *testing.T) { - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() var opts []Option @@ -184,7 +184,7 @@ func TestSortDevicesByUsedSize(t *testing.T) { } func getAnalyzedPathWithSorting(sortBy string, sortOrder string, apparentSize bool) *UI { - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(true) diff --git a/tui/tui_test.go b/tui/tui_test.go index 4c2a3e146..9a5a58457 100644 --- a/tui/tui_test.go +++ b/tui/tui_test.go @@ -55,6 +55,8 @@ func TestFooter(t *testing.T) { b, _, _ := simScreen.GetContents() + printScreen(simScreen) + text := []byte(" Total disk usage: 4.0 KiB Apparent size: 2 B Items: 1") for i, r := range b { if i >= len(text) { @@ -121,7 +123,7 @@ func TestHelpBw(t *testing.T) { } func TestAppRun(t *testing.T) { - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(false) @@ -133,7 +135,7 @@ func TestAppRun(t *testing.T) { } func TestAppRunWithErr(t *testing.T) { - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(true) @@ -158,7 +160,7 @@ func TestRescanDir(t *testing.T) { }, } - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(true) ui := CreateUI(app, simScreen, &bytes.Buffer{}, false, true, false, false, false) @@ -206,7 +208,7 @@ func TestFileSelected(t *testing.T) { } func TestSelectedWithoutCurrentDir(t *testing.T) { - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(true) @@ -232,7 +234,7 @@ func TestBeforeDraw(t *testing.T) { } func TestIgnorePaths(t *testing.T) { - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(true) @@ -372,7 +374,7 @@ func TestDeleteMarkedWithErr(t *testing.T) { } func TestShowErr(t *testing.T) { - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(true) @@ -384,7 +386,7 @@ func TestShowErr(t *testing.T) { } func TestShowErrBW(t *testing.T) { - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(true) @@ -401,7 +403,7 @@ func TestMin(t *testing.T) { } func TestSetSelectedBackgroundColor(t *testing.T) { - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(true) @@ -413,7 +415,7 @@ func TestSetSelectedBackgroundColor(t *testing.T) { } func TestSetSelectedTextColor(t *testing.T) { - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(true) @@ -425,7 +427,7 @@ func TestSetSelectedTextColor(t *testing.T) { } func TestSetCurrentItemNameMaxLen(t *testing.T) { - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(true) @@ -467,7 +469,7 @@ func getDevicesInfoMock() device.DevicesInfoGetter { } func getAnalyzedPathMockedApp(t *testing.T, useColors, apparentSize bool, mockedAnalyzer bool) *UI { - simScreen := testapp.CreateSimScreen(50, 50) + simScreen := testapp.CreateSimScreen() defer simScreen.Fini() app := testapp.CreateMockedApp(true)