Skip to content

Commit a2ae213

Browse files
committed
refactor: remove unimplement module; test bool and number
1 parent 17ce91c commit a2ae213

File tree

8 files changed

+175
-78
lines changed

8 files changed

+175
-78
lines changed

gox/defaultx/boolx.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
// DefaultIfError if error use false
2525
func DefaultIfError(value bool, err error) bool {
2626
if err != nil {
27-
log.Fatalln(err)
27+
log.Println(err)
2828
return false
2929
}
3030
return value

gox/encodingx/encodingx.go renamed to gox/defaultx/boolx_test.go

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,33 @@
1515
* limitations under the License.
1616
*/
1717

18-
package encodingx
18+
package defaultx
19+
20+
import "testing"
21+
22+
func TestDefaultIfError(t *testing.T) {
23+
type args struct {
24+
value bool
25+
err error
26+
}
27+
tests := []struct {
28+
name string
29+
args args
30+
want bool
31+
}{
32+
{
33+
args: args{
34+
value: true,
35+
err: nil,
36+
},
37+
want: true,
38+
},
39+
}
40+
for _, tt := range tests {
41+
t.Run(tt.name, func(t *testing.T) {
42+
if got := DefaultIfError(tt.args.value, tt.args.err); got != tt.want {
43+
t.Errorf("DefaultIfError() = %v, want %v", got, tt.want)
44+
}
45+
})
46+
}
47+
}

gox/defaultx/number.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import "log"
2222
// DefaultComplexIfError if error use defaultValue
2323
func DefaultComplexIfError(err error, value complex128, defaultValue complex128) complex128 {
2424
if err != nil {
25-
log.Fatalln(err)
25+
log.Println(err)
2626
return defaultValue
2727
}
2828
return value
@@ -31,7 +31,7 @@ func DefaultComplexIfError(err error, value complex128, defaultValue complex128)
3131
// DefaultFloat64IfError if error use defaultValue
3232
func DefaultFloat64IfError(err error, value float64, defaultValue float64) float64 {
3333
if err != nil {
34-
log.Fatalln(err)
34+
log.Println(err)
3535
return defaultValue
3636
}
3737
return value
@@ -40,7 +40,7 @@ func DefaultFloat64IfError(err error, value float64, defaultValue float64) float
4040
// DefaultIntIfError if error use defaultValue
4141
func DefaultIntIfError(err error, value int, defaultValue int) int {
4242
if err != nil {
43-
log.Fatalln(err)
43+
log.Println(err)
4444
return defaultValue
4545
}
4646
return value
@@ -49,7 +49,7 @@ func DefaultIntIfError(err error, value int, defaultValue int) int {
4949
// DefaultUint64IfError if error use defaultValue
5050
func DefaultUint64IfError(err error, value uint64, defaultValue uint64) uint64 {
5151
if err != nil {
52-
log.Fatalln(err)
52+
log.Println(err)
5353
return defaultValue
5454
}
5555
return value

gox/defaultx/number_test.go

Lines changed: 140 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,140 @@
1+
/*
2+
* Copyright (c) 2022, OpeningO
3+
* All rights reserved.
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
18+
package defaultx
19+
20+
import (
21+
"testing"
22+
23+
"github.com/openingo/godkits/gox/errorsx"
24+
)
25+
26+
func TestDefaultComplexIfError(t *testing.T) {
27+
type args struct {
28+
err error
29+
value complex128
30+
defaultValue complex128
31+
}
32+
tests := []struct {
33+
name string
34+
args args
35+
want complex128
36+
}{
37+
{
38+
args: args{
39+
err: nil,
40+
value: 123,
41+
defaultValue: 123,
42+
},
43+
want: 123,
44+
},
45+
}
46+
for _, tt := range tests {
47+
t.Run(tt.name, func(t *testing.T) {
48+
if got := DefaultComplexIfError(tt.args.err, tt.args.value, tt.args.defaultValue); got != tt.want {
49+
t.Errorf("DefaultComplexIfError() = %v, want %v", got, tt.want)
50+
}
51+
})
52+
}
53+
}
54+
55+
func TestDefaultFloat64IfError(t *testing.T) {
56+
type args struct {
57+
err error
58+
value float64
59+
defaultValue float64
60+
}
61+
tests := []struct {
62+
name string
63+
args args
64+
want float64
65+
}{
66+
{
67+
args: args{
68+
err: errorsx.Err("error"),
69+
value: 1.12,
70+
defaultValue: 0.123,
71+
},
72+
want: 0.123,
73+
},
74+
}
75+
for _, tt := range tests {
76+
t.Run(tt.name, func(t *testing.T) {
77+
if got := DefaultFloat64IfError(tt.args.err, tt.args.value, tt.args.defaultValue); got != tt.want {
78+
t.Errorf("DefaultFloat64IfError() = %v, want %v", got, tt.want)
79+
}
80+
})
81+
}
82+
}
83+
84+
func TestDefaultIntIfError(t *testing.T) {
85+
type args struct {
86+
err error
87+
value int
88+
defaultValue int
89+
}
90+
tests := []struct {
91+
name string
92+
args args
93+
want int
94+
}{
95+
{
96+
args: args{
97+
err: nil,
98+
value: 123,
99+
defaultValue: 123,
100+
},
101+
want: 123,
102+
},
103+
}
104+
for _, tt := range tests {
105+
t.Run(tt.name, func(t *testing.T) {
106+
if got := DefaultIntIfError(tt.args.err, tt.args.value, tt.args.defaultValue); got != tt.want {
107+
t.Errorf("DefaultIntIfError() = %v, want %v", got, tt.want)
108+
}
109+
})
110+
}
111+
}
112+
113+
func TestDefaultUint64IfError(t *testing.T) {
114+
type args struct {
115+
err error
116+
value uint64
117+
defaultValue uint64
118+
}
119+
tests := []struct {
120+
name string
121+
args args
122+
want uint64
123+
}{
124+
{
125+
args: args{
126+
err: nil,
127+
value: 123,
128+
defaultValue: 123,
129+
},
130+
want: 123,
131+
},
132+
}
133+
for _, tt := range tests {
134+
t.Run(tt.name, func(t *testing.T) {
135+
if got := DefaultUint64IfError(tt.args.err, tt.args.value, tt.args.defaultValue); got != tt.want {
136+
t.Errorf("DefaultUint64IfError() = %v, want %v", got, tt.want)
137+
}
138+
})
139+
}
140+
}

gox/mapx/mapx.go

Lines changed: 0 additions & 18 deletions
This file was deleted.

gox/number/number.go

Lines changed: 0 additions & 18 deletions
This file was deleted.

gox/timex/timex.go

Lines changed: 0 additions & 18 deletions
This file was deleted.

gox/unicodex/unicodex.go

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)