refactor: replace NewDriver args with options

This commit is contained in:
lilong.129
2023-08-11 15:21:57 +08:00
parent cbc72c99d4
commit 6964bb6c85
12 changed files with 58 additions and 22 deletions

View File

@@ -154,10 +154,15 @@ func (dev *AndroidDevice) LogEnabled() bool {
return dev.LogOn
}
func (dev *AndroidDevice) NewDriver(capabilities Capabilities) (driverExt *DriverExt, err error) {
func (dev *AndroidDevice) NewDriver(options ...DriverOption) (driverExt *DriverExt, err error) {
driverOptions := &DriverOptions{}
for _, option := range options {
option(driverOptions)
}
var driver WebDriver
if dev.UIA2 {
driver, err = dev.NewUSBDriver(capabilities)
driver, err = dev.NewUSBDriver(driverOptions.capabilities)
} else {
driver, err = dev.NewAdbDriver()
}
@@ -165,7 +170,7 @@ func (dev *AndroidDevice) NewDriver(capabilities Capabilities) (driverExt *Drive
return nil, errors.Wrap(err, "failed to init UIA driver")
}
driverExt, err = NewDriverExt(dev, driver)
driverExt, err = newDriverExt(dev, driver)
if err != nil {
return nil, err
}