Merge pull request #39 from zimmski/fix-compile-errors

Fix compile errors

Author: zimmski

Makefile

@@ -43,8 +43,8 @@ install-tools:
 lint:
 	$(ROOT_DIR)/scripts/lint.sh
 test:
-	go test -race -test.timeout 60s $(PKG_TEST)
+	go test -race -test.timeout 120s $(PKG_TEST)
 test-verbose:
-	go test -race -test.timeout 60s -v $(PKG_TEST)
+	go test -race -test.timeout 120s -v $(PKG_TEST)
 test-with-coverage:
 	ginkgo -r -cover -race -skipPackage="testdata"

README.md

@@ -92,7 +92,7 @@ Every mutation has to be tested using an [exec command](#write-mutation-exec-com
 - Execute all tests of the package of the mutated file.
 - Report if the mutation was killed.
 
-Alternatively the `--exec` argument can be used to invoke an external exec command. The [/scripts/exec](/scripts/exec) directory holds basic exec commands for Go projects. The [test-mutated-package.sh](/scripts/exec/test-mutated-package.sh) script implements all steps of the built-in exec command. It can be for example used to test the [github.com/zimmski/go-mutesting/example](/example) package.
+Alternatively the `--exec` argument can be used to invoke an external exec command. The [/scripts/exec](/scripts/exec) directory holds basic exec commands for Go projects. The [test-mutated-package.sh](/scripts/exec/test-mutated-package.sh) script implements all steps and almost all features of the built-in exec command. It can be for example used to test the [github.com/zimmski/go-mutesting/example](/example) package.
 
 ```bash
 go-mutesting --exec "$GOPATH/src/github.com/zimmski/go-mutesting/scripts/exec/test-mutated-package.sh" github.com/zimmski/go-mutesting/example

astutil/query.go

@@ -17,14 +17,39 @@ type identifierWalker struct {
 	identifiers []ast.Expr
 }
 
+var blacklistedIdentifiers = map[string]bool{
+	"_":      true,
+	"append": true,
+	"close":  true,
+	"go":     true,
+	"func":   true,
+	"len":    true,
+	"nil":    true,
+}
+
+func checkForSelectorExpr(node ast.Expr) bool {
+	switch n := node.(type) {
+	case *ast.Ident:
+		return true
+	case *ast.SelectorExpr:
+		return checkForSelectorExpr(n.X)
+	}
+
+	return false
+}
+
 func (w *identifierWalker) Visit(node ast.Node) ast.Visitor {
 	switch n := node.(type) {
 	case *ast.Ident:
-		w.identifiers = append(w.identifiers, n)
+		if _, ok := blacklistedIdentifiers[n.Name]; !ok {
+			w.identifiers = append(w.identifiers, n)
+		}
 
 		return nil
 	case *ast.SelectorExpr:
-		w.identifiers = append(w.identifiers, n)
+		if checkForSelectorExpr(n) {
+			w.identifiers = append(w.identifiers, n)
+		}
 
 		return nil
 	}

cmd/go-mutesting/main.go

@@ -300,7 +300,12 @@ MUTATOR:
 }
 
 func mutate(opts *options, mutators []mutatorItem, mutationBlackList map[string]struct{}, mutationID int, file string, fset *token.FileSet, src ast.Node, node ast.Node, tmpFile string, execs []string, stats *mutationStats) int {
-	pkg, err := build.ImportDir(filepath.Dir(file), build.FindOnly)
+	dir, err := filepath.Abs(filepath.Dir(file))
+	if err != nil {
+		panic(err)
+	}
+
+	pkg, err := build.ImportDir(dir, build.FindOnly)
 	if err != nil {
 		panic(err)
 	}

cmd/go-mutesting/main_test.go

@@ -10,12 +10,22 @@ import (
 )
 
 func TestMain(t *testing.T) {
+	testMain(
+		t,
+		"../../example",
+		[]string{"--debug", "--exec-timeout", "1"},
+		returnOk,
+		"The mutation score is 0.500000 (7 passed, 7 failed, 0 skipped, total is 14)",
+	)
+}
+
+func TestMainRecursive(t *testing.T) {
 	testMain(
 		t,
 		"../../example",
 		[]string{"--debug", "--exec-timeout", "1", "./..."},
 		returnOk,
-		"The mutation score is 0.538462 (7 passed, 6 failed, 1 skipped, total is 14)",
+		"The mutation score is 0.533333 (8 passed, 7 failed, 0 skipped, total is 15)",
 	)
 }
 
@@ -25,7 +35,7 @@ func TestMainFromOtherDirectory(t *testing.T) {
 		"../..",
 		[]string{"--debug", "--exec-timeout", "1", "github.com/zimmski/go-mutesting/example"},
 		returnOk,
-		"The mutation score is 0.538462 (7 passed, 6 failed, 1 skipped, total is 14)",
+		"The mutation score is 0.500000 (7 passed, 7 failed, 0 skipped, total is 14)",
 	)
 }
 
@@ -35,7 +45,7 @@ func TestMainMatch(t *testing.T) {
 		"../../example",
 		[]string{"--debug", "--exec", "../scripts/exec/test-mutated-package.sh", "--exec-timeout", "1", "--match", "baz", "./..."},
 		returnOk,
-		"The mutation score is 0.000000 (0 passed, 1 failed, 0 skipped, total is 1)",
+		"The mutation score is 0.500000 (1 passed, 1 failed, 0 skipped, total is 2)",
 	)
 }
 

example/sub/sub.go

@@ -0,0 +1,8 @@
+package sub
+
+func baz() int {
+	i := 1
+	i = i + i
+
+	return i
+}

example/sub/sub_test.go

@@ -0,0 +1,11 @@
+package sub
+
+import (
+	"testing"
+
+	. "github.com/stretchr/testify/assert"
+)
+
+func TestBaz(t *testing.T) {
+	Equal(t, baz(), 2)
+}