25 Commits

Author SHA1 Message Date
Jaime van Kessel
ef4fae5b80
Expand tests for hasUserSettings 2020-08-21 15:39:03 +02:00
Jaime van Kessel
e1e0a4d32c
Expand the getMachine test 2020-08-21 15:16:29 +02:00
Jaime van Kessel
ce930220e9
Add tests for SetActiveMachine 2020-08-21 15:14:44 +02:00
Jaime van Kessel
eb1ae9f18d
Fix tests 2020-01-03 15:12:14 +01:00
Lipu Fei
38ee4bf208 Remove deprecated functions in MachineManager
CURA-6858
2019-10-22 14:11:40 +02:00
Lipu Fei
fb368a4788 Remove MachineManager.activeVariantNames
CURA-6865
2019-10-08 15:16:27 +02:00
Lipu Fei
94e89ad4ac Fix merge conflicts with master 2019-09-24 14:26:43 +02:00
Jaime van Kessel
c0db1a17be
Fix the false positive failure in the unit test 2019-09-16 11:40:08 +02:00
Ghostkeeper
6a8e1557c3
Merge branch 'feature_intent' into feature_intent_container_tree
Conflicts:
	.gitlab-ci.yml
	cura/Machines/MaterialManager.py
	cura/Machines/VariantManager.py
	cura/Settings/ContainerManager.py
	cura/Settings/MachineManager.py
	tests/TestMachineManager.py
2019-08-13 14:59:05 +02:00
Ghostkeeper
20201c65e6
Merge branch 'master' into feature_intent
Conflicts:
	resources/bundled_packages/cura.json -> 4.1 to 4.2 upgrade package added simultaneously
	tests/TestMachineManager.py -> Due to changes in conftest.py
	tests/conftest.py -> Simultaneously expanding the magic mocks to have some correct properties
2019-08-13 14:43:28 +02:00
Jaime van Kessel
e08feb1099 Fix final set of broken tests
CURA-6600
2019-08-12 16:32:59 +02:00
Jaime van Kessel
9ad8d91ff9 Add tests for ExtruderManager 2019-07-19 13:55:16 +02:00
Jaime van Kessel
57199d8991 Add a few more simple test to MachineManager 2019-07-19 13:25:34 +02:00
Jaime van Kessel
2ee6f4af15 Added test for activeMaterialId's 2019-07-19 13:04:54 +02:00
Jaime van Kessel
9940023816 Add test for adding a new machine 2019-07-19 12:56:54 +02:00
Jaime van Kessel
b6de376b02 Add test for getMachine function 2019-07-19 12:48:36 +02:00
Remco Burema
02516f0f47 Refactor: Move common fixtures to 'conftest'.
Part of CURA-6091.
2019-06-21 14:58:55 +02:00
Jaime van Kessel
8907a624e1 Add test to check the number of known settings 2019-06-07 14:45:36 +02:00
Lipu Fei
9575c6b3b3 Fix merge conflicts 2019-04-01 13:28:42 +02:00
Jaime van Kessel
83361405a4 Add test for num instances in machine manager 2019-03-29 13:34:41 +01:00
Lipu Fei
5d45dba8f3 Fix DiscoveredMachineModel test 2019-03-20 16:00:39 +01:00
Lipu Fei
940a833e73 WIP: Add printers via network 2019-03-08 13:43:58 +01:00
Jaime van Kessel
1c7e047a38 Added tests for adding & removing discovered devices
CURA-6179
2019-02-28 09:47:25 +01:00
Jaime van Kessel
bbe1b1590a Added test for adding & creating machine with discovered printer
CURA-6179
2019-02-28 09:35:16 +01:00
Jaime van Kessel
b5c270f00a Add stubs for MachineManager testing
It also adds a first test that checks if the setActiveMachine
2019-02-22 13:49:31 +01:00