Skip to content

Commit

Permalink
revert
Browse files Browse the repository at this point in the history
  • Loading branch information
Fenny committed Feb 8, 2024
1 parent b127e3b commit b5c8482
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 76 deletions.
9 changes: 2 additions & 7 deletions convert.go
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,8 @@ func ByteSize(bytes uint64) string {

// ToString Change arg to string
func ToString(arg any, timeFormat ...string) string {
switch v := arg.(type) {
var tmp = reflect.Indirect(reflect.ValueOf(arg)).Interface()
switch v := tmp.(type) {
case int:
return strconv.Itoa(v)
case int8:
Expand Down Expand Up @@ -133,12 +134,6 @@ func ToString(arg any, timeFormat ...string) string {
case fmt.Stringer:
return v.String()
default:
// Check if the type is a pointer by using reflection
rv := reflect.ValueOf(arg)
if rv.Kind() == reflect.Ptr && !rv.IsNil() {
// Dereference the pointer and recursively call ToString
return ToString(rv.Elem().Interface(), timeFormat...)
}
return ""
}
}
78 changes: 9 additions & 69 deletions convert_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
package utils

import (
"reflect"
"testing"
"time"

"github.com/stretchr/testify/require"
)
Expand Down Expand Up @@ -70,76 +68,18 @@ func Test_CopyString(t *testing.T) {

func Test_ToString(t *testing.T) {
t.Parallel()

tests := []struct {
input interface{}
expected string
}{
{[]byte("Hello, World!"), "Hello, World!"},
{true, "true"},
{uint(100), "100"},
{int(42), "42"},
{int8(42), "42"},
{int16(42), "42"},
{int32(42), "42"},
{int64(42), "42"},
{uint8(100), "100"},
{uint16(100), "100"},
{uint32(100), "100"},
{uint64(100), "100"},
{"test string", "test string"},
{float32(3.14), "3.14"},
{float64(3.14159), "3.14159"},
{time.Date(2000, 1, 1, 12, 34, 56, 0, time.UTC), "2000-01-01 12:34:56"},
{struct{ Name string }{"John"}, ""}, // Assuming default case returns an empty string
}

for _, tc := range tests {
t.Run(reflect.TypeOf(tc.input).String(), func(t *testing.T) {
res := ToString(tc.input)
require.Equal(t, tc.expected, res)
})
}

// Testing pointer to int
intPtr := 42
testsPtr := []struct {
input interface{}
expected string
}{
{&intPtr, "42"},
}
for _, tc := range testsPtr {
t.Run("pointer to "+reflect.TypeOf(tc.input).Elem().String(), func(t *testing.T) {
res := ToString(tc.input)
require.Equal(t, tc.expected, res)
})
}
res := ToString([]byte("Hello, World!"))
require.Equal(t, "Hello, World!", res)
res = ToString(true)
require.Equal(t, "true", res)
res = ToString(uint(100))
require.Equal(t, "100", res)
}

// go test -v -run=^$ -bench=ToString -benchmem -count=4
// go test -v -run=^$ -bench=ToString -benchmem -count=2
func Benchmark_ToString(b *testing.B) {
values := []interface{}{
42,
int8(42),
int16(42),
int32(42),
int64(42),
uint(42),
uint8(42),
uint16(42),
uint32(42),
uint64(42),
"Hello, World!",
[]byte("Hello, World!"),
true,
float32(3.14),
float64(3.14),
time.Now(),
}
hello := []byte("Hello, World!")
for n := 0; n < b.N; n++ {
for _, value := range values {
_ = ToString(value)
}
ToString(hello)
}
}

0 comments on commit b5c8482

Please sign in to comment.