diff --git a/plugins/UM3NetworkPrinting/tests/Cloud/TestCloudApiClient.py b/plugins/UM3NetworkPrinting/tests/Cloud/TestCloudApiClient.py index acce55751c..fcaa14b055 100644 --- a/plugins/UM3NetworkPrinting/tests/Cloud/TestCloudApiClient.py +++ b/plugins/UM3NetworkPrinting/tests/Cloud/TestCloudApiClient.py @@ -1,19 +1,18 @@ # Copyright (c) 2018 Ultimaker B.V. # Copyright (c) 2018 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -import os from typing import List from unittest import TestCase from unittest.mock import patch, MagicMock -from cura.CuraConstants import CuraCloudAPIRoot -from src.Cloud.CloudApiClient import CloudApiClient -from src.Cloud.Models.CloudClusterResponse import CloudClusterResponse -from src.Cloud.Models.CloudClusterStatus import CloudClusterStatus -from src.Cloud.Models.CloudPrintJobResponse import CloudPrintJobResponse -from src.Cloud.Models.CloudPrintJobUploadRequest import CloudPrintJobUploadRequest -from src.Cloud.Models.CloudError import CloudError -from tests.Cloud.Fixtures import readFixture, parseFixture +from cura.UltimakerCloudAuthentication import CuraCloudAPIRoot +from ...src.Cloud.CloudApiClient import CloudApiClient +from ...src.Cloud.Models.CloudClusterResponse import CloudClusterResponse +from ...src.Cloud.Models.CloudClusterStatus import CloudClusterStatus +from ...src.Cloud.Models.CloudPrintJobResponse import CloudPrintJobResponse +from ...src.Cloud.Models.CloudPrintJobUploadRequest import CloudPrintJobUploadRequest +from ...src.Cloud.Models.CloudError import CloudError +from .Fixtures import readFixture, parseFixture from .NetworkManagerMock import NetworkManagerMock diff --git a/plugins/UM3NetworkPrinting/tests/Cloud/TestCloudOutputDevice.py b/plugins/UM3NetworkPrinting/tests/Cloud/TestCloudOutputDevice.py index 34e04689c2..0e2220ee04 100644 --- a/plugins/UM3NetworkPrinting/tests/Cloud/TestCloudOutputDevice.py +++ b/plugins/UM3NetworkPrinting/tests/Cloud/TestCloudOutputDevice.py @@ -5,14 +5,12 @@ from unittest import TestCase from unittest.mock import patch, MagicMock from UM.Scene.SceneNode import SceneNode -from UM.Signal import Signal -from cura.CuraApplication import CuraApplication -from cura.CuraConstants import CuraCloudAPIRoot +from cura.UltimakerCloudAuthentication import CuraCloudAPIRoot from cura.PrinterOutput.PrinterOutputModel import PrinterOutputModel -from src.Cloud.CloudApiClient import CloudApiClient -from src.Cloud.CloudOutputDevice import CloudOutputDevice -from src.Cloud.Models.CloudClusterResponse import CloudClusterResponse -from tests.Cloud.Fixtures import readFixture, parseFixture +from ...src.Cloud.CloudApiClient import CloudApiClient +from ...src.Cloud.CloudOutputDevice import CloudOutputDevice +from ...src.Cloud.Models.CloudClusterResponse import CloudClusterResponse +from .Fixtures import readFixture, parseFixture from .NetworkManagerMock import NetworkManagerMock diff --git a/plugins/UM3NetworkPrinting/tests/Cloud/TestCloudOutputDeviceManager.py b/plugins/UM3NetworkPrinting/tests/Cloud/TestCloudOutputDeviceManager.py index 8b72c9d62d..5388cf152d 100644 --- a/plugins/UM3NetworkPrinting/tests/Cloud/TestCloudOutputDeviceManager.py +++ b/plugins/UM3NetworkPrinting/tests/Cloud/TestCloudOutputDeviceManager.py @@ -4,10 +4,10 @@ from unittest import TestCase from unittest.mock import patch, MagicMock from UM.OutputDevice.OutputDeviceManager import OutputDeviceManager -from cura.CuraConstants import CuraCloudAPIRoot -from src.Cloud.CloudOutputDevice import CloudOutputDevice -from src.Cloud.CloudOutputDeviceManager import CloudOutputDeviceManager -from tests.Cloud.Fixtures import parseFixture, readFixture +from cura.UltimakerCloudAuthentication import CuraCloudAPIRoot +from ...src.Cloud.CloudOutputDevice import CloudOutputDevice +from ...src.Cloud.CloudOutputDeviceManager import CloudOutputDeviceManager +from .Fixtures import parseFixture, readFixture from .NetworkManagerMock import NetworkManagerMock, FakeSignal