Skip to content

fix relative path import #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 14, 2022
Merged

fix relative path import #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions difflib/bytes/bytes_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ import (
"math"
"reflect"
"runtime"
"sort"
"strings"
"testing"
"sort"
"../tester"

"github.com/mongodb-forks/go-difflib/difflib/tester"
)

func assertAlmostEqual(t *testing.T, a, b float64, places int) {
Expand All @@ -35,15 +36,15 @@ func splitChars(s string) [][]byte {

func stringsToBytes(in ...string) (out [][]byte) {
out = make([][]byte, len(in))
for i, s := range(in) {
for i, s := range in {
out[i] = []byte(s)
}
return
}

func bytesToStrings(in ...[]byte) (out []string) {
out = make([]string, len(in))
for i, s := range(in) {
for i, s := range in {
out[i] = string(s)
}
return
Expand Down Expand Up @@ -332,7 +333,7 @@ func TestOutputFormatRangeFormatUnified(t *testing.T) {
// If a range is empty, its beginning line number shall be the number of
// the line just before the range, or 0 if the empty range starts the file.
fmt := formatRangeUnified
fm := func (a, b int) string { return string(fmt(a,b)) }
fm := func(a, b int) string { return string(fmt(a, b)) }
assertEqual(t, fm(3, 3), "3,0")
assertEqual(t, fm(3, 4), "4")
assertEqual(t, fm(3, 5), "4,2")
Expand All @@ -357,7 +358,7 @@ func TestOutputFormatRangeFormatContext(t *testing.T) {
// and the following format otherwise:
// "--- %d ----\n", <ending line number>
fmt := formatRangeContext
fm := func (a, b int) string { return string(fmt(a,b)) }
fm := func(a, b int) string { return string(fmt(a, b)) }
assertEqual(t, fm(3, 3), "3")
assertEqual(t, fm(3, 4), "4")
assertEqual(t, fm(3, 5), "4,5")
Expand Down Expand Up @@ -476,7 +477,7 @@ func BenchmarkSplitLines10000(b *testing.B) {

func prepareFilesToDiff(count, seed int) (As, Bs [][][]byte) {
defer runtime.GC()
aux := func () { // to ensure temp variables go out of scope
aux := func() { // to ensure temp variables go out of scope
stringsA, stringsB := tester.PrepareStringsToDiff(count, seed)
As = make([][][]byte, len(stringsA))
Bs = make([][][]byte, len(stringsB))
Expand Down Expand Up @@ -547,7 +548,7 @@ func TestDifferStructuredDump(t *testing.T) {
stringsToBytes("foo", "bar", "baz", "quux", "qwerty"),
1, 3)
expected := []DiffLine{DiffLine{'+', []byte("bar")},
DiffLine{'+', []byte("baz")}}
DiffLine{'+', []byte("baz")}}
if !reflect.DeepEqual(out, expected) {
t.Fatal("Differ StructuredDump failure:", out)
}
Expand Down Expand Up @@ -661,7 +662,7 @@ func TestGetUnifiedDiffString(t *testing.T) {
// Build diff
diff := UnifiedDiff{A: SplitLines(A),
FromFile: "file", FromDate: "then",
B: SplitLines(B),
B: SplitLines(B),
ToFile: "tile", ToDate: "now", Eol: []byte{}, Context: 1}
// Run test
diffStr, err := GetUnifiedDiffString(diff)
Expand Down
5 changes: 3 additions & 2 deletions difflib/difflib_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ import (
"runtime"
"strings"
"testing"
"./tester"

"github.com/mongodb-forks/go-difflib/difflib/tester"
)

func assertAlmostEqual(t *testing.T, a, b float64, places int) {
Expand Down Expand Up @@ -602,7 +603,7 @@ func TestGetUnifiedDiffString(t *testing.T) {
// Build diff
diff := LineDiffParams{A: SplitLines(A),
FromFile: "file", FromDate: "then",
B: SplitLines(B),
B: SplitLines(B),
ToFile: "tile", ToDate: "now", Eol: "", Context: 1}
// Run test
diffStr, err := GetUnifiedDiffString(diff)
Expand Down