Skip to content

Commit 05071ea

Browse files
committed
Add error tests
1 parent a1a2f2c commit 05071ea

2 files changed

Lines changed: 49 additions & 9 deletions

File tree

‎errors.go‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ func (m *multiError) Errors() []error {
4747

4848
type requiredFlagsErr interface {
4949
error
50-
getMissingFlags() []string
5150
}
5251

5352
type errRequiredFlags struct {
@@ -62,10 +61,6 @@ func (e *errRequiredFlags) Error() string {
6261
return fmt.Sprintf("Required flags %q not set", joinedMissingFlags)
6362
}
6463

65-
func (e *errRequiredFlags) getMissingFlags() []string {
66-
return e.missingFlags
67-
}
68-
6964
type mutuallyExclusiveGroup struct {
7065
flag1Name string
7166
flag2Name string
@@ -148,10 +143,6 @@ func (ee *exitError) ExitCode() int {
148143
return ee.exitCode
149144
}
150145

151-
func (ee *exitError) Unwrap() error {
152-
return ee.err
153-
}
154-
155146
// HandleExitCoder handles errors implementing ExitCoder by printing their
156147
// message and calling OsExiter with the given exit code.
157148
//

‎errors_test.go‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,62 @@ func TestHandleExitCoder_MultiErrorWithExitCoder(t *testing.T) {
8181

8282
exitErr := Exit("galactic perimeter breach", 9)
8383
exitErr2 := Exit("last ExitCoder", 11)
84+
8485
err := newMultiError(errors.New("wowsa"), errors.New("egad"), exitErr, exitErr2)
8586
HandleExitCoder(err)
8687

8788
assert.Equal(t, 11, exitCode)
8889
assert.True(t, called)
8990
}
9091

92+
type exitFormatter struct {
93+
code int
94+
}
95+
96+
func (f *exitFormatter) Format(s fmt.State, verb rune) {
97+
s.Write([]byte("some other special"))
98+
}
99+
100+
func (f *exitFormatter) ExitCode() int {
101+
return f.code
102+
}
103+
104+
func (f *exitFormatter) Error() string {
105+
return fmt.Sprintf("my special error code %d", f.code)
106+
}
107+
108+
func TestHandleExitCoder_ErrorFormatter(t *testing.T) {
109+
exitCode := 0
110+
called := false
111+
112+
OsExiter = func(rc int) {
113+
if !called {
114+
exitCode = rc
115+
called = true
116+
}
117+
}
118+
119+
oldWriter := ErrWriter
120+
var buf bytes.Buffer
121+
ErrWriter = &buf
122+
defer func() {
123+
OsExiter = fakeOsExiter
124+
ErrWriter = oldWriter
125+
}()
126+
127+
exitErr := Exit("galactic perimeter breach", 9)
128+
exitErr2 := Exit("last ExitCoder", 11)
129+
exitErr3 := &exitFormatter{code: 12}
130+
131+
// add some recursion for multi error to fix test coverage
132+
err := newMultiError(errors.New("wowsa"), errors.New("egad"), exitErr3, newMultiError(exitErr, exitErr2))
133+
HandleExitCoder(err)
134+
135+
assert.Equal(t, 11, exitCode)
136+
assert.True(t, called)
137+
assert.Contains(t, buf.String(), "some other special")
138+
}
139+
91140
func TestHandleExitCoder_MultiErrorWithoutExitCoder(t *testing.T) {
92141
exitCode := 0
93142
called := false

0 commit comments

Comments
 (0)