eosswedenorg/antelope-api-healthcheck
1
0
Fork 0
mirror of https://github.com/eosswedenorg/antelope-api-healthcheck synced 2026-06-20 09:56:49 +02:00
Code Releases Activity

Fix code formatting

Browse source
This commit is contained in:
Henrik Hautakoski 2022-11-23 15:52:19 +01:00
parent b0e5b455ca
commit adb1ad3c6d
No known key found for this signature in database
GPG key ID: 608414D93E862CCD
21 changed files with 884 additions and 950 deletions
Download patch file Download diff file Expand all files Collapse all files

13
internal/utils/json.go
View file

@ -1,4 +1,3 @@
package utils
// JsonGetInt64
@ -8,10 +7,10 @@ package utils
// if the type assertion fails, the function defaults 0 (zero).
// ---------------------------------------------------------
func JsonGetInt64(input interface{}) (int64) {
v, res := input.(float64)
if res {
return (int64) (v)
}
return 0
func JsonGetInt64(input interface{}) int64 {
v, res := input.(float64)
if res {
return (int64)(v)
}
return 0
}

32
internal/utils/json_test.go
View file

@ -3,20 +3,20 @@ package utils
import "testing"
func TestJsonGetInt64(t *testing.T) {
tests := []struct {
name string
input interface{}
want int64
}{
{"String", "test", 0 },
{"Int", 1234, 0 },
{"Float", float64(1234), 1234 },
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if got := JsonGetInt64(tt.input); got != tt.want {
t.Errorf("JsonGetInt64() = %v, want %v", got, tt.want)
}
})
}
tests := []struct {
name string
input interface{}
want int64
}{
{"String", "test", 0},
{"Int", 1234, 0},
{"Float", float64(1234), 1234},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if got := JsonGetInt64(tt.input); got != tt.want {
t.Errorf("JsonGetInt64() = %v, want %v", got, tt.want)
}
})
}
}

24
internal/utils/parse_log_formatter.go
View file

@ -1,20 +1,18 @@
package utils
import (
log "github.com/inconshreveable/log15"
log "github.com/inconshreveable/log15"
)
func ParseLogFormatter(name string) log.Format {
switch name {
case "logfmt" :
return log.LogfmtFormat()
case "json" :
return log.JsonFormat()
case "json-pretty" :
return log.JsonFormatEx(true, true)
default :
return log.TerminalFormat()
}
switch name {
case "logfmt":
return log.LogfmtFormat()
case "json":
return log.JsonFormat()
case "json-pretty":
return log.JsonFormatEx(true, true)
default:
return log.TerminalFormat()
}
}

42
internal/utils/parse_log_formatter_test.go
View file

@ -1,29 +1,29 @@
package utils
import (
"reflect"
"testing"
"reflect"
"testing"
log "github.com/inconshreveable/log15"
log "github.com/inconshreveable/log15"
)
func Test_ParseLogFormatter(t *testing.T) {
tests := []struct {
name string
arg string
want log.Format
}{
{ "Default", "", log.TerminalFormat() },
{ "LogFmt", "logfmt", log.LogfmtFormat() },
{ "Json", "json", log.JsonFormat() },
{ "JsonPretty", "json-pretty", log.JsonFormat() },
{ "Unknown", "unknown", log.TerminalFormat() },
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if got := ParseLogFormatter(tt.arg); reflect.ValueOf(got).Pointer() != reflect.ValueOf(tt.want).Pointer() {
t.Errorf("parseLogFormatter() = %v, want %v", got, tt.want)
}
})
}
tests := []struct {
name string
arg string
want log.Format
}{
{"Default", "", log.TerminalFormat()},
{"LogFmt", "logfmt", log.LogfmtFormat()},
{"Json", "json", log.JsonFormat()},
{"JsonPretty", "json-pretty", log.JsonFormat()},
{"Unknown", "unknown", log.TerminalFormat()},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if got := ParseLogFormatter(tt.arg); reflect.ValueOf(got).Pointer() != reflect.ValueOf(tt.want).Pointer() {
t.Errorf("parseLogFormatter() = %v, want %v", got, tt.want)
}
})
}
}

16
internal/utils/time.go
View file

@ -1,22 +1,20 @@
package utils
import (
"time"
"time"
)
type Time struct {
ts time.Time
ts time.Time
}
func (t *Time) SetTime(value time.Time) {
t.ts = value
t.ts = value
}
func (t Time) GetTime() time.Time {
if ! t.ts.IsZero() {
return t.ts
}
return time.Now().In(time.UTC)
if !t.ts.IsZero() {
return t.ts
}
return time.Now().In(time.UTC)
}

24
internal/utils/time_test.go
View file

@ -1,26 +1,24 @@
package utils
import (
"time"
"testing"
"github.com/stretchr/testify/assert"
"testing"
"time"
"github.com/stretchr/testify/assert"
)
func TestTimeGetTimeWithDefaultValue(t *testing.T) {
var ts Time
var ts Time
// Assert that time is NOW (+-10 seconds)
assert.InDelta(t, ts.GetTime().Unix(), time.Now().In(time.UTC).Unix(), float64(10))
// Assert that time is NOW (+-10 seconds)
assert.InDelta(t, ts.GetTime().Unix(), time.Now().In(time.UTC).Unix(), float64(10))
}
func TestTimeGetTimeWithSetTime(t *testing.T) {
var ts Time
var ts Time
expected := time.Unix(1048722042, 500)
ts.SetTime(expected)
expected := time.Unix(1048722042, 500)
ts.SetTime(expected)
assert.Equal(t, expected, ts.GetTime())
assert.Equal(t, expected, ts.GetTime())
}