From 00b16009d2ee674f542f7a8cfea8c3c22293d776 Mon Sep 17 00:00:00 2001
From: Gabriel Aszalos <gabriel.aszalos@gmail.com>
Date: Thu, 12 Mar 2020 13:20:01 +0200
Subject: [PATCH] profiler: make tests more consistent (#599)

---
 profiler/options_test.go  | 14 ++++++++------
 profiler/profiler_test.go | 37 ++++++++++++++++++++-----------------
 profiler/upload_test.go   |  7 ++++---
 3 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/profiler/options_test.go b/profiler/options_test.go
index 0640ca0a66..2d943e5ca8 100644
--- a/profiler/options_test.go
+++ b/profiler/options_test.go
@@ -72,22 +72,24 @@ func TestDefaultConfig(t *testing.T) {
 
 func TestAddProfileType(t *testing.T) {
 	t.Run("default", func(t *testing.T) {
+		assert := assert.New(t)
 		cfg := defaultConfig()
 		_, ok := cfg.types[MutexProfile]
-		assert.False(t, ok)
+		assert.False(ok)
 		n := len(cfg.types)
 		cfg.addProfileType(MutexProfile)
-		assert.Len(t, cfg.types, n+1)
+		assert.Len(cfg.types, n+1)
 		_, ok = cfg.types[MutexProfile]
-		assert.True(t, ok)
+		assert.True(ok)
 	})
 
 	t.Run("nil", func(t *testing.T) {
 		var cfg config
-		assert.Nil(t, cfg.types)
+		assert := assert.New(t)
+		assert.Nil(cfg.types)
 		cfg.addProfileType(MutexProfile)
-		assert.Len(t, cfg.types, 1)
+		assert.Len(cfg.types, 1)
 		_, ok := cfg.types[MutexProfile]
-		assert.True(t, ok)
+		assert.True(ok)
 	})
 }
diff --git a/profiler/profiler_test.go b/profiler/profiler_test.go
index 9ca0781687..1ffda39914 100644
--- a/profiler/profiler_test.go
+++ b/profiler/profiler_test.go
@@ -32,17 +32,18 @@ func TestStart(t *testing.T) {
 
 		mu.Lock()
 		require.NotNil(t, activeProfiler)
+		assert := assert.New(t)
 		if host, err := os.Hostname(); err != nil {
-			assert.Equal(t, host, activeProfiler.cfg.hostname)
+			assert.Equal(host, activeProfiler.cfg.hostname)
 		}
-		assert.Equal(t, defaultAPIURL, activeProfiler.cfg.apiURL)
-		assert.Equal(t, DefaultPeriod, activeProfiler.cfg.period)
-		assert.Equal(t, len(defaultProfileTypes), len(activeProfiler.cfg.types))
+		assert.Equal(defaultAPIURL, activeProfiler.cfg.apiURL)
+		assert.Equal(DefaultPeriod, activeProfiler.cfg.period)
+		assert.Equal(len(defaultProfileTypes), len(activeProfiler.cfg.types))
 		for _, pt := range defaultProfileTypes {
 			_, ok := activeProfiler.cfg.types[pt]
-			assert.True(t, ok)
+			assert.True(ok)
 		}
-		assert.Equal(t, DefaultDuration, activeProfiler.cfg.cpuDuration)
+		assert.Equal(DefaultDuration, activeProfiler.cfg.cpuDuration)
 		mu.Unlock()
 	})
 
@@ -149,18 +150,19 @@ func TestProfilerInternal(t *testing.T) {
 			t.Fatalf("missing batch")
 		}
 
-		assert.EqualValues(t, 1, writeHeap)
-		assert.EqualValues(t, 1, startCPU)
-		assert.EqualValues(t, 1, stopCPU)
+		assert := assert.New(t)
+		assert.EqualValues(1, writeHeap)
+		assert.EqualValues(1, startCPU)
+		assert.EqualValues(1, stopCPU)
 
-		assert.Equal(t, 2, len(bat.profiles))
+		assert.Equal(2, len(bat.profiles))
 		firstTypes := []string{
 			bat.profiles[0].types[0],
 			bat.profiles[1].types[0],
 		}
 		sort.Strings(firstTypes)
-		assert.Equal(t, "alloc_objects", firstTypes[0])
-		assert.Equal(t, "samples", firstTypes[1])
+		assert.Equal("alloc_objects", firstTypes[0])
+		assert.Equal("samples", firstTypes[1])
 
 		p.exit <- struct{}{}
 		<-wait
@@ -210,16 +212,17 @@ func TestProfilerPassthrough(t *testing.T) {
 		t.Fatal("time expired")
 	}
 
-	assert.Equal(t, 2, len(bat.profiles))
+	assert := assert.New(t)
+	assert.Equal(2, len(bat.profiles))
 	firstTypes := []string{
 		bat.profiles[0].types[0],
 		bat.profiles[1].types[0],
 	}
 	sort.Strings(firstTypes)
-	assert.Equal(t, "alloc_objects", firstTypes[0])
-	assert.Equal(t, "samples", firstTypes[1])
-	assert.NotEmpty(t, bat.profiles[0].data)
-	assert.NotEmpty(t, bat.profiles[1].data)
+	assert.Equal("alloc_objects", firstTypes[0])
+	assert.Equal("samples", firstTypes[1])
+	assert.NotEmpty(bat.profiles[0].data)
+	assert.NotEmpty(bat.profiles[1].data)
 }
 
 func unstartedProfiler(opts ...Option) *profiler {
diff --git a/profiler/upload_test.go b/profiler/upload_test.go
index 2e0c4533a3..a4d6415037 100644
--- a/profiler/upload_test.go
+++ b/profiler/upload_test.go
@@ -87,7 +87,8 @@ func TestTryUpload(t *testing.T) {
 		t.Fatal("timeout")
 	}
 
-	assert.ElementsMatch(t, []string{
+	assert := assert.New(t)
+	assert.ElementsMatch([]string{
 		"host:my-host",
 		"runtime:go",
 		"service:my-service",
@@ -104,11 +105,11 @@ func TestTryUpload(t *testing.T) {
 		"types[1]": "alloc_objects,alloc_space",
 		"data[1]":  "my-heap-profile",
 	} {
-		assert.Equal(t, v, fields[k], k)
+		assert.Equal(v, fields[k], k)
 	}
 	for _, k := range []string{"recording-start", "recording-end"} {
 		_, ok := fields[k]
-		assert.True(t, ok, k)
+		assert.True(ok, k)
 	}
 }