From 970916154050afc77880783d00a78d090f5ceb9a Mon Sep 17 00:00:00 2001 From: huanggze Date: Fri, 17 Apr 2020 16:48:07 +0800 Subject: [PATCH] fix isRangeQuery Signed-off-by: huanggze --- pkg/kapis/monitoring/v1alpha3/helper.go | 2 +- pkg/kapis/monitoring/v1alpha3/helper_test.go | 30 ++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/pkg/kapis/monitoring/v1alpha3/helper.go b/pkg/kapis/monitoring/v1alpha3/helper.go index d5442b7e0..37f645c4f 100644 --- a/pkg/kapis/monitoring/v1alpha3/helper.go +++ b/pkg/kapis/monitoring/v1alpha3/helper.go @@ -70,7 +70,7 @@ type queryOptions struct { } func (q queryOptions) isRangeQuery() bool { - return !q.time.IsZero() + return q.time.IsZero() } func (q queryOptions) shouldSort() bool { diff --git a/pkg/kapis/monitoring/v1alpha3/helper_test.go b/pkg/kapis/monitoring/v1alpha3/helper_test.go index 46f72dc1b..4a099622e 100644 --- a/pkg/kapis/monitoring/v1alpha3/helper_test.go +++ b/pkg/kapis/monitoring/v1alpha3/helper_test.go @@ -12,6 +12,36 @@ import ( "time" ) +func TestIsRangeQuery(t *testing.T) { + tests := []struct { + opt queryOptions + expected bool + }{ + { + opt: queryOptions{ + time: time.Now(), + }, + expected: false, + }, + { + opt: queryOptions{ + start: time.Now().Add(-time.Hour), + end: time.Now(), + }, + expected: true, + }, + } + + for i, tt := range tests { + t.Run(fmt.Sprintf("%d", i), func(t *testing.T) { + b := tt.opt.isRangeQuery() + if b != tt.expected { + t.Fatalf("expected %v, but got %v", tt.expected, b) + } + }) + } +} + func TestParseRequestParams(t *testing.T) { tests := []struct { params reqParams