From af2e4a9aa6d9460c103c93f049ac06ab470b2d55 Mon Sep 17 00:00:00 2001 From: Stanislav Chzhen Date: Wed, 22 Jan 2025 17:44:34 +0300 Subject: [PATCH] proxy: imp naming --- proxy/stats_test.go | 184 ++++++++++++++++++++++---------------------- 1 file changed, 92 insertions(+), 92 deletions(-) diff --git a/proxy/stats_test.go b/proxy/stats_test.go index 1fc5af049..c59e69cf6 100644 --- a/proxy/stats_test.go +++ b/proxy/stats_test.go @@ -64,155 +64,155 @@ func TestCollectQueryStats(t *testing.T) { } testCases := []struct { - isExchangeErr assert.BoolAssertionFunc - config *proxy.UpstreamConfig - fallbackConfig *proxy.UpstreamConfig - name string - mode proxy.UpstreamMode - mainCount int - fallbackCount int - isMainErr bool - isFallbackErr bool + wantErr assert.ErrorAssertionFunc + wantMainErr assert.BoolAssertionFunc + wantFallbackErr assert.BoolAssertionFunc + config *proxy.UpstreamConfig + fallbackConfig *proxy.UpstreamConfig + name string + mode proxy.UpstreamMode + wantMainCount int + wantFallbackCount int }{{ - isExchangeErr: assert.False, + wantErr: assert.NoError, + wantMainErr: assert.False, + wantFallbackErr: assert.False, config: &proxy.UpstreamConfig{ Upstreams: []upstream.Upstream{ups}, }, fallbackConfig: &proxy.UpstreamConfig{ Upstreams: []upstream.Upstream{ups}, }, - name: "load_balance_success", - mode: proxy.UpstreamModeLoadBalance, - mainCount: 1, - fallbackCount: 0, - isMainErr: false, - isFallbackErr: false, + name: "load_balance_success", + mode: proxy.UpstreamModeLoadBalance, + wantMainCount: 1, + wantFallbackCount: 0, }, { - isExchangeErr: assert.True, + wantErr: assert.Error, + wantMainErr: assert.True, + wantFallbackErr: assert.True, config: &proxy.UpstreamConfig{ Upstreams: []upstream.Upstream{failUps}, }, fallbackConfig: &proxy.UpstreamConfig{ Upstreams: []upstream.Upstream{failUps, failUps}, }, - name: "load_balance_bad", - mode: proxy.UpstreamModeLoadBalance, - mainCount: 1, - fallbackCount: 2, - isMainErr: true, - isFallbackErr: true, + name: "load_balance_bad", + mode: proxy.UpstreamModeLoadBalance, + wantMainCount: 1, + wantFallbackCount: 2, }, { - isExchangeErr: assert.False, + wantErr: assert.NoError, + wantMainErr: assert.False, + wantFallbackErr: assert.False, config: &proxy.UpstreamConfig{ Upstreams: []upstream.Upstream{ups, failUps}, }, fallbackConfig: &proxy.UpstreamConfig{ Upstreams: []upstream.Upstream{ups}, }, - name: "parallel_success", - mode: proxy.UpstreamModeParallel, - mainCount: 1, - fallbackCount: 0, - isMainErr: false, - isFallbackErr: false, + name: "parallel_success", + mode: proxy.UpstreamModeParallel, + wantMainCount: 1, + wantFallbackCount: 0, }, { - isExchangeErr: assert.False, + wantErr: assert.NoError, + wantMainErr: assert.True, + wantFallbackErr: assert.False, config: &proxy.UpstreamConfig{ Upstreams: []upstream.Upstream{failUps}, }, fallbackConfig: &proxy.UpstreamConfig{ Upstreams: []upstream.Upstream{ups}, }, - name: "parallel_bad_fallback_success", - mode: proxy.UpstreamModeParallel, - mainCount: 1, - fallbackCount: 1, - isMainErr: true, - isFallbackErr: false, + name: "parallel_bad_fallback_success", + mode: proxy.UpstreamModeParallel, + wantMainCount: 1, + wantFallbackCount: 1, }, { - isExchangeErr: assert.True, + wantErr: assert.Error, + wantMainErr: assert.True, + wantFallbackErr: assert.True, config: &proxy.UpstreamConfig{ Upstreams: []upstream.Upstream{failUps, failUps}, }, fallbackConfig: &proxy.UpstreamConfig{ Upstreams: []upstream.Upstream{failUps, failUps, failUps}, }, - name: "parallel_bad", - mode: proxy.UpstreamModeParallel, - mainCount: 2, - fallbackCount: 3, - isMainErr: true, - isFallbackErr: true, + name: "parallel_bad", + mode: proxy.UpstreamModeParallel, + wantMainCount: 2, + wantFallbackCount: 3, }, { - isExchangeErr: assert.False, + wantErr: assert.NoError, + wantMainErr: assert.False, + wantFallbackErr: assert.False, config: &proxy.UpstreamConfig{ Upstreams: []upstream.Upstream{ups}, }, fallbackConfig: &proxy.UpstreamConfig{ Upstreams: []upstream.Upstream{ups}, }, - name: "fastest_single_success", - mode: proxy.UpstreamModeFastestAddr, - mainCount: 1, - fallbackCount: 0, - isMainErr: false, - isFallbackErr: false, + name: "fastest_single_success", + mode: proxy.UpstreamModeFastestAddr, + wantMainCount: 1, + wantFallbackCount: 0, }, { - isExchangeErr: assert.False, + wantErr: assert.NoError, + wantMainErr: assert.False, + wantFallbackErr: assert.False, config: &proxy.UpstreamConfig{ Upstreams: []upstream.Upstream{ups, ups}, }, fallbackConfig: &proxy.UpstreamConfig{ Upstreams: []upstream.Upstream{ups}, }, - name: "fastest_multiple_success", - mode: proxy.UpstreamModeFastestAddr, - mainCount: 2, - fallbackCount: 0, - isMainErr: false, - isFallbackErr: false, + name: "fastest_multiple_success", + mode: proxy.UpstreamModeFastestAddr, + wantMainCount: 2, + wantFallbackCount: 0, }, { - isExchangeErr: assert.False, + wantErr: assert.NoError, + wantMainErr: assert.True, + wantFallbackErr: assert.False, config: &proxy.UpstreamConfig{ Upstreams: []upstream.Upstream{ups, failUps}, }, fallbackConfig: &proxy.UpstreamConfig{ Upstreams: []upstream.Upstream{ups}, }, - name: "fastest_mixed_success", - mode: proxy.UpstreamModeFastestAddr, - mainCount: 2, - fallbackCount: 0, - isMainErr: true, - isFallbackErr: false, + name: "fastest_mixed_success", + mode: proxy.UpstreamModeFastestAddr, + wantMainCount: 2, + wantFallbackCount: 0, }, { - isExchangeErr: assert.True, + wantErr: assert.Error, + wantMainErr: assert.True, + wantFallbackErr: assert.True, config: &proxy.UpstreamConfig{ Upstreams: []upstream.Upstream{failUps, failUps}, }, fallbackConfig: &proxy.UpstreamConfig{ Upstreams: []upstream.Upstream{failUps, failUps, failUps}, }, - name: "fastest_multiple_bad", - mode: proxy.UpstreamModeFastestAddr, - mainCount: 2, - fallbackCount: 3, - isMainErr: true, - isFallbackErr: true, + name: "fastest_multiple_bad", + mode: proxy.UpstreamModeFastestAddr, + wantMainCount: 2, + wantFallbackCount: 3, }, { - isExchangeErr: assert.False, + wantErr: assert.NoError, + wantMainErr: assert.True, + wantFallbackErr: assert.False, config: &proxy.UpstreamConfig{ Upstreams: []upstream.Upstream{failUps, failUps}, }, fallbackConfig: &proxy.UpstreamConfig{ Upstreams: []upstream.Upstream{ups}, }, - name: "fastest_bad_fallback_success", - mode: proxy.UpstreamModeFastestAddr, - mainCount: 2, - fallbackCount: 1, - isMainErr: true, - isFallbackErr: false, + name: "fastest_bad_fallback_success", + mode: proxy.UpstreamModeFastestAddr, + wantMainCount: 2, + wantFallbackCount: 1, }} for _, tc := range testCases { @@ -227,16 +227,16 @@ func TestCollectQueryStats(t *testing.T) { d := &proxy.DNSContext{Req: testReq} err = p.Resolve(d) - tc.isExchangeErr(t, err != nil) + tc.wantErr(t, err) stats := d.QueryStatistics() assertQueryStats( t, stats, - tc.mainCount, - tc.isMainErr, - tc.fallbackCount, - tc.isFallbackErr, + tc.wantMainCount, + tc.wantMainErr, + tc.wantFallbackCount, + tc.wantFallbackErr, ) }) } @@ -246,21 +246,21 @@ func TestCollectQueryStats(t *testing.T) { func assertQueryStats( t *testing.T, stats *proxy.QueryStatistics, - mainCount int, - isMainErr bool, - fallbackCount int, - isFallbackErr bool, + wantMainCount int, + wantMainErr assert.BoolAssertionFunc, + wantFallbackCount int, + wantFallbackErr assert.BoolAssertionFunc, ) { t.Helper() main := stats.Main() - assert.Equalf(t, mainCount, len(main), "main stats count") + assert.Lenf(t, main, wantMainCount, "main stats count") fallback := stats.Fallback() - assert.Equalf(t, fallbackCount, len(fallback), "fallback stats count") + assert.Lenf(t, fallback, wantFallbackCount, "fallback stats count") - assert.Equalf(t, isMainErr, isErrorInStats(main), "main err") - assert.Equalf(t, isFallbackErr, isErrorInStats(fallback), "fallback err") + wantMainErr(t, isErrorInStats(main), "main err") + wantFallbackErr(t, isErrorInStats(fallback), "fallback err") } // isErrorInStats is a helper function for tests that returns true if the