simplify by always using all message lines

tmornini · Jun 2, 2017 · a81c617 · a81c617
1 parent 26421a6
commit a81c617
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 12 deletions.
diff --git a/05-expected-response-match-parser.go b/05-expected-response-match-parser.go
@@ -12,7 +12,7 @@ func expectedResponseMatchParser(context *context) {
 
 	expectedResponse := context.SpecTriplet.ExpectedResponse
 
-	for _, line := range expectedResponse.allHeaderAndBodyLines() {
+	for _, line := range expectedResponse.allLines() {
 		parts := strings.Split(line.Text, regexpIdentifier)
 
 		count := len(parts)

diff --git a/09-comparitor.go b/09-comparitor.go
@@ -11,8 +11,8 @@ func responseComparitor(context *context) {
 	expectedResponse := context.SpecTriplet.ExpectedResponse
 	actualResponse := context.SpecTriplet.ActualResponse
 
-	expectedResponseLines := expectedResponse.allHeaderAndBodyLines()
-	actualResponseLines := actualResponse.allHeaderAndBodyLines()
+	expectedResponseLines := expectedResponse.allLines()
+	actualResponseLines := actualResponse.allLines()
 
 	if len(actualResponseLines) != len(expectedResponseLines) {
 		errorHandler(

diff --git a/type-message.go b/type-message.go
@@ -84,20 +84,12 @@ func (message *message) allLines() []*line {
 
 	allLines = append(allLines, message.FirstLine)
 	allLines = append(allLines, message.HeaderLines...)
+	allLines = append(allLines, message.BlankLine)
 	allLines = append(allLines, message.BodyLines...)
 
 	return allLines
 }
 
-func (message *message) allHeaderAndBodyLines() []*line {
-	var allHeaderAndBodyLines []*line
-
-	allHeaderAndBodyLines = append(allHeaderAndBodyLines, message.HeaderLines...)
-	allHeaderAndBodyLines = append(allHeaderAndBodyLines, message.BodyLines...)
-
-	return allHeaderAndBodyLines
-}
-
 func (message *message) substitute(context *context) {
 	for _, line := range message.allLines() {
 		line.substitute(context)