diff options
author | remyabel <41764622+remyabel@users.noreply.github.com> | 2018-08-19 23:29:47 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-19 23:29:47 -0400 |
commit | 5c65066cbb27eac0e9cc2dd19354d6889c052406 (patch) | |
tree | 4beca6c465c61d81255604f88e38f59e71e3d2bc /pkg | |
parent | e8b12a086c94f29b8fdcd1b2197b332834e13ca6 (diff) | |
parent | 64cf8f5b107a310e6729b68ba8d7638effd3966d (diff) |
Merge branch 'master' into 157_remove_bom
Diffstat (limited to 'pkg')
-rw-r--r-- | pkg/i18n/i18n.go | 5 | ||||
-rw-r--r-- | pkg/utils/utils_test.go | 83 |
2 files changed, 85 insertions, 3 deletions
diff --git a/pkg/i18n/i18n.go b/pkg/i18n/i18n.go index f2bd2839e..e209d55c5 100644 --- a/pkg/i18n/i18n.go +++ b/pkg/i18n/i18n.go @@ -23,7 +23,10 @@ func NewLocalizer(log *logrus.Logger) (*Localizer, error) { // detect the user's language userLang, err := jibber_jabber.DetectLanguage() if err != nil { - return nil, err + if err.Error() != "Could not detect Language" { + return nil, err + } + userLang = "C" } log.Info("language: " + userLang) diff --git a/pkg/utils/utils_test.go b/pkg/utils/utils_test.go index 22a9c82dc..ffc753fd4 100644 --- a/pkg/utils/utils_test.go +++ b/pkg/utils/utils_test.go @@ -1,6 +1,86 @@ package utils -import "testing" +import ( + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestSplitLines(t *testing.T) { + type scenario struct { + multilineString string + expected []string + } + + scenarios := []scenario{ + { + "", + []string{}, + }, + { + "\n", + []string{}, + }, + { + "hello world !\nhello universe !\n", + []string{ + "hello world !", + "hello universe !", + }, + }, + } + + for _, s := range scenarios { + assert.EqualValues(t, s.expected, SplitLines(s.multilineString)) + } +} + +func TestWithPadding(t *testing.T) { + type scenario struct { + str string + padding int + expected string + } + + scenarios := []scenario{ + { + "hello world !", + 1, + "hello world !", + }, + { + "hello world !", + 14, + "hello world ! ", + }, + } + + for _, s := range scenarios { + assert.EqualValues(t, s.expected, WithPadding(s.str, s.padding)) + } +} + +func TestTrimTrailingNewline(t *testing.T) { + type scenario struct { + str string + expected string + } + + scenarios := []scenario{ + { + "hello world !\n", + "hello world !", + }, + { + "hello world !", + "hello world !", + }, + } + + for _, s := range scenarios { + assert.EqualValues(t, s.expected, TrimTrailingNewline(s.str)) + } +} var testCases = []struct { Input []byte @@ -30,5 +110,4 @@ func TestNormalizeLinefeeds(t *testing.T) { if input != expected { t.Error("Expected " + expected + ", got " + input) } - } } |