GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-03 09:14:24 +08:00
Code Issues Packages Projects Releases Wiki Activity
19,820 Commits 289 Branches 260 Tags
Commit Graph

315 Commits

Author SHA1 Message Date
Arjen Hiemstra
51b76acc6d Fix unit test 
CuraContainerRegistry::load now has a dependency on the ContainerStack
so we need to account for it in our mocks.
 2017-05-04 15:57:47 +02:00
Arjen Hiemstra
fe112d5d81 Fix extruderstack test on CI 
We do not need a complete CuraApplication just so registerExtruder
can work. Instead, we just mock away the extruder manager so the rest of
the test can proceed.
 2017-05-04 13:06:34 +02:00
Jaime van Kessel
d7004d3547 Merge branch 'master' of github.com:Ultimaker/Cura into cura_containerstack 2017-05-02 11:42:16 +02:00
Jaime van Kessel
69c3baf87f Fixed unit test 
CURA-3497
 2017-05-02 11:06:25 +02:00
Jaime van Kessel
c815077278 Fixed the upgraderFileRename test 
CURA-3479
 2017-05-01 17:28:55 +02:00
Jaime van Kessel
e6e442348b Fixed one of the tests 
The test failed due to it not creating the right application CURA-3497
 2017-05-01 16:10:05 +02:00
Jack Ha
8a227c0269 Revert permissions 2017-04-25 11:19:37 +02:00
Jack Ha
74059a82a5 Added some smoketests. CURA-3297 2017-04-25 11:18:55 +02:00
Jaime van Kessel
740b5ebc80 Removed print statements from unit test 2017-04-13 11:29:09 +02:00
Jaime van Kessel
a02eacd8bc Fixed unit test 2017-04-13 11:28:19 +02:00
Arjen Hiemstra
0c232c9462 ExtruderStack requires a next stack, so make sure it has that in tests 2017-04-12 12:06:02 +02:00
Ghostkeeper
70055d35c0
Remove superfluous mocking and fixtures 
These are now no longer used by the tests.

Contributes to issue CURA-3497.
 2017-04-12 10:00:45 +02:00
Ghostkeeper
eaf180c150
Let setProperty tests test only whether setProperty on container is called 
This makes these tests more simple to mock and stuff and also removes all dependencies of these tests.

Contributes to issue CURA-3497.
 2017-04-12 10:00:45 +02:00
Ghostkeeper
06797abafe
Change expected exception in test_set...ByIdDoesntExist 
It should raise an InvalidContainerError rather than a KeyError.

Contributes to issue CURA-3497.
 2017-04-12 10:00:45 +02:00
Ghostkeeper
0e82c84790
Let test_setVariantByIdExists use new container registry functionality 
It sets the container it expects beforehand and tests for its ID.

Contributes to issue CURA-3497.
 2017-04-12 10:00:45 +02:00
Ghostkeeper
4db7c6ae66
Let test_setQualityChangesByIdExists use new container registry functionality 
It sets the container it expects beforehand and tests for its ID.

Contributes to issue CURA-3497.
 2017-04-12 10:00:44 +02:00
Ghostkeeper
972e94386c
Let test_setQualityByIdExists use new container registry functionality 
It sets the container it expects beforehand and tests for its ID.

Contributes to issue CURA-3497.
 2017-04-12 10:00:44 +02:00
Ghostkeeper
27f053ad7b
Let test_setMaterialByIdExists use new container registry functionality 
It sets the container it expects beforehand and tests for its ID.

Contributes to issue CURA-3497.
 2017-04-12 10:00:44 +02:00
Ghostkeeper
361b58f49c
Let container_registry return a pre-set value for what containers it finds 
This makes a lot of tests more simple, without requiring elaborate mocks, patches and fixtures.

Contributes to issue CURA-3497.
 2017-04-12 10:00:44 +02:00
Ghostkeeper
479176bc6f
Remove superfluous mocking and fixtures 
There, that's better.

Contributes to issue CURA-3497.
 2017-04-12 10:00:44 +02:00
Ghostkeeper
09ab895feb
Only test whether setProperty calls setProperty on proper container 
It sets up a mock container and records whether setProperty is called on that container. Whether that actually sets the property correctly is up to the instance container.

Contributes to issue CURA-3497.
 2017-04-12 10:00:44 +02:00
Ghostkeeper
2161cf9f52
Remove superfluous output_value parameter 
It's not used any more since we don't test the actual instance container any more.

Contributes to issue CURA-3497.
 2017-04-12 10:00:44 +02:00
Ghostkeeper
7f1930d452
Rewrite test_setPropertyUser 
It now only checks if setProperty is being called on the user changes instance, not what the result of that should be.

Contributes to issue CURA-3497.
 2017-04-12 10:00:44 +02:00
Ghostkeeper
52d6c074f5
Align parameters of test_setPropertyUser 
For readability.

Contributes to issue CURA-3497.
 2017-04-12 10:00:44 +02:00
Ghostkeeper
2c9e115488
Add test for hasUserValue returning false 
When a value is not in user changes or in quality changes, it is no longer a user value so it shouldn't get marked as one.

Contributes to issue CURA-3497.
 2017-04-12 10:00:44 +02:00
Ghostkeeper
bbddc2308e
Don't use MockContainer in hasUserChanges tests 
This makes the testing code much simpler.

Contributes to issue CURA-3497.
 2017-04-12 10:00:44 +02:00
