Более внятное сообщение об ошибке при проблемах в парсинге ответа

Author: bozaro

assets/template.html

@@ -112,8 +112,8 @@ <h2 class="checker_title" id="{{ .Checker.Name }}" onclick="Toggle('{{ $did }}')
         <ol>
             {{range .Messages}}
             {{$rid := uid}}
-            <li id="{{$rid}}" class="{{ if not .Delta }} hidden {{ end }}">
-                <div class="roundtrip_title {{ if .Delta}} failed {{ else }} success {{ end }}"
+            <li id="{{$rid}}" class="{{ if not .Failed }} hidden {{ end }}">
+                <div class="roundtrip_title {{ if .Failed }} failed {{ else }} success {{ end }}"
                      onclick="Toggle('{{ $rid }}')">
                     {{ .Url }}
                 </div>
@@ -138,6 +138,16 @@ <h2 class="checker_title" id="{{ .Checker.Name }}" onclick="Toggle('{{ $did }}')
                     {{if and .Example ( ne .Delta "" ) }}
                     {{template "message" dict "Payload" .Example "Title" "Ожидался ответ вида" }}
                     {{end}}
+
+                    {{if ne .Error "" }}
+                    <div class="tabs">
+                        <div class="tab_title">Ошибка</div>
+                        <div style="clear:both"></div>
+                        <div class="tab_content">
+                            <pre><code class="nohighlight">{{.Error}}</code></pre>
+                        </div>
+                    </div>
+                    {{end}}
                 </div>
             </li>
             {{end}}

generated/assets/assets.go

@@ -107,16 +107,15 @@ func (self *Validator) validate(req *http.Request, res *http.Response) bool {
 					Delta:   difflib.RightOnly,
 					Payload: fmt.Sprintf("Status: %d %s", res.StatusCode, http.StatusText(res.StatusCode)),
 				},
-			})
+			}, nil)
 			return false
 		}
-		delta := GetDelta(body, self.body, self.filter)
-		if (res.StatusCode != self.code) || (delta != nil) {
-			self.report.RoundTrip(req, res, self.Example(req), delta)
+		delta, err := GetDelta(body, self.body, self.filter)
+		if (res.StatusCode != self.code) || (delta != nil) || (err != nil) {
+			self.report.RoundTrip(req, res, self.Example(req), delta, err)
 			return false
-		} else {
-			self.report.RoundTrip(req, res, nil, nil)
 		}
+		self.report.RoundTrip(req, res, nil, nil, nil)
 	}
 	return true
 }
@@ -184,21 +183,21 @@ func Colorize(color int, message string) string {
 	return fmt.Sprintf("\x1b[%dm%s\x1b[0m", color, message)
 }
 
-func GetDelta(data []byte, expected interface{}, prepare Filter) *[]difflib.DiffRecord {
+func GetDelta(data []byte, expected interface{}, prepare Filter) (*[]difflib.DiffRecord, error) {
 	if expected == nil {
-		return nil
+		return nil, nil
 	}
 	expected_obj := prepare(expected)
 	var actual interface{} = reflect.New(reflect.TypeOf(expected).Elem()).Interface()
 	if err := swag.ReadJSON(data, actual); err != nil {
-		return GetDiff(string(data), ToJsonPretty(expected_obj))
+		return nil, err
 	}
 
 	actual_obj := prepare(actual)
 	actual_json, _ := swag.WriteJSON(actual_obj)
 	expected_json, _ := swag.WriteJSON(expected_obj)
 	if bytes.Equal(expected_json, actual_json) {
-		return nil
+		return nil, nil
 	}
-	return GetDiff(ToJsonPretty(actual_obj), ToJsonPretty(expected_obj))
+	return GetDiff(ToJsonPretty(actual_obj), ToJsonPretty(expected_obj)), nil
 }

tests/expected.go

@@ -46,30 +46,35 @@ func (self *Report) Checkpoint(message string) bool {
 	return true
 }
 
-func (self *Report) RoundTrip(req *http.Request, res *http.Response, example *http.Response, delta *[]difflib.DiffRecord) {
+func (self *Report) RoundTrip(req *http.Request, res *http.Response, example *http.Response, delta *[]difflib.DiffRecord, err error) {
 	if self.Result == Failed {
 		return
 	}
-	if delta == nil && self.OnlyError {
+	if delta == nil && err == nil && self.OnlyError {
 		return
 	}
 	reportMessage := ReportMessage{
+		Failed:   delta != nil || err != nil,
 		Url:      req.URL.String(),
 		Request:  RequestInfo(req),
 		Response: ResponseInfo(res),
 		Example:  ResponseInfo(example),
 	}
-	if delta != nil {
-		reportMessage.Delta = template.HTML(DeltaToHtml(*delta))
-
+	if reportMessage.Failed {
 		log.Warningf("Request:\n%s", reportMessage.Request.String())
 		log.Warningf("Actual response:\n%s", reportMessage.Response.String())
 		if example != nil {
 			log.Warningf("Expected response like:\n%s", reportMessage.Example.String())
 		}
-		log.Errorf("Error:\n%s", DeltaToText(*delta))
-		//debug.PrintStack()
 		self.Result = Failed
+		if delta != nil {
+			reportMessage.Delta = template.HTML(DeltaToHtml(*delta))
+			log.Errorf("Delta:\n%s", DeltaToText(*delta))
+		}
+		if err != nil {
+			log.Errorf("Error:\n%s", err)
+			reportMessage.Error = err.Error()
+		}
 	}
 	// Добавляем сообщение в отчет
 	if len(self.Pass) == 0 {
@@ -101,11 +106,13 @@ type ReportHttp struct {
 }
 
 type ReportMessage struct {
+	Failed   bool
 	Url      string
 	Delta    template.HTML
 	Request  *ReportHttp
 	Response *ReportHttp
 	Example  *ReportHttp
+	Error    string
 }
 
 func DeltaToText(delta []difflib.DiffRecord) string {