Skip to content

Commit 91b3fe1

Browse files
committed
Add basic tests for If and Exists
Update tests
1 parent 4aa91e2 commit 91b3fe1

File tree

6 files changed

+29
-114
lines changed

6 files changed

+29
-114
lines changed

config/constants.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ const (
146146
DefaultGRPCAPINetwork = "tcp"
147147
DefaultGRPCAPIAddress = "localhost:19090"
148148

149-
// Policies
149+
// Policies.
150150
DefaultCompatibilityPolicy = Strict
151151
DefaultVerificationPolicy = PassDown
152152
DefaultAcceptancePolicy = Accept

config/getters_test.go

Lines changed: 0 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -3,108 +3,16 @@ package config
33
import (
44
"context"
55
"testing"
6-
"time"
76

8-
"github.com/rs/zerolog"
97
"github.com/stretchr/testify/assert"
108
)
119

12-
// TestGetVerificationPolicy tests the GetVerificationPolicy function.
13-
func TestGetVerificationPolicy(t *testing.T) {
14-
pluginConfig := PluginConfig{}
15-
assert.Equal(t, PassDown, pluginConfig.GetVerificationPolicy())
16-
}
17-
18-
// TestGetPluginCompatibilityPolicy tests the GetPluginCompatibilityPolicy function.
19-
func TestGetPluginCompatibilityPolicy(t *testing.T) {
20-
pluginConfig := PluginConfig{}
21-
assert.Equal(t, Strict, pluginConfig.GetPluginCompatibilityPolicy())
22-
}
23-
24-
// TestGetAcceptancePolicy tests the GetAcceptancePolicy function.
25-
func TestGetAcceptancePolicy(t *testing.T) {
26-
pluginConfig := PluginConfig{}
27-
assert.Equal(t, Accept, pluginConfig.GetAcceptancePolicy())
28-
}
29-
30-
// TestGetTerminationPolicy tests the GetTerminationPolicy function.
31-
func TestGetTerminationPolicy(t *testing.T) {
32-
pluginConfig := PluginConfig{}
33-
assert.Equal(t, Stop, pluginConfig.GetTerminationPolicy())
34-
}
35-
36-
// TestGetTCPKeepAlivePeriod tests the GetTCPKeepAlivePeriod function.
37-
func TestGetTCPKeepAlivePeriod(t *testing.T) {
38-
client := Client{}
39-
assert.Equal(t, client.GetTCPKeepAlivePeriod(), time.Duration(0))
40-
}
41-
42-
// TestGetReceiveDeadline tests the GetReceiveDeadline function.
43-
func TestGetReceiveDeadline(t *testing.T) {
44-
client := Client{}
45-
assert.Equal(t, time.Duration(0), client.GetReceiveDeadline())
46-
}
47-
48-
// TestGetReceiveTimeout tests the GetReceiveTimeout function.
49-
func TestGetReceiveTimeout(t *testing.T) {
50-
client := Client{}
51-
assert.Equal(t, time.Duration(0), client.GetReceiveTimeout())
52-
}
53-
54-
// TestGetSendDeadline tests the GetSendDeadline function.
55-
func TestGetSendDeadline(t *testing.T) {
56-
client := Client{}
57-
assert.Equal(t, time.Duration(0), client.GetSendDeadline())
58-
}
59-
60-
// TestGetReceiveChunkSize tests the GetReceiveChunkSize function.
61-
func TestGetReceiveChunkSize(t *testing.T) {
62-
client := Client{}
63-
assert.Equal(t, DefaultChunkSize, client.GetReceiveChunkSize())
64-
}
65-
66-
// TestGetHealthCheckPeriod tests the GetHealthCheckPeriod function.
67-
func TestGetHealthCheckPeriod(t *testing.T) {
68-
proxy := Proxy{}
69-
assert.Equal(t, DefaultHealthCheckPeriod, proxy.GetHealthCheckPeriod())
70-
}
71-
72-
// TestGetTickInterval tests the GetTickInterval function.
73-
func TestGetTickInterval(t *testing.T) {
74-
server := Server{}
75-
assert.Equal(t, server.GetTickInterval(), time.Duration(0))
76-
}
77-
78-
// TestGetSize tests the GetSize function.
79-
func TestGetSize(t *testing.T) {
80-
pool := Pool{}
81-
assert.Equal(t, DefaultPoolSize, pool.GetSize())
82-
}
83-
8410
// TestGetOutput tests the GetOutput function.
8511
func TestGetOutput(t *testing.T) {
8612
logger := Logger{}
8713
assert.Equal(t, []LogOutput{Console}, logger.GetOutput())
8814
}
8915

90-
// TestGetTimeFormat tests the GetTimeFormat function.
91-
func TestGetTimeFormat(t *testing.T) {
92-
logger := Logger{}
93-
assert.Equal(t, zerolog.TimeFormatUnix, logger.GetTimeFormat())
94-
}
95-
96-
// TestGetConsoleTimeFormat tests the GetConsoleTimeFormat function.
97-
func TestGetConsoleTimeFormat(t *testing.T) {
98-
logger := Logger{}
99-
assert.Equal(t, time.RFC3339, logger.GetConsoleTimeFormat())
100-
}
101-
102-
// TestGetLevel tests the GetLevel function.
103-
func TestGetLevel(t *testing.T) {
104-
logger := Logger{}
105-
assert.Equal(t, zerolog.InfoLevel, logger.GetLevel())
106-
}
107-
10816
// TestGetPlugins tests the GetPlugins function.
10917
func TestGetPlugins(t *testing.T) {
11018
plugin := Plugin{Name: "plugin1"}
@@ -117,18 +25,6 @@ func TestGetDefaultConfigFilePath(t *testing.T) {
11725
assert.Equal(t, GlobalConfigFilename, GetDefaultConfigFilePath(GlobalConfigFilename))
11826
}
11927

120-
// TestGetReadTimeout tests the GetReadTimeout function.
121-
func TestGetReadHeaderTimeout(t *testing.T) {
122-
metrics := Metrics{}
123-
assert.Equal(t, metrics.GetReadHeaderTimeout(), time.Duration(0))
124-
}
125-
126-
// TestGetTimeout tests the GetTimeout function of the metrics server.
127-
func TestGetTimeout(t *testing.T) {
128-
metrics := Metrics{}
129-
assert.Equal(t, metrics.GetTimeout(), time.Duration(0))
130-
}
131-
13228
// TestFilter tests the Filter function.
13329
func TestFilter(t *testing.T) {
13430
// Load config from the default config file.

config/getters_windows.go

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,7 @@
33

44
package config
55

6-
import "github.com/rs/zerolog"
7-
86
// GetSyslogPriority returns zero value for Windows.
97
func (l Logger) GetSyslogPriority() int {
108
return 0
119
}
12-
13-
// GetSystemLimits returns zero values for Windows.
14-
func (s Server) GetRLimits(logger zerolog.Logger) (uint64, uint64) {
15-
return 0, 0
16-
}

config/utils.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ func If[T any](predicate bool, truthy, falsy T) T {
99
}
1010

1111
// Exists returns true if key exists in map_, false otherwise.
12+
//
13+
//nolint:revive
1214
func Exists[T comparable, V any](map_ map[T]V, key T) bool {
1315
_, ok := map_[key]
1416
return ok

config/utils_test.go

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package config
2+
3+
import "testing"
4+
5+
func TestIf(t *testing.T) {
6+
if If(true, 1, 2) != 1 {
7+
t.Error("If(true, 1, 2) != 1")
8+
}
9+
if If(false, 1, 2) != 2 {
10+
t.Error("If(false, 1, 2) != 2")
11+
}
12+
}
13+
14+
func TestExists(t *testing.T) {
15+
m := map[string]int{"a": 1, "b": 2}
16+
if !Exists(m, "a") {
17+
t.Error("Exists(m, \"a\") != true")
18+
}
19+
if Exists(m, "c") {
20+
t.Error("Exists(m, \"c\") != false")
21+
}
22+
}

network/client.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -411,10 +411,12 @@ func (c *Client) LocalAddr() string {
411411
}
412412

413413
// Retry returns the retry object.
414+
//
415+
//nolint:revive
414416
func (c *Client) Retry() *Retry {
415-
if _, ok := c.retry.(*Retry); !ok {
417+
if retry, ok := c.retry.(*Retry); !ok {
416418
return nil
417419
} else {
418-
return c.retry.(*Retry)
420+
return retry
419421
}
420422
}

0 commit comments

Comments
 (0)