Merge branch 'develop' of https://github.com/GoRethink/gorethink into develop

Author: CMogilko

.gitignore

@@ -27,3 +27,4 @@ _testmain.go
 .wercker
 
 cover.html
+.idea/

.travis.yml

@@ -4,6 +4,8 @@ go:
   - 1.7.x
   - 1.8.x
   - 1.9.x
+  - 1.10.x
+  - 1.11.x
   - tip
 
 cache: apt
@@ -18,7 +20,7 @@ before_script:
   - sudo apt-get update
   - sudo apt-get install rethinkdb
   - rethinkdb > /dev/null 2>&1 &
-  - rethinkdb --port-offset 1 --directory rethinkdb_data1 --join localhost:29016 > /dev/null 2>&1 &
+  - rethinkdb --port-offset 1 --directory rethinkdb_data1                        > /dev/null 2>&1 &
   - rethinkdb --port-offset 2 --directory rethinkdb_data2 --join localhost:29016 > /dev/null 2>&1 &
   - rethinkdb --port-offset 3 --directory rethinkdb_data3 --join localhost:29016 > /dev/null 2>&1 &
 

internal/compare/expected.go

@@ -45,3 +45,11 @@ func PartialMatch(v interface{}) Expected {
 		Val:     v,
 	}
 }
+
+//func ContainsMatch(containsAllThis interface{}) Expected {
+//	return Expected{
+//		Ordered: false,
+//		Partial: false,
+//		Val: v,
+//	}
+//}

internal/integration/reql_tests/common.go

@@ -57,13 +57,13 @@ func runAndAssert(suite suite.Suite, expected, v interface{}, session *r.Session
 
 func fetchAndAssert(suite suite.Suite, expected, result interface{}, count int) {
 	switch v := expected.(type) {
-	case Expected:
+	case compare.Expected:
 		v.Fetch = true
 		v.FetchCount = count
 
 		expected = v
 	default:
-		expected = Expected(compare.Expected{
+		expected = compare.Expected(compare.Expected{
 			Val:        v,
 			Fetch:      true,
 			FetchCount: count,
@@ -105,17 +105,15 @@ func assertExpected(suite suite.Suite, expected interface{}, obtainedCursor *r.C
 	switch expected := expected.(type) {
 	case Err:
 		expected.assert(suite, obtainedCursor, obtainedErr)
-	case Expected:
-		expected.assert(suite, obtainedCursor, obtainedErr)
+	case compare.Expected:
+		assert(suite, expected, obtainedCursor, obtainedErr)
 	default:
-		Expected(compare.Expected{Val: expected}).assert(suite, obtainedCursor, obtainedErr)
+		assert(suite, compare.Expected{Val: expected}, obtainedCursor, obtainedErr)
 	}
 }
 
-type Expected compare.Expected
-
-func (expected Expected) assert(suite suite.Suite, obtainedCursor *r.Cursor, obtainedErr error) {
-	if suite.NoError(obtainedErr, "Query returned unexpected error") {
+func assert(suite suite.Suite, expected compare.Expected, obtainedCursor *r.Cursor, obtainedErr error) {
+	if !suite.NoError(obtainedErr, "Query returned unexpected error") {
 		return
 	}
 
@@ -217,7 +215,7 @@ func (expected Err) assert(suite suite.Suite, obtainerCursor *r.Cursor, obtained
 		obtainedErr = obtainerCursor.All(&res)
 	}
 
-	if suite.Error(obtainedErr) {
+	if !suite.Error(obtainedErr) {
 		return
 	}