Compare commits

..

4 Commits

Author SHA1 Message Date
peze 6192dca562 fix arr append 2025-03-14 16:27:38 +08:00
peze c032b7c3e5 compatible with old err 2025-03-12 15:51:16 +08:00
peze 171239d819 compatible with old err 2025-03-11 21:08:20 +08:00
peze 4f3624270b add to writer 2025-03-11 21:08:20 +08:00
5 changed files with 136 additions and 8 deletions
+22 -2
View File
@@ -294,8 +294,28 @@ func ConcatArr(arr1 interface{}, arr2 interface{}) interface{} {
}
// ArrAppend inserts a new pointer at a specified index in a pointer array.
func ArrAppend(arr interface{}, value interface{}) {
ArrPush(arr, value)
func ArrAppend(arr interface{}, value interface{}, index int) {
arrV := reflect.ValueOf(arr)
if arrV.Kind() != reflect.Ptr || arrV.Elem().Kind() != reflect.Slice {
return
}
sliceV := arrV.Elem()
if index < 0 || index > sliceV.Len() {
return
}
valueV := reflect.ValueOf(value)
// 创建一个容纳新值的切片
newSlice := reflect.Append(sliceV, reflect.Zero(sliceV.Type().Elem()))
reflect.Copy(newSlice.Slice(index+1, newSlice.Len()), newSlice.Slice(index, newSlice.Len()-1))
newSlice.Index(index).Set(valueV)
// 更新原始切片
sliceV.Set(newSlice)
return
}
// ArrRemove removes an element from the array
+48
View File
@@ -405,6 +405,54 @@ func TestConcatArr(t *testing.T) {
}
}
func TestArrAppend(t *testing.T) {
// 测试用例1:插入中间位置
t.Run("Append to middle of an array", func(t *testing.T) {
numbers := []*int{new(int), new(int), new(int)}
for i := range numbers {
*numbers[i] = i + 1
}
// 将 9 插入到索引 1
valueToInsert := new(int)
*valueToInsert = 9
// 期望的结果
expected := []*int{new(int), new(int), new(int), new(int)}
*expected[0], *expected[1], *expected[2], *expected[3] = 1, 9, 2, 3
defer func() {
if !reflect.DeepEqual(numbers, expected) {
t.Errorf("Expected %+v, but got %+v", expected, numbers)
}
}()
ArrAppend(&numbers, valueToInsert, 1)
})
// 测试用例2: 尝试在越界处插入
t.Run("Index out of bounds", func(t *testing.T) {
numbers := []*int{new(int), new(int), new(int)}
for i := range numbers {
*numbers[i] = i + 1
}
defer func() {
// Defer 检查:越界情况下,数组应保持不变
expected := []*int{new(int), new(int), new(int)}
*expected[0], *expected[1], *expected[2] = 1, 2, 3
if !reflect.DeepEqual(numbers, expected) {
t.Errorf("Index out of bounds should not modify array, but got %+v", numbers)
}
}()
valueToInsert := new(int)
*valueToInsert = 9
ArrAppend(&numbers, valueToInsert, 10) // 超出范围
})
}
func TestArrRemove(t *testing.T) {
// Create test data for string pointer array
str1 := "A"
+28 -2
View File
@@ -24,8 +24,8 @@ import (
"time"
"github.com/alibabacloud-go/debug/debug"
"github.com/alibabacloud-go/tea/utils"
util "github.com/alibabacloud-go/tea-utils/v2/service"
"github.com/alibabacloud-go/tea/utils"
"golang.org/x/net/proxy"
)
@@ -202,7 +202,7 @@ func getDaraClient(tag string) *daraClient {
// DoRequest is used send request to server
func DoRequest(request *Request, runtimeObject *RuntimeObject) (response *Response, err error) {
if(runtimeObject == nil) {
if runtimeObject == nil {
runtimeObject = &RuntimeObject{}
}
fieldMap := make(map[string]string)
@@ -429,6 +429,32 @@ func ToReader(obj interface{}) io.Reader {
}
}
func ToWriter(obj interface{}) io.Writer {
switch obj.(type) {
case string:
var buf bytes.Buffer
buf.WriteString(obj.(string))
return &buf
case *string:
var buf bytes.Buffer
tmp := obj.(*string)
buf.WriteString(*tmp)
return &buf
case []byte:
var buf bytes.Buffer
buf.Write(obj.([]byte))
return &buf
case io.Writer:
return obj.(io.Writer)
case *bytes.Buffer:
return obj.(*bytes.Buffer)
case *os.File:
return obj.(*os.File)
default:
panic("Invalid Writer. Please provide a valid Writer.")
}
}
func ToString(val interface{}) string {
switch v := val.(type) {
case []byte:
+36
View File
@@ -735,6 +735,42 @@ func Test_ToReader(t *testing.T) {
utils.AssertEqual(t, "", string(byt))
}
func Test_ToWriter(t *testing.T) {
str := "abc"
writer := ToWriter(str).(*bytes.Buffer)
utils.AssertEqual(t, "abc", writer.String())
strPtr := new(string)
*strPtr = "def"
writer = ToWriter(strPtr).(*bytes.Buffer)
utils.AssertEqual(t, "def", writer.String())
bytesData := []byte("ghi")
writer = ToWriter(bytesData).(*bytes.Buffer)
utils.AssertEqual(t, "ghi", writer.String())
buffer := new(bytes.Buffer)
writer = ToWriter(buffer).(*bytes.Buffer)
utils.AssertEqual(t, buffer, writer)
fileWriter := ToWriter(os.Stdout)
utils.AssertEqual(t, os.Stdout, fileWriter)
var buf bytes.Buffer
writer2 := ToWriter(&buf)
writer2.Write([]byte("test"))
utils.AssertEqual(t, "test", buf.String())
// Test a non-writer to trigger panic
defer func() {
if r := recover(); r != nil {
utils.AssertEqual(t, "Invalid Writer. Please provide a valid Writer.", r)
}
}()
num := 10
ToWriter(num) // This should cause a panic
}
func Test_ToString(t *testing.T) {
str := ToString(10)
utils.AssertEqual(t, "10", str)
+2 -4
View File
@@ -41,7 +41,7 @@ type CastError struct {
Message *string
}
func TeaSDKError(err error) *tea.SDKError {
func TeaSDKError(err error) error {
if(err == nil) {
return nil
}
@@ -72,9 +72,7 @@ func TeaSDKError(err error) *tea.SDKError {
})
}
return tea.NewSDKError(map[string]interface{}{
"message": err.Error(),
})
return err
}
// NewSDKError is used for shortly create SDKError object