Merge branch 'master' into auto-reset-session

hrp/pkg/boomer/runner_test.go

@@ -198,7 +198,7 @@ func TestSpawnWorkersWithManyTasks(t *testing.T) {
 	const numToSpawn int64 = 20
 
 	go runner.spawnWorkers(numToSpawn, float64(numToSpawn), runner.stopChan, runner.spawnComplete)
-	time.Sleep(3 * time.Second)
+	time.Sleep(5 * time.Second)
 
 	currentClients := runner.controller.getCurrentClientsNum()
 
@@ -210,28 +210,29 @@ func TestSpawnWorkersWithManyTasks(t *testing.T) {
 	lock.Unlock()
 
 	total := hundreds + tens + ones
-	t.Logf("total tasks run: %d\n", total)
+	t.Logf("total tasks: %d, hundreds: %d, tens: %d, ones: %d\n",
+		total, hundreds, tens, ones)
 
 	assert.True(t, total > 111)
 
 	assert.True(t, ones > 1)
 	actPercentage := float64(ones) / float64(total)
 	expectedPercentage := 1.0 / 111.0
-	if actPercentage > 2*expectedPercentage || actPercentage < 0.5*expectedPercentage {
+	if actPercentage > 4*expectedPercentage || actPercentage < 0.25*expectedPercentage {
 		t.Errorf("Unexpected percentage of ones task: exp %v, act %v", expectedPercentage, actPercentage)
 	}
 
 	assert.True(t, tens > 10)
 	actPercentage = float64(tens) / float64(total)
 	expectedPercentage = 10.0 / 111.0
-	if actPercentage > 2*expectedPercentage || actPercentage < 0.5*expectedPercentage {
+	if actPercentage > 4*expectedPercentage || actPercentage < 0.25*expectedPercentage {
 		t.Errorf("Unexpected percentage of tens task: exp %v, act %v", expectedPercentage, actPercentage)
 	}
 
 	assert.True(t, hundreds > 100)
 	actPercentage = float64(hundreds) / float64(total)
 	expectedPercentage = 100.0 / 111.0
-	if actPercentage > 2*expectedPercentage || actPercentage < 0.5*expectedPercentage {
+	if actPercentage > 1 || actPercentage < 0.25*expectedPercentage {
 		t.Errorf("Unexpected percentage of hundreds task: exp %v, act %v", expectedPercentage, actPercentage)
 	}
 }
@@ -259,7 +260,7 @@ func TestSpawnAndStop(t *testing.T) {
 	go runner.start()
 
 	// wait for spawning goroutines
-	time.Sleep(2 * time.Second)
+	time.Sleep(5 * time.Second)
 	if runner.controller.getCurrentClientsNum() != 10 {
 		t.Error("Number of goroutines mismatches, expected: 10, current count", runner.controller.getCurrentClientsNum())
 	}
@@ -269,7 +270,6 @@ func TestSpawnAndStop(t *testing.T) {
 		t.Error("Runner should send spawning_complete message when spawning completed, got", msg.Type)
 	}
 	go runner.stop()
-	close(runner.doneChan)
 
 	runner.onQuiting()
 	msg = <-runner.client.sendChannel()
@@ -384,7 +384,7 @@ func TestOnMessage(t *testing.T) {
 	}
 
 	// spawn complete and running
-	time.Sleep(2 * time.Second)
+	time.Sleep(5 * time.Second)
 	if runner.controller.getCurrentClientsNum() != 10 {
 		t.Error("Number of goroutines mismatches, expected: 10, current count:", runner.controller.getCurrentClientsNum())
 	}
@@ -430,7 +430,7 @@ func TestOnMessage(t *testing.T) {
 	}
 
 	// spawn complete and running
-	time.Sleep(3 * time.Second)
+	time.Sleep(5 * time.Second)
 	if runner.controller.getCurrentClientsNum() != 10 {
 		t.Error("Number of goroutines mismatches, expected: 10, current count:", runner.controller.getCurrentClientsNum())
 	}

hrp/pkg/convert/main.go

@@ -2,8 +2,8 @@ package convert
 
 import (
 	_ "embed"
-	"fmt"
 	"path/filepath"
+	"time"
 
 	"github.com/rs/zerolog/log"
 
@@ -139,19 +139,25 @@ func (c *TCaseConverter) loadCase(casePath string, fromType FromType) error {
 	return err
 }
 
-func (c *TCaseConverter) Convert(casePath string, fromType FromType, outputType OutputType) error {
-	// report event
-	sdk.SendEvent(sdk.EventTracking{
-		Category: "ConvertTests",
-		Action:   fmt.Sprintf("hrp convert --to-%s", outputType.String()),
-	})
+func (c *TCaseConverter) Convert(casePath string, fromType FromType, outputType OutputType) (err error) {
+	// report GA event
+	startTime := time.Now()
+	defer func() {
+		sdk.SendGA4Event("hrp_convert", map[string]interface{}{
+			"from":                 fromType.String(),
+			"to":                   outputType.String(),
+			"success":              err == nil,
+			"engagement_time_msec": time.Since(startTime).Milliseconds(),
+		})
+	}()
+
 	log.Info().Str("path", casePath).
 		Str("fromType", fromType.String()).
 		Str("outputType", outputType.String()).
 		Msg("convert testcase")
 
 	// load source file
-	err := c.loadCase(casePath, fromType)
+	err = c.loadCase(casePath, fromType)
 	if err != nil {
 		return err
 	}

hrp/pkg/uixt/android_device.go

@@ -555,8 +555,9 @@ func (s UiSelectorHelper) Index(index int) UiSelectorHelper {
 // 2, the `className(String)` matches the image
 // widget class, and `enabled(boolean)` is true.
 // The code would look like this:
-//  `new UiSelector().className("android.widget.ImageView")
-//    .enabled(true).instance(2);`
+//
+//	`new UiSelector().className("android.widget.ImageView")
+//	  .enabled(true).instance(2);`
 func (s UiSelectorHelper) Instance(instance int) UiSelectorHelper {
 	s.value.WriteString(fmt.Sprintf(`.instance(%d)`, instance))
 	return s

hrp/pkg/uixt/android_uia2_driver.go

@@ -261,7 +261,8 @@ func (ud *uiaDriver) DragFloat(fromX, fromY, toX, toY float64, options ...Action
 // Swipe performs a swipe from one coordinate to another using the number of steps
 // to determine smoothness and speed. Each step execution is throttled to 5ms
 // per step. So for a 100 steps, the swipe will take about 1/2 second to complete.
-//  `steps` is the number of move steps sent to the system
+//
+//	`steps` is the number of move steps sent to the system
 func (ud *uiaDriver) Swipe(fromX, fromY, toX, toY int, options ...ActionOption) error {
 	return ud.SwipeFloat(float64(fromX), float64(fromY), float64(toX), float64(toY), options...)
 }

hrp/pkg/uixt/interface.go

@@ -31,7 +31,8 @@ func (caps Capabilities) WithDefaultAlertAction(alertAction AlertAction) Capabil
 }
 
 // WithMaxTypingFrequency
-//  Defaults to `60`.
+//
+//	Defaults to `60`.
 func (caps Capabilities) WithMaxTypingFrequency(n int) Capabilities {
 	if n <= 0 {
 		n = 60
@@ -41,21 +42,24 @@ func (caps Capabilities) WithMaxTypingFrequency(n int) Capabilities {
 }
 
 // WithWaitForIdleTimeout
-//  Defaults to `10`
+//
+//	Defaults to `10`
 func (caps Capabilities) WithWaitForIdleTimeout(second float64) Capabilities {
 	caps["waitForIdleTimeout"] = second
 	return caps
 }
 
 // WithShouldUseTestManagerForVisibilityDetection If set to YES will ask TestManagerDaemon for element visibility
-//  Defaults to  `false`
+//
+//	Defaults to  `false`
 func (caps Capabilities) WithShouldUseTestManagerForVisibilityDetection(b bool) Capabilities {
 	caps["shouldUseTestManagerForVisibilityDetection"] = b
 	return caps
 }
 
 // WithShouldUseCompactResponses If set to YES will use compact (standards-compliant) & faster responses
-//  Defaults to `true`
+//
+//	Defaults to `true`
 func (caps Capabilities) WithShouldUseCompactResponses(b bool) Capabilities {
 	caps["shouldUseCompactResponses"] = b
 	return caps
@@ -63,28 +67,32 @@ func (caps Capabilities) WithShouldUseCompactResponses(b bool) Capabilities {
 
 // WithElementResponseAttributes If shouldUseCompactResponses == NO,
 // is the comma-separated list of fields to return with each element.
-//  Defaults to `type,label`.
+//
+//	Defaults to `type,label`.
 func (caps Capabilities) WithElementResponseAttributes(s string) Capabilities {
 	caps["elementResponseAttributes"] = s
 	return caps
 }
 
 // WithShouldUseSingletonTestManager
-//  Defaults to `true`
+//
+//	Defaults to `true`
 func (caps Capabilities) WithShouldUseSingletonTestManager(b bool) Capabilities {
 	caps["shouldUseSingletonTestManager"] = b
 	return caps
 }
 
 // WithDisableAutomaticScreenshots
-//  Defaults to `true`
+//
+//	Defaults to `true`
 func (caps Capabilities) WithDisableAutomaticScreenshots(b bool) Capabilities {
 	caps["disableAutomaticScreenshots"] = b
 	return caps
 }
 
 // WithShouldTerminateApp
-//  Defaults to `true`
+//
+//	Defaults to `true`
 func (caps Capabilities) WithShouldTerminateApp(b bool) Capabilities {
 	caps["shouldTerminateApp"] = b
 	return caps
@@ -376,7 +384,8 @@ func (opt SourceOption) WithFormatAsDescription() SourceOption {
 }
 
 // WithScope Allows to provide XML scope.
-//  only `xml` is supported.
+//
+//	only `xml` is supported.
 func (opt SourceOption) WithScope(scope string) SourceOption {
 	if vFormat, ok := opt["format"]; ok && vFormat != "xml" {
 		return opt

hrp/pkg/uixt/ocr_vedem.go

@@ -176,11 +176,12 @@ func newVEDEMImageService(actions ...string) (*veDEMImageService, error) {
 
 // veDEMImageService implements IImageService interface
 // actions:
-// 	ocr - get ocr texts
-// 	upload - get image uploaded url
-// 	liveType - get live type
-// 	popup - get popup windows
-// 	close - get close popup
+//
+//	ocr - get ocr texts
+//	upload - get image uploaded url
+//	liveType - get live type
+//	popup - get popup windows
+//	close - get close popup
 type veDEMImageService struct {
 	actions []string
 }
@@ -230,10 +231,6 @@ func (s *veDEMImageService) GetImage(imageBuf *bytes.Buffer) (
 	req.Header.Add("Agw-Auth-Content", signToken)
 	req.Header.Add("Content-Type", bodyWriter.FormDataContentType())
 
-	// ppe
-	// req.Header.Add("x-use-ppe", "1")
-	// req.Header.Add("x-tt-env", "ppe_vedem_algorithm")
-
 	var resp *http.Response
 	// retry 3 times
 	for i := 1; i <= 3; i++ {