去除assert依赖

Author: guonaihong

go.mod

@@ -1,5 +1,3 @@
 module github.com/antlabs/httparser
 
 go 1.14
-
-require github.com/stretchr/testify v1.7.1

go.sum

@@ -1,11 +0,0 @@
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

parser_both_test.go

@@ -3,8 +3,6 @@ package httparser
 import (
 	"bytes"
 	"testing"
-
-	"github.com/stretchr/testify/assert"
 )
 
 // 测试请求body
@@ -102,14 +100,44 @@ func Test_ParserResponse_RequestBody_BOTH(t *testing.T) {
 		t.Fatal("data length error")
 	}
 
-	assert.Equal(t, i, len(data))          // 总数据长度
-	assert.Equal(t, field, field2)         // header field
-	assert.Equal(t, string(value), value2) // header field
-	assert.Equal(t, string(body), body2)   // chunked body
-	assert.True(t, messageBegin)
-	assert.True(t, messageComplete)
-	assert.True(t, headersComplete)
-	assert.True(t, p.EOF())
+	// 总数据长度
+	if i != len(data) {
+		t.Errorf("i(%d) != len(data)(%d)\n", i, len(data))
+		return
+	}
+
+	if !bytes.Equal(field, field2) {
+		t.Errorf("field error: %s\n", field)
+		return
+	}
+	if string(value) != value2 {
+		t.Errorf("value error: %s\n", value)
+		return
+	}
+
+	if string(body) != body2 {
+		t.Errorf("body error: %s\n", body)
+		return
+	}
+
+	if !messageBegin {
+		t.Error("message begin is false, expect true")
+		return
+	}
+
+	if !messageComplete {
+		t.Error("message complete is false, expect true")
+		return
+	}
+
+	if !headersComplete {
+		t.Error("headers complete is false, expect true")
+		return
+	}
+	if !p.EOF() {
+		t.Error("EOF is false, expect true")
+		return
+	}
 
 	// fmt.Printf("##:%s", stateTab[p.currState])
 }
