From 1e5281d96f439c752cd0f0112f6f9b8d4b0a7273 Mon Sep 17 00:00:00 2001
From: xucong053 <xucong053@outlook.com>
Date: Wed, 8 Jun 2022 17:18:01 +0800
Subject: [PATCH] fix: failed to load overall pick_order strategy in
 parameters_setting

---
 examples/hrp/parameters_test.json | 4 ++--
 examples/hrp/parameters_test.yaml | 2 +-
 hrp/parameters.go                 | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/examples/hrp/parameters_test.json b/examples/hrp/parameters_test.json
index 9944599e..4af949ed 100644
--- a/examples/hrp/parameters_test.json
+++ b/examples/hrp/parameters_test.json
@@ -9,14 +9,14 @@
       "username-password": "${parameterize($file)}"
     },
     "parameters_setting": {
+      "pick_order": "random",
       "strategies": {
         "user_agent": {
           "name": "user-identity",
           "pick_order": "sequential"
         },
         "username-password": {
-          "name": "user-info",
-          "pick_order": "random"
+          "name": "user-info"
         }
       },
       "limit": 6
diff --git a/examples/hrp/parameters_test.yaml b/examples/hrp/parameters_test.yaml
index aaaf9b41..23fd8c01 100644
--- a/examples/hrp/parameters_test.yaml
+++ b/examples/hrp/parameters_test.yaml
@@ -4,13 +4,13 @@ config:
     user_agent: [ "iOS/10.1", "iOS/10.2" ]
     username-password: ${parameterize($file)}
   parameters_setting:
+    pick_order: "random"
     strategies:
       user_agent:
         name: "user-identity"
         pick_order: "sequential"
       username-password:
         name: "user-info"
-        pick_order: "random"
     limit: 6
   variables:
     app_version: v1
diff --git a/hrp/parameters.go b/hrp/parameters.go
index 376232fa..13d1b679 100644
--- a/hrp/parameters.go
+++ b/hrp/parameters.go
@@ -12,7 +12,7 @@ import (
 )
 
 type TParamsConfig struct {
-	PickOrder  iteratorPickOrder           `json:"strategy,omitempty" yaml:"strategy,omitempty"`     // overall pick-order strategy
+	PickOrder  iteratorPickOrder           `json:"pick_order,omitempty" yaml:"pick_order,omitempty"` // overall pick-order strategy
 	Strategies map[string]iteratorStrategy `json:"strategies,omitempty" yaml:"strategies,omitempty"` // individual strategies for each parameters
 	Limit      int                         `json:"limit,omitempty" yaml:"limit,omitempty"`
 }
@@ -69,7 +69,7 @@ func newParametersIterator(parameters map[string]Parameters, config *TParamsConf
 	for paramName := range parameters {
 		// check parameter individual pick order strategy
 		strategy, ok := config.Strategies[paramName]
-		if !ok {
+		if !ok || strategy.PickOrder == "" {
 			// default to overall pick order strategy
 			strategy.PickOrder = config.PickOrder
 		}