From a81264a82310305db9c186558cb6466c4057c97d Mon Sep 17 00:00:00 2001
From: Ian Cottrell <iancottrell@google.com>
Date: Fri, 5 Apr 2019 13:49:15 -0400
Subject: [PATCH] internal/lsp: change diff tests to take strings not string
 arrays to make them more realistic

Change-Id: I7916c29c24cf581ddb4909a9beb8b0be3fb94c68
Reviewed-on: https://go-review.googlesource.com/c/tools/+/170881
Run-TryBot: Ian Cottrell <iancottrell@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Rebecca Stambler <rstambler@golang.org>
---
 internal/lsp/diff/diff_test.go | 35 ++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/internal/lsp/diff/diff_test.go b/internal/lsp/diff/diff_test.go
index 966511fe..52e52a45 100644
--- a/internal/lsp/diff/diff_test.go
+++ b/internal/lsp/diff/diff_test.go
@@ -6,48 +6,51 @@ package diff
 
 import (
 	"reflect"
+	"strings"
 	"testing"
 )
 
 func TestDiff(t *testing.T) {
-	for _, tt := range []struct {
-		a, b       []string
+	for _, test := range []struct {
+		a, b       string
 		lines      []*Op
 		operations []*Op
 	}{
 		{
-			a: []string{"A", "B", "C", "A", "B", "B", "A"},
-			b: []string{"C", "B", "A", "B", "A", "C"},
+			a: "A\nB\nC\nA\nB\nB\nA\n",
+			b: "C\nB\nA\nB\nA\nC\n",
 			operations: []*Op{
 				&Op{Kind: Delete, I1: 0, I2: 1, J1: 0},
 				&Op{Kind: Delete, I1: 1, I2: 2, J1: 0},
-				&Op{Kind: Insert, Content: []string{"B"}, I1: 3, I2: 3, J1: 1},
+				&Op{Kind: Insert, Content: []string{"B\n"}, I1: 3, I2: 3, J1: 1},
 				&Op{Kind: Delete, I1: 5, I2: 6, J1: 4},
-				&Op{Kind: Insert, Content: []string{"C"}, I1: 7, I2: 7, J1: 5},
+				&Op{Kind: Insert, Content: []string{"C\n"}, I1: 7, I2: 7, J1: 5},
 			},
 		},
 		{
-			a: []string{"A", "B"},
-			b: []string{"A", "C", ""},
+			a: "A\nB\n",
+			b: "A\nC\n\n",
 			operations: []*Op{
 				&Op{Kind: Delete, I1: 1, I2: 2, J1: 1},
-				&Op{Kind: Insert, Content: []string{"C"}, I1: 2, I2: 2, J1: 1},
-				&Op{Kind: Insert, Content: []string{""}, I1: 2, I2: 2, J1: 2},
+				&Op{Kind: Insert, Content: []string{"C\n"}, I1: 2, I2: 2, J1: 1},
+				&Op{Kind: Insert, Content: []string{"\n"}, I1: 2, I2: 2, J1: 2},
 			},
 		},
 	} {
-		ops := Operations(tt.a, tt.b)
-		if len(ops) != len(tt.operations) {
-			t.Fatalf("expected %v operations, got %v", len(tt.operations), len(ops))
+		a := strings.SplitAfter(test.a, "\n")
+		b := strings.SplitAfter(test.b, "\n")
+		ops := Operations(a, b)
+		if len(ops) != len(test.operations) {
+			t.Fatalf("expected %v operations, got %v", len(test.operations), len(ops))
 		}
 		for i, got := range ops {
-			want := tt.operations[i]
+			want := test.operations[i]
 			if !reflect.DeepEqual(want, got) {
 				t.Errorf("expected %v, got %v", want, got)
 			}
 		}
-		b := ApplyEdits(tt.a, tt.operations)
-		for i, want := range tt.b {
+		applied := ApplyEdits(a, test.operations)
+		for i, want := range applied {
 			got := b[i]
 			if got != want {
 				t.Errorf("expected %v got %v", want, got)