vendor: Update vendor logic

vendor/github.com/onsi/gomega/matchers/assignable_to_type_of_matcher.go

@@ -1,3 +1,5 @@
+// untested sections: 2
+
 package matchers
 
 import (

vendor/github.com/onsi/gomega/matchers/be_a_directory.go

@@ -1,3 +1,5 @@
+// untested sections: 5
+
 package matchers
 
 import (

vendor/github.com/onsi/gomega/matchers/be_a_regular_file.go

@@ -1,3 +1,5 @@
+// untested sections: 5
+
 package matchers
 
 import (

vendor/github.com/onsi/gomega/matchers/be_an_existing_file.go

@@ -1,3 +1,5 @@
+// untested sections: 3
+
 package matchers
 
 import (

vendor/github.com/onsi/gomega/matchers/be_closed_matcher.go

@@ -1,3 +1,5 @@
+// untested sections: 2
+
 package matchers
 
 import (
@@ -23,8 +25,8 @@ func (matcher *BeClosedMatcher) Match(actual interface{}) (success bool, err err
 	}
 
 	winnerIndex, _, open := reflect.Select([]reflect.SelectCase{
-		reflect.SelectCase{Dir: reflect.SelectRecv, Chan: channelValue},
-		reflect.SelectCase{Dir: reflect.SelectDefault},
+		{Dir: reflect.SelectRecv, Chan: channelValue},
+		{Dir: reflect.SelectDefault},
 	})
 
 	var closed bool

vendor/github.com/onsi/gomega/matchers/be_element_of_matcher.go

@@ -0,0 +1,57 @@
+// untested sections: 1
+
+package matchers
+
+import (
+	"fmt"
+	"reflect"
+
+	"github.com/onsi/gomega/format"
+)
+
+type BeElementOfMatcher struct {
+	Elements []interface{}
+}
+
+func (matcher *BeElementOfMatcher) Match(actual interface{}) (success bool, err error) {
+	if reflect.TypeOf(actual) == nil {
+		return false, fmt.Errorf("BeElement matcher expects actual to be typed")
+	}
+
+	length := len(matcher.Elements)
+	valueAt := func(i int) interface{} {
+		return matcher.Elements[i]
+	}
+	// Special handling of a single element of type Array or Slice
+	if length == 1 && isArrayOrSlice(valueAt(0)) {
+		element := valueAt(0)
+		value := reflect.ValueOf(element)
+		length = value.Len()
+		valueAt = func(i int) interface{} {
+			return value.Index(i).Interface()
+		}
+	}
+
+	var lastError error
+	for i := 0; i < length; i++ {
+		matcher := &EqualMatcher{Expected: valueAt(i)}
+		success, err := matcher.Match(actual)
+		if err != nil {
+			lastError = err
+			continue
+		}
+		if success {
+			return true, nil
+		}
+	}
+
+	return false, lastError
+}
+
+func (matcher *BeElementOfMatcher) FailureMessage(actual interface{}) (message string) {
+	return format.Message(actual, "to be an element of", matcher.Elements)
+}
+
+func (matcher *BeElementOfMatcher) NegatedFailureMessage(actual interface{}) (message string) {
+	return format.Message(actual, "not to be an element of", matcher.Elements)
+}

vendor/github.com/onsi/gomega/matchers/be_empty_matcher.go

@@ -1,3 +1,5 @@
+// untested sections: 2
+
 package matchers
 
 import (

vendor/github.com/onsi/gomega/matchers/be_equivalent_to_matcher.go

@@ -1,3 +1,5 @@
+// untested sections: 2
+
 package matchers
 
 import (

vendor/github.com/onsi/gomega/matchers/be_false_matcher.go

@@ -1,3 +1,5 @@
+// untested sections: 2
+
 package matchers
 
 import (

vendor/github.com/onsi/gomega/matchers/be_identical_to.go

@@ -1,3 +1,5 @@
+// untested sections: 2
+
 package matchers
 
 import (

vendor/github.com/onsi/gomega/matchers/be_nil_matcher.go

@@ -1,3 +1,5 @@
+// untested sections: 2
+
 package matchers
 
 import "github.com/onsi/gomega/format"

vendor/github.com/onsi/gomega/matchers/be_numerically_matcher.go

@@ -1,3 +1,5 @@
+// untested sections: 4
+
 package matchers
 
 import (

vendor/github.com/onsi/gomega/matchers/be_sent_matcher.go

@@ -1,3 +1,5 @@
+// untested sections: 3
+
 package matchers
 
 import (
@@ -42,8 +44,8 @@ func (matcher *BeSentMatcher) Match(actual interface{}) (success bool, err error
 	}()
 
 	winnerIndex, _, _ := reflect.Select([]reflect.SelectCase{
-		reflect.SelectCase{Dir: reflect.SelectSend, Chan: channelValue, Send: argValue},
-		reflect.SelectCase{Dir: reflect.SelectDefault},
+		{Dir: reflect.SelectSend, Chan: channelValue, Send: argValue},
+		{Dir: reflect.SelectDefault},
 	})
 
 	var didSend bool

vendor/github.com/onsi/gomega/matchers/be_temporally_matcher.go

@@ -1,3 +1,5 @@
+// untested sections: 3
+
 package matchers
 
 import (

vendor/github.com/onsi/gomega/matchers/be_true_matcher.go

@@ -1,3 +1,5 @@
+// untested sections: 2
+
 package matchers
 
 import (

vendor/github.com/onsi/gomega/matchers/consist_of.go

@@ -1,3 +1,5 @@
+// untested sections: 3
+
 package matchers
 
 import (

vendor/github.com/onsi/gomega/matchers/contain_element_matcher.go

@@ -1,3 +1,5 @@
+// untested sections: 2
+
 package matchers
 
 import (
@@ -22,19 +24,21 @@ func (matcher *ContainElementMatcher) Match(actual interface{}) (success bool, e
 	}
 
 	value := reflect.ValueOf(actual)
-	var keys []reflect.Value
+	var valueAt func(int) interface{}
 	if isMap(actual) {
-		keys = value.MapKeys()
+		keys := value.MapKeys()
+		valueAt = func(i int) interface{} {
+			return value.MapIndex(keys[i]).Interface()
+		}
+	} else {
+		valueAt = func(i int) interface{} {
+			return value.Index(i).Interface()
+		}
 	}
+
 	var lastError error
 	for i := 0; i < value.Len(); i++ {
-		var success bool
-		var err error
-		if isMap(actual) {
-			success, err = elemMatcher.Match(value.MapIndex(keys[i]).Interface())
-		} else {
-			success, err = elemMatcher.Match(value.Index(i).Interface())
-		}
+		success, err := elemMatcher.Match(valueAt(i))
 		if err != nil {
 			lastError = err
 			continue

vendor/github.com/onsi/gomega/matchers/contain_substring_matcher.go

@@ -1,3 +1,5 @@
+// untested sections: 2
+
 package matchers
 
 import (

vendor/github.com/onsi/gomega/matchers/have_cap_matcher.go

@@ -1,3 +1,5 @@
+// untested sections: 2
+
 package matchers
 
 import (

vendor/github.com/onsi/gomega/matchers/have_key_matcher.go

@@ -1,3 +1,5 @@
+// untested sections: 6
+
 package matchers
 
 import (

vendor/github.com/onsi/gomega/matchers/have_key_with_value_matcher.go

@@ -1,3 +1,5 @@
+// untested sections:10
+
 package matchers
 
 import (

vendor/github.com/onsi/gomega/matchers/have_occurred_matcher.go

@@ -1,3 +1,5 @@
+// untested sections: 2
+
 package matchers
 
 import (
@@ -29,5 +31,5 @@ func (matcher *HaveOccurredMatcher) FailureMessage(actual interface{}) (message
 }
 
 func (matcher *HaveOccurredMatcher) NegatedFailureMessage(actual interface{}) (message string) {
-	return fmt.Sprintf("Expected error:\n%s\n%s\n%s", format.Object(actual, 1), format.IndentString(actual.(error).Error(), 1), "not to have occurred")
+	return fmt.Sprintf("Unexpected error:\n%s\n%s\n%s", format.Object(actual, 1), format.IndentString(actual.(error).Error(), 1), "occurred")
 }

vendor/github.com/onsi/gomega/matchers/match_xml_matcher.go

@@ -70,7 +70,7 @@ func parseXmlContent(content string) (*xmlNode, error) {
 			if err == io.EOF {
 				break
 			}
-			return nil, fmt.Errorf("failed to decode next token: %v", err)
+			return nil, fmt.Errorf("failed to decode next token: %v", err) // untested section
 		}
 
 		lastNodeIndex := len(allNodes) - 1
@@ -94,7 +94,7 @@ func parseXmlContent(content string) (*xmlNode, error) {
 		case xml.CharData:
 			lastNode.Content = append(lastNode.Content, tok.Copy()...)
 		case xml.Comment:
-			lastNode.Comments = append(lastNode.Comments, tok.Copy())
+			lastNode.Comments = append(lastNode.Comments, tok.Copy()) // untested section
 		case xml.ProcInst:
 			lastNode.ProcInsts = append(lastNode.ProcInsts, tok.Copy())
 		}

vendor/github.com/onsi/gomega/matchers/match_yaml_matcher.go

@@ -53,11 +53,11 @@ func normalise(input string) string {
 	var val interface{}
 	err := yaml.Unmarshal([]byte(input), &val)
 	if err != nil {
-		panic(err) // guarded by Match
+		panic(err) // unreachable since Match already calls Unmarshal
 	}
 	output, err := yaml.Marshal(val)
 	if err != nil {
-		panic(err) // guarded by Unmarshal
+		panic(err) // untested section, unreachable since we Unmarshal above
 	}
 	return strings.TrimSpace(string(output))
 }

vendor/github.com/onsi/gomega/matchers/receive_matcher.go

@@ -1,3 +1,5 @@
+// untested sections: 3
+
 package matchers
 
 import (
@@ -39,8 +41,8 @@ func (matcher *ReceiveMatcher) Match(actual interface{}) (success bool, err erro
 	}
 
 	winnerIndex, value, open := reflect.Select([]reflect.SelectCase{
-		reflect.SelectCase{Dir: reflect.SelectRecv, Chan: channelValue},
-		reflect.SelectCase{Dir: reflect.SelectDefault},
+		{Dir: reflect.SelectRecv, Chan: channelValue},
+		{Dir: reflect.SelectDefault},
 	})
 
 	var closed bool

vendor/github.com/onsi/gomega/matchers/semi_structured_data_support.go

@@ -1,3 +1,5 @@
+// untested sections: 5
+
 package matchers
 
 import (

vendor/github.com/onsi/gomega/matchers/support/goraph/bipartitegraph/bipartitegraph.go

@@ -1,6 +1,5 @@
 package bipartitegraph
 
-import "errors"
 import "fmt"
 
 import . "github.com/onsi/gomega/matchers/support/goraph/node"
@@ -14,12 +13,12 @@ type BipartiteGraph struct {
 
 func NewBipartiteGraph(leftValues, rightValues []interface{}, neighbours func(interface{}, interface{}) (bool, error)) (*BipartiteGraph, error) {
 	left := NodeOrderedSet{}
-	for i, _ := range leftValues {
+	for i := range leftValues {
 		left = append(left, Node{Id: i})
 	}
 
 	right := NodeOrderedSet{}
-	for j, _ := range rightValues {
+	for j := range rightValues {
 		right = append(right, Node{Id: j + len(left)})
 	}
 
@@ -28,7 +27,7 @@ func NewBipartiteGraph(leftValues, rightValues []interface{}, neighbours func(in
 		for j, rightValue := range rightValues {
 			neighbours, err := neighbours(leftValue, rightValue)
 			if err != nil {
-				return nil, errors.New(fmt.Sprintf("error determining adjacency for %v and %v: %s", leftValue, rightValue, err.Error()))
+				return nil, fmt.Errorf("error determining adjacency for %v and %v: %s", leftValue, rightValue, err.Error())
 			}
 
 			if neighbours {

vendor/github.com/onsi/gomega/matchers/type_support.go

@@ -6,6 +6,9 @@ See the docs for Gomega for documentation on the matchers
 
 http://onsi.github.io/gomega/
 */
+
+// untested sections: 11
+
 package matchers
 
 import (