From 457094bc153a6567f2078e2f09c3a2a9ac8f472a Mon Sep 17 00:00:00 2001 From: mmontes11 Date: Tue, 30 Jul 2024 22:12:16 +0200 Subject: [PATCH] Minor improvements --- api/v1alpha1/mariadb_galera_types_test.go | 17 ----------------- pkg/reflect/reflect_test.go | 20 ++++++++++---------- 2 files changed, 10 insertions(+), 27 deletions(-) diff --git a/api/v1alpha1/mariadb_galera_types_test.go b/api/v1alpha1/mariadb_galera_types_test.go index 110b58ce..7161c9ea 100644 --- a/api/v1alpha1/mariadb_galera_types_test.go +++ b/api/v1alpha1/mariadb_galera_types_test.go @@ -585,23 +585,6 @@ var _ = Describe("MariaDB Galera types", func() { }, true, ), - Entry( - "Integer out of range", - &MariaDB{ - Spec: MariaDBSpec{ - Replicas: 3, - Galera: &Galera{ - GaleraSpec: GaleraSpec{ - Recovery: &GaleraRecovery{ - Enabled: true, - MinClusterSize: ptr.To(intstr.FromInt(4)), - }, - }, - }, - }, - }, - true, - ), Entry( "Invalid forceClusterBootstrapInPod", &MariaDB{ diff --git a/pkg/reflect/reflect_test.go b/pkg/reflect/reflect_test.go index ece597dc..dd0929a8 100644 --- a/pkg/reflect/reflect_test.go +++ b/pkg/reflect/reflect_test.go @@ -11,23 +11,23 @@ func TestIsNil(t *testing.T) { input interface{} want bool }{ - {"nil interface", nil, true}, - {"nil pointer", (*int)(nil), true}, - {"nil slice", ([]int)(nil), true}, - {"nil map", (map[string]int)(nil), true}, {"nil channel", (chan int)(nil), true}, {"nil func", (func())(nil), true}, + {"nil interface containing nil pointer", interface{}((*int)(nil)), true}, + {"nil interface", nil, true}, + {"nil map", (map[string]int)(nil), true}, + {"nil pointer", (*int)(nil), true}, + {"nil slice", ([]int)(nil), true}, {"nil unsafe pointer", (unsafe.Pointer)(nil), true}, - {"non-nil pointer", new(int), false}, - {"non-nil slice", []int{}, false}, - {"non-nil map", map[string]int{}, false}, {"non-nil channel", make(chan int), false}, {"non-nil func", func() {}, false}, - {"non-nil unsafe pointer", unsafe.Pointer(new(int)), false}, - {"non-nil interface", interface{}(0), false}, {"non-nil int", 123, false}, + {"non-nil interface", interface{}(0), false}, + {"non-nil map", map[string]int{}, false}, + {"non-nil pointer", new(int), false}, + {"non-nil slice", []int{}, false}, {"non-nil string", "hello", false}, - {"nil interface containing nil pointer", interface{}((*int)(nil)), true}, + {"non-nil unsafe pointer", unsafe.Pointer(new(int)), false}, } for _, tt := range tests {