ChrisTerBeke
6506596ece
Fix typing syntax
2018-11-26 16:19:01 +01:00
ChrisTerBeke
e4d8fb36ab
Add more typing as per request from @sedwards2009
2018-11-26 15:53:04 +01:00
ChrisTerBeke
da5683c876
add typing to models
2018-11-26 15:30:30 +01:00
Marijn Deé
a382b77eaa
Added validation to the models
2018-11-26 14:30:17 +01:00
ChrisTerBeke
68a90ec510
Use simple models instead of namedtuples
...
Named tuples would throw a TypeError if an unknown attribute was set, but we just want to ignore those
2018-11-26 14:08:21 +01:00
Marijn Deé
76542a82d5
Removed the asserts on internals
2018-11-23 10:33:57 +01:00
Marijn Deé
294527f7fe
Review changes
2018-11-23 09:21:09 +01:00
Marijn Deé
bb5c0326de
Used duoble quotes iso single quotes
2018-11-23 09:20:19 +01:00
Marijn Deé
352427e460
Moved exception handling closer to the cause of error
2018-11-22 10:01:15 +01:00
Marijn Deé
7e3f86f091
Moved some of the mocks to class level because they are used in every test method
2018-11-22 09:37:47 +01:00
Marijn Deé
7b0f8882a2
Reverted models to namedtuples from collections because
...
NamedTuple is a Python3.6 feature
2018-11-21 11:01:26 +01:00
Marijn Deé
9e8be286af
Used NamedTuple from typing iso namedtuple from collections so we can at least give type hints
2018-11-21 10:12:53 +01:00
Marijn Deé
f3338aa187
Fixed the failing tests
2018-11-20 16:53:01 +01:00
Marijn Deé
ca60744292
Made the tests work with the named tuples
...
Tests only use the _onGetRemoteMaterial
2018-11-20 16:34:11 +01:00
Marijn Deé
481ca8cd2f
Fixed some bugs and added the color_code field to the named tuple
2018-11-20 16:33:52 +01:00
ChrisTerBeke
2497325d60
Test with named tuples, not working yet
2018-11-19 16:35:19 +01:00
ChrisTerBeke
c04ce7fce8
Use call_count on specific method to be more precise
2018-11-19 15:44:07 +01:00
ChrisTerBeke
60dd130393
Use logException where possible
2018-11-19 15:39:12 +01:00
ChrisTerBeke
66fbadf2de
Convert all single quotes to double quotes
2018-11-19 15:37:56 +01:00
ChrisTerBeke
d65114bd56
use call_count to assert device was not called
2018-11-19 15:08:58 +01:00
ChrisTerBeke
0b1ac87354
Fix some formatting, cleanup import
2018-11-19 15:03:43 +01:00
ChrisTerBeke
dc17bd8499
Fix the first tests
2018-11-19 13:54:45 +01:00
ChrisTerBeke
ee9210d8d1
Rewrite tests
2018-11-19 10:57:47 +01:00
ChrisTerBeke
23e957e1c5
Some more refactoring, splitting up methods
2018-11-19 10:44:24 +01:00
Marijn Deé
22aac7b566
Renamed TestContainerRegistry to ContainerRegistryMock
2018-11-16 16:35:08 +01:00
Marijn Deé
565f009e9b
Added comments
2018-11-16 16:34:44 +01:00
Marijn Deé
1000625d69
Added spaces around all =
2018-11-16 16:07:17 +01:00
Marijn Deé
0062250238
Moved the test to the plugin directory
2018-11-16 16:06:36 +01:00
Marijn Deé
695d45ffbe
Initialize the models with None
2018-11-16 15:54:07 +01:00
Marijn Deé
e9e8c49b2d
Added tests for SendMaterialJob and refactored SendMaterialJob for
...
better testability. This is part of a larger project to create tests
for the UM3NetworkPrinting plugin in preparation for printing from the
cloud
2018-11-16 14:16:45 +01:00
Lipu Fei
369747d106
Merge remote-tracking branch 'origin/3.6'
2018-11-08 15:28:42 +01:00
Simon Edwards
69c9ffaf61
Merge pull request #4755 from Ultimaker/CL-1040_show_print_time_in_monitor
...
CL-1140 Show print time in monitor tab
2018-11-08 11:53:47 +01:00
Ian Paschal
aa6ec9e44b
Make text black
...
Contributes to CL-1040
2018-11-08 11:48:22 +01:00
Lipu Fei
de6ab02422
Merge pull request #4678 from fieldOfView/fix_networkprinter_post
...
Fix type error in NetworkedPrinterOutputDevice.post
2018-11-08 11:05:47 +01:00
Lipu Fei
59b8bdec54
Merge pull request #4678 from fieldOfView/fix_networkprinter_post
...
Fix type error in NetworkedPrinterOutputDevice.post
2018-11-08 11:02:57 +01:00
Ian Paschal
35ed234991
Show print time in monitor tab
...
Contributes to CL-1040
2018-11-08 10:49:22 +01:00
fieldOfView
f12efb7aa1
Fix LegacyUM3OutputDevice post() call
2018-11-07 16:07:45 +01:00
Jaime van Kessel
36a9642c90
Merge branch 'CURA-5887_fix_material_shown_in_print_job' of github.com:Ultimaker/Cura
2018-11-07 12:39:41 +01:00
Simon Edwards
7ecffdef3d
Merge branch 'CL-1126_monitor_tab_context_menu_improvements' into 3.6
2018-11-06 17:06:04 +01:00
Ian Paschal
4c831de06c
Remove console logs
...
Contributes to CL-1126
2018-11-06 16:41:59 +01:00
Ian Paschal
dc4b69c386
Show context menu at the right times
...
Contributes to CL-1126
2018-11-06 16:37:47 +01:00
Ian Paschal
c84aa9cf21
Use default font for configuration override
...
Contributes to CL-1124
2018-11-05 17:19:22 +01:00
Ian Paschal
1abd0b3499
Show "Pausing...", "Aborting...", and "Resuming..." texts
...
Contributes to CL-1126
2018-11-05 15:45:17 +01:00
Lipu Fei
88f3325972
Add typing for _createMaterialOutputModel()
...
CURA-5887
2018-11-05 13:11:58 +01:00
Ian Paschal
4f10b7809a
Configuration override improvements
...
Contributes to CL-1124
2018-11-05 12:15:17 +01:00
Lipu Fei
fa693aef2b
Fix material shown in print jobs
...
CURA-5887
- Use MaterialManager to get materials
- For a GUID with mulitple matches, show the read-only materials first
if any. Otherwise, show non-read-only materials.
2018-11-05 11:48:19 +01:00
Ian Paschal
1ba8eff7fa
Don't show camera icon unless printer details are expanded
...
Contributes to CL-1063
2018-10-31 13:52:31 +01:00
Ian Paschal
7960772ac8
Do show "delete" on print jobs waiting for configuration change
...
Contributes to CL-1118
2018-10-31 11:46:19 +01:00
Ian Paschal
ac7a566ae1
Do not show "move to top" on print jobs waiting for configuration change
...
Contributes to CL-1118
2018-10-31 11:45:30 +01:00
Ian Paschal
903054190d
Fixing some spacing issues with camera button
...
Contributes to CL-1063
2018-10-31 11:23:57 +01:00