Chore: Remove xorcare/pointer dependency (#63900)

* Chore: remove pointer dependency

* fix type casts

* deprecate xorcare/pointer library in linter

* rooky mistake
This commit is contained in:
Serge Zaitsev
2023-03-06 05:23:15 -05:00
committed by GitHub
parent 30c6ac49ba
commit 0bdb105df2
23 changed files with 469 additions and 471 deletions
+14 -14
View File
@@ -4,9 +4,9 @@ import (
"testing"
"github.com/stretchr/testify/require"
ptr "github.com/xorcare/pointer"
"github.com/grafana/grafana/pkg/expr/mathexp"
"github.com/grafana/grafana/pkg/util"
)
func TestThresholdEvaluator(t *testing.T) {
@@ -19,25 +19,25 @@ func TestThresholdEvaluator(t *testing.T) {
{
name: "value 3 is gt 1: true",
evaluator: &thresholdEvaluator{"gt", 1},
inputNumber: newNumber(ptr.Float64(3)),
inputNumber: newNumber(util.Pointer(3.0)),
expected: true,
},
{
name: "value 1 is gt 3: false",
evaluator: &thresholdEvaluator{"gt", 3},
inputNumber: newNumber(ptr.Float64(1)),
inputNumber: newNumber(util.Pointer(1.0)),
expected: false,
},
{
name: "value 3 is lt 1: true",
evaluator: &thresholdEvaluator{"lt", 1},
inputNumber: newNumber(ptr.Float64(3)),
inputNumber: newNumber(util.Pointer(3.0)),
expected: false,
},
{
name: "value 1 is lt 3: false",
evaluator: &thresholdEvaluator{"lt", 3},
inputNumber: newNumber(ptr.Float64(1)),
inputNumber: newNumber(util.Pointer(1.0)),
expected: true,
},
}
@@ -60,50 +60,50 @@ func TestRangedEvaluator(t *testing.T) {
{
name: "value 3 is within range 1, 100: true",
evaluator: &rangedEvaluator{"within_range", 1, 100},
inputNumber: newNumber(ptr.Float64(3)),
inputNumber: newNumber(util.Pointer(3.0)),
expected: true,
},
{
name: "value 300 is within range 1, 100: false",
evaluator: &rangedEvaluator{"within_range", 1, 100},
inputNumber: newNumber(ptr.Float64(300)),
inputNumber: newNumber(util.Pointer(300.0)),
expected: false,
},
{
name: "value 3 is within range 100, 1: true",
evaluator: &rangedEvaluator{"within_range", 100, 1},
inputNumber: newNumber(ptr.Float64(3)),
inputNumber: newNumber(util.Pointer(3.0)),
expected: true,
},
{
name: "value 300 is within range 100, 1: false",
evaluator: &rangedEvaluator{"within_range", 100, 1},
inputNumber: newNumber(ptr.Float64(300)),
inputNumber: newNumber(util.Pointer(300.0)),
expected: false,
},
// outside
{
name: "value 1000 is outside range 1, 100: true",
evaluator: &rangedEvaluator{"outside_range", 1, 100},
inputNumber: newNumber(ptr.Float64(1000)),
inputNumber: newNumber(util.Pointer(1000.0)),
expected: true,
},
{
name: "value 50 is outside range 1, 100: false",
evaluator: &rangedEvaluator{"outside_range", 1, 100},
inputNumber: newNumber(ptr.Float64(50)),
inputNumber: newNumber(util.Pointer(50.0)),
expected: false,
},
{
name: "value 1000 is outside range 100, 1: true",
evaluator: &rangedEvaluator{"outside_range", 100, 1},
inputNumber: newNumber(ptr.Float64(1000)),
inputNumber: newNumber(util.Pointer(1000.0)),
expected: true,
},
{
name: "value 50 is outside range 100, 1: false",
evaluator: &rangedEvaluator{"outside_range", 100, 1},
inputNumber: newNumber(ptr.Float64(50)),
inputNumber: newNumber(util.Pointer(50.0)),
expected: false,
},
}
@@ -125,7 +125,7 @@ func TestNoValueEvaluator(t *testing.T) {
{
name: "value 50 is no_value: false",
evaluator: &noValueEvaluator{},
inputNumber: newNumber(ptr.Float64(50)),
inputNumber: newNumber(util.Pointer(50.0)),
expected: false,
},
{