From 8ee7e4bfda8ba271683fa03eff40af0d46dcaf04 Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Wed, 21 May 2025 17:59:27 -0300 Subject: [PATCH] refactor(table): rename tests to match a convention --- table/table_test.go | 50 +++++++++---------- ...den => ManualHeightGreaterThanRows.golden} | 0 ...n => ManualWidthGreaterThanColumns.golden} | 0 ...s.golden => MultipleRowsAndColumns.golden} | 0 .../{No_padding.golden => NoPadding.golden} | 0 ...olumn.golden => SingleRowAndColumn.golden} | 0 ...clear_styles.golden => ClearStyles.golden} | 0 .../{new_styles.golden => NewStyles.golden} | 0 ...golden => InvalidNumberOfArguments.golden} | 0 ...left_border.golden => NoLeftBorder.golden} | 0 ...o_top_border.golden => NoTopBorder.golden} | 0 ...en => RowSeparatorAndNoRightBorder.golden} | 0 ..._borders.golden => UnsetAllBorders.golden} | 0 ...only.golden => VerticalBordersOnly.golden} | 0 ...golden => ClearStylesWithStyleFunc.golden} | 0 ...empty_styles.golden => EmptyStyles.golden} | 0 .../{new_styles.golden => NewStyles.golden} | 0 .../{No_border.golden => NoBorder.golden} | 0 .../{With_border.golden => WithBorder.golden} | 0 19 files changed, 25 insertions(+), 25 deletions(-) rename table/testdata/TestModel_View/{Manual_height_greater_than_rows.golden => ManualHeightGreaterThanRows.golden} (100%) rename table/testdata/TestModel_View/{Manual_width_greater_than_columns.golden => ManualWidthGreaterThanColumns.golden} (100%) rename table/testdata/TestModel_View/{Multiple_rows_and_columns.golden => MultipleRowsAndColumns.golden} (100%) rename table/testdata/TestModel_View/{No_padding.golden => NoPadding.golden} (100%) rename table/testdata/TestModel_View/{Single_row_and_column.golden => SingleRowAndColumn.golden} (100%) rename table/testdata/TestOverwriteStyles/{clear_styles.golden => ClearStyles.golden} (100%) rename table/testdata/TestOverwriteStyles/{new_styles.golden => NewStyles.golden} (100%) rename table/testdata/TestSetBorder/{invalid_number_of_arguments.golden => InvalidNumberOfArguments.golden} (100%) rename table/testdata/TestSetBorder/{no_left_border.golden => NoLeftBorder.golden} (100%) rename table/testdata/TestSetBorder/{no_top_border.golden => NoTopBorder.golden} (100%) rename table/testdata/TestSetBorder/{row_separator_and_no_right_border.golden => RowSeparatorAndNoRightBorder.golden} (100%) rename table/testdata/TestSetBorder/{unset_all_borders.golden => UnsetAllBorders.golden} (100%) rename table/testdata/TestSetBorder/{vertical_borders_only.golden => VerticalBordersOnly.golden} (100%) rename table/testdata/TestSetStyleFunc/{Clear_styles_with_StyleFunc.golden => ClearStylesWithStyleFunc.golden} (100%) rename table/testdata/TestSetStyles/{empty_styles.golden => EmptyStyles.golden} (100%) rename table/testdata/TestSetStyles/{new_styles.golden => NewStyles.golden} (100%) rename table/testdata/TestTableAlignment/{No_border.golden => NoBorder.golden} (100%) rename table/testdata/TestTableAlignment/{With_border.golden => WithBorder.golden} (100%) diff --git a/table/table_test.go b/table/table_test.go index 7e86281..2358c69 100644 --- a/table/table_test.go +++ b/table/table_test.go @@ -133,7 +133,7 @@ func TestTableAlignment(t *testing.T) { {"Tim Tams", "Australia", "No"}, {"Hobnobs", "UK", "Yes"}, } - t.Run("No border", func(t *testing.T) { + t.Run("NoBorder", func(t *testing.T) { biscuits := New( WithHeaders(headers...), WithRows(rows...), @@ -148,7 +148,7 @@ func TestTableAlignment(t *testing.T) { }) golden.RequireEqual(t, []byte(biscuits.View())) }) - t.Run("With border", func(t *testing.T) { + t.Run("WithBorder", func(t *testing.T) { biscuits := New( WithHeaders(headers...), WithRows(rows...), @@ -168,12 +168,12 @@ func TestOverwriteStyles(t *testing.T) { name string styles Styles }{ - {"clear styles", Styles{ + {"ClearStyles", Styles{ Selected: lipgloss.NewStyle(), Header: lipgloss.NewStyle(), Cell: lipgloss.NewStyle(), }}, - {"new styles", Styles{ + {"NewStyles", Styles{ Selected: niceMargins.Foreground(lipgloss.Color("68")), Header: niceMargins, Cell: niceMargins, @@ -198,12 +198,12 @@ func TestSetStyles(t *testing.T) { name string styles Styles }{ - {"empty styles", Styles{ + {"EmptyStyles", Styles{ Selected: lipgloss.NewStyle(), Header: lipgloss.NewStyle(), Cell: lipgloss.NewStyle(), }}, - {"new styles", Styles{ + {"NewStyles", Styles{ Selected: niceMargins.Background(lipgloss.Color("68")), Header: niceMargins, Cell: niceMargins, @@ -226,7 +226,7 @@ func TestSetStyles(t *testing.T) { } func TestSetStyleFunc(t *testing.T) { - t.Run("Clear styles with StyleFunc", func(t *testing.T) { + t.Run("ClearStylesWithStyleFunc", func(t *testing.T) { tb := New( WithHeaders(headers...), WithRows(rows...), @@ -248,14 +248,14 @@ func TestSetBorder(t *testing.T) { name string borders []bool }{ - {"unset all borders", []bool{false}}, - // {"set all borders", []bool{true}}, // FIXME(@andreynering): Fix on Lip Gloss. Unneeded extra row. - {"vertical borders only", []bool{true, false}}, - {"no top border", []bool{false, true, true}}, - {"no left border", []bool{true, true, true, false}}, - {"row separator and no right border", []bool{true, false, true, true, true}}, - // {"set row and column separators", []bool{false, false, false, false, true, true}}, // FIXME(@andreynering): Broken style, does this make sense? - {"invalid number of arguments", []bool{true, false, false, false, false, true, true}}, + {"UnsetAllBorders", []bool{false}}, + //{"SetAllBorders", []bool{true}}, // FIXME(@andreynering): Fix on Lip Gloss. Unneeded extra row. + {"VerticalBordersOnly", []bool{true, false}}, + {"NoTopBorder", []bool{false, true, true}}, + {"NoLeftBorder", []bool{true, true, true, false}}, + {"RowSeparatorAndNoRightBorder", []bool{true, false, true, true, true}}, + //{"SetRowAndColumnSeparators", []bool{false, false, false, false, true, true}}, // FIXME(@andreynering): Broken style, does this make sense? + {"InvalidNumberOfArguments", []bool{true, false, false, false, false, true, true}}, } for _, tc := range tests { t.Run(tc.name, func(t *testing.T) { @@ -651,7 +651,7 @@ func TestModel_View(t *testing.T) { return New() }, }, - "Single row and column": { + "SingleRowAndColumn": { modelFunc: func() *Model { return New( WithHeaders("Name"), @@ -661,7 +661,7 @@ func TestModel_View(t *testing.T) { ) }, }, - "Multiple rows and columns": { + "MultipleRowsAndColumns": { modelFunc: func() *Model { return New( WithHeaders("Name", "Country of Origin", "Dunk-able"), @@ -674,7 +674,7 @@ func TestModel_View(t *testing.T) { }, }, // FIXME(@andreynering): Fix this scenario in Lip Gloss - "Extra padding": { + "ExtraPadding": { modelFunc: func() *Model { s := DefaultStyles() s.Header = lipgloss.NewStyle().Padding(2, 2) @@ -693,7 +693,7 @@ func TestModel_View(t *testing.T) { }, skip: true, }, - "No padding": { + "NoPadding": { modelFunc: func() *Model { s := DefaultStyles() s.Header = lipgloss.NewStyle() @@ -712,7 +712,7 @@ func TestModel_View(t *testing.T) { }, }, // FIXME(@andreynering): Fix this scenario in Lip Gloss - "Bordered headers": { + "BorderedHeaders": { modelFunc: func() *Model { return New( WithHeaders("Name", "Country of Origin", "Dunk-able"), @@ -729,7 +729,7 @@ func TestModel_View(t *testing.T) { skip: true, }, // FIXME(@andreynering): Fix this scenario in Lip Gloss - "Bordered cells": { + "BorderedCells": { modelFunc: func() *Model { return New( WithHeaders("Name", "Country of Origin", "Dunk-able"), @@ -746,7 +746,7 @@ func TestModel_View(t *testing.T) { skip: true, }, // FIXME(@andreynering): Fix in Lip Gloss? Potentially add extra empty lines to the bottom of the table. - "Manual height greater than rows": { + "ManualHeightGreaterThanRows": { modelFunc: func() *Model { return New( WithHeight(15), @@ -760,7 +760,7 @@ func TestModel_View(t *testing.T) { }, }, // FIXME(@andreynering): Fix this scenario in Lip Gloss. Should truncate table if height is too small. - "Manual height less than rows": { + "ManualHeightLessThanRows": { modelFunc: func() *Model { return New( WithHeight(2), @@ -774,7 +774,7 @@ func TestModel_View(t *testing.T) { }, skip: true, }, - "Manual width greater than columns": { + "ManualWidthGreaterThanColumns": { modelFunc: func() *Model { return New( WithWidth(80), @@ -788,7 +788,7 @@ func TestModel_View(t *testing.T) { }, }, // FIXME(@andreynering): Fix this scenario in Lip Gloss. - "Manual width less than columns": { + "ManualWidthLessThanColumns": { modelFunc: func() *Model { return New( WithWidth(30), diff --git a/table/testdata/TestModel_View/Manual_height_greater_than_rows.golden b/table/testdata/TestModel_View/ManualHeightGreaterThanRows.golden similarity index 100% rename from table/testdata/TestModel_View/Manual_height_greater_than_rows.golden rename to table/testdata/TestModel_View/ManualHeightGreaterThanRows.golden diff --git a/table/testdata/TestModel_View/Manual_width_greater_than_columns.golden b/table/testdata/TestModel_View/ManualWidthGreaterThanColumns.golden similarity index 100% rename from table/testdata/TestModel_View/Manual_width_greater_than_columns.golden rename to table/testdata/TestModel_View/ManualWidthGreaterThanColumns.golden diff --git a/table/testdata/TestModel_View/Multiple_rows_and_columns.golden b/table/testdata/TestModel_View/MultipleRowsAndColumns.golden similarity index 100% rename from table/testdata/TestModel_View/Multiple_rows_and_columns.golden rename to table/testdata/TestModel_View/MultipleRowsAndColumns.golden diff --git a/table/testdata/TestModel_View/No_padding.golden b/table/testdata/TestModel_View/NoPadding.golden similarity index 100% rename from table/testdata/TestModel_View/No_padding.golden rename to table/testdata/TestModel_View/NoPadding.golden diff --git a/table/testdata/TestModel_View/Single_row_and_column.golden b/table/testdata/TestModel_View/SingleRowAndColumn.golden similarity index 100% rename from table/testdata/TestModel_View/Single_row_and_column.golden rename to table/testdata/TestModel_View/SingleRowAndColumn.golden diff --git a/table/testdata/TestOverwriteStyles/clear_styles.golden b/table/testdata/TestOverwriteStyles/ClearStyles.golden similarity index 100% rename from table/testdata/TestOverwriteStyles/clear_styles.golden rename to table/testdata/TestOverwriteStyles/ClearStyles.golden diff --git a/table/testdata/TestOverwriteStyles/new_styles.golden b/table/testdata/TestOverwriteStyles/NewStyles.golden similarity index 100% rename from table/testdata/TestOverwriteStyles/new_styles.golden rename to table/testdata/TestOverwriteStyles/NewStyles.golden diff --git a/table/testdata/TestSetBorder/invalid_number_of_arguments.golden b/table/testdata/TestSetBorder/InvalidNumberOfArguments.golden similarity index 100% rename from table/testdata/TestSetBorder/invalid_number_of_arguments.golden rename to table/testdata/TestSetBorder/InvalidNumberOfArguments.golden diff --git a/table/testdata/TestSetBorder/no_left_border.golden b/table/testdata/TestSetBorder/NoLeftBorder.golden similarity index 100% rename from table/testdata/TestSetBorder/no_left_border.golden rename to table/testdata/TestSetBorder/NoLeftBorder.golden diff --git a/table/testdata/TestSetBorder/no_top_border.golden b/table/testdata/TestSetBorder/NoTopBorder.golden similarity index 100% rename from table/testdata/TestSetBorder/no_top_border.golden rename to table/testdata/TestSetBorder/NoTopBorder.golden diff --git a/table/testdata/TestSetBorder/row_separator_and_no_right_border.golden b/table/testdata/TestSetBorder/RowSeparatorAndNoRightBorder.golden similarity index 100% rename from table/testdata/TestSetBorder/row_separator_and_no_right_border.golden rename to table/testdata/TestSetBorder/RowSeparatorAndNoRightBorder.golden diff --git a/table/testdata/TestSetBorder/unset_all_borders.golden b/table/testdata/TestSetBorder/UnsetAllBorders.golden similarity index 100% rename from table/testdata/TestSetBorder/unset_all_borders.golden rename to table/testdata/TestSetBorder/UnsetAllBorders.golden diff --git a/table/testdata/TestSetBorder/vertical_borders_only.golden b/table/testdata/TestSetBorder/VerticalBordersOnly.golden similarity index 100% rename from table/testdata/TestSetBorder/vertical_borders_only.golden rename to table/testdata/TestSetBorder/VerticalBordersOnly.golden diff --git a/table/testdata/TestSetStyleFunc/Clear_styles_with_StyleFunc.golden b/table/testdata/TestSetStyleFunc/ClearStylesWithStyleFunc.golden similarity index 100% rename from table/testdata/TestSetStyleFunc/Clear_styles_with_StyleFunc.golden rename to table/testdata/TestSetStyleFunc/ClearStylesWithStyleFunc.golden diff --git a/table/testdata/TestSetStyles/empty_styles.golden b/table/testdata/TestSetStyles/EmptyStyles.golden similarity index 100% rename from table/testdata/TestSetStyles/empty_styles.golden rename to table/testdata/TestSetStyles/EmptyStyles.golden diff --git a/table/testdata/TestSetStyles/new_styles.golden b/table/testdata/TestSetStyles/NewStyles.golden similarity index 100% rename from table/testdata/TestSetStyles/new_styles.golden rename to table/testdata/TestSetStyles/NewStyles.golden diff --git a/table/testdata/TestTableAlignment/No_border.golden b/table/testdata/TestTableAlignment/NoBorder.golden similarity index 100% rename from table/testdata/TestTableAlignment/No_border.golden rename to table/testdata/TestTableAlignment/NoBorder.golden diff --git a/table/testdata/TestTableAlignment/With_border.golden b/table/testdata/TestTableAlignment/WithBorder.golden similarity index 100% rename from table/testdata/TestTableAlignment/With_border.golden rename to table/testdata/TestTableAlignment/WithBorder.golden