TestBomb(): don't instantiate an Assertions object

The other test functions don't, so doing it in this one function was
confusing.

Author: mhagger

git_sizer_test.go

@@ -133,7 +133,6 @@ func pow(x uint64, n int) uint64 {
 
 func TestBomb(t *testing.T) {
 	t.Parallel()
-	assert := assert.New(t)
 
 	path, err := ioutil.TempDir("", "bomb")
 	require.NoError(t, err)
@@ -147,49 +146,47 @@ func TestBomb(t *testing.T) {
 	h, err := sizes.ScanRepositoryUsingGraph(
 		repo, git.AllReferencesFilter, sizes.NameStyleFull, false,
 	)
-	if !assert.NoError(err) {
-		return
-	}
+	require.NoError(t, err)
 
-	assert.Equal(counts.Count32(1), h.UniqueCommitCount, "unique commit count")
-	assert.Equal(counts.Count64(172), h.UniqueCommitSize, "unique commit size")
-	assert.Equal(counts.Count32(172), h.MaxCommitSize, "max commit size")
-	assert.Equal("refs/heads/master", h.MaxCommitSizeCommit.Path(), "max commit size commit")
-	assert.Equal(counts.Count32(1), h.MaxHistoryDepth, "max history depth")
-	assert.Equal(counts.Count32(0), h.MaxParentCount, "max parent count")
-	assert.Equal("refs/heads/master", h.MaxParentCountCommit.Path(), "max parent count commit")
-
-	assert.Equal(counts.Count32(10), h.UniqueTreeCount, "unique tree count")
-	assert.Equal(counts.Count64(2910), h.UniqueTreeSize, "unique tree size")
-	assert.Equal(counts.Count64(100), h.UniqueTreeEntries, "unique tree entries")
-	assert.Equal(counts.Count32(10), h.MaxTreeEntries, "max tree entries")
-	assert.Equal("refs/heads/master:d0/d0/d0/d0/d0/d0/d0/d0/d0", h.MaxTreeEntriesTree.Path(), "max tree entries tree")
-
-	assert.Equal(counts.Count32(1), h.UniqueBlobCount, "unique blob count")
-	assert.Equal(counts.Count64(6), h.UniqueBlobSize, "unique blob size")
-	assert.Equal(counts.Count32(6), h.MaxBlobSize, "max blob size")
-	assert.Equal("refs/heads/master:d0/d0/d0/d0/d0/d0/d0/d0/d0/f0", h.MaxBlobSizeBlob.Path(), "max blob size blob")
-
-	assert.Equal(counts.Count32(0), h.UniqueTagCount, "unique tag count")
-	assert.Equal(counts.Count32(0), h.MaxTagDepth, "max tag depth")
-
-	assert.Equal(counts.Count32(1), h.ReferenceCount, "reference count")
-
-	assert.Equal(counts.Count32(10), h.MaxPathDepth, "max path depth")
-	assert.Equal("refs/heads/master^{tree}", h.MaxPathDepthTree.Path(), "max path depth tree")
-	assert.Equal(counts.Count32(29), h.MaxPathLength, "max path length")
-	assert.Equal("refs/heads/master^{tree}", h.MaxPathLengthTree.Path(), "max path length tree")
-
-	assert.Equal(counts.Count32((pow(10, 10)-1)/(10-1)), h.MaxExpandedTreeCount, "max expanded tree count")
-	assert.Equal("refs/heads/master^{tree}", h.MaxExpandedTreeCountTree.Path(), "max expanded tree count tree")
-	assert.Equal(counts.Count32(0xffffffff), h.MaxExpandedBlobCount, "max expanded blob count")
-	assert.Equal("refs/heads/master^{tree}", h.MaxExpandedBlobCountTree.Path(), "max expanded blob count tree")
-	assert.Equal(counts.Count64(6*pow(10, 10)), h.MaxExpandedBlobSize, "max expanded blob size")
-	assert.Equal("refs/heads/master^{tree}", h.MaxExpandedBlobSizeTree.Path(), "max expanded blob size tree")
-	assert.Equal(counts.Count32(0), h.MaxExpandedLinkCount, "max expanded link count")
-	assert.Nil(h.MaxExpandedLinkCountTree, "max expanded link count tree")
-	assert.Equal(counts.Count32(0), h.MaxExpandedSubmoduleCount, "max expanded submodule count")
-	assert.Nil(h.MaxExpandedSubmoduleCountTree, "max expanded submodule count tree")
+	assert.Equal(t, counts.Count32(1), h.UniqueCommitCount, "unique commit count")
+	assert.Equal(t, counts.Count64(172), h.UniqueCommitSize, "unique commit size")
+	assert.Equal(t, counts.Count32(172), h.MaxCommitSize, "max commit size")
+	assert.Equal(t, "refs/heads/master", h.MaxCommitSizeCommit.Path(), "max commit size commit")
+	assert.Equal(t, counts.Count32(1), h.MaxHistoryDepth, "max history depth")
+	assert.Equal(t, counts.Count32(0), h.MaxParentCount, "max parent count")
+	assert.Equal(t, "refs/heads/master", h.MaxParentCountCommit.Path(), "max parent count commit")
+
+	assert.Equal(t, counts.Count32(10), h.UniqueTreeCount, "unique tree count")
+	assert.Equal(t, counts.Count64(2910), h.UniqueTreeSize, "unique tree size")
+	assert.Equal(t, counts.Count64(100), h.UniqueTreeEntries, "unique tree entries")
+	assert.Equal(t, counts.Count32(10), h.MaxTreeEntries, "max tree entries")
+	assert.Equal(t, "refs/heads/master:d0/d0/d0/d0/d0/d0/d0/d0/d0", h.MaxTreeEntriesTree.Path(), "max tree entries tree")
+
+	assert.Equal(t, counts.Count32(1), h.UniqueBlobCount, "unique blob count")
+	assert.Equal(t, counts.Count64(6), h.UniqueBlobSize, "unique blob size")
+	assert.Equal(t, counts.Count32(6), h.MaxBlobSize, "max blob size")
+	assert.Equal(t, "refs/heads/master:d0/d0/d0/d0/d0/d0/d0/d0/d0/f0", h.MaxBlobSizeBlob.Path(), "max blob size blob")
+
+	assert.Equal(t, counts.Count32(0), h.UniqueTagCount, "unique tag count")
+	assert.Equal(t, counts.Count32(0), h.MaxTagDepth, "max tag depth")
+
+	assert.Equal(t, counts.Count32(1), h.ReferenceCount, "reference count")
+
+	assert.Equal(t, counts.Count32(10), h.MaxPathDepth, "max path depth")
+	assert.Equal(t, "refs/heads/master^{tree}", h.MaxPathDepthTree.Path(), "max path depth tree")
+	assert.Equal(t, counts.Count32(29), h.MaxPathLength, "max path length")
+	assert.Equal(t, "refs/heads/master^{tree}", h.MaxPathLengthTree.Path(), "max path length tree")
+
+	assert.Equal(t, counts.Count32((pow(10, 10)-1)/(10-1)), h.MaxExpandedTreeCount, "max expanded tree count")
+	assert.Equal(t, "refs/heads/master^{tree}", h.MaxExpandedTreeCountTree.Path(), "max expanded tree count tree")
+	assert.Equal(t, counts.Count32(0xffffffff), h.MaxExpandedBlobCount, "max expanded blob count")
+	assert.Equal(t, "refs/heads/master^{tree}", h.MaxExpandedBlobCountTree.Path(), "max expanded blob count tree")
+	assert.Equal(t, counts.Count64(6*pow(10, 10)), h.MaxExpandedBlobSize, "max expanded blob size")
+	assert.Equal(t, "refs/heads/master^{tree}", h.MaxExpandedBlobSizeTree.Path(), "max expanded blob size tree")
+	assert.Equal(t, counts.Count32(0), h.MaxExpandedLinkCount, "max expanded link count")
+	assert.Nil(t, h.MaxExpandedLinkCountTree, "max expanded link count tree")
+	assert.Equal(t, counts.Count32(0), h.MaxExpandedSubmoduleCount, "max expanded submodule count")
+	assert.Nil(t, h.MaxExpandedSubmoduleCountTree, "max expanded submodule count tree")
 }
 
 func TestTaggedTags(t *testing.T) {