|
@@ -33,10 +33,10 @@ func Test_mergeApexVariations(t *testing.T) {
|
|
|
{
|
|
|
name: "single",
|
|
|
in: []ApexInfo{
|
|
|
- {"foo", FutureApiLevel, false, false, []string{"foo"}, []string{"foo"}, nil, NotForPrebuiltApex},
|
|
|
+ {"foo", FutureApiLevel, false, false, []string{"foo"}, []string{"foo"}, nil, NotForPrebuiltApex, nil},
|
|
|
},
|
|
|
wantMerged: []ApexInfo{
|
|
|
- {"apex10000", FutureApiLevel, false, false, []string{"foo"}, []string{"foo"}, nil, NotForPrebuiltApex},
|
|
|
+ {"apex10000", FutureApiLevel, false, false, []string{"foo"}, []string{"foo"}, nil, NotForPrebuiltApex, nil},
|
|
|
},
|
|
|
wantAliases: [][2]string{
|
|
|
{"foo", "apex10000"},
|
|
@@ -45,11 +45,11 @@ func Test_mergeApexVariations(t *testing.T) {
|
|
|
{
|
|
|
name: "merge",
|
|
|
in: []ApexInfo{
|
|
|
- {"foo", FutureApiLevel, false, false, []string{"foo"}, []string{"foo"}, nil, NotForPrebuiltApex},
|
|
|
- {"bar", FutureApiLevel, false, false, []string{"bar"}, []string{"bar"}, nil, NotForPrebuiltApex},
|
|
|
+ {"foo", FutureApiLevel, false, false, []string{"foo"}, []string{"foo"}, nil, NotForPrebuiltApex, nil},
|
|
|
+ {"bar", FutureApiLevel, false, false, []string{"bar"}, []string{"bar"}, nil, NotForPrebuiltApex, nil},
|
|
|
},
|
|
|
wantMerged: []ApexInfo{
|
|
|
- {"apex10000", FutureApiLevel, false, false, []string{"bar", "foo"}, []string{"bar", "foo"}, nil, false}},
|
|
|
+ {"apex10000", FutureApiLevel, false, false, []string{"bar", "foo"}, []string{"bar", "foo"}, nil, false, nil}},
|
|
|
wantAliases: [][2]string{
|
|
|
{"bar", "apex10000"},
|
|
|
{"foo", "apex10000"},
|
|
@@ -58,12 +58,12 @@ func Test_mergeApexVariations(t *testing.T) {
|
|
|
{
|
|
|
name: "don't merge version",
|
|
|
in: []ApexInfo{
|
|
|
- {"foo", FutureApiLevel, false, false, []string{"foo"}, []string{"foo"}, nil, NotForPrebuiltApex},
|
|
|
- {"bar", uncheckedFinalApiLevel(30), false, false, []string{"bar"}, []string{"bar"}, nil, NotForPrebuiltApex},
|
|
|
+ {"foo", FutureApiLevel, false, false, []string{"foo"}, []string{"foo"}, nil, NotForPrebuiltApex, nil},
|
|
|
+ {"bar", uncheckedFinalApiLevel(30), false, false, []string{"bar"}, []string{"bar"}, nil, NotForPrebuiltApex, nil},
|
|
|
},
|
|
|
wantMerged: []ApexInfo{
|
|
|
- {"apex30", uncheckedFinalApiLevel(30), false, false, []string{"bar"}, []string{"bar"}, nil, NotForPrebuiltApex},
|
|
|
- {"apex10000", FutureApiLevel, false, false, []string{"foo"}, []string{"foo"}, nil, NotForPrebuiltApex},
|
|
|
+ {"apex30", uncheckedFinalApiLevel(30), false, false, []string{"bar"}, []string{"bar"}, nil, NotForPrebuiltApex, nil},
|
|
|
+ {"apex10000", FutureApiLevel, false, false, []string{"foo"}, []string{"foo"}, nil, NotForPrebuiltApex, nil},
|
|
|
},
|
|
|
wantAliases: [][2]string{
|
|
|
{"bar", "apex30"},
|
|
@@ -73,11 +73,11 @@ func Test_mergeApexVariations(t *testing.T) {
|
|
|
{
|
|
|
name: "merge updatable",
|
|
|
in: []ApexInfo{
|
|
|
- {"foo", FutureApiLevel, false, false, []string{"foo"}, []string{"foo"}, nil, NotForPrebuiltApex},
|
|
|
- {"bar", FutureApiLevel, true, false, []string{"bar"}, []string{"bar"}, nil, NotForPrebuiltApex},
|
|
|
+ {"foo", FutureApiLevel, false, false, []string{"foo"}, []string{"foo"}, nil, NotForPrebuiltApex, nil},
|
|
|
+ {"bar", FutureApiLevel, true, false, []string{"bar"}, []string{"bar"}, nil, NotForPrebuiltApex, nil},
|
|
|
},
|
|
|
wantMerged: []ApexInfo{
|
|
|
- {"apex10000", FutureApiLevel, true, false, []string{"bar", "foo"}, []string{"bar", "foo"}, nil, NotForPrebuiltApex},
|
|
|
+ {"apex10000", FutureApiLevel, true, false, []string{"bar", "foo"}, []string{"bar", "foo"}, nil, NotForPrebuiltApex, nil},
|
|
|
},
|
|
|
wantAliases: [][2]string{
|
|
|
{"bar", "apex10000"},
|
|
@@ -87,15 +87,15 @@ func Test_mergeApexVariations(t *testing.T) {
|
|
|
{
|
|
|
name: "don't merge when for prebuilt_apex",
|
|
|
in: []ApexInfo{
|
|
|
- {"foo", FutureApiLevel, false, false, []string{"foo"}, []string{"foo"}, nil, NotForPrebuiltApex},
|
|
|
- {"bar", FutureApiLevel, true, false, []string{"bar"}, []string{"bar"}, nil, NotForPrebuiltApex},
|
|
|
+ {"foo", FutureApiLevel, false, false, []string{"foo"}, []string{"foo"}, nil, NotForPrebuiltApex, nil},
|
|
|
+ {"bar", FutureApiLevel, true, false, []string{"bar"}, []string{"bar"}, nil, NotForPrebuiltApex, nil},
|
|
|
// This one should not be merged in with the others because it is for
|
|
|
// a prebuilt_apex.
|
|
|
- {"baz", FutureApiLevel, true, false, []string{"baz"}, []string{"baz"}, nil, ForPrebuiltApex},
|
|
|
+ {"baz", FutureApiLevel, true, false, []string{"baz"}, []string{"baz"}, nil, ForPrebuiltApex, nil},
|
|
|
},
|
|
|
wantMerged: []ApexInfo{
|
|
|
- {"apex10000", FutureApiLevel, true, false, []string{"bar", "foo"}, []string{"bar", "foo"}, nil, NotForPrebuiltApex},
|
|
|
- {"baz", FutureApiLevel, true, false, []string{"baz"}, []string{"baz"}, nil, ForPrebuiltApex},
|
|
|
+ {"apex10000", FutureApiLevel, true, false, []string{"bar", "foo"}, []string{"bar", "foo"}, nil, NotForPrebuiltApex, nil},
|
|
|
+ {"baz", FutureApiLevel, true, false, []string{"baz"}, []string{"baz"}, nil, ForPrebuiltApex, nil},
|
|
|
},
|
|
|
wantAliases: [][2]string{
|
|
|
{"bar", "apex10000"},
|
|
@@ -105,11 +105,11 @@ func Test_mergeApexVariations(t *testing.T) {
|
|
|
{
|
|
|
name: "merge different UsePlatformApis but don't allow using platform api",
|
|
|
in: []ApexInfo{
|
|
|
- {"foo", FutureApiLevel, false, false, []string{"foo"}, []string{"foo"}, nil, NotForPrebuiltApex},
|
|
|
- {"bar", FutureApiLevel, false, true, []string{"bar"}, []string{"bar"}, nil, NotForPrebuiltApex},
|
|
|
+ {"foo", FutureApiLevel, false, false, []string{"foo"}, []string{"foo"}, nil, NotForPrebuiltApex, nil},
|
|
|
+ {"bar", FutureApiLevel, false, true, []string{"bar"}, []string{"bar"}, nil, NotForPrebuiltApex, nil},
|
|
|
},
|
|
|
wantMerged: []ApexInfo{
|
|
|
- {"apex10000", FutureApiLevel, false, false, []string{"bar", "foo"}, []string{"bar", "foo"}, nil, NotForPrebuiltApex},
|
|
|
+ {"apex10000", FutureApiLevel, false, false, []string{"bar", "foo"}, []string{"bar", "foo"}, nil, NotForPrebuiltApex, nil},
|
|
|
},
|
|
|
wantAliases: [][2]string{
|
|
|
{"bar", "apex10000"},
|
|
@@ -119,11 +119,11 @@ func Test_mergeApexVariations(t *testing.T) {
|
|
|
{
|
|
|
name: "merge same UsePlatformApis and allow using platform api",
|
|
|
in: []ApexInfo{
|
|
|
- {"foo", FutureApiLevel, false, true, []string{"foo"}, []string{"foo"}, nil, NotForPrebuiltApex},
|
|
|
- {"bar", FutureApiLevel, false, true, []string{"bar"}, []string{"bar"}, nil, NotForPrebuiltApex},
|
|
|
+ {"foo", FutureApiLevel, false, true, []string{"foo"}, []string{"foo"}, nil, NotForPrebuiltApex, nil},
|
|
|
+ {"bar", FutureApiLevel, false, true, []string{"bar"}, []string{"bar"}, nil, NotForPrebuiltApex, nil},
|
|
|
},
|
|
|
wantMerged: []ApexInfo{
|
|
|
- {"apex10000", FutureApiLevel, false, true, []string{"bar", "foo"}, []string{"bar", "foo"}, nil, NotForPrebuiltApex},
|
|
|
+ {"apex10000", FutureApiLevel, false, true, []string{"bar", "foo"}, []string{"bar", "foo"}, nil, NotForPrebuiltApex, nil},
|
|
|
},
|
|
|
wantAliases: [][2]string{
|
|
|
{"bar", "apex10000"},
|