From ec49adca0e129bad949203d83ea983d0d220fa28 Mon Sep 17 00:00:00 2001
From: Michael Lange <Michael.Lange@ecmwf.int>
Date: Thu, 5 Sep 2024 12:04:33 +0000
Subject: [PATCH] IR: Adjust imports of utilities across all tests

---
 loki/expression/tests/test_expression.py | 10 +++++-----
 loki/expression/tests/test_parser.py     |  3 ++-
 loki/ir/tests/test_expr_visitors.py      |  8 ++++----
 loki/ir/tests/test_visitor.py            |  7 +++----
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/loki/expression/tests/test_expression.py b/loki/expression/tests/test_expression.py
index 7f3b1ddf2..ee3ef99cf 100644
--- a/loki/expression/tests/test_expression.py
+++ b/loki/expression/tests/test_expression.py
@@ -20,14 +20,14 @@
 )
 from loki.backend import cgen, fgen
 from loki.build import jit_compile, clean_test
-from loki.expression import (
-    symbols as sym, FindVariables, FindExpressions, FindInlineCalls,
-    SubstituteExpressions, AttachScopesMapper, parse_expr
-)
+from loki.expression import symbols as sym, parse_expr, AttachScopesMapper
 from loki.frontend import (
     available_frontends, OFP, OMNI, FP, HAVE_FP, parse_fparser_expression
 )
-from loki.ir import nodes as ir, FindNodes
+from loki.ir import (
+    nodes as ir, FindNodes, FindVariables, FindExpressions,
+    FindInlineCalls, SubstituteExpressions
+)
 from loki.tools import (
     filehash, stdchannel_redirected, stdchannel_is_captured
 )
diff --git a/loki/expression/tests/test_parser.py b/loki/expression/tests/test_parser.py
index 5be2b3530..531691e83 100644
--- a/loki/expression/tests/test_parser.py
+++ b/loki/expression/tests/test_parser.py
@@ -11,10 +11,11 @@
 import pymbolic.mapper as pmbl_mapper
 
 from loki import Subroutine, Module, Scope
-from loki.expression import symbols as sym, FindVariables, parse_expr
+from loki.expression import symbols as sym, parse_expr
 from loki.frontend import (
     available_frontends, OMNI, HAVE_FP, parse_fparser_expression
 )
+from loki.ir import FindVariables
 
 
 # utility function to test parse_expr with different case
diff --git a/loki/ir/tests/test_expr_visitors.py b/loki/ir/tests/test_expr_visitors.py
index 29d634b35..57d928eea 100644
--- a/loki/ir/tests/test_expr_visitors.py
+++ b/loki/ir/tests/test_expr_visitors.py
@@ -8,12 +8,12 @@
 import pytest
 
 from loki import Sourcefile, Subroutine
-from loki.expression import (
-    symbols as sym, parse_expr, FindVariables, FindTypedSymbols,
+from loki.expression import symbols as sym, parse_expr
+from loki.frontend import available_frontends
+from loki.ir import (
+    nodes as ir, FindNodes, FindVariables, FindTypedSymbols,
     SubstituteExpressions, SubstituteStringExpressions
 )
-from loki.frontend import available_frontends
-from loki.ir import nodes as ir, FindNodes
 
 
 @pytest.mark.parametrize('frontend', available_frontends())
diff --git a/loki/ir/tests/test_visitor.py b/loki/ir/tests/test_visitor.py
index 69130d0fb..c5a5a2e3a 100644
--- a/loki/ir/tests/test_visitor.py
+++ b/loki/ir/tests/test_visitor.py
@@ -16,12 +16,11 @@
 from loki.ir import (
     is_parent_of, is_child_of, FindNodes, FindScopes, Transformer,
     NestedTransformer, MaskedTransformer, NestedMaskedTransformer,
-    Stringifier
+    Stringifier, FindVariables, ExpressionFinder,
+    SubstituteExpressions
 )
 from loki.expression import (
-    symbols as sym, FindVariables, ExpressionFinder,
-    ExpressionCallbackMapper, ExpressionRetriever,
-    SubstituteExpressions
+    symbols as sym, ExpressionCallbackMapper, ExpressionRetriever
 )