Merge pull request #6 from fred1268/release-1.3.1

Release 1.3.1

Author: fred1268

testing/internal/os/strings.go

@@ -12,7 +12,7 @@ func SubstituteEnvironmentVariable(value string) string {
 	for {
 		start := strings.Index(value, "${env:")
 		if start != -1 {
-			end := strings.Index(value, "}")
+			end := start + strings.Index(value[start:], "}")
 			if end != -1 {
 				result += fmt.Sprintf("%s%s", value[0:start], os.Getenv(value[start+6:end]))
 				end++
@@ -76,7 +76,7 @@ func SubstituteCapturedVariable(value string, captures map[string]any) string {
 	for {
 		start := strings.Index(value, "${")
 		if start != -1 {
-			end := strings.Index(value, "}")
+			end := start + strings.Index(value[start:], "}")
 			if end != -1 {
 				result += fmt.Sprintf("%s%s", value[0:start], findValue(value[start+2:end], captures))
 				end++

testing/setup.go

@@ -25,12 +25,12 @@ func load(ctx context.Context, cfg *Config, clients map[string]*Client, name str
 		return err
 	}
 	if cfg.Verbose {
-		log.Printf(fmt.Sprintf("%s tests executed\n", name))
+		log.Printf("--- EXEC:\t%s.test.json\n", name)
 	}
 	for _, test := range tests {
 		client := clients[test.Server]
 		if client == nil {
-			log.Fatalf("invalid server '%s' for test '%s'\n", test.Server, test.Name)
+			log.Fatalf("    --- FAIL:\tinvalid server '%s' for test '%s'\n", test.Server, test.Name)
 			continue
 		}
 		test.Endpoint = tos.SubstituteCapturedVariable(test.Endpoint, cfg.setupCapture)
@@ -39,8 +39,12 @@ func load(ctx context.Context, cfg *Config, clients map[string]*Client, name str
 		response, err := client.Test(ctx, test, cfg.Verbose)
 		if err != nil {
 			if !errors.Is(err, ErrStatusCodeMismatched) && !errors.Is(err, ErrResponseMismatched) {
-				log.Fatalf(fmt.Sprintf("Cannot run %s test '%s': %v\n", name, test.Name, err))
+				log.Printf("    --- FAIL:\tcannot run %s test '%s': %v\n", name, test.Name, err)
+				return err
 			}
+			log.Printf("    --- FAIL:\t%s\n", test.Name)
+			log.Printf("    wanted: '%s' (%d), got '%s' (%d)\n", test.Expected.Response, test.Expected.StatusCode,
+				strings.Trim(response.Response, "\n"), response.StatusCode)
 		}
 		if name == "setup" {
 			var r interface{}