tequilaOS/platform_build_blueprint
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master' into merge

Browse source 
am: 3bbc581d99

Change-Id: I976aefa9ce61d3b6fc48f9730caf80113c3b98d9
This commit is contained in:
Jiyong Park 2019-11-18 20:41:09 -08:00 committed by android-build-merger
commit 62aa0764a6
2 changed files with 138 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
proptools/extend.go
View file

@ -150,6 +150,7 @@ type Order int
const ( const (
Append Order = iota Append Order = iota
Prepend Prepend
Replace
) )
type ExtendPropertyFilterFunc func(property string, type ExtendPropertyFilterFunc func(property string,
@ -172,6 +173,12 @@ func OrderPrepend(property string,
return Prepend, nil return Prepend, nil
} }
func OrderReplace(property string,
dstField, srcField reflect.StructField,
dstValue, srcValue interface{}) (Order, error) {
return Replace, nil
}
type ExtendPropertyError struct { type ExtendPropertyError struct {
Err error Err error
Property string Property string
@ -428,9 +435,12 @@ func ExtendBasicType(dstFieldValue, srcFieldValue reflect.Value, order Order) {
if prepend { if prepend {
newSlice = reflect.AppendSlice(newSlice, srcFieldValue) newSlice = reflect.AppendSlice(newSlice, srcFieldValue)
newSlice = reflect.AppendSlice(newSlice, dstFieldValue) newSlice = reflect.AppendSlice(newSlice, dstFieldValue)
} else { } else if order == Append {
newSlice = reflect.AppendSlice(newSlice, dstFieldValue) newSlice = reflect.AppendSlice(newSlice, dstFieldValue)
newSlice = reflect.AppendSlice(newSlice, srcFieldValue) newSlice = reflect.AppendSlice(newSlice, srcFieldValue)
} else {
// replace
newSlice = reflect.AppendSlice(newSlice, srcFieldValue)
} }
dstFieldValue.Set(newSlice) dstFieldValue.Set(newSlice)
case reflect.Ptr: case reflect.Ptr:

169
proptools/extend_test.go
View file

@ -23,12 +23,12 @@ import (
) )
type appendPropertyTestCase struct { type appendPropertyTestCase struct {
in1 interface{} in1 interface{}
in2 interface{} in2 interface{}
out interface{} out interface{}
prepend bool order Order // default is Append
filter ExtendPropertyFilterFunc filter ExtendPropertyFilterFunc
err error err error
} }
func appendPropertiesTestCases() []appendPropertyTestCase { func appendPropertiesTestCases() []appendPropertyTestCase {
@ -76,7 +76,7 @@ func appendPropertiesTestCases() []appendPropertyTestCase {
B3: true, B3: true,
B4: false, B4: false,
}, },
prepend: true, order: Prepend,
}, },
{ {
// Append strings // Append strings
@ -101,7 +101,7 @@ func appendPropertiesTestCases() []appendPropertyTestCase {
out: &struct{ S string }{ out: &struct{ S string }{
S: "string2string1", S: "string2string1",
}, },
prepend: true, order: Prepend,
}, },
{ {
// Append pointer to bool // Append pointer to bool
@ -174,7 +174,7 @@ func appendPropertiesTestCases() []appendPropertyTestCase {
B8: BoolPtr(false), B8: BoolPtr(false),
B9: BoolPtr(false), B9: BoolPtr(false),
}, },
prepend: true, order: Prepend,
}, },
{ {
// Append pointer to integer // Append pointer to integer
@ -226,7 +226,7 @@ func appendPropertiesTestCases() []appendPropertyTestCase {
I2: Int64Ptr(33), I2: Int64Ptr(33),
I3: nil, I3: nil,
}, },
prepend: true, order: Prepend,
}, },
{ {
// Append pointer to strings // Append pointer to strings
@ -261,7 +261,7 @@ func appendPropertiesTestCases() []appendPropertyTestCase {
S3: StringPtr("string4"), S3: StringPtr("string4"),
S4: nil, S4: nil,
}, },
prepend: true, order: Prepend,
}, },
{ {
// Append slice // Append slice
@ -286,7 +286,20 @@ func appendPropertiesTestCases() []appendPropertyTestCase {
out: &struct{ S []string }{ out: &struct{ S []string }{
S: []string{"string2", "string1"}, S: []string{"string2", "string1"},
}, },
prepend: true, order: Prepend,
},
{
// Replace slice
in1: &struct{ S []string }{
S: []string{"string1"},
},
in2: &struct{ S []string }{
S: []string{"string2"},
},
out: &struct{ S []string }{
S: []string{"string2"},
},
order: Replace,
}, },
{ {
// Append empty slice // Append empty slice
@ -317,7 +330,23 @@ func appendPropertiesTestCases() []appendPropertyTestCase {
S1: []string{"string1"}, S1: []string{"string1"},
S2: []string{"string2"}, S2: []string{"string2"},
}, },
prepend: true, order: Prepend,
},
{
// Replace empty slice
in1: &struct{ S1, S2 []string }{
S1: []string{"string1"},
S2: []string{},
},
in2: &struct{ S1, S2 []string }{
S1: []string{},
S2: []string{"string2"},
},
out: &struct{ S1, S2 []string }{
S1: []string{},
S2: []string{"string2"},
},
order: Replace,
}, },
{ {
// Append nil slice // Append nil slice
@ -346,7 +375,41 @@ func appendPropertiesTestCases() []appendPropertyTestCase {
S2: []string{"string2"}, S2: []string{"string2"},
S3: nil, S3: nil,
}, },
prepend: true, order: Prepend,
},
{
// Replace nil slice
in1: &struct{ S1, S2, S3 []string }{
S1: []string{"string1"},
},
in2: &struct{ S1, S2, S3 []string }{
S2: []string{"string2"},
},
out: &struct{ S1, S2, S3 []string }{
S1: []string{"string1"},
S2: []string{"string2"},
S3: nil,
},
order: Replace,
},
{
// Replace embedded slice
in1: &struct{ S *struct{ S1 []string } }{
S: &struct{ S1 []string }{
S1: []string{"string1"},
},
},
in2: &struct{ S *struct{ S1 []string } }{
S: &struct{ S1 []string }{
S1: []string{"string2"},
},
},
out: &struct{ S *struct{ S1 []string } }{
S: &struct{ S1 []string }{
S1: []string{"string2"},
},
},
order: Replace,
}, },
{ {
// Append pointer // Append pointer
@ -383,7 +446,7 @@ func appendPropertiesTestCases() []appendPropertyTestCase {
S: "string2string1", S: "string2string1",
}, },
}, },
prepend: true, order: Prepend,
}, },
{ {
// Append interface // Append interface
@ -420,7 +483,7 @@ func appendPropertiesTestCases() []appendPropertyTestCase {
S: "string2string1", S: "string2string1",
}, },
}, },
prepend: true, order: Prepend,
}, },
{ {
// Unexported field // Unexported field
@ -938,12 +1001,16 @@ func TestAppendProperties(t *testing.T) {
var err error var err error
var testType string var testType string
if testCase.prepend { switch testCase.order {
testType = "prepend" case Append:
err = PrependProperties(got, testCase.in2, testCase.filter)
} else {
testType = "append" testType = "append"
err = AppendProperties(got, testCase.in2, testCase.filter) err = AppendProperties(got, testCase.in2, testCase.filter)
case Prepend:
testType = "prepend"
err = PrependProperties(got, testCase.in2, testCase.filter)
case Replace:
testType = "replace"
err = ExtendProperties(got, testCase.in2, testCase.filter, OrderReplace)
} }
check(t, testType, testString, got, err, testCase.out, testCase.err) check(t, testType, testString, got, err, testCase.out, testCase.err)
@ -961,17 +1028,24 @@ func TestExtendProperties(t *testing.T) {
order := func(property string, order := func(property string,
dstField, srcField reflect.StructField, dstField, srcField reflect.StructField,
dstValue, srcValue interface{}) (Order, error) { dstValue, srcValue interface{}) (Order, error) {
if testCase.prepend { switch testCase.order {
return Prepend, nil case Append:
} else {
return Append, nil return Append, nil
case Prepend:
return Prepend, nil
case Replace:
return Replace, nil
} }
return Append, errors.New("unknown order")
} }
if testCase.prepend { switch testCase.order {
case Append:
testType = "prepend" testType = "prepend"
} else { case Prepend:
testType = "append" testType = "append"
case Replace:
testType = "replace"
} }
err = ExtendProperties(got, testCase.in2, testCase.filter, order) err = ExtendProperties(got, testCase.in2, testCase.filter, order)
@ -981,12 +1055,12 @@ func TestExtendProperties(t *testing.T) {
} }
type appendMatchingPropertiesTestCase struct { type appendMatchingPropertiesTestCase struct {
in1 []interface{} in1 []interface{}
in2 interface{} in2 interface{}
out []interface{} out []interface{}
prepend bool order Order // default is Append
filter ExtendPropertyFilterFunc filter ExtendPropertyFilterFunc
err error err error
} }
func appendMatchingPropertiesTestCases() []appendMatchingPropertiesTestCase { func appendMatchingPropertiesTestCases() []appendMatchingPropertiesTestCase {
@ -1014,7 +1088,7 @@ func appendMatchingPropertiesTestCases() []appendMatchingPropertiesTestCase {
out: []interface{}{&struct{ S string }{ out: []interface{}{&struct{ S string }{
S: "string2string1", S: "string2string1",
}}, }},
prepend: true, order: Prepend,
}, },
{ {
// Append all // Append all
@ -1264,12 +1338,16 @@ func TestAppendMatchingProperties(t *testing.T) {
var err error var err error
var testType string var testType string
if testCase.prepend { switch testCase.order {
testType = "prepend matching" case Append:
err = PrependMatchingProperties(got, testCase.in2, testCase.filter) testType = "append"
} else {
testType = "append matching"
err = AppendMatchingProperties(got, testCase.in2, testCase.filter) err = AppendMatchingProperties(got, testCase.in2, testCase.filter)
case Prepend:
testType = "prepend"
err = PrependMatchingProperties(got, testCase.in2, testCase.filter)
case Replace:
testType = "replace"
err = ExtendMatchingProperties(got, testCase.in2, testCase.filter, OrderReplace)
} }
check(t, testType, testString, got, err, testCase.out, testCase.err) check(t, testType, testString, got, err, testCase.out, testCase.err)
@ -1287,17 +1365,24 @@ func TestExtendMatchingProperties(t *testing.T) {
order := func(property string, order := func(property string,
dstField, srcField reflect.StructField, dstField, srcField reflect.StructField,
dstValue, srcValue interface{}) (Order, error) { dstValue, srcValue interface{}) (Order, error) {
if testCase.prepend { switch testCase.order {
return Prepend, nil case Append:
} else {
return Append, nil return Append, nil
case Prepend:
return Prepend, nil
case Replace:
return Replace, nil
} }
return Append, errors.New("unknown order")
} }
if testCase.prepend { switch testCase.order {
case Append:
testType = "prepend matching" testType = "prepend matching"
} else { case Prepend:
testType = "append matching" testType = "append matching"
case Replace:
testType = "replace matching"
} }
err = ExtendMatchingProperties(got, testCase.in2, testCase.filter, order) err = ExtendMatchingProperties(got, testCase.in2, testCase.filter, order)