Commit graph

8977 commits

Author SHA1 Message Date
Ghostkeeper
eeb84ac27b
Add tests for prohibited operations on extruder stacks
These operations are explicitly prohibited, so they should raise an exception.

Contributes to issue CURA-3497.
2017-03-24 15:11:25 +01:00
Ghostkeeper
3d7dbe2e3b
Expand constrainContainerTypes test with subclasses of container types
Subclasses should behave in the same way as their parents.

Contributes to issue CURA-3497.
2017-03-24 14:50:57 +01:00
Ghostkeeper
00c1c2dcf6
Add test to verify that you can't change types of containers
For instance, you shouldn't be able to put an instance container in the definition slot.

Contributes to issue CURA-3497.
2017-03-24 14:40:32 +01:00
Ghostkeeper
d1dc48d7e1
Add test to verify priority of resolve property
The resolve property should get priority over the value in the definition container, but not anywhere else.

Contributes to issue CURA-3497.
2017-03-24 14:27:30 +01:00
Ghostkeeper
f4673b340a
Document tests
Missing documentation here.

Contributes to issue CURA-3497.
2017-03-24 12:44:20 +01:00
Ghostkeeper
56082bdbdf
Add tests for prohibited operations
Four of these. It's probably too simple to test now, but who knows what could happen in the future.

Contributes to issue CURA-3497.
2017-03-24 12:42:35 +01:00
Ghostkeeper
f2b9f79fb3
Document test_addExtruder better
Contributes to issue CURA-3497.
2017-03-24 12:28:26 +01:00
Ghostkeeper
d40a67f2b0
Add test for addExtruder
This mainly tests if it is properly limited by the number of extruders setting.

Contributes to issue CURA-3497.
2017-03-24 12:27:39 +01:00
Ghostkeeper
86a1d3eb10
Add marker to indicate where the test cases start
Sorting also takes care of this, but it's still more clear this way.

Contributes to issue CURA-3497.
2017-03-24 12:01:23 +01:00
Ghostkeeper
4215ba3ce7
Add test for setting fall-through
This tests whether a setting still falls through properly to lower containers if it is not defined in a container.

Contributes to issue CURA-3497.
2017-03-24 11:59:19 +01:00
Jaime van Kessel
dafeab4e8a Merge branch 'feature_CURA-3495_open_menu' of github.com:Ultimaker/Cura 2017-03-24 11:52:26 +01:00
Jaime van Kessel
298fa52da5 Merge branch '2.5' of github.com:Ultimaker/Cura 2017-03-24 11:51:16 +01:00
fieldOfView
33f20710d9 Ups the limit of the maximum cost of a spool of filament
This is necessary for currencies such as Japanese Yen or South Korean Won, where prices can easily exceed 1000. This PR sets the limit to 100,000,000. If the price of a spool exceeds this amount, perhaps the user should consider moving to a more stable country.

Fixes https://github.com/Ultimaker/Cura/issues/1567
2017-03-24 11:23:40 +01:00
Jaime van Kessel
4b7b8600ec Shortened the logging of the auth key. Turned out it was extremely long 2017-03-24 11:22:57 +01:00
Jaime van Kessel
8d2e824205 Added even more logging 2017-03-24 11:17:59 +01:00
Jaime van Kessel
8572be99b9 Merge branch 'master' of github.com:Ultimaker/Cura 2017-03-24 11:05:21 +01:00
Jaime van Kessel
adab4a1110 Added "blurred" auth key logging.
The getSafeaAuthKey prints a key of the same length, but only the last 5 chars are real. The rest is blurred out with *
THis is a bit like how most payment services hide your credit card number.
2017-03-24 11:04:08 +01:00
Ghostkeeper
7688ce6582
Merge branch 'master' of github.com:Ultimaker/Cura 2017-03-24 10:50:28 +01:00
Ghostkeeper
e76c3f72e7
Lower QtQuick requirement further to 2.2
2.2 is required for the modifications we make to the Button objects.
2017-03-24 10:49:46 +01:00
Ghostkeeper
0f0b8cd5dd
Lower QtQuick requirement further to 2.2
2.2 is required for the modifications we make to the Button objects.
2017-03-24 10:47:47 +01:00
Lipu Fei
578f72c91e Use "False" instead "false" in cfg files
CURA-3555
2017-03-24 10:44:44 +01:00
Jaime van Kessel
ba21a52827 Merge pull request #1570 from fieldOfView/fix_spool_cost_limit
Up the limit of the maximum cost of a spool of filament
2017-03-24 09:53:42 +01:00
Lipu Fei
7ad5a64b91 Add msg dialog for ignoring gcode in multiple file selection
CURA-3495
2017-03-24 09:53:12 +01:00
fieldOfView
6474f3eb25 Ups the limit of the maximum cost of a spool of filament
This is necessary for currencies such as Japanese Yen or South Korean Won, where prices can easily exceed 1000. This PR sets the limit to 100,000,000. If the price of a spool exceeds this amount, perhaps the user should consider moving to a more stable country.

