Skip to content

Commit 572c1a2

Browse files
committed
add more test
Signed-off-by: zzzk1 <[email protected]>
1 parent 7e9f49c commit 572c1a2

File tree

3 files changed

+51
-2
lines changed

3 files changed

+51
-2
lines changed

internal/storage/v2/clickhouse/factory_test.go

+6-2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"testing"
88

99
"github.com/ClickHouse/ch-go/cht"
10+
"github.com/stretchr/testify/assert"
1011
"github.com/stretchr/testify/require"
1112
"go.uber.org/zap"
1213

@@ -27,8 +28,9 @@ func TestClickHouseFactoryWithConfig(t *testing.T) {
2728
cht.New(t,
2829
cht.WithLog(zap.NewNop()),
2930
)
30-
_, err := NewFactoryWithConfig(&cfg, zap.NewNop())
31+
f, err := NewFactoryWithConfig(&cfg, zap.NewNop())
3132
require.NoError(t, err)
33+
defer f.Close()
3234
}
3335

3436
func TestCreateTraceWriter(t *testing.T) {
@@ -40,6 +42,8 @@ func TestCreateTraceWriter(t *testing.T) {
4042

4143
f, err := NewFactoryWithConfig(&cfg, zap.NewNop())
4244
require.NoError(t, err)
43-
_, err = f.CreateTraceWriter()
45+
traceWriter, err := f.CreateTraceWriter()
4446
require.NoError(t, err)
47+
assert.NotEmpty(t, traceWriter)
48+
defer f.Close()
4549
}

pkg/clickhouse/config/config.go

+6
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,9 @@ func (c *Configuration) newPool(log *zap.Logger) (*chpool.Pool, error) {
9797
HealthCheckPeriod: c.ConnectionPoolConfig.HealthCheckPeriod,
9898
}
9999
chPool, err := chpool.Dial(context.Background(), option)
100+
if err != nil {
101+
return nil, err
102+
}
100103
return chPool, err
101104
}
102105

@@ -112,5 +115,8 @@ func (c *Configuration) newConn() (driver.Conn, error) {
112115
},
113116
}
114117
conn, err := clientV2.Open(&option)
118+
if err != nil {
119+
return nil, err
120+
}
115121
return conn, err
116122
}

pkg/clickhouse/config/config_test.go

+39
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,45 @@ func TestNewClientWithDefaults(t *testing.T) {
3535
defer client.Close()
3636
}
3737

38+
func TestNewPool(t *testing.T) {
39+
cfg := DefaultConfiguration()
40+
logger := zap.NewNop()
41+
conn, err := cfg.newConn()
42+
43+
cht.New(t,
44+
cht.WithLog(logger),
45+
)
46+
47+
require.NoError(t, err)
48+
assert.NotEmpty(t, conn)
49+
defer conn.Close()
50+
}
51+
52+
func TestNewPoolFail(t *testing.T) {
53+
cfg := Configuration{}
54+
logger := zap.NewNop()
55+
pool, err := cfg.newPool(logger)
56+
57+
cht.New(t,
58+
cht.WithLog(logger),
59+
)
60+
61+
require.Error(t, err)
62+
assert.Nil(t, pool)
63+
}
64+
65+
func TestNewConnection(t *testing.T) {
66+
cfg := DefaultConfiguration()
67+
logger := zap.NewNop()
68+
69+
cht.New(t, cht.WithLog(logger))
70+
71+
conn, err := cfg.newConn()
72+
require.NoError(t, err)
73+
assert.NotEmpty(t, conn)
74+
defer conn.Close()
75+
}
76+
3877
func TestMain(m *testing.M) {
3978
testutils.VerifyGoLeaks(m)
4079
}

0 commit comments

Comments
 (0)