fix windows tests

broker/src/asapo_broker/server/get_image.go

@@ -21,6 +21,22 @@ func extractRequestParameters(r *http.Request, needGroupID bool) (string, string
 	return db_name, group_id, ok1 && ok2
 }
 
+func checkGroupID(w http.ResponseWriter, needGroupID bool, group_id string, db_name string, op string) bool {
+	if !needGroupID {
+		return true
+	}
+	if _, err := xid.FromString(group_id); err != nil {
+		err_str := "wrong groupid " + group_id
+		log_str := "processing get " + op + " request in " + db_name + " at " + settings.BrokerDbAddress + ": " + err_str
+		logger.Error(log_str)
+		fmt.Println(log_str)
+		w.WriteHeader(http.StatusBadRequest)
+		w.Write([]byte(err_str))
+		return false
+	}
+	return true
+}
+
 func getImage(w http.ResponseWriter, r *http.Request, op string, id int, needGroupID bool) {
 	r.Header.Set("Content-type", "application/json")
 	w.Header().Set("Access-Control-Allow-Origin", "*")
@@ -35,17 +51,10 @@ func getImage(w http.ResponseWriter, r *http.Request, op string, id int, needGro
 		return
 	}
 
-	if needGroupID {
-		if _, err := xid.FromString(group_id); err != nil {
-			err_str := "wrong groupid " + group_id
-			log_str := "processing get " + op + " request in " + db_name + " at " + settings.BrokerDbAddress + ": " + err_str
-			logger.Error(log_str)
-			fmt.Println(log_str)
-			w.WriteHeader(http.StatusBadRequest)
-			w.Write([]byte(err_str))
-			return
-		}
+	if !checkGroupID(w, needGroupID, group_id, db_name, op) {
+		return
 	}
+
 	answer, code := getRecord(db_name, group_id, op, id)
 	w.WriteHeader(code)
 	w.Write(answer)

tests/automatic/broker/get_last/check_linux.sh

@@ -37,4 +37,9 @@ curl -v  --silent 127.0.0.1:5005/database/data/${groupid}/last?token=$token --st
 echo "db.data.insert({"_id":4})" | mongo ${database_name}
 
 curl -v  --silent 127.0.0.1:5005/database/data/${groupid}/next?token=$token --stderr - | grep '"_id":4'
+curl -v  --silent 127.0.0.1:5005/database/data/${groupid}/last?token=$token --stderr - | grep '"_id":4'
+
+#with a new group
+groupid=`curl -d '' --silent 127.0.0.1:5005/creategroup`
+curl -v  --silent 127.0.0.1:5005/database/data/${groupid}/next?token=$token --stderr - | grep '"_id":1'
 curl -v  --silent 127.0.0.1:5005/database/data/${groupid}/last?token=$token --stderr - | grep '"_id":4'
\ No newline at end of file

tests/automatic/broker/get_last/check_windows.bat

@@ -10,14 +10,13 @@ set short_name="%~nx1"
 "%2" token -secret broker_secret.key data > token
 set /P token=< token
 
+start /B "" "%full_name%" -config settings.json
+ping 1.0.0.0 -n 1 -w 100 > nul
+
 C:\Curl\curl.exe -d '' --silent 127.0.0.1:5005/creategroup > groupid
 set /P groupid=< groupid
 
 
-start /B "" "%full_name%" -config settings.json
-
-ping 1.0.0.0 -n 1 -w 100 > nul
-
 C:\Curl\curl.exe -v  --silent 127.0.0.1:5005/database/data/%groupid%/last?token=%token% --stderr - | findstr /c:\"_id\":2  || goto :error
 C:\Curl\curl.exe -v  --silent 127.0.0.1:5005/database/data/%groupid%/last?token=%token% --stderr - | findstr /c:\"_id\":2  || goto :error
 
@@ -30,6 +29,12 @@ C:\Curl\curl.exe -v  --silent 127.0.0.1:5005/database/data/%groupid%/next?token=
 C:\Curl\curl.exe -v  --silent 127.0.0.1:5005/database/data/%groupid%/last?token=%token% --stderr - | findstr /c:\"_id\":4  || goto :error
 
 
+C:\Curl\curl.exe -d '' --silent 127.0.0.1:5005/creategroup > groupid
+set /P groupid=< groupid
+C:\Curl\curl.exe -v  --silent 127.0.0.1:5005/database/data/%groupid%/next?token=%token% --stderr - | findstr /c:\"_id\":1  || goto :error
+C:\Curl\curl.exe -v  --silent 127.0.0.1:5005/database/data/%groupid%/last?token=%token% --stderr - | findstr /c:\"_id\":4  || goto :error
+
+
 goto :clean
 
 :error

tests/automatic/broker/get_next/check_linux.sh

@@ -26,5 +26,8 @@ groupid=`curl -d '' --silent 127.0.0.1:5005/creategroup`
 
 curl -v  --silent 127.0.0.1:5005/database/data/${groupid}/next?token=$token --stderr - | grep '"_id":1'
 curl -v  --silent 127.0.0.1:5005/database/data/${groupid}/next?token=$token --stderr - | grep '"_id":2'
-
 curl -v  --silent 127.0.0.1:5005/database/data/${groupid}/next?token=$token --stderr - | grep "not found"
+
+# with a new group
+groupid=`curl -d '' --silent 127.0.0.1:5005/creategroup`
+curl -v  --silent 127.0.0.1:5005/database/data/${groupid}/next?token=$token --stderr - | grep '"_id":1'
\ No newline at end of file

tests/automatic/broker/get_next/check_windows.bat

@@ -10,19 +10,18 @@ set short_name="%~nx1"
 "%2" token -secret broker_secret.key data > token
 set /P token=< token
 
-
-C:\Curl\curl.exe -d '' --silent 127.0.0.1:5005/creategroup > groupid
-set /P groupid=< groupid
-
-
 start /B "" "%full_name%" -config settings.json
 
 ping 1.0.0.0 -n 1 -w 100 > nul
 
+C:\Curl\curl.exe -d '' --silent 127.0.0.1:5005/creategroup > groupid
+set /P groupid=< groupid
 C:\Curl\curl.exe -v  --silent 127.0.0.1:5005/database/data/%groupid%/next?token=%token% --stderr - | findstr /c:\"_id\":1  || goto :error
 C:\Curl\curl.exe -v  --silent 127.0.0.1:5005/database/data/%groupid%/next?token=%token% --stderr - | findstr /c:\"_id\":2  || goto :error
 C:\Curl\curl.exe -v  --silent 127.0.0.1:5005/database/data/%groupid%/next?token=%token% --stderr - | findstr  /c:"not found"  || goto :error
 
+C:\Curl\curl.exe -v  --silent 127.0.0.1:5005/database/data/%groupid%/next?token=%token% --stderr - | findstr /c:\"_id\":1  || goto :error
+
 goto :clean
 
 :error