@@ -121,7 +149,9 @@ func Test_ParserResponse_Chunked_Both(t *testing.T) {
 	rcvBuf := []byte{}
 	setting := &Setting{
 		Status: func(p *Parser, buf []byte, _ int) {
-			assert.Equal(t, buf, []byte("OK"))
+			if !bytes.Equal(buf, []byte("OK")) {
+				t.Error("status error")
+			}
 		}, MessageBegin: func(p *Parser, _ int) {
 			messageBegin = true
 		}, HeaderField: func(p *Parser, buf []byte, _ int) {
@@ -150,19 +180,36 @@ func Test_ParserResponse_Chunked_Both(t *testing.T) {
 	parserTotal := 0
 	for _, buf := range rsp {
 		rv, err := p.Execute(setting, []byte(buf))
-		assert.NoError(t, err)
 		if err != nil {
+			t.Errorf("err:%s", err)
 			return
 		}
 
 		parserTotal += rv
 		sentTotal += len(buf)
 	}
 
-	assert.Equal(t, rcvBuf, []byte("MozillaDeveloperNetworknew year"))
-	assert.Equal(t, p.Major, uint8(1))
-	assert.Equal(t, p.Minor, uint8(1))
-	assert.True(t, messageBegin)
-	assert.Equal(t, sentTotal, parserTotal)
-	assert.True(t, p.EOF())
+	if !bytes.Equal(rcvBuf, []byte("MozillaDeveloperNetworknew year")) {
+		t.Errorf("rcvBuf:%s", rcvBuf)
+		return
+	}
+	if p.Major != 1 || p.Minor != 1 {
+		t.Errorf("major:%d, minor:%d", p.Major, p.Minor)
+		return
+	}
+
+	if !messageBegin {
+		t.Error("message begin is false, expect true")
+		return
+	}
+
+	if sentTotal != parserTotal {
+		t.Errorf("sendTotal:%d, parserTotal:%d", sentTotal, parserTotal)
+		return
+	}
+
+	if !p.EOF() {
+		t.Error("EOF is false, expect true")
+		return
+	}
 }

parser_porting_code_test.go

@@ -15,9 +15,8 @@
 package httparser
 
 import (
+	"reflect"
 	"testing"
-
-	"github.com/stretchr/testify/assert"
 )
 
 type message struct {
@@ -57,57 +56,60 @@ type message struct {
 }
 
 func (m *message) eq(t *testing.T, m2 *message) bool {
-	b := assert.Equal(t, m.messageCompleteCbCalled, m2.messageCompleteCbCalled, "messageCompleteCbCalled")
-	if !b {
+	if m.messageCompleteCbCalled != m2.messageCompleteCbCalled {
+		t.Errorf("messageCompleteCbCalled: %v != %v", m.messageCompleteCbCalled, m2.messageCompleteCbCalled)
 		return false
 	}
 
-	b = assert.Equal(t, m.method, m2.method, "method")
-	if !b {
+	if m.method != m2.method {
+		t.Errorf("method: %v != %v", m.method, m2.method)
 		return false
 	}
 
-	b = assert.Equal(t, m.headers, m2.headers)
-	if !b {
+	if !reflect.DeepEqual(m.headers, m2.headers) {
+		t.Errorf("headers: %v\n", m.headers)
+		t.Errorf("headers: %v\n", m2.headers)
 		return false
 	}
 
-	b = assert.Equal(t, m.httpMajor, m2.httpMajor, "major")
-	if !b {
+	if m.httpMajor != m2.httpMajor {
+		t.Errorf("httpMajor: %v != %v", m.httpMajor, m2.httpMajor)
 		return false
 	}
-	b = assert.Equal(t, m.httpMinor, m2.httpMinor, "minor")
-	if !b {
+	if m.httpMinor != m2.httpMinor {
+		t.Errorf("httpMinor: %v != %v", m.httpMinor, m2.httpMinor)
 		return false
 	}
-	b = assert.Equal(t, m.hType, m2.hType, "htype")
-	if !b {
+
+	if m.hType != m2.hType {
+		t.Errorf("hType: %v != %v", m.hType, m2.hType)
 		return false
 	}
 
-	b = assert.Equal(t, m.requestURL, m2.requestURL, "request url")
-	if !b {
+	if m.requestURL != m2.requestURL {
+		t.Errorf("requestURL: %v != %v", m.requestURL, m2.requestURL)
 		return false
 	}
 
-	b = assert.Equal(t, m.body, m2.body, "body")
-	if !b {
+	if m.body != m2.body {
+		t.Errorf("body: %v != %v", m.body, m2.body)
 		return false
 	}
 
-	b = assert.Equal(t, m.responseStatus, m2.responseStatus, "responseStatus")
-	if !b {
+	if m.responseStatus != m2.responseStatus {
+		t.Errorf("responseStatus: %v != %v", m.responseStatus, m2.responseStatus)
 		return false
 	}
 
-	b = assert.Equal(t, m.statusCode, m2.statusCode, "status code")
-	if !b {
+	if m.statusCode != m2.statusCode {
+		t.Errorf("statusCode: %v != %v", m.statusCode, m2.statusCode)
 		return false
+
 	}
 
-	b = assert.Equal(t, m.upgrade, m2.upgrade, "upgrade")
-	if !b {
-		return b
+	if m.upgrade != m2.upgrade {
+		t.Errorf("upgrade: %v != %v", m.upgrade, m2.upgrade)
+		return false
 	}
 	return true
 }
@@ -2002,7 +2004,10 @@ func testMessage(t *testing.T, m *message) {
 		// 模拟第1次读包
 		if msg1len > 0 {
 			n1, err1 = parse(p, msg1Message)
-			assert.NoError(t, err1)
+			if err1 != nil {
+				t.Errorf("msg1len:%d, msg1(%s)", msg1len, msg1Message)
+				return
+			}
 			// 如果有upgrade状态, 就不需要再重复送往数据
 			if p.ReadyUpgradeData() {
 				//if p.callMessageComplete && p.Upgrade {
@@ -2021,13 +2026,19 @@ func testMessage(t *testing.T, m *message) {
 			got.upgrade += data[n2:]
 			goto test
 		}
-		assert.NoError(t, err)
+		if err != nil {
+			t.Error(err)
+			return
+		}
 
 	test:
 
 		// flush 解析器
 		_, err = parse(p, "")
-		assert.NoError(t, err)
+		if err != nil {
+			t.Error(err)
+			return
+		}
 		if b := m.eq(t, got); !b {
 			t.Logf("msg1.len:%d, msg2.len:%d, test case name:%s\n", len(msg1Message), len(msg2Message), m.name)
 			t.Logf("msg1len:%d,  msg1(%s)", msg1len, msg1Message)