Commit: 4d2d536747c02979fdfe06ddfa315a4defa48051
Author: Himanshi Kalra
Date: Thu Aug 27 18:44:04 2020 +0530
Branches: soc-2020-testing-frameworks
https://developer.blender.org/rB4d2d536747c02979fdfe06ddfa315a4defa48051
Changed the interface, now operators,bevel and boolean use MeshTest, no helper
class
===================================================================
M tests/python/bevel_operator.py
M tests/python/boolean_operator.py
M tests/python/operators.py
===================================================================
diff --git a/tests/python/bevel_operator.py b/tests/python/bevel_operator.py
index a86080621bd..b1767e63ad6 100644
--- a/tests/python/bevel_operator.py
+++ b/tests/python/bevel_operator.py
@@ -27,170 +27,276 @@ import os
import sys
sys.path.append(os.path.dirname(os.path.realpath(__file__)))
-from modules.mesh_test import OperatorTest
+from modules.mesh_test import MeshTest, OperatorSpecEditMode, RunTest
def main():
tests = [
# 0
- ['EDGE', {10}, 'Cube_test_1', 'Cube_test', 'Cube_result_1', 'bevel',
{'offset': 0.2}],
- ['EDGE', {10, 7}, 'Cube_test_2', 'Cube_test', 'Cube_result_2', 'bevel',
- {'offset': 0.2, 'offset_type': 'WIDTH'}],
- ['EDGE', {8, 10, 7}, 'Cube_test_3', 'Cube_test', 'Cube_result_3',
'bevel',
- {'offset': 0.2, 'offset_type': 'DEPTH'}],
- ['EDGE', {10}, 'Cube_test_4', 'Cube_test', 'Cube_result_4', 'bevel',
{'offset': 0.4, 'segments': 2}],
- ['EDGE', {10, 7}, 'Cube_test_5', 'Cube_test', 'Cube_result_5',
'bevel', {'offset': 0.4, 'segments': 3}],
+ MeshTest('Cube_test_1', 'Cube_test', 'Cube_result_1',
+
+ [OperatorSpecEditMode('bevel',
+ {'offset': 0.2}, 'EDGE', {10})]),
+ MeshTest('Cube_test_2', 'Cube_test', 'Cube_result_2',
+ [OperatorSpecEditMode('bevel',
+ {'offset': 0.2, 'offset_type':
'WIDTH'}, 'EDGE', {10, 7}, )]),
+ MeshTest('Cube_test_3', 'Cube_test', 'Cube_result_3',
+ [OperatorSpecEditMode('bevel',
+ {'offset': 0.2, 'offset_type':
'DEPTH'}, 'EDGE', {8, 10, 7}, )]),
+ MeshTest('Cube_test_4', 'Cube_test', 'Cube_result_4',
+ [OperatorSpecEditMode('bevel', {'offset': 0.4, 'segments':
2}, 'EDGE', {10}, )]),
+ MeshTest('Cube_test_5', 'Cube_test', 'Cube_result_5',
+ [OperatorSpecEditMode('bevel', {'offset': 0.4, 'segments':
3}, 'EDGE', {10, 7}, )]),
# 5
- ['EDGE', {8, 10, 7}, 'Cube_test_6', 'Cube_test', 'Cube_result_6',
'bevel', {'offset': 0.4, 'segments': 4}],
- ['EDGE', {0, 10, 4, 7}, 'Cube_test_7', 'Cube_test', 'Cube_result_7',
'bevel',
- {'offset': 0.4, 'segments': 5, 'profile': 0.2}],
- ['EDGE', {8, 10, 7}, 'Cube_test_8', 'Cube_test', 'Cube_result_8',
'bevel',
- {'offset': 0.4, 'segments': 5, 'profile': 0.25}],
- ['EDGE', {8, 10, 7}, 'Cube_test_9', 'Cube_test', 'Cube_result_9',
'bevel',
- {'offset': 0.4, 'segments': 6, 'profile': 0.9}],
- ['EDGE', {10, 7}, 'Cube_test_10', 'Cube_test', 'Cube_result_10',
'bevel',
- {'offset': 0.4, 'segments': 4, 'profile': 1.0}],
+ MeshTest('Cube_test_6', 'Cube_test', 'Cube_result_6',
+ [OperatorSpecEditMode('bevel', {'offset': 0.4, 'segments':
4}, 'EDGE', {8, 10, 7}, )]),
+ MeshTest('Cube_test_7', 'Cube_test', 'Cube_result_7',
+ [OperatorSpecEditMode('bevel',
+ {'offset': 0.4, 'segments': 5,
'profile': 0.2}, 'EDGE', {0, 10, 4, 7}, )]),
+ MeshTest('Cube_test_8', 'Cube_test', 'Cube_result_8',
+ [OperatorSpecEditMode('bevel',
+ {'offset': 0.4, 'segments': 5,
'profile': 0.25}, 'EDGE', {8, 10, 7}, )]),
+ MeshTest('Cube_test_9', 'Cube_test', 'Cube_result_9',
+ [OperatorSpecEditMode('bevel',
+ {'offset': 0.4, 'segments': 6,
'profile': 0.9}, 'EDGE', {8, 10, 7}, )]),
+ MeshTest('Cube_test_10', 'Cube_test', 'Cube_result_10',
+ [OperatorSpecEditMode('bevel',
+ {'offset': 0.4, 'segments': 4,
'profile': 1.0}, 'EDGE', {10, 7}, )]),
# 10
- ['EDGE', {8, 10, 7}, 'Cube_test_11', 'Cube_test', 'Cube_result_11',
'bevel',
- {'offset': 0.4, 'segments': 5, 'profile': 1.0}],
- ['EDGE', {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}, "test 12",
'Cube_test', 'Cube_result_12', 'bevel',
- {'offset': 0.4, 'segments': 8}],
- ['EDGE', {5}, 'Pyramid4_test_1', 'Pyr4_test', 'Pyr4_result_1',
'bevel', {'offset': 0.2}],
- ['EDGE', {2, 5}, 'Pyramid4_test_2', 'Pyr4_test', 'Pyr4_result_2',
'bevel', {'offset': 0.2}],
- ['EDGE', {2, 3, 5}, 'Pyramid4_test_3', 'Pyr4_test', 'Pyr4_result_3',
'bevel', {'offset': 0.2}],
+ MeshTest('Cube_test_11', 'Cube_test', 'Cube_result_11',
+ [OperatorSpecEditMode('bevel',
+ {'offset': 0.4, 'segments': 5,
'profile': 1.0}, 'EDGE', {8, 10, 7}, )]),
+ MeshTest("test 12", 'Cube_test', 'Cube_result_12',
+ [OperatorSpecEditMode('bevel',
+ {'offset': 0.4, 'segments': 8}, 'EDGE',
+ {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11},
)]),
+ MeshTest('Pyramid4_test_1', 'Pyr4_test', 'Pyr4_result_1',
+ [OperatorSpecEditMode('bevel', {'offset': 0.2}, 'EDGE', {5},
)]),
+ MeshTest('Pyramid4_test_2', 'Pyr4_test', 'Pyr4_result_2',
+ [OperatorSpecEditMode('bevel', {'offset': 0.2}, 'EDGE', {2,
5}, )]),
+ MeshTest('Pyramid4_test_3', 'Pyr4_test', 'Pyr4_result_3',
+ [OperatorSpecEditMode('bevel', {'offset': 0.2}, 'EDGE', {2,
3, 5}, )]),
# 15
- ['EDGE', {1, 2, 3, 5}, 'Pyramid4_test_4', 'Pyr4_test',
'Pyr4_result_4', 'bevel', {'offset': 0.2}],
- ['EDGE', {1, 2, 3, 5}, 'Pyramid4_test_5', 'Pyr4_test',
'Pyr4_result_5', 'bevel',
- {'offset': 0.2, 'segments': 3}],
- ['EDGE', {2, 3}, 'Pyramid4_test_6', 'Pyr4_test', 'Pyr4_result_6',
'bevel', {'offset': 0.2, 'segments': 2}],
- ['EDGE', {1, 2, 3, 5}, 'Pyramid4_test_7', 'Pyr4_test',
'Pyr4_result_7', 'bevel',
- {'offset': 0.2, 'segments': 4, 'profile': 0.15}],
- ['VERT', {1}, 'Pyramid4_test_8', 'Pyr4_test', 'Pyr4_result_8', 'bevel',
- {'offset': 0.75, 'segments': 4, 'affect': 'VERTICES'}],
+ MeshTest('Pyramid4_test_4', 'Pyr4_test', 'Pyr4_result_4',
+ [OperatorSpecEditMode('bevel', {'offset': 0.2}, 'EDGE', {1,
2, 3, 5}, )]),
+ MeshTest('Pyramid4_test_5', 'Pyr4_test', 'Pyr4_result_5',
+ [OperatorSpecEditMode('bevel',
+ {'offset': 0.2, 'segments': 3}, 'EDGE',
{1, 2, 3, 5}, )]),
+ MeshTest('Pyramid4_test_6', 'Pyr4_test', 'Pyr4_result_6',
+ [OperatorSpecEditMode('bevel', {'offset': 0.2, 'segments':
2}, 'EDGE', {2, 3}, )]),
+ MeshTest('Pyramid4_test_7', 'Pyr4_test', 'Pyr4_result_7',
+ [OperatorSpecEditMode('bevel',
+ {'offset': 0.2, 'segments': 4,
'profile': 0.15}, 'EDGE', {1, 2, 3, 5}, )]),
+ MeshTest('Pyramid4_test_8', 'Pyr4_test', 'Pyr4_result_8',
+ [OperatorSpecEditMode('bevel',
+ {'offset': 0.75, 'segments': 4,
'affect': 'VERTICES'}, 'VERT', {1}, )]),
# 20
- ['VERT', {1}, 'Pyramid4_test_9', 'Pyr4_test', 'Pyr4_result_9', 'bevel',
- {'offset': 0.75, 'segments': 3, 'affect': 'VERTICES', 'profile':
0.25}],
- ['EDGE', {2, 3}, 'Pyramid6_test_1', 'Pyr6_test', 'Pyr6_result_1',
'bevel', {'offset': 0.2}],
- ['EDGE', {8, 2, 3}, 'Pyramid6_test_2', 'Pyr6_test', 'Pyr6_result_2',
'bevel', {'offset': 0.2, 'segments': 2}],
- ['EDGE', {0, 2, 3, 4, 6, 7, 9, 10, 11}, 'Pyramid6_test_3',
'Pyr6_test', 'Pyr6_result_3', 'bevel',
- {'offset': 0.2, 'segments': 4, 'profile': 0.8}],
- ['EDGE', {8, 9, 3, 11}, 'Sept_test_1', 'Sept_test', 'Sept_result_1',
'bevel', {'offset': 0.1}],
+ MeshTest('Pyramid4_test_9', 'Pyr4_test', 'Pyr4_result_9',
+ [OperatorSpecEditMode('bevel',
+ {'offset': 0.75, 'segments': 3,
'affect': 'VERTICES', 'profile': 0.25}, 'VERT',
+ {1}, )]),
+ MeshTest('Pyramid6_test_1', 'Pyr6_test', 'Pyr6_result_1',
+ [OperatorSpecEditMode('bevel', {'offset': 0.2}, 'EDGE', {2,
3}, )]),
+ MeshTest('Pyramid6_test_2', 'Pyr6_test', 'Pyr6_result_2',
+ [OperatorSpecEditMode('bevel', {'offset': 0.2, 'segments':
2}, 'EDGE', {8, 2, 3}, )]),
+ MeshTest('Pyramid6_test_3', 'Pyr6_test', 'Pyr6_result_3',
+ [OperatorSpecEditMode('bevel',
+ {'offset': 0.2, 'segments': 4,
'profile': 0.8}, 'EDGE',
+ {0, 2, 3, 4, 6, 7, 9, 10, 11}, )]),
+ MeshTest('Sept_test_1', 'Sept_test', 'Sept_result_1',
+ [OperatorSpecEditMode('bevel', {'offset': 0.1}, 'EDGE', {8,
9, 3, 11}, )]),
# 25
- ['EDGE', {8, 9, 11}, 'Sept_test_2', 'Sept_test', 'Sept_result_2',
'bevel',
- {'offset': 0.1, 'offset_type': 'WIDTH'}],
- ['EDGE', {2, 8, 9, 12, 13, 14}, 'Saddle_test_1', 'Saddle_test',
'Saddle_result_1', 'bevel',
- {'offset': 0.3, 'segments': 5}],
- ['VERT', {4}, 'Saddle_test_2', 'Saddle_test', 'Saddle_result_2',
'bevel',
- {'offset': 0.6, 'segments': 6, 'affect': 'VERTICES'}],
- ['EDGE', {2, 5, 8, 11, 14, 18, 21, 24, 27, 30, 34, 37, 40, 43, 46, 50,
53, 56, 59, 62, 112, 113, 114, 115},
- 'Bent_test',
+ MeshTest('Sept_test_2', 'Sept_test', 'Sept_result_2',
+ [OperatorSpecEditMode('bevel',
+ {'offset': 0.1, 'offset_type':
'WIDTH'}, 'EDGE', {8, 9, 11}, )]),
+ MeshTest('Saddle_test_1', 'Saddle_test', 'Saddle_result_1',
+ [OperatorSpecEditMode('bevel',
+ {'offset': 0.3, 'segments': 5}, 'EDGE',
{2, 8, 9, 12, 13, 14}, )]),
+ MeshTest('Saddle_test_2', 'Saddle_test', 'Saddle_result_2',
+ [OperatorSpecEditMode('bevel',
+ {'offset': 0.6, 'segments': 6,
'affect': 'VERTICES'}, 'VERT', {4}, )]),
- 'Bent_test', 'Bent_result_1', 'bevel', {'offset': 0.2, 'segments':
3}],
- ['EDGE', {1, 8, 9, 10, 11}, 'Bentlines_test_1', 'Bentlines_test',
'Bentlines_result_1', 'bevel',
- {'offset': 0.2, 'segments':
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