Ghostkeeper
e0c8a52eec
Fix test_setVariantByIdExists 
It now also uses the return_value construct.

Contributes to issue CURA-3497.
 2017-04-12 10:00:44 +02:00
Ghostkeeper
f08053283e
Fix test_setQualityChangesByIdExists 
It now also uses the return_value construct.

Contributes to issue CURA-3497.
 2017-04-12 10:00:44 +02:00
Ghostkeeper
73bd47a0a1
Actually assert that the ID is correct 
Oops.

Contributes to issue CURA-3497.
 2017-04-12 10:00:44 +02:00
Ghostkeeper
c5cce10786
Fix test_setQualityByIdExists 
It now also uses the return_value construct.

Contributes to issue CURA-3497.
 2017-04-12 10:00:44 +02:00
Ghostkeeper
d652e4564e
Fix test_setMaterialByIdExists 
It now also uses the return_value construct.

Contributes to issue CURA-3497.
 2017-04-12 10:00:43 +02:00
Ghostkeeper
546cacec37
Verify that we set the correct container after set...ByID 
Makes sense.

Contributes to issue CURA-3497.
 2017-04-12 10:00:43 +02:00
Ghostkeeper
6ba79881df
Use new container registry functionality for test_setDefinitionByIdExists 
We can just set the return value of the registry to whatever we like and we'll verify that we got that from the registry and it was put on the stack.

Contributes to issue CURA-3497.
 2017-04-12 10:00:43 +02:00
Ghostkeeper
4f83ae3fa7
Remove unused import 
It was removed when we removed some of the mocking code earlier.

Contributes to issue CURA-3497.
 2017-04-12 10:00:43 +02:00
Ghostkeeper
c3ad7d114a
Set return value of registry.findContainers in the test 
This way we need to mock way less. It's the min-cut.

Contributes to issue CURA-3497.
 2017-04-12 10:00:43 +02:00
Ghostkeeper
8dc073f5c8
Add container types to fallthrough tests 
This checks exactly the same code as the global stack.

Contributes to issue CURA-3497.
 2017-04-12 10:00:43 +02:00
Ghostkeeper
b97ef58436
Remove redundant deserialize tests 
They test Uranium code, not this module.

Contributes to issue CURA-3497.
 2017-04-12 10:00:43 +02:00
Ghostkeeper
4bb217592f
Refactor deserialise tests 
These are now essentially testing the same code as the similar tests for the global stack. This is ugly but without looking at the implementation this is correct.

Contributes to issue CURA-3497.
 2017-04-12 10:00:43 +02:00
Arjen Hiemstra
93e42164a8 Make value unit tests also provide a "state" property 
Since we now use state to determine whether we should perform resolve or
not.
 2017-04-11 13:56:40 +02:00
Ghostkeeper
70dc9fd95b
Document why we skip this test for now 
Contributes to issue CURA-3497.
 2017-04-11 10:42:17 +02:00
Ghostkeeper
1c2ce5b8b1
Remove old getPropertyWithResolve test 
It has been replaced by several separate tests right above it.

Contributes to issue CURA-3497.
 2017-04-11 10:42:17 +02:00
Ghostkeeper
86b288cc6e
Add test for when instances have value and definition has resolve 
The value of the instances should always get evaluated first.

Contributes to issue CURA-3497.
 2017-04-11 10:42:17 +02:00
Ghostkeeper
759da2ab05
Add test for value winning over resolve in instances 
In instance containers, if there's both a resolve and a value, it should take the value.

Contributes to issue CURA-3497.
 2017-04-11 10:42:17 +02:00
Ghostkeeper
0a7bcc4277
Add test for when there's no resolve in definitions 
It must not attempt to execute a resolve function then.

Contributes to issue CURA-3497.
 2017-04-11 10:42:17 +02:00
Ghostkeeper
12d1db8f19
Add test for whether resolve wins in definition 
I'm splitting the test below up into pieces. It'll be removed eventually, when I've made all of these separate tests.

Contributes to issue CURA-3497.
 2017-04-11 10:42:17 +02:00
Arjen Hiemstra
73779eef25 Properly set the ContainerRegistry for the missing container test 2017-04-10 18:06:24 +02:00
Ghostkeeper
dfd8cfb2b8
Skip test_deserializeMoveDefinitionContainer 
This test is currently failing because of a weird hack we're doing to get around a Uranium bug: We're searching only through definitions that have a category, any category. This is done because Uranium requires a search to have some metadata entry to search on. We'll have to refactor that eventually but for now that is out of scope.

Contributes to issue CURA-3497.
 2017-04-10 17:17:13 +02:00
Ghostkeeper
71aca6aa4b
Remove old deserialize tests 
Most of these tests also tested the Uranium code, which it should mock out. The last test, test_deserializeMissingContainer, is caught by the currently existing tests.

Contributes to issue CURA-3497.
 2017-04-10 17:14:50 +02:00
Ghostkeeper
f12ffad2c1
Add test for moving definition containers 
When a definition container is in the wrong spot in a stack file it needs to be moved to the definition slot.

Contributes to issue CURA-3497.
 2017-04-10 17:12:27 +02:00
Ghostkeeper
e807739117
Add test for moving containers through deserialising 
When a container in the stack file is located in the wrong spot, it needs to move the container to the correct spot.

Contributes to issue CURA-3497.
 2017-04-10 17:08:23 +02:00