ArrayBlockingQueue: More tests

Theo · Theo · commit a15448cc86e7 · 2017-12-22T18:54:56.000Z
diff --git a/Makefile b/Makefile
@@ -19,7 +19,7 @@ test:
 
 .PHONY: bench
 bench:
-	GOPATH=$(GOPATH) go test -bench=. -check.b
+	GOPATH=$(GOPATH) go test -bench=. -check.b -benchmem
 
 .PHONY: docs
 docs:
diff --git a/README.md b/README.md
@@ -33,11 +33,12 @@ Using:
 
 Simple operations - no goroutines
 
-```go
-PASS: ArrayBlockingQueueSuite.BenchmarkPop    50000000                49.1 ns/op
-PASS: ArrayBlockingQueueSuite.BenchmarkPopOverflow    50000000                51.3 ns/op
-PASS: ArrayBlockingQueueSuite.BenchmarkPush   20000000                84.7 ns/op
-PASS: ArrayBlockingQueueSuite.BenchmarkPushOverflow   20000000                75.3 ns/op
+```text
+ArrayBlockingQueueSuite.BenchmarkPeek  50000000                56.5 ns/op
+ArrayBlockingQueueSuite.BenchmarkPop    50000000                49.1 ns/op
+ArrayBlockingQueueSuite.BenchmarkPopOverflow    50000000                51.3 ns/op
+ArrayBlockingQueueSuite.BenchmarkPush   20000000                84.7 ns/op
+ArrayBlockingQueueSuite.BenchmarkPushOverflow   20000000                75.3 ns/op
 ```
 
 ## LICENCE
diff --git a/blockingQueue.go b/blockingQueue.go
@@ -119,7 +119,7 @@ func (q *BlockingQueue) Pop() (interface{}, error) {
 
 	if q.count == 0 {
 		// Case empty
-		return false, nil
+		return false, ErrorEmpty
 	} else {
 		var item = q.pop()
 		return item, nil
diff --git a/blockingQueue_test.go b/blockingQueue_test.go
@@ -51,11 +51,15 @@ func (s *ArrayBlockingQueueSuite) TestIncrement(c *C) {
 }
 
 func (s *ArrayBlockingQueueSuite) TestPush(c *C) {
-	for i:= 0;i < 10; i+=1 {
+	for i:= 0;i < 16; i+=1 {
 		s.queue.Push(i)
 	}
 
-	c.Assert(s.queue.Size(), Equals, uint64(10))
+	c.Assert(s.queue.Size(), Equals, uint64(16))
+
+	res, err := s.queue.Push(17)
+	c.Assert(res, Equals, false)
+	c.Assert(err, ErrorMatches, "ERROR_FULL: attempt to Put while Queue is Full")
 }
 
 
@@ -85,6 +89,10 @@ func (s *ArrayBlockingQueueSuite) TestPop(c *C) {
 	}
 
 	c.Assert(s.queue.Size(), Equals, uint64(0))
+
+	res, err := s.queue.Pop()
+	c.Assert(res, Equals, false)
+	c.Assert(err, ErrorMatches, "ERROR_EMPTY: attempt to Get while Queue is Empty")
 }
 
 
@@ -102,9 +110,50 @@ func (s *ArrayBlockingQueueSuite) BenchmarkPop(c *C) {
 	}
 
 	c.ResetTimer()
-	c.StartTimer()
 
 	for i := 0; i < c.N; i++ {
 		q.Pop()
 	}
-}
+}
+
+
+func (s *ArrayBlockingQueueSuite) TestClear(c *C) {
+	for i:= 0;i < 10; i+=1 {
+		s.queue.Push(i)
+	}
+
+	s.queue.Clear()
+
+	c.Assert(s.queue.Size(), Equals, uint64(0))
+}
+
+
+func (s *ArrayBlockingQueueSuite) TestPeek(c *C) {
+	for i:= 0;i < 10; i+=1 {
+		s.queue.Push(i)
+	}
+
+	c.Assert(s.queue.Peek(), Equals, 0)
+
+	s.queue.Pop()
+
+	c.Assert(s.queue.Peek(), Equals, 1)
+}
+
+
+func (s *ArrayBlockingQueueSuite) BenchmarkPeek(c *C) {
+	for i := 0; i < c.N; i++ {
+		s.queue.Peek()
+	}
+
+	q, _ := NewArrayBlockingQueue(math.MaxUint16)
+
+	q.Push(1);q.Push(1);q.Push(1)
+
+	c.ResetTimer()
+
+	for i := 0; i < c.N; i++ {
+		s.queue.Peek()
+	}
+}
+
diff --git a/errors.go b/errors.go
@@ -8,10 +8,4 @@ import "errors"
 
 var ErrorCapacity = errors.New("ERROR_CAPACITY: attempt to Create Queue with invalid Capacity")
 var ErrorFull = errors.New("ERROR_FULL: attempt to Put while Queue is Full")
-
-//
-//var (
-//
-//	//ErrorEmpty = errors.New("ERROR_EMPTY: attempt to Get while Queue is Empty")
-//	//
-//)
+var ErrorEmpty = errors.New("ERROR_EMPTY: attempt to Get while Queue is Empty")
