lib/text: replace json.Escape with strconv.Quote

We want to prevent import cycle in the future, when the test package
use the text/diff for display difference between string.

4 files changed, 82 insertions, 10 deletions

diff --git a/lib/text/chunk.go b/lib/text/chunk.go
index 49ab395d..ddf2edc4 100644
--- a/lib/text/chunk.go
+++ b/lib/text/chunk.go
@@ -8,8 +8,6 @@ import (
 	"bytes"
 	"fmt"
 	"strconv"
-
-	"github.com/shuLhan/share/lib/json"
 )
 
 // Chunk represent subset of line, contain starting position and slice of
@@ -38,9 +36,9 @@ func (chunk Chunk) MarshalJSON() ([]byte, error) {
 
 	bb.WriteString(`{"StartAt":`)
 	bb.WriteString(strconv.Itoa(chunk.StartAt))
-	bb.WriteString(`,"V":"`)
-	bb.Write(json.Escape(chunk.V))
-	bb.WriteString(`"}`)
+	bb.WriteString(`,"V":`)
+	bb.WriteString(strconv.Quote(string(chunk.V)))
+	bb.WriteString(`}`)
 
 	return bb.Bytes(), nil
 }
diff --git a/lib/text/chunk_test.go b/lib/text/chunk_test.go
new file mode 100644
index 00000000..36f1cf8b
--- /dev/null
+++ b/lib/text/chunk_test.go
@@ -0,0 +1,38 @@
+package text
+
+import (
+	"reflect"
+	"testing"
+)
+
+func TestChunk_MarshalJSON(t *testing.T) {
+	type testCase struct {
+		chunk Chunk
+		exp   string
+	}
+
+	var cases = []testCase{{
+		chunk: Chunk{
+			StartAt: 1,
+			V:       []byte("<script>a\"\\ \b\f\n\r\tz"),
+		},
+		exp: `{"StartAt":1,"V":"<script>a\"\\ \b\f\n\r\tz"}`,
+	}}
+
+	var (
+		c   testCase
+		got []byte
+		err error
+	)
+
+	for _, c = range cases {
+		got, err = c.chunk.MarshalJSON()
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		if !reflect.DeepEqual(c.exp, string(got)) {
+			t.Fatalf(`want %s, got %s`, c.exp, got)
+		}
+	}
+}
diff --git a/lib/text/line.go b/lib/text/line.go
index cb551141..254fc0dc 100644
--- a/lib/text/line.go
+++ b/lib/text/line.go
@@ -8,8 +8,6 @@ import (
 	"bytes"
 	"fmt"
 	"strconv"
-
-	"github.com/shuLhan/share/lib/json"
 )
 
 // Line represent line number and slice of bytes as string.
@@ -23,9 +21,9 @@ func (line Line) MarshalJSON() ([]byte, error) {
 
 	bb.WriteString(`{"N":`)
 	bb.WriteString(strconv.Itoa(line.N))
-	bb.WriteString(`,"V":"`)
-	bb.Write(json.Escape(line.V))
-	bb.WriteString(`"}`)
+	bb.WriteString(`,"V":`)
+	bb.WriteString(strconv.Quote(string(line.V)))
+	bb.WriteString(`}`)
 
 	return bb.Bytes(), nil
 }
diff --git a/lib/text/line_test.go b/lib/text/line_test.go
new file mode 100644
index 00000000..e4395592
--- /dev/null
+++ b/lib/text/line_test.go
@@ -0,0 +1,38 @@
+package text
+
+import (
+	"reflect"
+	"testing"
+)
+
+func TestLine_MarshalJSON(t *testing.T) {
+	type testCase struct {
+		line Line
+		exp  string
+	}
+
+	var cases = []testCase{{
+		line: Line{
+			N: 1,
+			V: []byte("<script>a\"\\ \b\f\n\r\tz"),
+		},
+		exp: `{"N":1,"V":"<script>a\"\\ \b\f\n\r\tz"}`,
+	}}
+
+	var (
+		c   testCase
+		got []byte
+		err error
+	)
+
+	for _, c = range cases {
+		got, err = c.line.MarshalJSON()
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		if !reflect.DeepEqual(c.exp, string(got)) {
+			t.Fatalf(`want %s, got %s`, c.exp, got)
+		}
+	}
+}