Simplify limiter test

open-telemetry · Dec 6, 2023 · 92efe65 · 92efe65
1 parent b53c71c
commit 92efe65
Showing 1 changed file with 26 additions and 32 deletions.
diff --git a/sdk/metric/internal/aggregate/limit_test.go b/sdk/metric/internal/aggregate/limit_test.go
@@ -21,37 +21,31 @@ import (
 	"go.opentelemetry.io/otel/attribute"
 )
 
-func TestLimiter(t *testing.T) {
-	t.Run("Attributes", testAttributes())
-}
-
-func testAttributes() func(*testing.T) {
+func TestLimiterAttributes(t *testing.T) {
 	m := map[attribute.Set]struct{}{alice: {}}
-	return func(t *testing.T) {
-		t.Run("NoLimit", func(t *testing.T) {
-			l := newLimiter[struct{}](0)
-			assert.Equal(t, alice, l.Attributes(alice, m))
-			assert.Equal(t, bob, l.Attributes(bob, m))
-		})
-
-		t.Run("NotAtLimit/Exists", func(t *testing.T) {
-			l := newLimiter[struct{}](3)
-			assert.Equal(t, alice, l.Attributes(alice, m))
-		})
-
-		t.Run("NotAtLimit/DoesNotExist", func(t *testing.T) {
-			l := newLimiter[struct{}](3)
-			assert.Equal(t, bob, l.Attributes(bob, m))
-		})
-
-		t.Run("AtLimit/Exists", func(t *testing.T) {
-			l := newLimiter[struct{}](2)
-			assert.Equal(t, alice, l.Attributes(alice, m))
-		})
-
-		t.Run("AtLimit/DoesNotExist", func(t *testing.T) {
-			l := newLimiter[struct{}](2)
-			assert.Equal(t, overflowSet, l.Attributes(bob, m))
-		})
-	}
+	t.Run("NoLimit", func(t *testing.T) {
+		l := newLimiter[struct{}](0)
+		assert.Equal(t, alice, l.Attributes(alice, m))
+		assert.Equal(t, bob, l.Attributes(bob, m))
+	})
+
+	t.Run("NotAtLimit/Exists", func(t *testing.T) {
+		l := newLimiter[struct{}](3)
+		assert.Equal(t, alice, l.Attributes(alice, m))
+	})
+
+	t.Run("NotAtLimit/DoesNotExist", func(t *testing.T) {
+		l := newLimiter[struct{}](3)
+		assert.Equal(t, bob, l.Attributes(bob, m))
+	})
+
+	t.Run("AtLimit/Exists", func(t *testing.T) {
+		l := newLimiter[struct{}](2)
+		assert.Equal(t, alice, l.Attributes(alice, m))
+	})
+
+	t.Run("AtLimit/DoesNotExist", func(t *testing.T) {
+		l := newLimiter[struct{}](2)
+		assert.Equal(t, overflowSet, l.Attributes(bob, m))
+	})
 }