improve utils tests to 100% coverage

utils/float16_test.go

@@ -2,6 +2,7 @@ package utils
 
 import (
 	"bytes"
+	"io"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
@@ -66,6 +67,11 @@ var _ = Describe("float16", func() {
 		}
 	})
 
+	It("errors on eof", func() {
+		_, err := ReadUfloat16(&bytes.Buffer{})
+		Expect(err).To(MatchError(io.EOF))
+	})
+
 	It("writes", func() {
 		testcases := []struct {
 			decoded uint64

utils/log_test.go

@@ -54,4 +54,10 @@ var _ = Describe("Log", func() {
 		Errorf("err")
 		Expect(b.Bytes()).To(Equal([]byte("debug\ninfo\nerr\n")))
 	})
+
+	It("says whether debug is enabled", func() {
+		Expect(Debug()).To(BeFalse())
+		SetLogLevel(LogLevelDebug)
+		Expect(Debug()).To(BeTrue())
+	})
 })

utils/minmax_test.go

@@ -71,6 +71,13 @@ var _ = Describe("Min / Max", func() {
 			Expect(MinPacketNumber(1, 2)).To(Equal(protocol.PacketNumber(1)))
 			Expect(MinPacketNumber(2, 1)).To(Equal(protocol.PacketNumber(1)))
 		})
+
+		It("returns the minimum time", func() {
+			a := time.Now()
+			b := a.Add(time.Second)
+			Expect(MinTime(a, b)).To(Equal(a))
+			Expect(MinTime(b, a)).To(Equal(a))
+		})
 	})
 
 	It("returns the abs time", func() {

utils/utils.go

@@ -167,13 +167,7 @@ func WriteUint16(b *bytes.Buffer, i uint16) {
 func RandomBit() (bool, error) {
 	b := make([]byte, 1)
 	_, err := rand.Read(b)
-	if err != nil {
+	return uint8(b[0])%2 == 0, err
-		return false, err
-	}
-	if uint8(b[0])%2 == 0 {
-		return false, nil
-	}
-	return true, nil
 }
 
 // Uint32Slice attaches the methods of sort.Interface to []uint32, sorting in increasing order.

utils/utils_test.go

@@ -2,6 +2,8 @@ package utils
 
 import (
 	"bytes"
+	"io"
+	"sort"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
@@ -17,9 +19,11 @@ var _ = Describe("Utils", func() {
 		})
 
 		It("throws an error if less than 2 bytes are passed", func() {
-			b := []byte{0x13}
+			b := []byte{0x13, 0xEF}
-			_, err := ReadUint16(bytes.NewReader(b))
+			for i := 0; i < len(b); i++ {
-			Expect(err).To(HaveOccurred())
+				_, err := ReadUint16(bytes.NewReader(b[:i]))
+				Expect(err).To(MatchError(io.EOF))
+			}
 		})
 	})
 
@@ -32,9 +36,11 @@ var _ = Describe("Utils", func() {
 		})
 
 		It("throws an error if less than 4 bytes are passed", func() {
-			b := []byte{0x13, 0x34, 0xEA}
+			b := []byte{0x12, 0x35, 0xAB, 0xFF}
-			_, err := ReadUint32(bytes.NewReader(b))
+			for i := 0; i < len(b); i++ {
-			Expect(err).To(HaveOccurred())
+				_, err := ReadUint32(bytes.NewReader(b[:i]))
+				Expect(err).To(MatchError(io.EOF))
+			}
 		})
 	})
 
@@ -47,9 +53,11 @@ var _ = Describe("Utils", func() {
 		})
 
 		It("throws an error if less than 8 bytes are passed", func() {
-			b := []byte{0x13, 0x34, 0xEA, 0x00, 0x14, 0xAA}
+			b := []byte{0x12, 0x35, 0xAB, 0xFF, 0xEF, 0xBE, 0xAD, 0xDE}
-			_, err := ReadUint64(bytes.NewReader(b))
+			for i := 0; i < len(b); i++ {
-			Expect(err).To(HaveOccurred())
+				_, err := ReadUint64(bytes.NewReader(b[:i]))
+				Expect(err).To(MatchError(io.EOF))
+			}
 		})
 	})
 
@@ -168,9 +176,19 @@ var _ = Describe("Utils", func() {
 
 	Context("Rand", func() {
 		It("returns either true or false", func() {
+			countTrue := 0
+			countFalse := 0
+			for i := 0; i < 100; i++ {
 				val, err := RandomBit()
-			Expect(err).ToNot(HaveOccurred())
+				Expect(err).NotTo(HaveOccurred())
-			Expect(val).To(SatisfyAny(Equal(true), Equal(false)))
+				if val {
+					countTrue++
+				} else {
+					countFalse++
+				}
+			}
+			Expect(countTrue).ToNot(BeZero())
+			Expect(countFalse).ToNot(BeZero())
 		})
 	})
 
@@ -194,4 +212,10 @@ var _ = Describe("Utils", func() {
 			Expect(err).To(HaveOccurred())
 		})
 	})
+
+	It("sorts uint32 slices", func() {
+		s := Uint32Slice{1, 5, 2, 4, 3}
+		sort.Sort(s)
+		Expect(s).To(Equal(Uint32Slice{1, 2, 3, 4, 5}))
+	})
 })