test: refine and improve pkg/utils unit test coverage to 82.3%

Makefile

@@ -200,8 +200,8 @@ coverage_fix_cover_mode:
 	sed -i "s/mode: count/mode: atomic/g" $(TEST_DIR)/cov.*.dmctl.*.out
 
 coverage: coverage_fix_cover_mode retool_setup
-	retool do gocovmerge "$(TEST_DIR)"/cov.* | grep -vE ".*.pb.go|.*.__failpoint_binding__.go" > "$(TEST_DIR)/all_cov.out"
-	retool do gocovmerge "$(TEST_DIR)"/cov.unit_test*.out | grep -vE ".*.pb.go|.*.__failpoint_binding__.go" > $(TEST_DIR)/unit_test.out
+	retool do gocovmerge "$(TEST_DIR)"/cov.* | grep -vE ".*.pb.go|.*.__failpoint_binding__.go|.*debug-tools.*|.*portal.*|.*tracer.*|.*loader.*|.*tracing.*|.*ctl.* > "$(TEST_DIR)/all_cov.out"
+	retool do gocovmerge "$(TEST_DIR)"/cov.unit_test*.out | grep -vE ".*.pb.go|.*.__failpoint_binding__.go|.*debug-tools.*|.*portal.*|.*tracer.*|.*loader .*|.*tracing.*|.*ctl.*" > $(TEST_DIR)/unit_test.out
 ifeq ("$(JenkinsCI)", "1")
 	@retool do goveralls -coverprofile=$(TEST_DIR)/all_cov.out -service=jenkins-ci -repotoken $(COVERALLS_TOKEN)
 	@bash <(curl -s https://codecov.io/bash) -f $(TEST_DIR)/unit_test.out -t $(CODECOV_TOKEN)

pkg/utils/common_test.go

@@ -0,0 +1,54 @@
+// Copyright 2020 PingCAP, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package utils
+
+import (
+	"bytes"
+
+	. "github.com/pingcap/check"
+	"github.com/pingcap/parser"
+)
+
+var _ = Suite(&testCommonSuite{})
+
+type testCommonSuite struct {
+}
+
+func (s *testCommonSuite) TestTrimCtrlChars(c *C) {
+	ddl := "create table if not exists foo.bar(id int)"
+	controlChars := make([]byte, 0, 33)
+	nul := byte(0x00)
+	for i := 0; i < 32; i++ {
+		controlChars = append(controlChars, nul)
+		nul++
+	}
+	controlChars = append(controlChars, 0x7f)
+
+	parser2 := parser.New()
+	var buf bytes.Buffer
+	for _, char := range controlChars {
+		buf.WriteByte(char)
+		buf.WriteByte(char)
+		buf.WriteString(ddl)
+		buf.WriteByte(char)
+		buf.WriteByte(char)
+
+		newDDL := TrimCtrlChars(buf.String())
+		c.Assert(newDDL, Equals, ddl)
+
+		_, err := parser2.ParseOneStmt(newDDL, "", "")
+		c.Assert(err, IsNil)
+		buf.Reset()
+	}
+}

syncer/ddl_test.go

@@ -14,8 +14,6 @@
 package syncer
 
 import (
-	"bytes"
-
 	"github.com/pingcap/dm/dm/config"
 	tcontext "github.com/pingcap/dm/pkg/context"
 	parserpkg "github.com/pingcap/dm/pkg/parser"
@@ -28,38 +26,6 @@ import (
 	router "github.com/pingcap/tidb-tools/pkg/table-router"
 )
 
-func (s *testSyncerSuite) TestTrimCtrlChars(c *C) {
-	ddl := "create table if not exists foo.bar(id int)"
-	controlChars := make([]byte, 0, 33)
-	nul := byte(0x00)
-	for i := 0; i < 32; i++ {
-		controlChars = append(controlChars, nul)
-		nul++
-	}
-	controlChars = append(controlChars, 0x7f)
-
-	var buf bytes.Buffer
-	db, mock, err := sqlmock.New()
-	c.Assert(err, IsNil)
-	p, err := s.mockParser(db, mock)
-	c.Assert(err, IsNil)
-
-	for _, char := range controlChars {
-		buf.WriteByte(char)
-		buf.WriteByte(char)
-		buf.WriteString(ddl)
-		buf.WriteByte(char)
-		buf.WriteByte(char)
-
-		newDDL := utils.TrimCtrlChars(buf.String())
-		c.Assert(len(newDDL), Equals, len(ddl))
-
-		_, err := p.ParseOneStmt(newDDL, "", "")
-		c.Assert(err, IsNil)
-		buf.Reset()
-	}
-}
-
 func (s *testSyncerSuite) TestAnsiQuotes(c *C) {
 	ansiQuotesCases := []string{
 		"create database `test`",