diff --git a/container/container_test.go b/container/container_test.go index da24801..fe8c5eb 100644 --- a/container/container_test.go +++ b/container/container_test.go @@ -23,14 +23,14 @@ import ( "github.com/mum4k/termdash/align" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/canvas/testcanvas" + "github.com/mum4k/termdash/internal/draw" + "github.com/mum4k/termdash/internal/draw/testdraw" "github.com/mum4k/termdash/internal/event" "github.com/mum4k/termdash/internal/event/testevent" "github.com/mum4k/termdash/internal/faketerm" "github.com/mum4k/termdash/internal/keyboard" "github.com/mum4k/termdash/internal/mouse" - "github.com/mum4k/termdash/internal/testdraw" "github.com/mum4k/termdash/internal/widgetapi" "github.com/mum4k/termdash/linestyle" "github.com/mum4k/termdash/terminal/terminalapi" diff --git a/container/draw.go b/container/draw.go index 14bc08c..c23a35c 100644 --- a/container/draw.go +++ b/container/draw.go @@ -22,9 +22,9 @@ import ( "image" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/area" "github.com/mum4k/termdash/internal/canvas" + "github.com/mum4k/termdash/internal/draw" ) // drawTree draws this container and all of its sub containers. diff --git a/container/draw_test.go b/container/draw_test.go index afc5d1d..38bed22 100644 --- a/container/draw_test.go +++ b/container/draw_test.go @@ -20,10 +20,10 @@ import ( "github.com/mum4k/termdash/align" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/canvas/testcanvas" + "github.com/mum4k/termdash/internal/draw" + "github.com/mum4k/termdash/internal/draw/testdraw" "github.com/mum4k/termdash/internal/faketerm" - "github.com/mum4k/termdash/internal/testdraw" "github.com/mum4k/termdash/internal/widgetapi" "github.com/mum4k/termdash/linestyle" "github.com/mum4k/termdash/widgets/fakewidget" diff --git a/draw/border.go b/internal/draw/border.go similarity index 100% rename from draw/border.go rename to internal/draw/border.go diff --git a/draw/border_test.go b/internal/draw/border_test.go similarity index 100% rename from draw/border_test.go rename to internal/draw/border_test.go diff --git a/draw/braille_circle.go b/internal/draw/braille_circle.go similarity index 100% rename from draw/braille_circle.go rename to internal/draw/braille_circle.go diff --git a/draw/braille_circle_test.go b/internal/draw/braille_circle_test.go similarity index 100% rename from draw/braille_circle_test.go rename to internal/draw/braille_circle_test.go diff --git a/draw/braille_fill.go b/internal/draw/braille_fill.go similarity index 100% rename from draw/braille_fill.go rename to internal/draw/braille_fill.go diff --git a/draw/braille_fill_test.go b/internal/draw/braille_fill_test.go similarity index 100% rename from draw/braille_fill_test.go rename to internal/draw/braille_fill_test.go diff --git a/draw/braille_line.go b/internal/draw/braille_line.go similarity index 100% rename from draw/braille_line.go rename to internal/draw/braille_line.go diff --git a/draw/braille_line_test.go b/internal/draw/braille_line_test.go similarity index 100% rename from draw/braille_line_test.go rename to internal/draw/braille_line_test.go diff --git a/draw/draw.go b/internal/draw/draw.go similarity index 100% rename from draw/draw.go rename to internal/draw/draw.go diff --git a/draw/hv_line.go b/internal/draw/hv_line.go similarity index 100% rename from draw/hv_line.go rename to internal/draw/hv_line.go diff --git a/draw/hv_line_graph.go b/internal/draw/hv_line_graph.go similarity index 100% rename from draw/hv_line_graph.go rename to internal/draw/hv_line_graph.go diff --git a/draw/hv_line_graph_test.go b/internal/draw/hv_line_graph_test.go similarity index 100% rename from draw/hv_line_graph_test.go rename to internal/draw/hv_line_graph_test.go diff --git a/draw/hv_line_test.go b/internal/draw/hv_line_test.go similarity index 100% rename from draw/hv_line_test.go rename to internal/draw/hv_line_test.go diff --git a/draw/line_style.go b/internal/draw/line_style.go similarity index 100% rename from draw/line_style.go rename to internal/draw/line_style.go diff --git a/draw/rectangle.go b/internal/draw/rectangle.go similarity index 100% rename from draw/rectangle.go rename to internal/draw/rectangle.go diff --git a/draw/rectangle_test.go b/internal/draw/rectangle_test.go similarity index 100% rename from draw/rectangle_test.go rename to internal/draw/rectangle_test.go diff --git a/internal/testdraw/testdraw.go b/internal/draw/testdraw/testdraw.go similarity index 98% rename from internal/testdraw/testdraw.go rename to internal/draw/testdraw/testdraw.go index 6887266..e29f499 100644 --- a/internal/testdraw/testdraw.go +++ b/internal/draw/testdraw/testdraw.go @@ -19,9 +19,9 @@ import ( "fmt" "image" - "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/braille" + "github.com/mum4k/termdash/internal/draw" ) // MustBorder draws border on the canvas or panics. diff --git a/draw/text.go b/internal/draw/text.go similarity index 100% rename from draw/text.go rename to internal/draw/text.go diff --git a/draw/text_test.go b/internal/draw/text_test.go similarity index 100% rename from draw/text_test.go rename to internal/draw/text_test.go diff --git a/draw/vertical_text.go b/internal/draw/vertical_text.go similarity index 100% rename from draw/vertical_text.go rename to internal/draw/vertical_text.go diff --git a/draw/vertical_text_test.go b/internal/draw/vertical_text_test.go similarity index 100% rename from draw/vertical_text_test.go rename to internal/draw/vertical_text_test.go diff --git a/internal/segdisp/segment/segment.go b/internal/segdisp/segment/segment.go index 99f242a..2d4553b 100644 --- a/internal/segdisp/segment/segment.go +++ b/internal/segdisp/segment/segment.go @@ -20,8 +20,8 @@ import ( "image" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/canvas/braille" + "github.com/mum4k/termdash/internal/draw" ) // Type identifies the type of the segment that is drawn. diff --git a/internal/segdisp/segment/segment_test.go b/internal/segdisp/segment/segment_test.go index b5c9f51..012cffd 100644 --- a/internal/segdisp/segment/segment_test.go +++ b/internal/segdisp/segment/segment_test.go @@ -20,12 +20,12 @@ import ( "testing" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/area" "github.com/mum4k/termdash/internal/canvas/braille" "github.com/mum4k/termdash/internal/canvas/braille/testbraille" + "github.com/mum4k/termdash/internal/draw" + "github.com/mum4k/termdash/internal/draw/testdraw" "github.com/mum4k/termdash/internal/faketerm" - "github.com/mum4k/termdash/internal/testdraw" ) func TestHV(t *testing.T) { diff --git a/linestyle/linestyle_test.go b/linestyle/linestyle_test.go new file mode 100644 index 0000000..1e5e585 --- /dev/null +++ b/linestyle/linestyle_test.go @@ -0,0 +1,46 @@ +package linestyle + +import "testing" + +func TestLineStyleName(t *testing.T) { + tests := []struct { + desc string + ls LineStyle + want string + }{ + { + desc: "unknown", + ls: LineStyle(-1), + want: "LineStyleUnknown", + }, + { + desc: "none", + ls: None, + want: "LineStyleNone", + }, + { + desc: "light", + ls: Light, + want: "LineStyleLight", + }, + { + desc: "double", + ls: Double, + want: "LineStyleDouble", + }, + { + desc: "round", + ls: Round, + want: "LineStyleRound", + }, + } + + for _, tc := range tests { + t.Run(tc.desc, func(t *testing.T) { + if got := tc.ls.String(); got != tc.want { + t.Errorf("String => %q, want %q", got, tc.want) + } + + }) + } +} diff --git a/widgets/barchart/barchart.go b/widgets/barchart/barchart.go index 9d35acb..e65e5d1 100644 --- a/widgets/barchart/barchart.go +++ b/widgets/barchart/barchart.go @@ -24,9 +24,9 @@ import ( "github.com/mum4k/termdash/align" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/area" "github.com/mum4k/termdash/internal/canvas" + "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/widgetapi" "github.com/mum4k/termdash/terminal/terminalapi" ) diff --git a/widgets/barchart/barchart_test.go b/widgets/barchart/barchart_test.go index e3c6a27..ce9d146 100644 --- a/widgets/barchart/barchart_test.go +++ b/widgets/barchart/barchart_test.go @@ -20,11 +20,11 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" + "github.com/mum4k/termdash/internal/draw" + "github.com/mum4k/termdash/internal/draw/testdraw" "github.com/mum4k/termdash/internal/faketerm" - "github.com/mum4k/termdash/internal/testdraw" "github.com/mum4k/termdash/internal/widgetapi" ) diff --git a/widgets/barchart/options.go b/widgets/barchart/options.go index 5b941c9..1bdb770 100644 --- a/widgets/barchart/options.go +++ b/widgets/barchart/options.go @@ -20,7 +20,7 @@ import ( "fmt" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/draw" + "github.com/mum4k/termdash/internal/draw" ) // Option is used to provide options. diff --git a/widgets/button/button.go b/widgets/button/button.go index 7c25d8e..8fc793e 100644 --- a/widgets/button/button.go +++ b/widgets/button/button.go @@ -24,8 +24,8 @@ import ( "github.com/mum4k/termdash/align" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/canvas" + "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/mouse" "github.com/mum4k/termdash/internal/mouse/button" "github.com/mum4k/termdash/internal/widgetapi" diff --git a/widgets/button/button_test.go b/widgets/button/button_test.go index 1254f17..db9ea00 100644 --- a/widgets/button/button_test.go +++ b/widgets/button/button_test.go @@ -23,13 +23,13 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" + "github.com/mum4k/termdash/internal/draw" + "github.com/mum4k/termdash/internal/draw/testdraw" "github.com/mum4k/termdash/internal/faketerm" "github.com/mum4k/termdash/internal/keyboard" "github.com/mum4k/termdash/internal/mouse" - "github.com/mum4k/termdash/internal/testdraw" "github.com/mum4k/termdash/internal/widgetapi" "github.com/mum4k/termdash/terminal/terminalapi" ) diff --git a/widgets/donut/donut.go b/widgets/donut/donut.go index 2f97a8b..b88c7eb 100644 --- a/widgets/donut/donut.go +++ b/widgets/donut/donut.go @@ -23,9 +23,9 @@ import ( "sync" "github.com/mum4k/termdash/align" - "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/braille" + "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/numbers" "github.com/mum4k/termdash/internal/runewidth" "github.com/mum4k/termdash/internal/widgetapi" diff --git a/widgets/donut/donut_test.go b/widgets/donut/donut_test.go index 830bcb0..003b241 100644 --- a/widgets/donut/donut_test.go +++ b/widgets/donut/donut_test.go @@ -20,12 +20,12 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/braille/testbraille" "github.com/mum4k/termdash/internal/canvas/testcanvas" + "github.com/mum4k/termdash/internal/draw" + "github.com/mum4k/termdash/internal/draw/testdraw" "github.com/mum4k/termdash/internal/faketerm" - "github.com/mum4k/termdash/internal/testdraw" "github.com/mum4k/termdash/internal/widgetapi" "github.com/mum4k/termdash/terminal/terminalapi" ) diff --git a/widgets/fakewidget/fakewidget.go b/widgets/fakewidget/fakewidget.go index 24ca384..5f195d8 100644 --- a/widgets/fakewidget/fakewidget.go +++ b/widgets/fakewidget/fakewidget.go @@ -21,9 +21,9 @@ import ( "image" "sync" - "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/area" "github.com/mum4k/termdash/internal/canvas" + "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/keyboard" "github.com/mum4k/termdash/internal/mouse" "github.com/mum4k/termdash/internal/widgetapi" diff --git a/widgets/fakewidget/fakewidget_test.go b/widgets/fakewidget/fakewidget_test.go index c73151c..b36ff8b 100644 --- a/widgets/fakewidget/fakewidget_test.go +++ b/widgets/fakewidget/fakewidget_test.go @@ -21,10 +21,10 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" + "github.com/mum4k/termdash/internal/draw/testdraw" "github.com/mum4k/termdash/internal/faketerm" "github.com/mum4k/termdash/internal/keyboard" "github.com/mum4k/termdash/internal/mouse" - "github.com/mum4k/termdash/internal/testdraw" "github.com/mum4k/termdash/internal/widgetapi" "github.com/mum4k/termdash/terminal/terminalapi" ) diff --git a/widgets/gauge/gauge.go b/widgets/gauge/gauge.go index 4665665..d22641d 100644 --- a/widgets/gauge/gauge.go +++ b/widgets/gauge/gauge.go @@ -24,9 +24,9 @@ import ( "github.com/mum4k/termdash/align" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/area" "github.com/mum4k/termdash/internal/canvas" + "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/runewidth" "github.com/mum4k/termdash/internal/widgetapi" "github.com/mum4k/termdash/linestyle" diff --git a/widgets/gauge/gauge_test.go b/widgets/gauge/gauge_test.go index 26903e1..18b795c 100644 --- a/widgets/gauge/gauge_test.go +++ b/widgets/gauge/gauge_test.go @@ -21,11 +21,11 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/align" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" + "github.com/mum4k/termdash/internal/draw" + "github.com/mum4k/termdash/internal/draw/testdraw" "github.com/mum4k/termdash/internal/faketerm" - "github.com/mum4k/termdash/internal/testdraw" "github.com/mum4k/termdash/internal/widgetapi" "github.com/mum4k/termdash/linestyle" ) diff --git a/widgets/gauge/options.go b/widgets/gauge/options.go index 0a0a69d..62f1e43 100644 --- a/widgets/gauge/options.go +++ b/widgets/gauge/options.go @@ -21,7 +21,7 @@ import ( "github.com/mum4k/termdash/align" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/draw" + "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/linestyle" ) diff --git a/widgets/linechart/linechart.go b/widgets/linechart/linechart.go index 226cd6f..6e934a5 100644 --- a/widgets/linechart/linechart.go +++ b/widgets/linechart/linechart.go @@ -23,10 +23,10 @@ import ( "sync" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/area" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/braille" + "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/numbers" "github.com/mum4k/termdash/internal/widgetapi" "github.com/mum4k/termdash/terminal/terminalapi" diff --git a/widgets/linechart/linechart_test.go b/widgets/linechart/linechart_test.go index 9092f75..dce7ce2 100644 --- a/widgets/linechart/linechart_test.go +++ b/widgets/linechart/linechart_test.go @@ -21,13 +21,13 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/braille/testbraille" "github.com/mum4k/termdash/internal/canvas/testcanvas" + "github.com/mum4k/termdash/internal/draw" + "github.com/mum4k/termdash/internal/draw/testdraw" "github.com/mum4k/termdash/internal/faketerm" "github.com/mum4k/termdash/internal/mouse" - "github.com/mum4k/termdash/internal/testdraw" "github.com/mum4k/termdash/internal/widgetapi" "github.com/mum4k/termdash/terminal/terminalapi" ) diff --git a/widgets/sparkline/sparkline.go b/widgets/sparkline/sparkline.go index c81e14b..ce83e4c 100644 --- a/widgets/sparkline/sparkline.go +++ b/widgets/sparkline/sparkline.go @@ -22,9 +22,9 @@ import ( "sync" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/area" "github.com/mum4k/termdash/internal/canvas" + "github.com/mum4k/termdash/internal/draw" "github.com/mum4k/termdash/internal/widgetapi" "github.com/mum4k/termdash/terminal/terminalapi" ) diff --git a/widgets/sparkline/sparkline_test.go b/widgets/sparkline/sparkline_test.go index 76f9095..2af5c4c 100644 --- a/widgets/sparkline/sparkline_test.go +++ b/widgets/sparkline/sparkline_test.go @@ -20,11 +20,11 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" + "github.com/mum4k/termdash/internal/draw" + "github.com/mum4k/termdash/internal/draw/testdraw" "github.com/mum4k/termdash/internal/faketerm" - "github.com/mum4k/termdash/internal/testdraw" "github.com/mum4k/termdash/internal/widgetapi" ) diff --git a/widgets/text/line_trim_test.go b/widgets/text/line_trim_test.go index 1e3e7cb..bfb2099 100644 --- a/widgets/text/line_trim_test.go +++ b/widgets/text/line_trim_test.go @@ -21,8 +21,8 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" + "github.com/mum4k/termdash/internal/draw/testdraw" "github.com/mum4k/termdash/internal/faketerm" - "github.com/mum4k/termdash/internal/testdraw" ) func TestLineTrim(t *testing.T) { diff --git a/widgets/text/text_test.go b/widgets/text/text_test.go index a20741b..f3b9ebf 100644 --- a/widgets/text/text_test.go +++ b/widgets/text/text_test.go @@ -20,13 +20,13 @@ import ( "github.com/kylelemons/godebug/pretty" "github.com/mum4k/termdash/cell" - "github.com/mum4k/termdash/draw" "github.com/mum4k/termdash/internal/canvas" "github.com/mum4k/termdash/internal/canvas/testcanvas" + "github.com/mum4k/termdash/internal/draw" + "github.com/mum4k/termdash/internal/draw/testdraw" "github.com/mum4k/termdash/internal/faketerm" "github.com/mum4k/termdash/internal/keyboard" "github.com/mum4k/termdash/internal/mouse" - "github.com/mum4k/termdash/internal/testdraw" "github.com/mum4k/termdash/internal/widgetapi" "github.com/mum4k/termdash/terminal/terminalapi" )