Fix wild import warnings in system tests

robertapplin · robertapplin · commit 50e35fef3c8c · 2024-10-16T13:30:44.000+01:00
diff --git a/Testing/SystemTests/tests/framework/ARCSReductionTest.py b/Testing/SystemTests/tests/framework/ARCSReductionTest.py
@@ -11,7 +11,9 @@
 
 import os
 import systemtesting
-from mantid.simpleapi import *
+from mantid.api import mtd
+from mantid.kernel import config
+from mantid.simpleapi import DeleteWorkspace, DgsReduction, ExtractMask, Load, LoadNXSPE, SaveNXSPE
 
 
 class ARCSReductionTest(systemtesting.MantidSystemTest):
diff --git a/Testing/SystemTests/tests/framework/AlignAndFocusPowderFromFilesTest.py b/Testing/SystemTests/tests/framework/AlignAndFocusPowderFromFilesTest.py
@@ -6,8 +6,27 @@
 # SPDX - License - Identifier: GPL - 3.0 +
 # pylint: disable=no-init,invalid-name,attribute-defined-outside-init
 import systemtesting
-from mantid.simpleapi import *
-from mantid.api import WorkspaceFactory
+from mantid.api import mtd, AnalysisDataService, WorkspaceFactory
+from mantid.kernel import PropertyManagerDataService
+from mantid.simpleapi import (
+    AlignAndFocusPowder,
+    AlignAndFocusPowderFromFiles,
+    ConvertUnits,
+    CreateGroupingWorkspace,
+    CylinderAbsorption,
+    DeleteWorkspace,
+    Divide,
+    FilterBadPulses,
+    LoadDiffCal,
+    LoadEventAndCompress,
+    LoadEventNexus,
+    NormaliseByCurrent,
+    PDDetermineCharacterizations,
+    PDLoadCharacterizations,
+    RebinRagged,
+    SetSample,
+    SortEvents,
+)
 import numpy as np
 import os
 import time
@@ -418,7 +437,7 @@ def runTest(self):
         for i in range(absorptionWS.getNumberHistograms()):
             absorptionWS.setX(i, xaxis)
         absorptionWS.getAxis(0).setUnit("Wavelength")
