Merge pull request mattn#35 from markus-oberhumer/minor-testcase-cleanups

Minor testcase cleanups

Author: mattn

shellwords_test.go

@@ -12,6 +12,9 @@ var testcases = []struct {
 	line     string
 	expected []string
 }{
+	{``, []string{}},
+	{`""`, []string{``}},
+	{`''`, []string{``}},
 	{`var --bar=baz`, []string{`var`, `--bar=baz`}},
 	{`var --bar="baz"`, []string{`var`, `--bar=baz`}},
 	{`var "--bar=baz"`, []string{`var`, `--bar=baz`}},
@@ -25,10 +28,12 @@ var testcases = []struct {
 	{`var  --"bar baz"`, []string{`var`, `--bar baz`}},
 	{`a "b"`, []string{`a`, `b`}},
 	{`a " b "`, []string{`a`, ` b `}},
-	{`a "   "`, []string{`a`, `   `}}, // FAILS !
+	{`a "   "`, []string{`a`, `   `}},
 	{`a 'b'`, []string{`a`, `b`}},
 	{`a ' b '`, []string{`a`, ` b `}},
-	{`a '   '`, []string{`a`, `   `}}, // FAILS !
+	{`a '   '`, []string{`a`, `   `}},
+	{"foo bar\\  ", []string{`foo`, `bar `}},
+	{`foo "" bar ''`, []string{`foo`, ``, `bar`, ``}},
 }
 
 func TestSimple(t *testing.T) {
@@ -59,44 +64,6 @@ func TestError(t *testing.T) {
 	}
 }
 
-func TestLastSpace(t *testing.T) {
-	args, err := Parse("foo bar\\  ")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(args) != 2 {
-		t.Fatal("Should have two elements")
-	}
-	if args[0] != "foo" {
-		t.Fatal("1st element should be `foo`")
-	}
-	if args[1] != "bar " {
-		t.Fatal("1st element should be `bar `")
-	}
-}
-
-func TestEmptyArgs(t *testing.T) {
-	args, err := Parse(`foo "" bar ''`)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(args) != 4 {
-		t.Fatal("Should have three elements")
-	}
-	if args[0] != "foo" {
-		t.Fatal("1st element should be `foo`")
-	}
-	if args[1] != "" {
-		t.Fatal("2nd element should be empty")
-	}
-	if args[2] != "bar" {
-		t.Fatal("3rd element should be `bar`")
-	}
-	if args[3] != "" {
-		t.Fatal("4th element should be empty")
-	}
-}
-
 func TestShellRun(t *testing.T) {
 	dir, err := os.Getwd()
 	if err != nil {