Fixes https://github.com/Ultimaker/Cura/issues/1567
2017-03-24 09:12:48 +01:00
Jaime van Kessel
e30e2a8018 Instead of not sending the line at all, just send a get temp command 2017-03-23 20:13:13 +01:00
Jaime van Kessel
645e3e8dfe Don't try to send empty g-code lines 2017-03-23 19:42:52 +01:00
Jaime van Kessel
6ff130c361 Added logging 2017-03-23 17:57:52 +01:00
Arjen Hiemstra
de1dbfbc07 Override replaceContainer and add some type checking
type in this case being container type

Contributes to CURA-3497
2017-03-23 17:55:21 +01:00
Arjen Hiemstra
dc0c666a54 Disable add/insert/remove container
Since we want to have a fixed list of containers in the stack.

Contributes to CURA-3497
2017-03-23 17:55:21 +01:00
Arjen Hiemstra
5ad0651fd1 Add an "extruders" property and an addExtruder method
Contributes to CURA-3497
2017-03-23 17:55:21 +01:00
Arjen Hiemstra
462d5fac8d Add setters for properties
Contributes to CURA-3497
2017-03-23 17:55:21 +01:00
Arjen Hiemstra
f97a6ebd74 Move exceptions to their own file
Since that keeps the GlobalStack cleaner

Contributes to CURA-3497
2017-03-23 17:55:21 +01:00
Ghostkeeper
a95404f72f
Add test for missing containers in container stack
This seems to give a different exception than intended at the moment.

Contributes to issue CURA-3497.
2017-03-23 17:31:21 +01:00
Ghostkeeper
f579b5f304
Clean up temporary files after test
If the test fails to remove the temporary file, this cleans up after it.

Contributes to issue CURA-3497.
2017-03-23 17:22:10 +01:00
Ghostkeeper
9ce621a02d
Restore the original container registry after each test
A bit of code duplication, but I don't see how to reduce this at the moment.

Contributes to issue CURA-3497.
2017-03-23 17:17:43 +01:00
Ghostkeeper
b18c72bbbf
Remove unused import
This was replaced with mocks, if I recall correctly.

Contributes to issue CURA-3497.
2017-03-23 16:48:38 +01:00
Ghostkeeper
053974bc96
Add test to see if legacy files are renamed
The test seems to fail at the moment. No new file is created.

Contributes to issue CURA-3497.
2017-03-23 16:47:37 +01:00
Ghostkeeper
e521f6b38d
Remove unnecessary findContainer replacement
By default the patch context returns mock objects anyway, so no need to actually make a function that does that.

Contributes to issue CURA-3497.
2017-03-23 16:35:11 +01:00
Ghostkeeper
96c7a4ed77
Remove unused variable
This was changed earlier that it doesn't return the same mock every time but creates a new mock in findContainer. So the single mock that used to be returned every time is no longer needed.

Contributes to issue CURA-3497.
2017-03-23 16:16:32 +01:00
Ghostkeeper
91192b702e
Use a global stack from a fixture
Removes a bit of duplicate code.

Contributes to issue CURA-3497.
2017-03-23 16:12:28 +01:00
Ghostkeeper
bf2050479b
Add tests for hasUserValue
These fail at the moment because they also depend on being able to change the stack, which isn't implemented yet.

Contributes to issue CURA-3497.
2017-03-23 16:09:03 +01:00
Ghostkeeper
8a3ab6d289
Fix testing ID of mock-definitions
This isn't the best solution because all definitions now have to get the ID 'some_definition', but it's the best that I could come up with so far.

Contributes to issue CURA-3497.
2017-03-23 15:46:11 +01:00
Ghostkeeper
610d2ae1e6
Fix assertion for test_deserializeDefinitionChanges
Copy-paste error there. Sorry.

Contributes to issue CURA-3497.
2017-03-23 15:41:25 +01:00
Ghostkeeper
521e85b2a7
Add test for deserializing stacks with definitions in them
This tests whether the definition is properly found.

Contributes to issue CURA-3497.
2017-03-23 15:40:44 +01:00
Ghostkeeper
91f51d11cd
Fix ID and name of only-variant stack
This makes it consistent with the file name and such.

Contributes to issue CURA-3497.
2017-03-23 15:32:27 +01:00
Ghostkeeper
15de1f235a
Add test for seeing whether definition changes are properly found
Whether the deserialize function finds the definition changes properly.

Contributes to issue CURA-3497.
2017-03-23 15:30:54 +01:00
Ghostkeeper
79f6e49280
Add test for seeing whether variants are properly found
Whether the deserialize function finds the variants properly.

Contributes to issue CURA-3497.
2017-03-23 15:21:57 +01:00
Jaime van Kessel
8023341090 Merge branch '2.5' of github.com:Ultimaker/Cura 2017-03-23 15:15:08 +01:00
Jaime van Kessel
ecbf0e1e28 Only add center to list for merge if there is one 2017-03-23 15:14:34 +01:00
Jack Ha
462f3abead Merge branch 'master' into feature_arrange 2017-03-23 15:02:04 +01:00