Skip to content

Commit e53c064

Browse files
warstrolowarstrolo
committed
Merge branch 'dev' into main
2 parents bb9ac43 + 6643eaf commit e53c064

File tree

3 files changed

+52
-51
lines changed

3 files changed

+52
-51
lines changed

‎log/main_test.go

+17-16
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,14 @@ func TestFlagCompareOneMoreThanTwo(t *testing.T) {
9898
// upper or eq flag => log should be displayed
9999
for _, flag := range tocompare_up {
100100
if log.FlagCompareOneMoreThanTwo(one, flag) != false {
101-
t.Fail()
101+
t.Errorf("%s was found more than %s", one, flag)
102102
}
103103
}
104104
// down => log should be discarded
105105
for _, flag := range tocompare_down {
106106
if log.FlagCompareOneMoreThanTwo(one, flag) != true {
107-
t.Fail()
107+
/// atm useless but can be used in the futur
108+
t.Errorf("%s was found less or eq than %s", one, flag)
108109
}
109110
}
110111
})
@@ -115,13 +116,13 @@ func TestFlagCompareOneMoreThanTwo(t *testing.T) {
115116
// upper or eq flag => log should be displayed
116117
for _, flag := range tocompare_up {
117118
if log.FlagCompareOneMoreThanTwo(one, flag) != false {
118-
t.Fail()
119+
t.Errorf("%s was found more than %s", one, flag)
119120
}
120121
}
121122
// down => log should be discarded
122123
for _, flag := range tocompare_down {
123124
if log.FlagCompareOneMoreThanTwo(one, flag) != true {
124-
t.Fail()
125+
t.Errorf("%s was found less or eq than %s", one, flag)
125126
}
126127
}
127128
})
@@ -132,13 +133,13 @@ func TestFlagCompareOneMoreThanTwo(t *testing.T) {
132133
// upper or eq flag => log should be displayed
133134
for _, flag := range tocompare_up {
134135
if log.FlagCompareOneMoreThanTwo(one, flag) != false {
135-
t.Fail()
136+
t.Errorf("%s was found more than %s", one, flag)
136137
}
137138
}
138139
// down => log should be discarded
139140
for _, flag := range tocompare_down {
140141
if log.FlagCompareOneMoreThanTwo(one, flag) != true {
141-
t.Fail()
142+
t.Errorf("%s was found less or eq than %s", one, flag)
142143
}
143144
}
144145
})
@@ -149,13 +150,13 @@ func TestFlagCompareOneMoreThanTwo(t *testing.T) {
149150
// upper or eq flag => log should be displayed
150151
for _, flag := range tocompare_up {
151152
if log.FlagCompareOneMoreThanTwo(one, flag) != false {
152-
t.Fail()
153+
t.Errorf("%s was found more than %s", one, flag)
153154
}
154155
}
155156
// down => log should be discarded
156157
for _, flag := range tocompare_down {
157158
if log.FlagCompareOneMoreThanTwo(one, flag) != true {
158-
t.Fail()
159+
t.Errorf("%s was found less or eq than %s", one, flag)
159160
}
160161
}
161162
})
@@ -166,13 +167,13 @@ func TestFlagCompareOneMoreThanTwo(t *testing.T) {
166167
// upper or eq flag => log should be displayed
167168
for _, flag := range tocompare_up {
168169
if log.FlagCompareOneMoreThanTwo(one, flag) != false {
169-
t.Fail()
170+
t.Errorf("%s was found more than %s", one, flag)
170171
}
171172
}
172173
// down => log should be discarded
173174
for _, flag := range tocompare_down {
174175
if log.FlagCompareOneMoreThanTwo(one, flag) != true {
175-
t.Fail()
176+
t.Errorf("%s was found less or eq than %s", one, flag)
176177
}
177178
}
178179
})
@@ -183,13 +184,13 @@ func TestFlagCompareOneMoreThanTwo(t *testing.T) {
183184
// upper or eq flag => log should be displayed
184185
for _, flag := range tocompare_up {
185186
if log.FlagCompareOneMoreThanTwo(one, flag) != false {
186-
t.Fail()
187+
t.Errorf("%s was found more than %s", one, flag)
187188
}
188189
}
189190
// down => log should be discarded
190191
for _, flag := range tocompare_down {
191192
if log.FlagCompareOneMoreThanTwo(one, flag) != true {
192-
t.Fail()
193+
t.Errorf("%s was found less or eq than %s", one, flag)
193194
}
194195
}
195196
})
@@ -200,13 +201,13 @@ func TestFlagCompareOneMoreThanTwo(t *testing.T) {
200201
// upper or eq flag => log should be displayed
201202
for _, flag := range tocompare_up {
202203
if log.FlagCompareOneMoreThanTwo(one, flag) != false {
203-
t.Fail()
204+
t.Errorf("%s was found more than %s", one, flag)
204205
}
205206
}
206207
// down => log should be discarded
207208
for _, flag := range tocompare_down {
208209
if log.FlagCompareOneMoreThanTwo(one, flag) != true {
209-
t.Fail()
210+
t.Errorf("%s was found less or eq than %s", one, flag)
210211
}
211212
}
212213
})
@@ -217,13 +218,13 @@ func TestFlagCompareOneMoreThanTwo(t *testing.T) {
217218
// upper or eq flag => log should be displayed
218219
for _, flag := range tocompare_up {
219220
if log.FlagCompareOneMoreThanTwo(one, flag) != false {
220-
t.Fail()
221+
t.Errorf("%s was found more eq than %s", one, flag)
221222
}
222223
}
223224
// down => log should be discarded
224225
for _, flag := range tocompare_down {
225226
if log.FlagCompareOneMoreThanTwo(one, flag) != true {
226-
t.Fail()
227+
t.Errorf("%s was found less or eq than %s", one, flag)
227228
}
228229
}
229230
})

