Blake Mizerany 11 years ago
parent
commit
80c8e7ac05
1 changed files with 11 additions and 9 deletions
  1. 11 9
      z_spec_test.go

+ 11 - 9
z_spec_test.go

@@ -6,6 +6,7 @@
 package http2
 package http2
 
 
 import (
 import (
+	"bytes"
 	"encoding/xml"
 	"encoding/xml"
 	"flag"
 	"flag"
 	"fmt"
 	"fmt"
@@ -74,7 +75,10 @@ func (a bySpecSection) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
 type specCoverage map[specPart]bool
 type specCoverage map[specPart]bool
 
 
 func readSection(sc specCoverage, d *xml.Decoder, sec []int) {
 func readSection(sc specCoverage, d *xml.Decoder, sec []int) {
-	sub := 0
+	var (
+		buf = new(bytes.Buffer)
+		sub = 0
+	)
 	for {
 	for {
 		tk, err := d.Token()
 		tk, err := d.Token()
 		if err != nil {
 		if err != nil {
@@ -99,13 +103,14 @@ func readSection(sc specCoverage, d *xml.Decoder, sec []int) {
 			if len(sec) == 0 {
 			if len(sec) == 0 {
 				break
 				break
 			}
 			}
-			ssec := fmt.Sprintf("%d", sec[0])
-			for _, n := range sec[1:] {
-				ssec = fmt.Sprintf("%s.%d", ssec, n)
-			}
-			sc.addSentences(ssec, string(v))
+			buf.Write(v)
 		case xml.EndElement:
 		case xml.EndElement:
 			if v.Name.Local == "section" {
 			if v.Name.Local == "section" {
+				ssec := fmt.Sprintf("%d", sec[0])
+				for _, n := range sec[1:] {
+					ssec = fmt.Sprintf("%s.%d", ssec, n)
+				}
+				sc.addSentences(ssec, buf.String())
 				return
 				return
 			}
 			}
 		}
 		}
@@ -278,9 +283,6 @@ func TestSpecUncovered(t *testing.T) {
 }
 }
 
 
 func TestSpecCoverage(t *testing.T) {
 func TestSpecCoverage(t *testing.T) {
-	if !*coverSpec {
-		t.Skip("skipping spec coverage without -coverspec")
-	}
 	var notCovered bySpecSection
 	var notCovered bySpecSection
 	for p, covered := range defaultSpecCoverage {
 	for p, covered := range defaultSpecCoverage {
 		if !covered {
 		if !covered {