Fix merge conflict

assert/assertions.go

@@ -234,7 +234,7 @@ func isEmpty(object interface{}) bool {
 	switch objValue.Kind() {
 	case reflect.Map:
 		fallthrough
-	case reflect.Slice:
+	case reflect.Slice, reflect.Chan:
 		{
 			return (objValue.Len() == 0)
 		}
@@ -251,8 +251,8 @@ func isEmpty(object interface{}) bool {
 	return false
 }
 
-// Empty asserts that the specified object is empty.  I.e. nil, "", false, 0 or a
+// Empty asserts that the specified object is empty.  I.e. nil, "", false, 0 or either
-// slice with len == 0.
+// a slice or a channel with len == 0.
 //
 // assert.Empty(t, obj)
 //
@@ -268,8 +268,8 @@ func Empty(t TestingT, object interface{}, msgAndArgs ...interface{}) bool {
 
 }
 
-// Empty asserts that the specified object is NOT empty.  I.e. not nil, "", false, 0 or a
+// Empty asserts that the specified object is NOT empty.  I.e. not nil, "", false, 0 or either
-// slice with len == 0.
+// a slice or a channel with len == 0.
 //
 // if assert.NotEmpty(t, obj) {
 //   assert.Equal(t, "two", obj[1])

assert/assertions_test.go

@@ -329,6 +329,9 @@ func TestEqualError(t *testing.T) {
 
 func Test_isEmpty(t *testing.T) {
 
+	ch_with_value := make(chan struct{}, 1)
+	ch_with_value <- struct{}{}
+
 	True(t, isEmpty(""))
 	True(t, isEmpty(nil))
 	True(t, isEmpty([]string{}))
@@ -336,50 +339,57 @@ func Test_isEmpty(t *testing.T) {
 	True(t, isEmpty(false))
 	True(t, isEmpty(map[string]string{}))
 	True(t, isEmpty(new(time.Time)))
-
+	True(t, isEmpty(make(chan struct{})))
 	False(t, isEmpty("something"))
 	False(t, isEmpty(errors.New("something")))
 	False(t, isEmpty([]string{"something"}))
 	False(t, isEmpty(1))
 	False(t, isEmpty(true))
 	False(t, isEmpty(map[string]string{"Hello": "World"}))
+	False(t, isEmpty(ch_with_value))
 
 }
 
 func TestEmpty(t *testing.T) {
 
 	mockT := new(testing.T)
+	ch_with_value := make(chan struct{}, 1)
+	ch_with_value <- struct{}{}
 
 	True(t, Empty(mockT, ""), "Empty string is empty")
 	True(t, Empty(mockT, nil), "Nil is empty")
 	True(t, Empty(mockT, []string{}), "Empty string array is empty")
 	True(t, Empty(mockT, 0), "Zero int value is empty")
 	True(t, Empty(mockT, false), "False value is empty")
+	True(t, Empty(mockT, make(chan struct{})), "Channel without values is empty")
 
 	False(t, Empty(mockT, "something"), "Non Empty string is not empty")
 	False(t, Empty(mockT, errors.New("something")), "Non nil object is not empty")
 	False(t, Empty(mockT, []string{"something"}), "Non empty string array is not empty")
 	False(t, Empty(mockT, 1), "Non-zero int value is not empty")
 	False(t, Empty(mockT, true), "True value is not empty")
-
+	False(t, Empty(mockT, ch_with_value), "Channel with values is not empty")
 }
 
 func TestNotEmpty(t *testing.T) {
 
 	mockT := new(testing.T)
+	ch_with_value := make(chan struct{}, 1)
+	ch_with_value <- struct{}{}
 
 	False(t, NotEmpty(mockT, ""), "Empty string is empty")
 	False(t, NotEmpty(mockT, nil), "Nil is empty")
 	False(t, NotEmpty(mockT, []string{}), "Empty string array is empty")
 	False(t, NotEmpty(mockT, 0), "Zero int value is empty")
 	False(t, NotEmpty(mockT, false), "False value is empty")
+	False(t, NotEmpty(mockT, make(chan struct{})), "Channel without values is empty")
 
 	True(t, NotEmpty(mockT, "something"), "Non Empty string is not empty")
 	True(t, NotEmpty(mockT, errors.New("something")), "Non nil object is not empty")
 	True(t, NotEmpty(mockT, []string{"something"}), "Non empty string array is not empty")
 	True(t, NotEmpty(mockT, 1), "Non-zero int value is not empty")
 	True(t, NotEmpty(mockT, true), "True value is not empty")
-
+	True(t, NotEmpty(mockT, ch_with_value), "Channel with values is not empty")
 }
 
 func TestWithinDuration(t *testing.T) {