Skip to content

Commit c91e09a

Browse files
committed
Simplify tests
1 parent 03c1a28 commit c91e09a

File tree

1 file changed

+13
-43
lines changed

1 file changed

+13
-43
lines changed

locale_unix_test.go

+13-43
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,11 @@ import (
1010
"github.com/stretchr/testify/assert"
1111
)
1212

13-
func resetEnv(t *testing.T) {
14-
t.Log("Resetting LANGUAGE, LC_ALL, LC_MESSAGES and LANG")
15-
16-
for _, env := range [...]string{"LANGUAGE", "LC_ALL", "LC_MESSAGES", "LANG"} {
17-
err := os.Setenv(env, "")
18-
assert.Equal(t, nil, err)
19-
}
20-
}
21-
2213
func TestMultipleLocales(t *testing.T) {
23-
resetEnv(t)
24-
25-
err := os.Setenv("LANGUAGE", "en_US:fr:ja")
26-
assert.Equal(t, nil, err, "err should be nil")
27-
err = os.Setenv("LC_ALL", "")
28-
assert.Equal(t, nil, err, "err should be nil")
29-
err = os.Setenv("LC_MESSAGES", "")
30-
assert.Equal(t, nil, err, "err should be nil")
31-
err = os.Setenv("LANG", "en_US.UTF-8")
32-
assert.Equal(t, nil, err, "err should be nil")
14+
t.Setenv("LANGUAGE", "en_US:fr:ja")
15+
t.Setenv("LC_ALL", "")
16+
t.Setenv("LC_MESSAGES", "")
17+
t.Setenv("LANG", "en_US.UTF-8")
3318

3419
locales, err := GetLocales()
3520
assert.Equal(t, nil, err, "err should be nil")
@@ -48,8 +33,7 @@ func TestMultipleLocales(t *testing.T) {
4833
assert.Equal(t, "US", region)
4934

5035
// If "C" is set, we should ignore LANGUAGE
51-
err = os.Setenv("LC_ALL", "C")
52-
assert.Equal(t, nil, err, "err should be nil")
36+
t.Setenv("LC_ALL", "C")
5337

5438
var nilStringSlice []string
5539

@@ -71,16 +55,10 @@ func TestMultipleLocales(t *testing.T) {
7155
}
7256

7357
func TestSingleLocale(t *testing.T) {
74-
resetEnv(t)
75-
76-
err := os.Setenv("LANGUAGE", "ja_JP")
77-
assert.Equal(t, nil, err, "err should be nil")
78-
err = os.Setenv("LC_ALL", "en_US")
79-
assert.Equal(t, nil, err, "err should be nil")
80-
err = os.Setenv("LC_MESSAGES", "ko_KR")
81-
assert.Equal(t, nil, err, "err should be nil")
82-
err = os.Setenv("LANG", "fr_FR")
83-
assert.Equal(t, nil, err, "err should be nil")
58+
t.Setenv("LANGUAGE", "ja_JP")
59+
t.Setenv("LC_ALL", "en_US")
60+
t.Setenv("LC_MESSAGES", "ko_KR")
61+
t.Setenv("LANG", "fr_FR")
8462

8563
locales, err := GetLocales()
8664
assert.Equal(t, nil, err, "err should be nil")
@@ -98,8 +76,7 @@ func TestSingleLocale(t *testing.T) {
9876
assert.Equal(t, nil, err, "err should be nil")
9977
assert.Equal(t, "JP", region)
10078

101-
err = os.Setenv("LANGUAGE", "")
102-
assert.Equal(t, nil, err, "err should be nil")
79+
t.Setenv("LANGUAGE", "")
10380

10481
locale, err = GetLocale()
10582
assert.Equal(t, nil, err, "err should be nil")
@@ -113,8 +90,7 @@ func TestSingleLocale(t *testing.T) {
11390
assert.Equal(t, nil, err, "err should be nil")
11491
assert.Equal(t, "US", region)
11592

116-
err = os.Setenv("LC_ALL", "")
117-
assert.Equal(t, nil, err, "err should be nil")
93+
t.Setenv("LC_ALL", "")
11894

11995
locale, err = GetLocale()
12096
assert.Equal(t, nil, err, "err should be nil")
@@ -128,8 +104,7 @@ func TestSingleLocale(t *testing.T) {
128104
assert.Equal(t, nil, err, "err should be nil")
129105
assert.Equal(t, "KR", region)
130106

131-
err = os.Setenv("LC_MESSAGES", "")
132-
assert.Equal(t, nil, err, "err should be nil")
107+
t.Setenv("LC_MESSAGES", "")
133108

134109
locale, err = GetLocale()
135110
assert.Equal(t, nil, err, "err should be nil")
@@ -145,10 +120,7 @@ func TestSingleLocale(t *testing.T) {
145120
}
146121

147122
func TestLocaleNoRegion(t *testing.T) {
148-
resetEnv(t)
149-
150-
err := os.Setenv("LANG", "fr")
151-
assert.Equal(t, nil, err, "err should be nil")
123+
t.Setenv("LANG", "fr")
152124

153125
locales, err := GetLocales()
154126
assert.Equal(t, nil, err, "err should be nil")
@@ -168,8 +140,6 @@ func TestLocaleNoRegion(t *testing.T) {
168140
}
169141

170142
func TestNoLocale(t *testing.T) {
171-
resetEnv(t)
172-
173143
var nilStringSlice []string
174144

175145
locales, err := GetLocales()

0 commit comments

Comments
 (0)