Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 749eeaa9 authored by Cole Faust's avatar Cole Faust
Browse files

Update select tests for optionals 

Bug: 323382414
Test: m nothing --no-skip-soong-tests
Change-Id: I314719c9e287638acbc1ef82651d14fee6e1a55a
parent e0d5ea1d

android/selects_test.go

+13 −5
Original line number Diff line number Diff line
@@ -792,13 +792,21 @@ type selectsMockModule struct { 
	properties selectsMockModuleProperties

}



func optionalToPtr[T any](o proptools.ConfigurableOptional[T]) *T {

	if o.IsEmpty() {

		return nil

	}

	x := o.Get()

	return &x

}



func (p *selectsMockModule) GenerateAndroidBuildActions(ctx ModuleContext) {

	SetProvider(ctx, selectsTestProviderKey, selectsTestProvider{

		my_bool:                        p.properties.My_bool.Get(ctx),

		my_string:                      p.properties.My_string.Get(ctx),

		my_string_list:                 p.properties.My_string_list.Get(ctx),

		my_paths:                       p.properties.My_paths.Get(ctx),

		replacing_string_list:          p.properties.Replacing_string_list.Get(ctx),

		my_bool:                        optionalToPtr(p.properties.My_bool.Get(ctx)),

		my_string:                      optionalToPtr(p.properties.My_string.Get(ctx)),

		my_string_list:                 optionalToPtr(p.properties.My_string_list.Get(ctx)),

		my_paths:                       optionalToPtr(p.properties.My_paths.Get(ctx)),

		replacing_string_list:          optionalToPtr(p.properties.Replacing_string_list.Get(ctx)),

		my_nonconfigurable_bool:        p.properties.My_nonconfigurable_bool,

		my_nonconfigurable_string:      p.properties.My_nonconfigurable_string,

		my_nonconfigurable_string_list: p.properties.My_nonconfigurable_string_list,