‎loginstance/main_test.go

+28-28
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
)
1010

1111
type ConsoleWriterBack struct {
12-
logfunc func (string)
12+
logfunc func(string)
1313
}
1414

1515
func (console *ConsoleWriterBack) Debug(message string) {
@@ -27,7 +27,7 @@ func (console *ConsoleWriterBack) Error(message string) {
2727

2828
func TestLogInstance(t *testing.T) {
2929
var last_log string = "null"
30-
logfunc := func (message string) {
30+
logfunc := func(message string) {
3131
last_log = message
3232
}
3333
var logback writer.ConsoleWriterInterface = &ConsoleWriterBack{
@@ -43,36 +43,36 @@ func TestLogInstance(t *testing.T) {
4343
code := "OP-R403"
4444
message := "Rest API Error 403"
4545
logmgr.Log(product, service, location, level, code, message)
46-
if (last_log == "null") {
47-
t.Fail() // Log was not sended
46+
if last_log == "null" {
47+
t.Error("Log was not sended")
4848
}
4949
}
5050

51-
5251
func TestLogInstanceLevel(t *testing.T) {
5352
var last_log string = "null"
54-
logfunc := func (message string) {
53+
logfunc := func(message string) {
5554
last_log = message
56-
}
57-
var logback writer.ConsoleWriterInterface = &ConsoleWriterBack{
58-
logfunc: logfunc,
59-
}
60-
logwriter := writer.NewConsoleWriter(&logback)
61-
logmgr := loginstance.NewLogInstance(&logwriter, log.FlagDebug)
55+
}
56+
var logback writer.ConsoleWriterInterface = &ConsoleWriterBack{
57+
logfunc: logfunc,
58+
}
59+
logwriter := writer.NewConsoleWriter(&logback)
60+
logmgr := loginstance.NewLogInstance(&logwriter, log.FlagDebug)
6261

63-
product := "App"
64-
service := "Service"
65-
location := "EU01-D01-R01-N01"
66-
code := "OP-R403"
67-
message := "Rest API Error 403"
68-
level_not_pass := log.FlagVerbose
69-
level_pass := log.FlagError
70-
logmgr.Log(product, service, location, level_not_pass, code, message)
71-
if (last_log != "null") {
72-
t.Fail() // log was sended but should be filtered
73-
}
74-
logmgr.Log(product, service, location, level_pass, code, message)
75-
if (last_log == "null") {
76-
t.Fail() // log should be displayed
77-
}
78-
}
62+
product := "App"
63+
service := "Service"
64+
location := "EU01-D01-R01-N01"
65+
code := "OP-R403"
66+
message := "Rest API Error 403"
67+
level_not_pass := log.FlagVerbose
68+
level_pass := log.FlagError
69+
logmgr.Log(product, service, location, level_not_pass, code, message)
70+
if last_log != "null" {
71+
72+
t.Error("Log was sended but should be filtered") // log was sended but should be filtered
73+
}
74+
logmgr.Log(product, service, location, level_pass, code, message)
75+
if last_log == "null" {
76+
t.Error("Log was not sended ") // log should be displayed
77+
}
78+
}

‎writer/console_test.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func TestConsoleWriter(t *testing.T) {
4141
consolewriter.Write(logobj)
4242
val, err := logobj.ToJSONString()
4343
if debug != val || err != nil {
44-
t.Fail()
44+
t.Error("Log was not written")
4545
}
4646
})
4747

@@ -50,47 +50,47 @@ func TestConsoleWriter(t *testing.T) {
5050
consolewriter.Write(logobj)
5151
val, err := logobj.ToJSONString()
5252
if debug != val || err != nil {
53-
t.Fail()
53+
t.Error("Log was not written")
5454
}
5555
})
5656
t.Run("Test info write", func(t *testing.T) {
5757
logobj := log.CreateLog(product, service, location, log.FlagInfo, code, message)
5858
consolewriter.Write(logobj)
5959
val, err := logobj.ToJSONString()
6060
if info != val || err != nil {
61-
t.Fail()
61+
t.Error("Log was not written")
6262
}
6363
})
6464
t.Run("Test warn write", func(t *testing.T) {
6565
logobj := log.CreateLog(product, service, location, log.FlagWarn, code, message)
6666
consolewriter.Write(logobj)
6767
val, err := logobj.ToJSONString()
6868
if warn != val || err != nil {
69-
t.Fail()
69+
t.Error("Log was not written")
7070
}
7171
})
7272
t.Run("Test error write", func(t *testing.T) {
7373
logobj := log.CreateLog(product, service, location, log.FlagError, code, message)
7474
consolewriter.Write(logobj)
7575
val, err := logobj.ToJSONString()
7676
if errorval != val || err != nil {
77-
t.Fail()
77+
t.Error("Log was not written")
7878
}
7979
})
8080
t.Run("Test fatal write", func(t *testing.T) {
8181
logobj := log.CreateLog(product, service, location, log.FlagFatal, code, message)
8282
consolewriter.Write(logobj)
8383
val, err := logobj.ToJSONString()
8484
if errorval != val || err != nil {
85-
t.Fail()
85+
t.Error("Log was not written")
8686
}
8787
})
8888
t.Run("Test default write", func(t *testing.T) {
8989
logobj := log.CreateLog(product, service, location, "default", code, message)
9090
consolewriter.Write(logobj)
9191
val, err := logobj.ToJSONString()
9292
if debug != val || err != nil {
93-
t.Fail()
93+
t.Error("Log was not written")
9494
}
9595
})
9696

0 commit comments

Comments
 (0)