Skip to content

Commit 66d09c7

Browse files
committed
Move gocb log level equality checking to a test
1 parent 843d321 commit 66d09c7

File tree

2 files changed

+35
-12
lines changed

2 files changed

+35
-12
lines changed

base/logger_external.go

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,6 @@ import (
2222
gocbcorev7 "gopkg.in/couchbase/gocbcore.v7"
2323
)
2424

25-
func init() {
26-
// Ensure all gocb and gocbcore log levels match between versions, if they don't,
27-
// we'll need to revisit the log wrappers below to not just do direct type conversions to implement 4 loggers.
28-
if gocb.LogError != gocb.LogLevel(gocbcore.LogError) || gocb.LogLevel(gocbcore.LogError) != gocb.LogLevel(gocbv1.LogError) || gocb.LogLevel(gocbv1.LogError) != gocb.LogLevel(gocbcorev7.LogError) ||
29-
gocb.LogWarn != gocb.LogLevel(gocbcore.LogWarn) || gocb.LogLevel(gocbcore.LogWarn) != gocb.LogLevel(gocbv1.LogWarn) || gocb.LogLevel(gocbv1.LogWarn) != gocb.LogLevel(gocbcorev7.LogWarn) ||
30-
gocb.LogInfo != gocb.LogLevel(gocbcore.LogInfo) || gocb.LogLevel(gocbcore.LogInfo) != gocb.LogLevel(gocbv1.LogInfo) || gocb.LogLevel(gocbv1.LogInfo) != gocb.LogLevel(gocbcorev7.LogInfo) ||
31-
gocb.LogDebug != gocb.LogLevel(gocbcore.LogDebug) || gocb.LogLevel(gocbcore.LogDebug) != gocb.LogLevel(gocbv1.LogDebug) || gocb.LogLevel(gocbv1.LogDebug) != gocb.LogLevel(gocbcorev7.LogDebug) ||
32-
gocb.LogTrace != gocb.LogLevel(gocbcore.LogTrace) || gocb.LogLevel(gocbcore.LogTrace) != gocb.LogLevel(gocbv1.LogTrace) || gocb.LogLevel(gocbv1.LogTrace) != gocb.LogLevel(gocbcorev7.LogTrace) {
33-
panic("mismatched gocb/gocbcore/gocbv1/gocbcorev7 log level values")
34-
}
35-
}
36-
3725
// This file implements wrappers around the loggers of external packages
3826
// so that all of SG's logging output is consistent
3927
func initExternalLoggers() {

base/logger_external_test.go

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
package base
2+
3+
import (
4+
"testing"
5+
6+
"github.com/couchbase/gocb"
7+
"github.com/couchbase/gocbcore"
8+
"github.com/stretchr/testify/assert"
9+
gocbv1 "gopkg.in/couchbase/gocb.v1"
10+
gocbcorev7 "gopkg.in/couchbase/gocbcore.v7"
11+
)
12+
13+
func TestGoCBLogLevelEquality(t *testing.T) {
14+
// Ensures all gocb and gocbcore log levels match between versions.
15+
// If they don't, we'll need to revisit the log wrappers to not just do direct type conversions to implement 4 loggers.
16+
assert.Equal(t, gocb.LogError, gocb.LogLevel(gocbcore.LogError))
17+
assert.Equal(t, gocb.LogError, gocb.LogLevel(gocbv1.LogError))
18+
assert.Equal(t, gocb.LogError, gocb.LogLevel(gocbcorev7.LogError))
19+
20+
assert.Equal(t, gocb.LogWarn, gocb.LogLevel(gocbcore.LogWarn))
21+
assert.Equal(t, gocb.LogWarn, gocb.LogLevel(gocbv1.LogWarn))
22+
assert.Equal(t, gocb.LogWarn, gocb.LogLevel(gocbcorev7.LogWarn))
23+
24+
assert.Equal(t, gocb.LogInfo, gocb.LogLevel(gocbcore.LogInfo))
25+
assert.Equal(t, gocb.LogInfo, gocb.LogLevel(gocbv1.LogInfo))
26+
assert.Equal(t, gocb.LogInfo, gocb.LogLevel(gocbcorev7.LogInfo))
27+
28+
assert.Equal(t, gocb.LogDebug, gocb.LogLevel(gocbcore.LogDebug))
29+
assert.Equal(t, gocb.LogDebug, gocb.LogLevel(gocbv1.LogDebug))
30+
assert.Equal(t, gocb.LogDebug, gocb.LogLevel(gocbcorev7.LogDebug))
31+
32+
assert.Equal(t, gocb.LogTrace, gocb.LogLevel(gocbcore.LogTrace))
33+
assert.Equal(t, gocb.LogTrace, gocb.LogLevel(gocbv1.LogTrace))
34+
assert.Equal(t, gocb.LogTrace, gocb.LogLevel(gocbcorev7.LogTrace))
35+
}

0 commit comments

Comments
 (0)