Add some tests of the counts package

Vendor in `stretchr/testify` to make this easier.

This also necessitates some changes to the Makefile.

Author: mhagger

.gitignore

@@ -1,3 +1,2 @@
 /.gopath
 /bin
-/vendor

Gopkg.lock

@@ -2,3 +2,8 @@
 #
 # Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
 # for detailed Gopkg.toml documentation.
+
+[prune]
+  unused-packages = true
+  go-tests = true
+  non-go = true

Gopkg.toml

@@ -21,7 +21,7 @@ all: bin/git-sizer
 .PHONY: bin/git-sizer
 bin/git-sizer:
 	mkdir -p bin
-	$(GO) build $(GOFLAGS) -o $@ $(PACKAGE)
+	cd $(GOPATH)/src/$(PACKAGE) && $(GO) build $(GOFLAGS) -o $(ROOTDIR)/$@ $(PACKAGE)
 
 # Cross-compile for a bunch of common platforms. Note that this
 # doesn't work with USE_ISATTY:
@@ -43,7 +43,7 @@ define PLATFORM_template =
 .PHONY: bin/git-sizer-$(1)-$(2)$(3)
 bin/git-sizer-$(1)-$(2)$(3):
 	mkdir -p bin
-	GOOS=$(1) GOARCH=$(2) $$(GO) build $$(GOFLAGS) -o $$@ $$(PACKAGE)
+	cd $$(GOPATH)/src/$$(PACKAGE) && GOOS=$(1) GOARCH=$(2) $$(GO) build $$(GOFLAGS) -o $$(ROOTDIR)/$$@ $$(PACKAGE)
 endef
 
 $(eval $(call PLATFORM_template,linux,amd64))
@@ -60,7 +60,7 @@ test: bin/git-sizer gotest
 
 .PHONY: gotest
 gotest:
-	$(GO) test -timeout 60s $(GOFLAGS) ./...
+	cd $(GOPATH)/src/$(PACKAGE) && $(GO) test -timeout 60s $(GOFLAGS) ./...
 
 .PHONY: gofmt
 gofmt:

Makefile

@@ -33,8 +33,8 @@ func (n1 *Count32) Increment(n2 Count32) {
 	*n1 = n1.Plus(n2)
 }
 
-// Adjust `*n1` to be `max(*n1, n2)` and return true iff n2 was
-// bigger. Favor `*n1` if they are equal.
+// AdjustMaxIfNecessary adjusts `*n1` to be `max(*n1, n2)`. Return
+// true iff `n2` was greater than `*n1`.
 func (n1 *Count32) AdjustMaxIfNecessary(n2 Count32) bool {
 	if n2 > *n1 {
 		*n1 = n2
@@ -44,8 +44,8 @@ func (n1 *Count32) AdjustMaxIfNecessary(n2 Count32) bool {
 	}
 }
 
-// Adjust `*n1` to be `max(*n1, n2)` and return true iff n2 was
-// bigger. Favor `n2` if they are equal.
+// AdjustMaxIfPossible adjusts `*n1` to be `max(*n1, n2)`. Return true
+// iff `n2` was greater than or equal to `*n1`.
 func (n1 *Count32) AdjustMaxIfPossible(n2 Count32) bool {
 	if n2 >= *n1 {
 		*n1 = n2
@@ -81,8 +81,8 @@ func (n1 *Count64) Increment(n2 Count64) {
 	*n1 = n1.Plus(n2)
 }
 
-// Adjust `*n1` to be `max(*n1, n2)` and return true iff n2 was
-// bigger. Favor `*n1` if they are equal.
+// AdjustMaxIfNecessary adjusts `*n1` to be `max(*n1, n2)`. Return
+// true iff `n2` was greater than `*n1`.
 func (n1 *Count64) AdjustMaxIfNecessary(n2 Count64) bool {
 	if n2 > *n1 {
 		*n1 = n2
@@ -92,8 +92,8 @@ func (n1 *Count64) AdjustMaxIfNecessary(n2 Count64) bool {
 	}
 }
 
-// Adjust `*n1` to be `max(*n1, n2)` and return true iff n2 was
-// bigger. Favor `n2` if they are equal.
+// AdjustMaxIfPossible adjusts `*n1` to be `max(*n1, n2)`. Return true
+// iff `n2` was greater than or equal to `*n1`.
 func (n1 *Count64) AdjustMaxIfPossible(n2 Count64) bool {
 	if n2 > *n1 {
 		*n1 = n2

counts/counts.go

@@ -0,0 +1,35 @@
+package counts_test
+
+import (
+	"testing"
+
+	"github.com/github/git-sizer/counts"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestCount32(t *testing.T) {
+	assert := assert.New(t)
+
+	c := counts.NewCount32(0)
+	assert.Equalf(uint64(0), c.ToUint64(), "NewCount32(0).ToUint64() should be 0")
+
+	c.Increment(counts.Count32(0xf0000000))
+	assert.Equalf(uint64(0xf0000000), c.ToUint64(), "Count32(0xf0000000).ToUint64() value")
+
+	c.Increment(counts.Count32(0xf0000000))
+	assert.Equalf(uint64(0xffffffff), c.ToUint64(), "Count32(0xffffffff).ToUint64() value")
+}
+
+func TestCount64(t *testing.T) {
+	assert := assert.New(t)
+
+	c := counts.NewCount64(0)
+	assert.Equalf(uint64(0), c.ToUint64(), "NewCount64(0).ToUint64() should be 0")
+
+	c.Increment(counts.Count64(0xf000000000000000))
+	assert.Equalf(uint64(0xf000000000000000), c.ToUint64(), "Count64(0xf000000000000000).ToUint64() value")
+
+	c.Increment(counts.Count64(0xf000000000000000))
+	assert.Equalf(uint64(0xffffffffffffffff), c.ToUint64(), "Count64(0xffffffffffffffff).ToUint64() value")
+}