From 150fc635c53ef552024088ac65f82522b3626808 Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Tue, 3 Mar 2009 08:39:12 -0800 Subject: Automated g4 rollback of changelist 25024, plus significant hand editing. Back to T{x} for composite literals. R=r OCL=25612 CL=25632 --- src/lib/strings_test.go | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'src/lib/strings_test.go') diff --git a/src/lib/strings_test.go b/src/lib/strings_test.go index 0efe254ce..2cbf70b93 100644 --- a/src/lib/strings_test.go +++ b/src/lib/strings_test.go @@ -30,10 +30,10 @@ type ExplodeTest struct { s string; a []string; } -var explodetests = []ExplodeTest ( - ExplodeTest( abcd, []string("a", "b", "c", "d") ), - ExplodeTest( faces, []string("☺", "☻", "☹" ) ), -) +var explodetests = []ExplodeTest { + ExplodeTest{ abcd, []string{"a", "b", "c", "d"} }, + ExplodeTest{ faces, []string{"☺", "☻", "☹" } }, +} func TestExplode(t *testing.T) { for i := 0; i < len(explodetests); i++ { tt := explodetests[i]; @@ -54,16 +54,16 @@ type SplitTest struct { sep string; a []string; } -var splittests = []SplitTest ( - SplitTest( abcd, "a", []string("", "bcd") ), - SplitTest( abcd, "z", []string("abcd") ), - SplitTest( abcd, "", []string("a", "b", "c", "d") ), - SplitTest( commas, ",", []string("1", "2", "3", "4") ), - SplitTest( dots, "...", []string("1", ".2", ".3", ".4") ), - SplitTest( faces, "☹", []string("☺☻", "") ), - SplitTest( faces, "~", []string(faces) ), - SplitTest( faces, "", []string("☺", "☻", "☹") ), -) +var splittests = []SplitTest { + SplitTest{ abcd, "a", []string{"", "bcd"} }, + SplitTest{ abcd, "z", []string{"abcd"} }, + SplitTest{ abcd, "", []string{"a", "b", "c", "d"} }, + SplitTest{ commas, ",", []string{"1", "2", "3", "4"} }, + SplitTest{ dots, "...", []string{"1", ".2", ".3", ".4"} }, + SplitTest{ faces, "☹", []string{"☺☻", ""} }, + SplitTest{ faces, "~", []string{faces} }, + SplitTest{ faces, "", []string{"☺", "☻", "☹"} }, +} func TestSplit(t *testing.T) { for i := 0; i < len(splittests); i++ { tt := splittests[i]; -- cgit v1.2.3