X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=pe_test.go;h=f560e37249949d7b17c04e94956ae8fd2d317078;hb=10f0b99e4b320a2beb819c7dc40423041b039f31;hp=6038afe9722e3f1fe3ee805737abed9e83e7e4cd;hpb=feba31d0851fee86d73575955c5f1806094bc59a;p=path-extractor.git

diff --git a/pe_test.go b/pe_test.go
index 6038afe..f560e37 100644
--- a/pe_test.go
+++ b/pe_test.go
@@ -2,83 +2,83 @@ package pathextractor
 
 import "testing"
 
-func TestGitIgnore(t *testing.T) {
-	output := GetAllMatches("?? alt/generateStore.php")
+func TestEverything(t *testing.T) {
+	output := GetAllMatches("?? alt/generateStore.php", MatchOptions{})
 	if output[0] != "alt/generateStore.php" {
 		t.Errorf("Doesnt match files", output)
 	}
 
-	output = GetAllMatches("I have a cat.")
+	output = GetAllMatches("I have a cat.", MatchOptions{})
 	if len(output) != 0 {
 		t.Errorf("Matches sentence", output)
 	}
 
-	output = GetAllMatches("hello .gitignore")
+	output = GetAllMatches("hello .gitignore", MatchOptions{})
 	if output[0] != ".gitignore" {
 		t.Errorf("Doesnt match hidden files", output)
 	}
 
-	output = GetAllMatches(" this.user ")
+	output = GetAllMatches(" this.user ", MatchOptions{})
 	if len(output) != 0 {
 		t.Errorf("Matches this.user", output)
 	}
 
-	output = GetAllMatches(" mail@mail.com ")
+	output = GetAllMatches(" mail@mail.com ", MatchOptions{})
 	if len(output) != 0 {
 		t.Errorf("Matches email adresses", output)
 	}
 
-	output = GetAllMatches(" logo@2x.png ")
+	output = GetAllMatches(" logo@2x.png ", MatchOptions{})
 	if len(output) == 0 {
 		t.Errorf("Doesn't match retina asset", output)
 	}
 
-	output = GetAllMatches("and/or")
+	output = GetAllMatches("and/or", MatchOptions{})
 	if len(output) != 0 {
 		t.Errorf("Matches and/or adresses", output)
 	}
 
-	output = GetAllMatches("v1.2")
+	output = GetAllMatches("v1.2", MatchOptions{})
 	if len(output) != 0 {
 		t.Errorf("Matches version number", output)
 	}
 
-	output = GetAllMatches("obj.slice()")
+	output = GetAllMatches("obj.slice()", MatchOptions{})
 	if len(output) != 0 {
 		t.Errorf("Matches function call", output)
 	}
 
-	output = GetAllMatches("~/www")
+	output = GetAllMatches("~/www", MatchOptions{})
 	if len(output) == 0 || output[0] != "~/www" {
 		t.Errorf("Doesnt match home", output)
 	}
 
-	output = GetAllMatches("origin/master")
+	output = GetAllMatches("origin/master", MatchOptions{})
 	if len(output) != 0 {
 		t.Errorf("Matches remote name", output)
 	}
 
-	output = GetAllMatches("john doe (dead on 28/04/2014)")
+	output = GetAllMatches("john doe (dead on 28/04/2014)", MatchOptions{})
 	if len(output) != 0 {
 		t.Errorf("Matches date", output)
 	}
 
-	output = GetAllMatches("john doe ,dead on 28/04/2014")
+	output = GetAllMatches("john doe ,dead on 28/04/2014", MatchOptions{})
 	if len(output) != 0 {
 		t.Errorf("Matches date", output)
 	}
 
-	output = GetAllMatches(".gitignore , ~/www")
+	output = GetAllMatches(".gitignore , ~/www", MatchOptions{})
 	if len(output) != 2 {
 		t.Errorf("Doesnt match multi", output)
 	}
 
-	output = GetAllMatches("user.test.js")
+	output = GetAllMatches("user.test.js", MatchOptions{})
 	if len(output) != 1 {
 		t.Errorf("Doesnt match multiple extensions", output)
 	}
 
-	output = GetAllMatches("(user.js)")
+	output = GetAllMatches("(user.js)", MatchOptions{})
 	if len(output) != 1 {
 		t.Errorf("Doesnt match surrounded by parens", output)
 	}
@@ -86,13 +86,24 @@ func TestGitIgnore(t *testing.T) {
 		t.Errorf("matches surrounded by parens badly", output)
 	}
 
-	output = GetAllMatches("var/")
+	output = GetAllMatches("var/", MatchOptions{})
 	if len(output) != 1 {
 		t.Errorf("Doesnt match dir", output)
 	}
 
-	output = GetAllMatches("//")
+	output = GetAllMatches("//", MatchOptions{})
 	if len(output) != 0 {
 		t.Errorf("Comment matches", output)
 	}
+
+	output = GetAllMatches("test.js:45", MatchOptions{format: "ackmate"})
+	if len(output) != 1 {
+		t.Errorf("Ackmate doesnt match", output)
+	}
+	if output[0] == "test.js" {
+		t.Errorf("Ackmate should not forget number", output)
+	}
+	if output[0] != "test.js:45" {
+		t.Errorf("Ackmate should output right line number", output)
+	}
 }