From 24350521be7504f02aac038c9df635bdb7553564 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Farkas?= <gabor.farkas@gmail.com>
Date: Tue, 19 Sep 2023 09:19:28 +0200
Subject: [PATCH] sql: improve imports in test (#75006)

---
 .../sql/components/SqlComponents.test.tsx     | 44 ++++++++++++-------
 1 file changed, 28 insertions(+), 16 deletions(-)

diff --git a/public/app/features/plugins/sql/components/SqlComponents.test.tsx b/public/app/features/plugins/sql/components/SqlComponents.test.tsx
index 412abd45f3c..4c82f5c5fdc 100644
--- a/public/app/features/plugins/sql/components/SqlComponents.test.tsx
+++ b/public/app/features/plugins/sql/components/SqlComponents.test.tsx
@@ -1,8 +1,8 @@
 import { render, waitFor } from '@testing-library/react';
 import React from 'react';
 
+import { CustomVariableModel, LoadingState, VariableHide } from '@grafana/data';
 import { config } from '@grafana/runtime';
-import { customBuilder } from 'app/features/variables/shared/testing/builders';
 
 import { SQLExpression } from '../types';
 
@@ -69,16 +69,34 @@ describe('TableSelector', () => {
 });
 
 describe('SQLWhereRow', () => {
+  function makeVariable(id: string, name: string, multi: boolean): CustomVariableModel {
+    return {
+      id,
+      name,
+      multi,
+      type: 'custom',
+      includeAll: false,
+      current: {},
+      options: [],
+      query: '',
+      rootStateKey: null,
+      global: false,
+      hide: VariableHide.dontHide,
+      skipUrlSync: false,
+      index: -1,
+      state: LoadingState.NotStarted,
+      error: null,
+      description: null,
+    };
+  }
+
   it('should remove quotes in a where clause including multi-value variable', () => {
     const exp: SQLExpression = {
       whereString: "hostname IN ('${multiHost}')",
     };
 
-    const multiVar = customBuilder().withId('multiVar').withName('multiHost').build();
-    const nonMultiVar = customBuilder().withId('nonMultiVar').withName('host').build();
-
-    multiVar.multi = true;
-    nonMultiVar.multi = false;
+    const multiVar = makeVariable('multiVar', 'multiHost', true);
+    const nonMultiVar = makeVariable('nonMultiVar', 'host', false);
 
     const variables = [multiVar, nonMultiVar];
 
@@ -92,11 +110,8 @@ describe('SQLWhereRow', () => {
       whereString: "hostname IN ('${host}')",
     };
 
-    const multiVar = customBuilder().withId('multiVar').withName('multiHost').build();
-    const nonMultiVar = customBuilder().withId('nonMultiVar').withName('host').build();
-
-    multiVar.multi = true;
-    nonMultiVar.multi = false;
+    const multiVar = makeVariable('multiVar', 'multiHost', true);
+    const nonMultiVar = makeVariable('nonMultiVar', 'host', false);
 
     const variables = [multiVar, nonMultiVar];
 
@@ -110,11 +125,8 @@ describe('SQLWhereRow', () => {
       whereString: "hostname IN ('${nonMultiHost}')",
     };
 
-    const multiVar = customBuilder().withId('multiVar').withName('multiHost').build();
-    const nonMultiVar = customBuilder().withId('nonMultiVar').withName('host').build();
-
-    multiVar.multi = true;
-    nonMultiVar.multi = false;
+    const multiVar = makeVariable('multiVar', 'multiHost', true);
+    const nonMultiVar = makeVariable('nonMultiVar', 'host', false);
 
     const variables = [multiVar, nonMultiVar];