Re-enable modifer and bmesh_boolean tests.

These were disabled in the newboolean merge commit.
This commit renables them, using the original 'FAST' solver
so that the result objects need not change.
A TODO to add more tests using the 'EXACT' solver,
though most functionality there is now covered by unit gtests.

3 files changed, 24 insertions, 24 deletions

diff --git a/tests/python/CMakeLists.txt b/tests/python/CMakeLists.txt
index 617313ee1c3..18f61d83c3c 100644
--- a/tests/python/CMakeLists.txt
+++ b/tests/python/CMakeLists.txt
@@ -154,13 +154,13 @@ add_blender_test(
   --run-all-tests
 )
 
-# add_blender_test(
-#  bmesh_boolean
-#  ${TEST_SRC_DIR}/modeling/bool_regression.blend
-#  --python ${TEST_PYTHON_DIR}/boolean_operator.py
-#  --
-#  --run-all-tests
-#)
+add_blender_test(
+  bmesh_boolean
+  ${TEST_SRC_DIR}/modeling/bool_regression.blend
+  --python ${TEST_PYTHON_DIR}/boolean_operator.py
+  --
+  --run-all-tests
+)
 
 add_blender_test(
   bmesh_split_faces
@@ -176,13 +176,13 @@ add_blender_test(
   --python-text run_tests.py
 )
 
-#add_blender_test(
-#  modifiers
-#  ${TEST_SRC_DIR}/modeling/modifiers.blend
-#  --python ${TEST_PYTHON_DIR}/modifiers.py
-#  --
-#  --run-all-tests
-#)
+add_blender_test(
+  modifiers
+  ${TEST_SRC_DIR}/modeling/modifiers.blend
+  --python ${TEST_PYTHON_DIR}/modifiers.py
+  --
+  --run-all-tests
+)
 
 add_blender_test(
   physics_cloth
diff --git a/tests/python/boolean_operator.py b/tests/python/boolean_operator.py
index 5a674c35a47..b35c69b7ca5 100644
--- a/tests/python/boolean_operator.py
+++ b/tests/python/boolean_operator.py
@@ -34,16 +34,16 @@ from modules.mesh_test import OperatorTest
 
 def main():
     tests = [
-        ['FACE', {0, 1, 2, 3, 4, 5}, 'Cubecube', 'Cubecube_result_1', 'intersect_boolean', {'operation': 'UNION'}],
-        ['FACE', {0, 1, 2, 3, 4, 5}, 'Cubecube', 'Cubecube_result_2', 'intersect_boolean', {'operation': 'INTERSECT'}],
-        ['FACE', {0, 1, 2, 3, 4, 5}, 'Cubecube', 'Cubecube_result_3', 'intersect_boolean', {'operation': 'DIFFERENCE'}],
-        ['FACE', {0, 1, 2, 3, 4, 5}, 'Cubecube', 'Cubecube_result_4', 'intersect', {'separate_mode': 'CUT'}],
-        ['FACE', {0, 1, 2, 3, 4, 5}, 'Cubecube', 'Cubecube_result_5', 'intersect', {'separate_mode': 'ALL'}],
-        ['FACE', {0, 1, 2, 3, 4, 5}, 'Cubecube', 'Cubecube_result_6', 'intersect', {'separate_mode': 'NONE'}],
+        ['FACE', {0, 1, 2, 3, 4, 5}, 'Cubecube', 'Cubecube_result_1', 'intersect_boolean', {'operation': 'UNION', 'solver' : 'FAST'}],
+        ['FACE', {0, 1, 2, 3, 4, 5}, 'Cubecube', 'Cubecube_result_2', 'intersect_boolean', {'operation': 'INTERSECT', 'solver' : 'FAST'}],
+        ['FACE', {0, 1, 2, 3, 4, 5}, 'Cubecube', 'Cubecube_result_3', 'intersect_boolean', {'operation': 'DIFFERENCE', 'solver' : 'FAST'}],
+        ['FACE', {0, 1, 2, 3, 4, 5}, 'Cubecube', 'Cubecube_result_4', 'intersect', {'separate_mode': 'CUT', 'solver' : 'FAST'}],
+        ['FACE', {0, 1, 2, 3, 4, 5}, 'Cubecube', 'Cubecube_result_5', 'intersect', {'separate_mode': 'ALL', 'solver' : 'FAST'}],
+        ['FACE', {0, 1, 2, 3, 4, 5}, 'Cubecube', 'Cubecube_result_6', 'intersect', {'separate_mode': 'NONE', 'solver' : 'FAST'}],
         ['FACE', {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}, 'Cubecube', 'Cubecube_result_7', 'intersect',
-         {'mode': 'SELECT', 'separate_mode': 'NONE'}],
-        ['FACE', {6, 7, 8, 9, 10}, 'Cubecone', 'Cubecone_result_1', 'intersect_boolean', {'operation': 'UNION'}],
-        ['FACE', {0, 1, 2, 3, 4, 5}, 'Cubecones', 'Cubecones_result_1', 'intersect_boolean', {'operation': 'UNION'}],
+         {'mode': 'SELECT', 'separate_mode': 'NONE', 'solver' : 'FAST'}],
+        ['FACE', {6, 7, 8, 9, 10}, 'Cubecone', 'Cubecone_result_1', 'intersect_boolean', {'operation': 'UNION', 'solver' : 'FAST'}],
+        ['FACE', {0, 1, 2, 3, 4, 5}, 'Cubecones', 'Cubecones_result_1', 'intersect_boolean', {'operation': 'UNION', 'solver' : 'FAST'}],
     ]
 
     operator_test = OperatorTest(tests)
diff --git a/tests/python/modifiers.py b/tests/python/modifiers.py
index 5e032f658af..4bbcf226aba 100644
--- a/tests/python/modifiers.py
+++ b/tests/python/modifiers.py
@@ -46,7 +46,7 @@ def get_generate_modifiers_list(test_object_name, randomize=False):
     generate_modifiers = [
         ModifierSpec('array', 'ARRAY', {}),
         ModifierSpec('bevel', 'BEVEL', {'width': 0.1}),
-        ModifierSpec('boolean', 'BOOLEAN', {'object': boolean_test_object}),
+        ModifierSpec('boolean', 'BOOLEAN', {'object': boolean_test_object, 'solver': 'FAST'}),
         ModifierSpec('build', 'BUILD', {'frame_start': 0, 'frame_duration': 1}),
         ModifierSpec('decimate', 'DECIMATE', {}),
         ModifierSpec('edge split', 'EDGE_SPLIT', {}),