diff options
| author | 2020-10-07 17:58:00 +0000 | |
|---|---|---|
| committer | 2020-10-07 17:58:00 +0000 | |
| commit | 43159bd1b7c99790d84fdedda09db3701d466f30 (patch) | |
| tree | 35345376d9aa3db8fde6b578017b99894a2c01ea /android/apex_test.go | |
| parent | a87ea4587da10cc9da000d4ea4b11b1aa7806e7a (diff) | |
| parent | 56a8321c210bf73c7b9f177849ff4a6b6192d237 (diff) | |
Merge "Remove global state from apex modules"
Diffstat (limited to 'android/apex_test.go')
| -rw-r--r-- | android/apex_test.go | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/android/apex_test.go b/android/apex_test.go index dd372f792..512b50f96 100644 --- a/android/apex_test.go +++ b/android/apex_test.go @@ -29,10 +29,10 @@ func Test_mergeApexVariations(t *testing.T) { { name: "single", in: []ApexInfo{ - {"foo", "current", false, nil, []string{"foo"}}, + {"foo", "current", false, nil, []string{"foo"}, nil}, }, wantMerged: []ApexInfo{ - {"apex10000", "current", false, nil, []string{"foo"}}, + {"apex10000", "current", false, nil, []string{"foo"}, nil}, }, wantAliases: [][2]string{ {"foo", "apex10000"}, @@ -41,12 +41,11 @@ func Test_mergeApexVariations(t *testing.T) { { name: "merge", in: []ApexInfo{ - {"foo", "current", false, SdkRefs{{"baz", "1"}}, []string{"foo"}}, - {"bar", "current", false, SdkRefs{{"baz", "1"}}, []string{"bar"}}, + {"foo", "current", false, SdkRefs{{"baz", "1"}}, []string{"foo"}, nil}, + {"bar", "current", false, SdkRefs{{"baz", "1"}}, []string{"bar"}, nil}, }, wantMerged: []ApexInfo{ - {"apex10000_baz_1", "current", false, SdkRefs{{"baz", "1"}}, []string{"bar", "foo"}}, - }, + {"apex10000_baz_1", "current", false, SdkRefs{{"baz", "1"}}, []string{"bar", "foo"}, nil}}, wantAliases: [][2]string{ {"bar", "apex10000_baz_1"}, {"foo", "apex10000_baz_1"}, @@ -55,12 +54,12 @@ func Test_mergeApexVariations(t *testing.T) { { name: "don't merge version", in: []ApexInfo{ - {"foo", "current", false, nil, []string{"foo"}}, - {"bar", "30", false, nil, []string{"bar"}}, + {"foo", "current", false, nil, []string{"foo"}, nil}, + {"bar", "30", false, nil, []string{"bar"}, nil}, }, wantMerged: []ApexInfo{ - {"apex30", "30", false, nil, []string{"bar"}}, - {"apex10000", "current", false, nil, []string{"foo"}}, + {"apex30", "30", false, nil, []string{"bar"}, nil}, + {"apex10000", "current", false, nil, []string{"foo"}, nil}, }, wantAliases: [][2]string{ {"bar", "apex30"}, @@ -70,11 +69,11 @@ func Test_mergeApexVariations(t *testing.T) { { name: "merge updatable", in: []ApexInfo{ - {"foo", "current", false, nil, []string{"foo"}}, - {"bar", "current", true, nil, []string{"bar"}}, + {"foo", "current", false, nil, []string{"foo"}, nil}, + {"bar", "current", true, nil, []string{"bar"}, nil}, }, wantMerged: []ApexInfo{ - {"apex10000", "current", true, nil, []string{"bar", "foo"}}, + {"apex10000", "current", true, nil, []string{"bar", "foo"}, nil}, }, wantAliases: [][2]string{ {"bar", "apex10000"}, @@ -84,12 +83,12 @@ func Test_mergeApexVariations(t *testing.T) { { name: "don't merge sdks", in: []ApexInfo{ - {"foo", "current", false, SdkRefs{{"baz", "1"}}, []string{"foo"}}, - {"bar", "current", false, SdkRefs{{"baz", "2"}}, []string{"bar"}}, + {"foo", "current", false, SdkRefs{{"baz", "1"}}, []string{"foo"}, nil}, + {"bar", "current", false, SdkRefs{{"baz", "2"}}, []string{"bar"}, nil}, }, wantMerged: []ApexInfo{ - {"apex10000_baz_2", "current", false, SdkRefs{{"baz", "2"}}, []string{"bar"}}, - {"apex10000_baz_1", "current", false, SdkRefs{{"baz", "1"}}, []string{"foo"}}, + {"apex10000_baz_2", "current", false, SdkRefs{{"baz", "2"}}, []string{"bar"}, nil}, + {"apex10000_baz_1", "current", false, SdkRefs{{"baz", "1"}}, []string{"foo"}, nil}, }, wantAliases: [][2]string{ {"bar", "apex10000_baz_2"}, |