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

Commit 4ab1563f authored by Cole Faust's avatar Cole Faust Committed by Gerrit Code Review
Browse files

Merge "Update select tests for optionals" into main

parents 30f6e282 749eeaa9

android/selects_test.go

+13 −5
Original line number Diff line number Diff line
@@ -815,13 +815,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,