Merge pull request #449 from rethinkdb/next

2.4 Support

Author: gabor-boros

.travis.yml

@@ -1,13 +1,11 @@
 language: go
 
 go:
-  - 1.7.x
-  - 1.8.x
   - 1.9.x
   - 1.10.x
   - 1.11.x
   - 1.12.x
-  - master
+  - 1.13.x
 
 cache: apt
 

README.md

@@ -8,7 +8,7 @@
 
 ![RethinkDB-go Logo](https://raw.github.com/wiki/rethinkdb/rethinkdb-go/gopher-and-thinker-s.png "Golang Gopher and RethinkDB Thinker")
 
-Current version: v5.0.1 (RethinkDB v2.3)
+Current version: v5.1.0 (RethinkDB v2.4)
 
 Please note that this version of the driver only supports versions of RethinkDB using the v0.4 protocol (any versions of the driver older than RethinkDB 2.0 will not work).
 

internal/integration/reql_tests/gorethink_test.go

@@ -5,14 +5,19 @@ package reql_tests
 import (
 	"flag"
 	"os"
+	"runtime"
 
 	r "gopkg.in/rethinkdb/rethinkdb-go.v5"
 )
 
 var url string
 
 func init() {
-	flag.Parse()
+	// Fixing test.testlogfile parsing error on Go 1.13+.
+	if runtime.Version() < "go1.13" {
+		flag.Parse()
+	}
+
 	r.SetVerbose(true)
 
 	// If the test is being run by wercker look for the rethink url

internal/integration/reql_tests/reql_bitwise_test.go

@@ -0,0 +1,165 @@
+package reql_tests
+
+import (
+	"github.com/stretchr/testify/suite"
+	r "gopkg.in/rethinkdb/rethinkdb-go.v5"
+	"testing"
+)
+
+// Test edge cases of bitwise operations
+func TestBitwiseSuite(t *testing.T) {
+	suite.Run(t, new(BitwiseSuite))
+}
+
+type BitwiseSuite struct {
+	suite.Suite
+
+	session *r.Session
+}
+
+func (suite *BitwiseSuite) SetupTest() {
+	suite.T().Log("Setting up BitwiseSuite")
+
+	session, err := r.Connect(r.ConnectOpts{
+		Address: url,
+	})
+	suite.Require().NoError(err, "Error returned when connecting to server")
+	suite.session = session
+}
+
+func (suite *BitwiseSuite) TearDownSuite() {
+	suite.T().Log("Tearing down BitwiseSuite")
+
+	if suite.session != nil {
+		suite.session.Close()
+	}
+}
+
+func (suite *BitwiseSuite) TestCases() {
+	suite.T().Log("Running BitwiseSuite: Test edge cases of bitwise operations")
+
+	runOpts := r.RunOpts{
+		GeometryFormat: "raw",
+		GroupFormat:    "map",
+	}
+
+	{
+		var q = r.BitAnd(3, 5)
+		var expected_ = 3 & 5
+
+		suite.T().Logf("About to run line #1: %v", q)
+
+		runAndAssert(suite.Suite, expected_, q, suite.session, runOpts)
+		suite.T().Log("Finished running line #1")
+	}
+
+	{
+		var q = r.Expr(3).BitAnd(5)
+		var expected_ = 3 & 5
+
+		suite.T().Logf("About to run line #2: %v", q)
+
+		runAndAssert(suite.Suite, expected_, q, suite.session, runOpts)
+		suite.T().Log("Finished running line #2")
+	}
+
+	{
+		var q = r.BitOr(3, 5)
+		var expected_ = 3 | 5
+
+		suite.T().Logf("About to run line #3: %v", q)
+
+		runAndAssert(suite.Suite, expected_, q, suite.session, runOpts)
+		suite.T().Log("Finished running line #3")
+	}
+
+	{
+		var q = r.Expr(3).BitOr(5)
+		var expected_ = 3 | 5
+
+		suite.T().Logf("About to run line #4: %v", q)
+
+		runAndAssert(suite.Suite, expected_, q, suite.session, runOpts)
+		suite.T().Log("Finished running line #4")
+	}
+
+	{
+		var q = r.BitXor(3, 5)
+		var expected_ = 3 ^ 5
+
+		suite.T().Logf("About to run line #5: %v", q)
+
+		runAndAssert(suite.Suite, expected_, q, suite.session, runOpts)
+		suite.T().Log("Finished running line #5")
+	}
+
+	{
+		var q = r.Expr(3).BitXor(5)
+		var expected_ = 3 ^ 5
+
+		suite.T().Logf("About to run line #6: %v", q)
+
+		runAndAssert(suite.Suite, expected_, q, suite.session, runOpts)
+		suite.T().Log("Finished running line #6")
+	}
+
+	{
+		var q = r.BitNot(3)
+		var expected_ = ^3
+
+		suite.T().Logf("About to run line #7: %v", q)
+
+		runAndAssert(suite.Suite, expected_, q, suite.session, runOpts)
+		suite.T().Log("Finished running line #7")
+	}
+
+	{
+		var q = r.Expr(3).BitNot()
+		var expected_ = ^3
+
+		suite.T().Logf("About to run line #8: %v", q)
+
+		runAndAssert(suite.Suite, expected_, q, suite.session, runOpts)
+		suite.T().Log("Finished running line #8")
+	}
+
+	{
+		var q = r.BitSal(3, 5)
+		var expected_ = 3 << 5
+
+		suite.T().Logf("About to run line #9: %v", q)
+
+		runAndAssert(suite.Suite, expected_, q, suite.session, runOpts)
+		suite.T().Log("Finished running line #9")
+	}
+
+	{
+		var q = r.Expr(3).BitSal(5)
+		var expected_ = 3 << 5
+
+		suite.T().Logf("About to run line #10: %v", q)
+
+		runAndAssert(suite.Suite, expected_, q, suite.session, runOpts)
+		suite.T().Log("Finished running line #10")
+	}
+
+	{
+		var q = r.BitSar(3, 5)
+		var expected_ = 3 >> 5
+
+		suite.T().Logf("About to run line #11: %v", q)
+
+		runAndAssert(suite.Suite, expected_, q, suite.session, runOpts)
+		suite.T().Log("Finished running line #11")
+	}
+
+	{
+		var q = r.Expr(3).BitSar(5)
+		var expected_ = 3 >> 5
+
+		suite.T().Logf("About to run line #12: %v", q)
+
+		runAndAssert(suite.Suite, expected_, q, suite.session, runOpts)
+		suite.T().Log("Finished running line #12")
+	}
+}