Skip to content

Commit

Permalink
Forgot to update references to lowercase test directory.
Browse files Browse the repository at this point in the history
  • Loading branch information
Sean-McCann-HG committed Apr 19, 2024
1 parent 6913c95 commit 1c0a848
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion QGIS-AIMS-Plugin/AIMSDataManager/AimsApi.py
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ def _request(self,*args,**kwargs):
'''
if TEST_MODE:
# TBD If this is the best course of action. Unable to get the mocking to intercept calls to httplib2 requests otherwise
from Test.AimsService_Mock import mock_api_request
from test.AimsService_Mock import mock_api_request
return mock_api_request(*args, **kwargs)
else:
aimslog.info("Request {}".format(args))
Expand Down
4 changes: 2 additions & 2 deletions QGIS-AIMS-Plugin/AIMSDataManager/Config.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@
# For Unit Testing, outside of QGIS, set path to your .ini file here as QgsApplication.qgisSettingsDirPath() resolves to '' if not called from QGIS
if sys.platform == 'linux':
# For testing via github actions, builds path to the repository aims_test_config.ini
# AIMS_CONFIG = os.path.join(os.path.dirname(os.path.dirname(__file__)), 'Test', 'aims_test_config.ini')
# AIMS_CONFIG = os.path.join(os.path.dirname(os.path.dirname(__file__)), 'test', 'aims_test_config.ini')
print(f'LINUX CI DETECTED - USING PATH: {AIMS_CONFIG}')

if AIMS_CONFIG == 'aims\\aimsConfig.ini':
# Local testing
AIMS_CONFIG = os.path.join(os.path.dirname(os.path.dirname(__file__)), 'Test', 'aims_test_config.ini')
AIMS_CONFIG = os.path.join(os.path.dirname(os.path.dirname(__file__)), 'test', 'aims_test_config.ini')

if not USE_PLAINTEXT:
K='12345678901234567890123456789012'
Expand Down
4 changes: 2 additions & 2 deletions QGIS-AIMS-Plugin/test/Controller_Test.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
sys.path.append(os.path.join(ROOT, 'AIMSDataManager'))
sys.path.append(os.path.join(ROOT, 'AimsUI'))

from Test.AimsService_Mock import ASM
#from Test._QGisInterface import QgisInterface
from test.AimsService_Mock import ASM
#from test._QGisInterface import QgisInterface
from AimsUI.AimsClient.Gui.Controller import Controller
from AIMSDataManager.Address import Address

Expand Down
2 changes: 1 addition & 1 deletion QGIS-AIMS-Plugin/test/CreateNewTool_Test.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
sys.path.append(os.path.join(ROOT, 'AIMSDataManager'))
sys.path.append(os.path.join(ROOT, 'AimsUI'))

#from Test._QGisInterface import QgisInterface
#from test._QGisInterface import QgisInterface
# from AimsUI.CreateNewAddressTool import CreateNewTool
from AimsUI.LayerManager import LayerManager
from AimsUI.AimsLogging import Logger
Expand Down
6 changes: 3 additions & 3 deletions QGIS-AIMS-Plugin/test/LayerManager_Test.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@
sys.path.append(os.path.join(ROOT, 'AIMSDataManager'))
sys.path.append(os.path.join(ROOT, 'AimsUI'))

#from Test._QGisInterface import QgisInterface
from Test.AimsService_Mock import ASM
#from test._QGisInterface import QgisInterface
from test.AimsService_Mock import ASM

from AimsUI.LayerManager import LayerManager, InvalidParameterException
from AimsUI.AimsClient.Gui.Controller import Controller
from AimsUI.AimsLogging import Logger
from Test.Database_Test import DCONF
from test.Database_Test import DCONF
from AimsUI.AimsClient import Database

from mock import Mock, patch
Expand Down
24 changes: 12 additions & 12 deletions RunAllTests.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,24 +24,24 @@
BM=0xF

if BM & IMASK['adr']:
from Test.Address_Test import Test_0_AddressSelfTest as AT0
from Test.Address_Test import Test_1_AddressTestSetters as AT1
from Test.AddressFactory_Test import Test_0_AddressFactorySelfTest as AFT0
from Test.AddressFactory_Test import Test_1_AddressTestSetters as AFT1
from test.Address_Test import Test_0_AddressSelfTest as AT0
from test.Address_Test import Test_1_AddressTestSetters as AT1
from test.AddressFactory_Test import Test_0_AddressFactorySelfTest as AFT0
from test.AddressFactory_Test import Test_1_AddressTestSetters as AFT1

if BM & IMASK['db']:
from Test.Database_Test import Test_0_DatabaseSelfTest as DT0
from Test.Database_Test import Test_1_DatabaseTestSetters as DT1
from Test.Database_Test import Test_2_DatabaseConnectivity as DT2
from test.Database_Test import Test_0_DatabaseSelfTest as DT0
from test.Database_Test import Test_1_DatabaseTestSetters as DT1
from test.Database_Test import Test_2_DatabaseConnectivity as DT2

if BM & IMASK['lm']:
from Test.LayerManager_Test import Test_0_LayerManagerSelfTest as LMT0
from Test.LayerManager_Test import Test_1_LayerManagerSetters as LMT1
from Test.LayerManager_Test import Test_2_LayerManagerConnection as LMT2
from test.LayerManager_Test import Test_0_LayerManagerSelfTest as LMT0
from test.LayerManager_Test import Test_1_LayerManagerSetters as LMT1
from test.LayerManager_Test import Test_2_LayerManagerConnection as LMT2

if BM & IMASK['con']:
from Test.Controller_Test import Test_0_ControllerSelfTest as CT0
from Test.Controller_Test import Test_1_ControllerTestSetupFunction as CT1
from test.Controller_Test import Test_0_ControllerSelfTest as CT0
from test.Controller_Test import Test_1_ControllerTestSetupFunction as CT1

from AimsUI.AimsLogging import Logger

Expand Down

0 comments on commit 1c0a848

Please sign in to comment.