-        mantid.api.AnalysisDataService.addOrReplace("V_abs", absorptionWS)
+        AnalysisDataService.addOrReplace("V_abs", absorptionWS)
         SetSample(
             InputWorkspace="V_abs",
             Material={"ChemicalFormula": "V", "SampleNumberDensity": 0.0721},
diff --git a/Testing/SystemTests/tests/framework/BuildSQWTest.py b/Testing/SystemTests/tests/framework/BuildSQWTest.py
@@ -16,7 +16,19 @@
 
 import systemtesting
 import os
-from mantid.simpleapi import *
+from mantid.kernel import config, logger
+from mantid.simpleapi import (
+    CompareMDWorkspaces,
+    ConvertToMD,
+    DeleteWorkspace,
+    LoadMD,
+    LoadNXSPE,
+    LoadSQW,
+    MergeMDFiles,
+    SaveMD,
+    SetGoniometer,
+    SetUB,
+)
 
 # allow for multiple locations
 FILE_LOCATIONS = ["/isis/mantid/localtestdata/"]  # ,"d:/Data/MantidSystemTests/BigData/Dropbox/LoadSQW"]
@@ -109,7 +121,7 @@ def cleanup(self):
             try:
                 os.remove(filename)
             except OSError:
-                mantid.logger.warning("Unable to remove created file '%s'" % filename)
+                logger.warning("Unable to remove created file '%s'" % filename)
 
 
 class LoadSQW_FileBasedTest(BuildSQWTest):
diff --git a/Testing/SystemTests/tests/framework/CNCSReductionTest.py b/Testing/SystemTests/tests/framework/CNCSReductionTest.py
@@ -11,7 +11,9 @@
 
 import os
 import systemtesting
-from mantid.simpleapi import *
+from mantid.api import mtd
+from mantid.kernel import config
+from mantid.simpleapi import CNCSSuggestTIB, DeleteWorkspace, DgsReduction, GenerateGroupingPowder, Load, LoadNXSPE, SaveNXSPE
 
 
 class CNCSReductionTest(systemtesting.MantidSystemTest):
diff --git a/Testing/SystemTests/tests/framework/CRISPLoadingTest.py b/Testing/SystemTests/tests/framework/CRISPLoadingTest.py
@@ -4,7 +4,7 @@
 #   NScD Oak Ridge National Laboratory, European Spallation Source,
 #   Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
 # SPDX - License - Identifier: GPL - 3.0 +
-from LoadAndCheckBase import *
+from LoadAndCheckBase import LoadAndCheckBase
 
 
 class CRISPLoadingTest(LoadAndCheckBase):
diff --git a/Testing/SystemTests/tests/framework/CalMuonDeadTimeTest.py b/Testing/SystemTests/tests/framework/CalMuonDeadTimeTest.py
@@ -6,7 +6,7 @@
 # SPDX - License - Identifier: GPL - 3.0 +
 # pylint: disable=no-init,attribute-defined-outside-init
 import systemtesting
-from mantid.simpleapi import *
+from mantid.simpleapi import CalMuonDeadTime, GroupWorkspaces, Load
 
 
 class CalMuonDeadTimeTest(systemtesting.MantidSystemTest):
diff --git a/Testing/SystemTests/tests/framework/CodeConventions.py b/Testing/SystemTests/tests/framework/CodeConventions.py
@@ -8,7 +8,7 @@
 import systemtesting
 import re
 import mantid
-from mantid.simpleapi import *
+from mantid.api import AlgorithmFactory
 
 MAX_ALG_LEN = 40  # TODO convention says 20 is the maximum
 
diff --git a/Testing/SystemTests/tests/framework/CompareMDWorkspacesTest.py b/Testing/SystemTests/tests/framework/CompareMDWorkspacesTest.py
@@ -10,7 +10,8 @@
 """
 
 import systemtesting
-from mantid.simpleapi import *
+from mantid.api import mtd
+from mantid.simpleapi import ChangeBinOffset, CompareMDWorkspaces, ConvertToMD, CreateSampleWorkspace, MergeMD
 
 
 class CompareMDWorkspacesTest(systemtesting.MantidSystemTest):
diff --git a/Testing/SystemTests/tests/framework/CompressEvents.py b/Testing/SystemTests/tests/framework/CompressEvents.py
@@ -6,7 +6,8 @@
 # SPDX - License - Identifier: GPL - 3.0 +
 # pylint: disable=no-init,invalid-name,attribute-defined-outside-init
 import systemtesting
-from mantid.simpleapi import *
+from mantid.api import mtd
+from mantid.simpleapi import CompressEvents, Integration, LoadEventNexus, SumSpectra
 
 
 class CompressEventsTesting(systemtesting.MantidSystemTest):
diff --git a/Testing/SystemTests/tests/framework/ConvToMDCompareDefaultVsIndexing.py b/Testing/SystemTests/tests/framework/ConvToMDCompareDefaultVsIndexing.py
@@ -7,7 +7,8 @@
 # pylint: disable=no-init
 import sys
 import systemtesting
-from mantid.simpleapi import *
+from mantid.api import mtd
+from mantid.simpleapi import BinMD, CompareMDWorkspaces, ConvertToMD, CreateSampleWorkspace
 
 
 class ConvToMDCompareDefaultVsIndexing(systemtesting.MantidSystemTest):
diff --git a/Testing/SystemTests/tests/framework/ConvertHFIRSCDtoMDETest.py b/Testing/SystemTests/tests/framework/ConvertHFIRSCDtoMDETest.py
@@ -7,7 +7,8 @@
 import platform
 import systemtesting
 import numpy as np
-from mantid.simpleapi import *
+from mantid.api import AlgorithmManager
+from mantid.simpleapi import ConvertHFIRSCDtoMDE, FindPeaksMD, HFIRCalculateGoniometer, IndexPeaks, Load, LoadMD, SaveMD, SetGoniometer
 
 
 def _skip_test():
diff --git a/Testing/SystemTests/tests/framework/ConvertToMDworkflow.py b/Testing/SystemTests/tests/framework/ConvertToMDworkflow.py
@@ -6,7 +6,8 @@
 # SPDX - License - Identifier: GPL - 3.0 +
 # pylint: disable=no-init
 import systemtesting
-from mantid.simpleapi import *
+from mantid.api import AlgorithmManager
+from mantid.simpleapi import AddSampleLog, CloneWorkspace, ConvertToMD, DeleteWorkspace, Load, SaveMD, SetGoniometer, SetUB
 
 
 # ----------------------------------------------------------------------
diff --git a/Testing/SystemTests/tests/framework/ConvertWANDSCDtoQTest.py b/Testing/SystemTests/tests/framework/ConvertWANDSCDtoQTest.py
@@ -6,7 +6,8 @@
 # SPDX - License - Identifier: GPL - 3.0 +
 import systemtesting
 import numpy as np
-from mantid.simpleapi import *
+from mantid.api import AlgorithmManager
+from mantid.simpleapi import ConvertWANDSCDtoQ, FindPeaksMD, IndexPeaks, Load, LoadMD, SaveMD, SetGoniometer, SetUB
 
 
 class ConvertWANDSCDtoQTest(systemtesting.MantidSystemTest):
diff --git a/Testing/SystemTests/tests/framework/CountReflectionsTest.py b/Testing/SystemTests/tests/framework/CountReflectionsTest.py
@@ -5,7 +5,7 @@
 #   Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
 # SPDX - License - Identifier: GPL - 3.0 +
 import systemtesting
-from mantid.simpleapi import *
+from mantid.simpleapi import CountReflections
 from SortHKLTest import HKLStatisticsTestMixin
 
 
diff --git a/Testing/SystemTests/tests/framework/D7AbsoluteCrossSectionsTest.py b/Testing/SystemTests/tests/framework/D7AbsoluteCrossSectionsTest.py
@@ -5,7 +5,9 @@
 #   Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
 # SPDX - License - Identifier: GPL - 3.0 +
 import systemtesting
-from mantid.simpleapi import *
+from mantid.api import mtd
+from mantid.kernel import config
+from mantid.simpleapi import AppendSpectra, D7AbsoluteCrossSections, PolDiffILLReduction, RenameWorkspace
 import numpy as np
 
 
diff --git a/Testing/SystemTests/tests/framework/D7YIGPositionCalibrationTest.py b/Testing/SystemTests/tests/framework/D7YIGPositionCalibrationTest.py
@@ -5,8 +5,9 @@
 #   Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
 # SPDX - License - Identifier: GPL - 3.0 +
 import systemtesting
-from mantid.simpleapi import *
-from mantid.api import ITableWorkspace
+from mantid.api import mtd, ITableWorkspace
+from mantid.kernel import config, ConfigService
+from mantid.simpleapi import CloneWorkspace, D7YIGPositionCalibration, DeleteWorkspace, Load, LoadILLPolarizedDiffraction
 
 import math
 import os.path
diff --git a/Testing/SystemTests/tests/framework/DOSTest.py b/Testing/SystemTests/tests/framework/DOSTest.py
@@ -6,9 +6,7 @@
 # SPDX - License - Identifier: GPL - 3.0 +
 # pylint: disable=no-init,attribute-defined-outside-init
 import systemtesting
-from mantid.kernel import *
-from mantid.api import *
-from mantid.simpleapi import *
+from mantid.simpleapi import SimulatedDensityOfStates
 
 # ------------------------------------------------------------------------------------
 
diff --git a/Testing/SystemTests/tests/framework/Diffraction_Workflow_Test.py b/Testing/SystemTests/tests/framework/Diffraction_Workflow_Test.py
@@ -13,7 +13,22 @@
 import systemtesting
 import numpy
 import os
-from mantid.simpleapi import *
+from mantid.api import mtd
+from mantid.simpleapi import (
+    AnvredCorrection,
+    BinMD,
+    CentroidPeaksMD,
+    CopySample,
+    ConvertToDiffractionMDWorkspace,
+    FindPeaksMD,
+    FindUBUsingFFT,
+    FindUBUsingLatticeParameters,
+    IndexPeaks,
+    IntegratePeaksMD,
+    LoadEventNexus,
+    LoadHKL,
+    SaveHKL,
+)
 from mantid.api import FileFinder
 
 
diff --git a/Testing/SystemTests/tests/framework/DirectILLAutoProcessTest.py b/Testing/SystemTests/tests/framework/DirectILLAutoProcessTest.py
@@ -5,7 +5,9 @@
 #   Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
 # SPDX - License - Identifier: GPL - 3.0 +
 import systemtesting
-from mantid.simpleapi import *
+from mantid.api import mtd
+from mantid.kernel import config
+from mantid.simpleapi import DirectILLAutoProcess, GroupWorkspaces, Load
 
 
 class DirectILLAuto_PANTHER_Powder_Test(systemtesting.MantidSystemTest):
diff --git a/Testing/SystemTests/tests/framework/DirectInelasticDiagnostic2.py b/Testing/SystemTests/tests/framework/DirectInelasticDiagnostic2.py
@@ -7,7 +7,8 @@
 # pylint: disable=invalid-name,no-init
 import os
 from systemtesting import MantidSystemTest
-from mantid.simpleapi import *
+from mantid.api import mtd
+from mantid.simpleapi import pmds, DgsDiagnose, Load, MaskDetectors
 from mantid.kernel import PropertyManager
 from mantid import config
 
diff --git a/Testing/SystemTests/tests/framework/DistributeProtonChargeTest.py b/Testing/SystemTests/tests/framework/DistributeProtonChargeTest.py
@@ -9,7 +9,8 @@
 System test for distributing proton charge using FilterEvents and FilterByTime
 """
 
-from mantid.simpleapi import *
+from mantid.api import mtd
+from mantid.simpleapi import ChangeLogTime, DeleteWorkspace, FilterByTime, FilterEvents, GenerateEventsFilter, LoadEventNexus
 import systemtesting
 import numpy as np
 import mantid.kernel as mk
diff --git a/Testing/SystemTests/tests/framework/DrillProcessTest.py b/Testing/SystemTests/tests/framework/DrillProcessTest.py
@@ -11,14 +11,14 @@
 import sys
 import time
 
-from qtpy.QtWidgets import QApplication, QFormLayout, QLineEdit, QComboBox
+from qtpy.QtWidgets import QApplication, QFormLayout, QLineEdit, QCheckBox, QComboBox
 from qtpy.QtTest import QTest
 from qtpy.QtCore import Qt, QPoint
 
 from mantid.kernel import config
 from mantid.simpleapi import mtd, GroupWorkspaces
-from mantidqtinterfaces.drill.view.DrillView import *
-from mantidqtinterfaces.drill.view.DrillSettingsDialog import *
+from mantidqtinterfaces.drill.view.DrillView import DrillView
+from mantidqtinterfaces.drill.view.DrillSettingsDialog import DrillSettingsDialog
 
 
 app = QApplication(sys.argv)
diff --git a/Testing/SystemTests/tests/framework/EQSANSBeamCenterAPIv2.py b/Testing/SystemTests/tests/framework/EQSANSBeamCenterAPIv2.py
@@ -6,10 +6,20 @@
 # SPDX - License - Identifier: GPL - 3.0 +
 # pylint: disable=no-init,attribute-defined-outside-init
 import systemtesting
-from mantid.simpleapi import *
-from mantid.api import *
+from mantid import FileFinder
+from mantid.kernel import ConfigService
+from mantid.simpleapi import Scale
 
-from reduction_workflow.instruments.sans.sns_command_interface import *
+from reduction_workflow.instruments.sans.sns_command_interface import (
+    AppendDataFile,
+    EQSANS,
+    IndependentBinning,
+    Reduce,
+    TotalChargeNormalization,
+    UseConfig,
+    UseConfigMask,
+    UseConfigTOFTailsCutoff,
+)
 from reduction_workflow.instruments.sans.hfir_command_interface import DirectBeamCenter, NoSolidAngle, SetTransmission
 
 import os
diff --git a/Testing/SystemTests/tests/framework/EQSANSDarkCurrentAPIv2.py b/Testing/SystemTests/tests/framework/EQSANSDarkCurrentAPIv2.py
@@ -6,10 +6,23 @@
 # SPDX - License - Identifier: GPL - 3.0 +
 # pylint: disable=no-init,attribute-defined-outside-init
 import systemtesting
-from mantid.simpleapi import *
-from reduction_workflow.instruments.sans.sns_command_interface import *
+from mantid import FileFinder
+from mantid.kernel import ConfigService
+from mantid.simpleapi import Scale
+from reduction_workflow.instruments.sans.sns_command_interface import (
+    AppendDataFile,
+    EQSANS,
+    PerformFlightPathCorrection,
+    Reduce1D,
+    SetBeamCenter,
+    SetTOFTailsCutoff,
+    SolidAngle,
+    TotalChargeNormalization,
+    UseConfig,
+    UseConfigMask,
+    UseConfigTOFTailsCutoff,
+)
 from reduction_workflow.instruments.sans.hfir_command_interface import DarkCurrent, SetTransmission
-from mantid.api import *
 
 import os
 
diff --git a/Testing/SystemTests/tests/framework/EQSANSEffAPIv2.py b/Testing/SystemTests/tests/framework/EQSANSEffAPIv2.py
@@ -6,10 +6,21 @@
 # SPDX - License - Identifier: GPL - 3.0 +
 # pylint: disable=no-init,attribute-defined-outside-init
 import systemtesting
-from mantid.simpleapi import *
-from reduction_workflow.instruments.sans.sns_command_interface import *
+from reduction_workflow.instruments.sans.sns_command_interface import (
+    AppendDataFile,
+    EQSANS,
+    Reduce1D,
+    SetBeamCenter,
+    SolidAngle,
+    TotalChargeNormalization,
+    UseConfig,
+    UseConfigMask,
+    UseConfigTOFTailsCutoff,
+)
 from reduction_workflow.instruments.sans.hfir_command_interface import SensitivityCorrection, SetTransmission
-from mantid.api import FileFinder
+from mantid.api import mtd, FileFinder
+from mantid.kernel import ConfigService
+from mantid.simpleapi import Scale
 
 import os
 
diff --git a/Testing/SystemTests/tests/framework/EQSANSFlatTestAPIv2.py b/Testing/SystemTests/tests/framework/EQSANSFlatTestAPIv2.py
diff --git a/Testing/SystemTests/tests/framework/EQSANSIQOutputAPIv2.py b/Testing/SystemTests/tests/framework/EQSANSIQOutputAPIv2.py
diff --git a/Testing/SystemTests/tests/framework/EQSANSNormalisationAPIv2.py b/Testing/SystemTests/tests/framework/EQSANSNormalisationAPIv2.py
diff --git a/Testing/SystemTests/tests/framework/EQSANSProcessedEffAPIv2.py b/Testing/SystemTests/tests/framework/EQSANSProcessedEffAPIv2.py
diff --git a/Testing/SystemTests/tests/framework/EQSANSSolidAPIv2.py b/Testing/SystemTests/tests/framework/EQSANSSolidAPIv2.py
