|
12 | 12 | NurbsAlgorithm, |
13 | 13 | CoolType, |
14 | 14 | TriClassification, |
15 | | - GradingFactor, |
16 | 15 | Mesher3DType, |
17 | 16 | CADContactMesh, |
18 | 17 | ) |
@@ -134,8 +133,9 @@ def test_functions_no_args( |
134 | 133 | ("cad_auto_size_scale", "CadAutoSizeScale", 50, (int, float)), |
135 | 134 | ("cad_sliver_remove", "CadSliverRemove", True, bool), |
136 | 135 | ("cad_sliver_remove", "CadSliverRemove", False, bool), |
137 | | - ("cad_mesh_grading_factor", "CadMeshGradingFactor", 0, int), |
138 | | - ("cad_mesh_grading_factor", "CadMeshGradingFactor", 1, int), |
| 136 | + ("cad_mesh_grading_factor", "CadMeshGradingFactor", 0.0, (int, float)), |
| 137 | + ("cad_mesh_grading_factor", "CadMeshGradingFactor", 0.5, (int, float)), |
| 138 | + ("cad_mesh_grading_factor", "CadMeshGradingFactor", 1.0, (int, float)), |
139 | 139 | ( |
140 | 140 | "cad_mesh_minimum_curvature_percentage", |
141 | 141 | "CadMeshMinimumCurvaturePercentage", |
@@ -312,8 +312,9 @@ def test_get_properties( |
312 | 312 | ("cad_auto_size_scale", "CadAutoSizeScale", 50, (int, float)), |
313 | 313 | ("cad_sliver_remove", "CadSliverRemove", True, bool), |
314 | 314 | ("cad_sliver_remove", "CadSliverRemove", False, bool), |
315 | | - ("cad_mesh_grading_factor", "CadMeshGradingFactor", 0, int), |
316 | | - ("cad_mesh_grading_factor", "CadMeshGradingFactor", 1, int), |
| 315 | + ("cad_mesh_grading_factor", "CadMeshGradingFactor", 0.0, (int, float)), |
| 316 | + ("cad_mesh_grading_factor", "CadMeshGradingFactor", 0.5, (int, float)), |
| 317 | + ("cad_mesh_grading_factor", "CadMeshGradingFactor", 1.0, (int, float)), |
317 | 318 | ( |
318 | 319 | "cad_mesh_minimum_curvature_percentage", |
319 | 320 | "CadMeshMinimumCurvaturePercentage", |
@@ -450,7 +451,7 @@ def test_set_properties( |
450 | 451 | + [("use_auto_size", x) for x in ["abc", -1, 1.0, 1, 1.5, None]] |
451 | 452 | + [("cad_auto_size_scale", x) for x in ["abc", True, None]] |
452 | 453 | + [("cad_sliver_remove", x) for x in ["abc", -1, 1.0, 1, 1.5, None]] |
453 | | - + [("cad_mesh_grading_factor", x) for x in ["abc", True, 1.5, None]] |
| 454 | + + [("cad_mesh_grading_factor", x) for x in ["abc", True, None]] |
454 | 455 | + [("cad_mesh_minimum_curvature_percentage", x) for x in ["abc", True, None]] |
455 | 456 | + [("use_fallbacks", x) for x in ["abc", -1, 1.0, 1, 1.5, None]] |
456 | 457 | + [("max_edge_length_in_thickness_direction", x) for x in ["abc", True, None]] |
@@ -505,7 +506,6 @@ def test_set_properties_invalid_value( |
505 | 506 | "property_name, invalid_value", |
506 | 507 | [("nurbs_mesher", x) for x in [-1, 10, 5]] |
507 | 508 | + [("cad_contact_mesh_type", x) for x in ["abc", "Something"]] |
508 | | - + [("cad_mesh_grading_factor", x) for x in [-1, 10, 5]] |
509 | 509 | + [("source_geom_type", x) for x in ["Hello", "abc"]] |
510 | 510 | + [("cool_type", x) for x in [-1, 10, 5]] |
511 | 511 | + [("tri_classification_opt", x) for x in [-1, 10, 5]], |
@@ -552,14 +552,6 @@ def test_gel_false(self, mock_mesh_generator, mock_object): |
552 | 552 | ("tri_classification_opt", "TriClassificationOpt", x.value, x.value, int) |
553 | 553 | for x in TriClassification |
554 | 554 | ] |
555 | | - + [ |
556 | | - ("cad_mesh_grading_factor", "CadMeshGradingFactor", x, x.value, int) |
557 | | - for x in GradingFactor |
558 | | - ] |
559 | | - + [ |
560 | | - ("cad_mesh_grading_factor", "CadMeshGradingFactor", x.value, x.value, int) |
561 | | - for x in GradingFactor |
562 | | - ] |
563 | 555 | + [("mesher_3d", "Mesher3D", x, x.value, str) for x in Mesher3DType] |
564 | 556 | + [("mesher_3d", "Mesher3D", x.value, x.value, str) for x in Mesher3DType] |
565 | 557 | + [("source_geom_type", "SourceGeomType", x, x.value, str) for x in GeomType] |
|
0 commit comments