diff --git a/draw_test.go b/draw_test.go index 3fc284c..cfce42e 100644 --- a/draw_test.go +++ b/draw_test.go @@ -547,7 +547,7 @@ want: "[++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++=]", }, { - style: BarStyle().Tip("<").Reverse(), + style: BarStyle().Reverse(), name: "t,c,r{100,100,99}rev", total: 100, current: 100, @@ -555,7 +555,7 @@ want: " [=++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++] ", }, { - style: BarStyle().Tip("<").Reverse(), + style: BarStyle().Reverse(), name: "t,c,r{100,100,99}trim,rev", total: 100, current: 100, @@ -581,7 +581,7 @@ want: "[+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++]", }, { - style: BarStyle().Tip("<").Reverse(), + style: BarStyle().Reverse(), name: "t,c,r{100,100,100}rev", total: 100, current: 100, @@ -589,7 +589,7 @@ want: " [+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++] ", }, { - style: BarStyle().Tip("<").Reverse(), + style: BarStyle().Reverse(), name: "t,c,r{100,100,100}trim", total: 100, current: 100, @@ -694,7 +694,7 @@ want: "[++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++]", }, { - style: BarStyle().Tip("<").Reverse(), + style: BarStyle().Reverse(), name: "t,c,r{100,100,99}rev", total: 100, current: 100, @@ -702,7 +702,7 @@ want: " [=+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++] ", }, { - style: BarStyle().Tip("<").Reverse(), + style: BarStyle().Reverse(), name: "t,c,r{100,100,99}trim,rev", total: 100, current: 100, @@ -711,7 +711,7 @@ want: "[=+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++]", }, { - style: BarStyle().Tip("<").Reverse(), + style: BarStyle().Reverse(), name: "t,c,r{100,100,100}rev", total: 100, current: 100, @@ -719,7 +719,7 @@ want: " [++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++] ", }, { - style: BarStyle().Tip("<").Reverse(), + style: BarStyle().Reverse(), name: "t,c,r{100,100,100}trim", total: 100, current: 100, @@ -800,79 +800,30 @@ trim bool want string }{ - 0: { - { - style: BarStyle().TipOnComplete(">"), - name: "t,c{60,20}", - total: 60, - current: 20, - want: "", - }, - { - style: BarStyle().TipOnComplete(">"), - name: "t,c{60,20}trim", - total: 60, - current: 20, - trim: true, - want: "", - }, - }, - 1: { - { - style: BarStyle().TipOnComplete(">"), - name: "t,c{60,20}", - total: 60, - current: 20, - want: "", - }, - { - style: BarStyle().TipOnComplete(">"), - name: "t,c{60,20}trim", - total: 60, - current: 20, - trim: true, - want: "", - }, - }, - 2: { - { - style: BarStyle().TipOnComplete(">"), - name: "t,c{60,20}", - total: 60, - current: 20, + 3: { + { + style: BarStyle().TipOnComplete(">"), + name: "t,c{60,60}", + total: 60, + current: 60, want: " ", }, { style: BarStyle().TipOnComplete(">"), - name: "t,c{60,20}trim", - total: 60, - current: 20, - trim: true, - want: "[]", - }, - }, - 3: { - { - style: BarStyle().TipOnComplete(">"), - name: "t,c{60,20}", - total: 60, - current: 20, - want: " ", - }, - { - style: BarStyle().TipOnComplete(">"), - name: "t,c{60,20}trim", - total: 60, - current: 20, - trim: true, - want: "[-]", - }, + name: "t,c{60,60}trim", + total: 60, + current: 60, + trim: true, + want: "[>]", + }, + }, + 4: { { style: BarStyle().TipOnComplete(">"), name: "t,c{60,59}", total: 60, current: 59, - want: " ", + want: " [] ", }, { style: BarStyle().TipOnComplete(">"), @@ -880,14 +831,14 @@ total: 60, current: 59, trim: true, - want: "[>]", + want: "[=>]", }, { style: BarStyle().TipOnComplete(">"), name: "t,c{60,60}", total: 60, current: 60, - want: " ", + want: " [] ", }, { style: BarStyle().TipOnComplete(">"), @@ -895,31 +846,16 @@ total: 60, current: 60, trim: true, - want: "[>]", - }, - }, - 4: { - { - style: BarStyle().TipOnComplete(">"), - name: "t,c{60,20}", - total: 60, - current: 20, - want: " [] ", - }, - { - style: BarStyle().TipOnComplete(">"), - name: "t,c{60,20}trim", - total: 60, - current: 20, - trim: true, - want: "[>-]", - }, + want: "[=>]", + }, + }, + 5: { { style: BarStyle().TipOnComplete(">"), name: "t,c{60,59}", total: 60, current: 59, - want: " [] ", + want: " [>] ", }, { style: BarStyle().TipOnComplete(">"), @@ -927,14 +863,14 @@ total: 60, current: 59, trim: true, - want: "[=>]", + want: "[==>]", }, { style: BarStyle().TipOnComplete(">"), name: "t,c{60,60}", total: 60, current: 60, - want: " [] ", + want: " [>] ", }, { style: BarStyle().TipOnComplete(">"), @@ -942,31 +878,16 @@ total: 60, current: 60, trim: true, - want: "[=>]", - }, - }, - 5: { - { - style: BarStyle().TipOnComplete(">"), - name: "t,c{60,20}", - total: 60, - current: 20, - want: " [-] ", - }, - { - style: BarStyle().TipOnComplete(">"), - name: "t,c{60,20}trim", - total: 60, - current: 20, - trim: true, - want: "[>--]", - }, + want: "[==>]", + }, + }, + 6: { { style: BarStyle().TipOnComplete(">"), name: "t,c{60,59}", total: 60, current: 59, - want: " [>] ", + want: " [=>] ", }, { style: BarStyle().TipOnComplete(">"), @@ -974,14 +895,14 @@ total: 60, current: 59, trim: true, - want: "[==>]", + want: "[===>]", }, { style: BarStyle().TipOnComplete(">"), name: "t,c{60,60}", total: 60, current: 60, - want: " [>] ", + want: " [=>] ", }, { style: BarStyle().TipOnComplete(">"), @@ -989,31 +910,16 @@ total: 60, current: 60, trim: true, - want: "[==>]", - }, - }, - 6: { - { - style: BarStyle().TipOnComplete(">"), - name: "t,c{60,20}", - total: 60, - current: 20, - want: " [>-] ", - }, - { - style: BarStyle().TipOnComplete(">"), - name: "t,c{60,20}trim", - total: 60, - current: 20, - trim: true, - want: "[>---]", - }, + want: "[===>]", + }, + }, + 7: { { style: BarStyle().TipOnComplete(">"), name: "t,c{60,59}", total: 60, current: 59, - want: " [=>] ", + want: " [==>] ", }, { style: BarStyle().TipOnComplete(">"), @@ -1021,14 +927,14 @@ total: 60, current: 59, trim: true, - want: "[===>]", + want: "[====>]", }, { style: BarStyle().TipOnComplete(">"), name: "t,c{60,60}", total: 60, current: 60, - want: " [=>] ", + want: " [==>] ", }, { style: BarStyle().TipOnComplete(">"), @@ -1036,31 +942,16 @@ total: 60, current: 60, trim: true, - want: "[===>]", - }, - }, - 7: { - { - style: BarStyle().TipOnComplete(">"), - name: "t,c{60,20}", - total: 60, - current: 20, - want: " [>--] ", - }, - { - style: BarStyle().TipOnComplete(">"), - name: "t,c{60,20}trim", - total: 60, - current: 20, - trim: true, - want: "[=>---]", - }, + want: "[====>]", + }, + }, + 8: { { style: BarStyle().TipOnComplete(">"), name: "t,c{60,59}", total: 60, current: 59, - want: " [==>] ", + want: " [===>] ", }, { style: BarStyle().TipOnComplete(">"), @@ -1068,14 +959,14 @@ total: 60, current: 59, trim: true, - want: "[====>]", + want: "[=====>]", }, { style: BarStyle().TipOnComplete(">"), name: "t,c{60,60}", total: 60, current: 60, - want: " [==>] ", + want: " [===>] ", }, { style: BarStyle().TipOnComplete(">"), @@ -1083,89 +974,10 @@ total: 60, current: 60, trim: true, - want: "[====>]", - }, - }, - 8: { - { - style: BarStyle().TipOnComplete(">"), - name: "t,c{60,20}", - total: 60, - current: 20, - want: " [>---] ", - }, - { - style: BarStyle().TipOnComplete(">"), - name: "t,c{60,20}trim", - total: 60, - current: 20, - trim: true, - want: "[=>----]", - }, - { - style: BarStyle().TipOnComplete(">"), - name: "t,c{60,59}", - total: 60, - current: 59, - want: " [===>] ", - }, - { - style: BarStyle().TipOnComplete(">"), - name: "t,c{60,59}trim", - total: 60, - current: 59, - trim: true, want: "[=====>]", }, - { - style: BarStyle().TipOnComplete(">"), - name: "t,c{60,60}", - total: 60, - current: 60, - want: " [===>] ", - }, - { - style: BarStyle().TipOnComplete(">"), - name: "t,c{60,60}trim", - total: 60, - current: 60, - trim: true, - want: "[=====>]", - }, }, 80: { - { - style: BarStyle().TipOnComplete(">"), - name: "t,c{60,20}", - total: 60, - current: 20, - want: " [========================>---------------------------------------------------] ", - }, - { - style: BarStyle().TipOnComplete(">"), - name: "t,c{60,20}trim", - total: 60, - current: 20, - trim: true, - want: "[=========================>----------------------------------------------------]", - }, - { - style: BarStyle().TipOnComplete(">"), - name: "t,c,bw{60,20,60}", - total: 60, - current: 20, - barWidth: 60, - want: " [==================>---------------------------------------] ", - }, - { - style: BarStyle().TipOnComplete(">"), - name: "t,c,bw{60,20,60}trim", - total: 60, - current: 20, - barWidth: 60, - trim: true, - want: "[==================>---------------------------------------]", - }, { style: BarStyle().TipOnComplete(">"), name: "t,c{60,59}", @@ -1234,55 +1046,6 @@ 99: { { style: BarStyle().TipOnComplete(">"), - name: "t,c{100,1}", - total: 100, - current: 1, - want: " [>----------------------------------------------------------------------------------------------] ", - }, - { - style: BarStyle().TipOnComplete(">"), - name: "t,c{100,1}trim", - total: 100, - current: 1, - trim: true, - want: "[>------------------------------------------------------------------------------------------------]", - }, - { - style: BarStyle().TipOnComplete(">"), - name: "t,c,r{100,40,33}", - total: 100, - current: 40, - refill: 33, - want: " [+++++++++++++++++++++++++++++++======>---------------------------------------------------------] ", - }, - { - style: BarStyle().TipOnComplete(">"), - name: "t,c,r{100,40,33}trim", - total: 100, - current: 40, - refill: 33, - trim: true, - want: "[++++++++++++++++++++++++++++++++======>----------------------------------------------------------]", - }, - { - style: BarStyle().Tip("<").Reverse().TipOnComplete(">"), - name: "t,c,r{100,40,33},rev", - total: 100, - current: 40, - refill: 33, - want: " [---------------------------------------------------------<======+++++++++++++++++++++++++++++++] ", - }, - { - style: BarStyle().Tip("<").Reverse().TipOnComplete(">"), - name: "t,c,r{100,40,33}trim,rev", - total: 100, - current: 40, - refill: 33, - trim: true, - want: "[----------------------------------------------------------<======++++++++++++++++++++++++++++++++]", - }, - { - style: BarStyle().TipOnComplete(">"), name: "t,c{100,99}", total: 100, current: 99, @@ -1363,16 +1126,16 @@ want: "[++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++>]", }, { - style: BarStyle().Tip("<").TipOnComplete("<").Reverse(), - name: `t,c,r{100,100,100}Tip("<").TipOnComplete("<").Reverse()`, + style: BarStyle().TipOnComplete("<").Reverse(), + name: `t,c,r{100,100,100}TipOnComplete("<").Reverse()`, total: 100, current: 100, refill: 100, want: " [<++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++] ", }, { - style: BarStyle().Tip("<").Reverse().TipOnComplete("<"), - name: "t,c,r{100,100,100}trim", + style: BarStyle().TipOnComplete("<").Reverse(), + name: `t,c,r{100,100,100}TipOnComplete("<").Reverse()trim`, total: 100, current: 100, refill: 100, @@ -1381,36 +1144,6 @@ }, }, 100: { - { - style: BarStyle().TipOnComplete(">"), - name: "t,c{100,0}", - total: 100, - current: 0, - want: " [------------------------------------------------------------------------------------------------] ", - }, - { - style: BarStyle().TipOnComplete(">"), - name: "t,c{100,0}trim", - total: 100, - current: 0, - trim: true, - want: "[--------------------------------------------------------------------------------------------------]", - }, - { - style: BarStyle().TipOnComplete(">"), - name: "t,c{100,1}", - total: 100, - current: 1, - want: " [>-----------------------------------------------------------------------------------------------] ", - }, - { - style: BarStyle().TipOnComplete(">"), - name: "t,c{100,1}trim", - total: 100, - current: 1, - trim: true, - want: "[>-------------------------------------------------------------------------------------------------]", - }, { style: BarStyle().TipOnComplete(">"), name: "t,c{100,99}", @@ -1474,74 +1207,6 @@ refill: 100, trim: true, want: "[+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++>]", - }, - { - style: BarStyle().TipOnComplete("").Reverse(), - name: "t,c,r{100,100,99}rev", - total: 100, - current: 100, - refill: 99, - want: " [=+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++] ", - }, - { - style: BarStyle().TipOnComplete("").Reverse(), - name: "t,c,r{100,100,99}trim,rev", - total: 100, - current: 100, - refill: 99, - trim: true, - want: "[=+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++]", - }, - { - style: BarStyle().TipOnComplete("").Reverse(), - name: "t,c,r{100,100,100}rev", - total: 100, - current: 100, - refill: 100, - want: " [++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++] ", - }, - { - style: BarStyle().TipOnComplete("").Reverse(), - name: "t,c,r{100,100,100}trim", - total: 100, - current: 100, - refill: 100, - trim: true, - want: "[++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++]", - }, - { - style: BarStyle().TipOnComplete(">"), - name: "t,c,r{100,40,33}", - total: 100, - current: 40, - refill: 33, - want: " [++++++++++++++++++++++++++++++++=====>----------------------------------------------------------] ", - }, - { - style: BarStyle().TipOnComplete(">"), - name: "t,c,r{100,40,33}trim", - total: 100, - current: 40, - refill: 33, - trim: true, - want: "[++++++++++++++++++++++++++++++++======>-----------------------------------------------------------]", - }, - { - style: BarStyle().Tip("<").TipOnComplete("<").Reverse(), - name: "t,c,r{100,40,33},rev", - total: 100, - current: 40, - refill: 33, - want: " [----------------------------------------------------------<=====++++++++++++++++++++++++++++++++] ", - }, - { - style: BarStyle().Tip("<").TipOnComplete("<").Reverse(), - name: "t,c,r{100,40,33}trim,rev", - total: 100, - current: 40, - refill: 33, - trim: true, - want: "[-----------------------------------------------------------<======++++++++++++++++++++++++++++++++]", }, }, }