gitbase: add integration test for uast functions

Signed-off-by: Miguel Molina <[email protected]>

Author: erizocosmico

.travis.yml

@@ -33,7 +33,8 @@ install:
 
 before_script:
   - docker run -d --name bblfshd --privileged -p 9432:9432 -v /var/lib/bblfshd:/var/lib/bblfshd bblfsh/bblfshd
-  - docker exec -it bblfshd bblfshctl driver install --all
+  - docker exec -it bblfshd bblfshctl driver install python bblfsh/python-driver
+  - docker exec -it bblfshd bblfshctl driver install php bblfsh/php-driver
 
 script:
   - make test-coverage codecov

integration_test.go

@@ -157,6 +157,38 @@ func TestIntegration(t *testing.T) {
 	t.Run("with squash", runTests)
 }
 
+func TestUastQueries(t *testing.T) {
+	require := require.New(t)
+	engine := sqle.New()
+	require.NoError(fixtures.Init())
+	defer func() {
+		require.NoError(fixtures.Clean())
+	}()
+
+	pool := gitbase.NewRepositoryPool()
+	for _, f := range fixtures.ByTag("worktree") {
+		pool.AddGit(f.Worktree().Root())
+	}
+
+	engine.AddDatabase(gitbase.NewDatabase("foo"))
+	engine.Catalog.RegisterFunctions(function.Functions)
+
+	session := gitbase.NewSession(&pool)
+	ctx := sql.NewContext(context.TODO(), sql.WithSession(session))
+	_, iter, err := engine.Query(ctx, `
+		SELECT uast_xpath(uast(content, 'php'), '//*[@roleIdentifier]') as uast, name 
+		FROM tree_entries te
+		INNER JOIN blobs b
+		ON b.hash = te.entry_hash
+		WHERE te.name = 'php/crappy.php'`,
+	)
+	require.NoError(err)
+
+	rows, err := sql.RowIterToRows(iter)
+	require.NoError(err)
+	require.Len(rows, 3)
+}
+
 func BenchmarkQueries(b *testing.B) {
 	queries := []struct {
 		name  string

internal/function/uast_test.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"testing"
 
-	opentracing "github.com/opentracing/opentracing-go"
 	"github.com/src-d/gitbase"
 	"github.com/stretchr/testify/require"
 	"gopkg.in/bblfsh/client-go.v2/tools"
@@ -166,7 +165,7 @@ func bblfshFixtures(t *testing.T, ctx *sql.Context) (uast []interface{}, filtere
 		Language("python").
 		Do()
 	require.NoError(t, err)
-	require.Equal(t, protocol.Ok, resp.Status)
+	require.Equal(t, protocol.Ok, resp.Status, "errors: %v", resp.Errors)
 	testUAST, err := resp.UAST.Marshal()
 	require.NoError(t, err)
 
@@ -193,7 +192,7 @@ func setup(t *testing.T) (*sql.Context, func()) {
 	}
 
 	session := gitbase.NewSession(&pool)
-	ctx := sql.NewContext(context.TODO(), session, opentracing.NoopTracer{})
+	ctx := sql.NewContext(context.TODO(), sql.WithSession(session))
 
 	return ctx, func() {
 		require.NoError(t, fixtures.Clean())