Skip to content

Commit 37ca9db

Browse files
fredroyfredroy
authored
[RequiredPlugin] Use pluginName instead of name (#603)
* requiredplugin: use pluginName instead of name * fix tests
1 parent 518a52d commit 37ca9db

File tree

15 files changed

+80
-80
lines changed

15 files changed

+80
-80
lines changed

‎bindings/Modules/tests/SofaDeformable/SpringForceField.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66

77
def create_scene(root):
8-
root.addObject("RequiredPlugin", name="Sofa.Component.Topology.Container.Grid")
9-
root.addObject("RequiredPlugin", name="Sofa.Component.StateContainer")
10-
root.addObject("RequiredPlugin", name="Sofa.Component.SolidMechanics.Spring")
8+
root.addObject("RequiredPlugin", pluginName="Sofa.Component.Topology.Container.Grid")
9+
root.addObject("RequiredPlugin", pluginName="Sofa.Component.StateContainer")
10+
root.addObject("RequiredPlugin", pluginName="Sofa.Component.SolidMechanics.Spring")
1111

1212
# Create a simple plane having 3x3 nodes and a size of 3x3 on the yz plane centered on (-0.5,0,0).
1313
root.addChild('plane_1')

‎bindings/Modules/tests/SofaLinearSolver/matrix_access.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ def simulate_beam(self, linear_solver_template):
99

1010
loop = root.addObject('DefaultAnimationLoop')
1111

12-
root.addObject('RequiredPlugin', name='Sofa.Component.ODESolver.Backward')
13-
root.addObject('RequiredPlugin', name='Sofa.Component.LinearSolver.Direct')
14-
root.addObject('RequiredPlugin', name='Sofa.Component.Engine.Select')
15-
root.addObject('RequiredPlugin', name='Sofa.Component.Constraint.Projective')
16-
root.addObject('RequiredPlugin', name='Sofa.Component.SolidMechanics.FEM.Elastic')
17-
root.addObject('RequiredPlugin', name='Sofa.Component.Mass')
12+
root.addObject('RequiredPlugin', pluginName='Sofa.Component.ODESolver.Backward')
13+
root.addObject('RequiredPlugin', pluginName='Sofa.Component.LinearSolver.Direct')
14+
root.addObject('RequiredPlugin', pluginName='Sofa.Component.Engine.Select')
15+
root.addObject('RequiredPlugin', pluginName='Sofa.Component.Constraint.Projective')
16+
root.addObject('RequiredPlugin', pluginName='Sofa.Component.SolidMechanics.FEM.Elastic')
17+
root.addObject('RequiredPlugin', pluginName='Sofa.Component.Mass')
1818

1919
root.addObject('EulerImplicitSolver', rayleighStiffness="0.1", rayleighMass="0.1")
2020
linear_solver = root.addObject('SparseLDLSolver', name='linear_solver', template=linear_solver_template)

‎bindings/Sofa/tests/Core/Base.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
def create_scene(rootName="root"):
77
root = Sofa.Core.Node(rootName)
8-
root.addObject("RequiredPlugin", name="Sofa.Component.StateContainer")
8+
root.addObject("RequiredPlugin", pluginName="Sofa.Component.StateContainer")
99
return root
1010

1111
class Test(unittest.TestCase):

‎bindings/Sofa/tests/Core/BaseData.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ def testValue(self, test):
9393

9494
def create_scene(rootName="root"):
9595
root = Sofa.Core.Node(rootName)
96-
root.addObject("RequiredPlugin", name="Sofa.Component.StateContainer")
96+
root.addObject("RequiredPlugin", pluginName="Sofa.Component.StateContainer")
9797
return root
9898

9999
class Test(unittest.TestCase):

‎bindings/Sofa/tests/Core/BaseLink.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
def create_scene(rootName="root"):
88
root = Sofa.Core.Node(rootName)
9-
root.addObject("RequiredPlugin", name="Sofa.Component.StateContainer")
10-
root.addObject("RequiredPlugin", name="Sofa.Component.SolidMechanics.Spring")
11-
root.addObject("RequiredPlugin", name="Sofa.Component.Mapping.Linear")
9+
root.addObject("RequiredPlugin", pluginName="Sofa.Component.StateContainer")
10+
root.addObject("RequiredPlugin", pluginName="Sofa.Component.SolidMechanics.Spring")
11+
root.addObject("RequiredPlugin", pluginName="Sofa.Component.Mapping.Linear")
1212
return root
1313

1414
class Test(unittest.TestCase):

‎bindings/Sofa/tests/Core/BaseObject.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
def create_scene(rootName="root"):
77
root = Sofa.Core.Node(rootName)
8-
root.addObject("RequiredPlugin", name="Sofa.Component.StateContainer")
9-
root.addObject("RequiredPlugin", name="Sofa.Component.Topology.Container.Constant")
8+
root.addObject("RequiredPlugin", pluginName="Sofa.Component.StateContainer")
9+
root.addObject("RequiredPlugin", pluginName="Sofa.Component.Topology.Container.Constant")
1010
return root
1111

1212
class Test(unittest.TestCase):

‎bindings/Sofa/tests/Core/Events.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ class Test(unittest.TestCase):
3939
def test_events(self):
4040
"""Test the BuildConstraintSystem and SolveConstraintSystem events."""
4141
node = Sofa.Core.Node("root")
42-
node.addObject("RequiredPlugin", name="Sofa.Component.AnimationLoop")
43-
node.addObject("RequiredPlugin", name="Sofa.Component.Constraint.Lagrangian.Solver")
42+
node.addObject("RequiredPlugin", pluginName="Sofa.Component.AnimationLoop")
43+
node.addObject("RequiredPlugin", pluginName="Sofa.Component.Constraint.Lagrangian.Solver")
4444
node.addObject("FreeMotionAnimationLoop", name="loop")
4545
node.addObject("BlockGaussSeidelConstraintSolver", name="constraintSolver")
4646
controller = node.addObject( MyController() )

‎bindings/Sofa/tests/Core/ForceField.py‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ def createParticle(node, node_name, use_implicit_scheme, use_iterative_solver):
4242
def rssffScene(use_implicit_scheme=True, use_iterative_solver=True):
4343
node = Sofa.Core.Node("root")
4444
node.addObject('DefaultAnimationLoop')
45-
node.addObject("RequiredPlugin", name="Sofa.Component.StateContainer")
46-
node.addObject("RequiredPlugin", name="Sofa.Component.LinearSolver")
47-
node.addObject("RequiredPlugin", name="Sofa.Component.ODESolver")
48-
node.addObject("RequiredPlugin", name="Sofa.Component.Mass")
45+
node.addObject("RequiredPlugin", pluginName="Sofa.Component.StateContainer")
46+
node.addObject("RequiredPlugin", pluginName="Sofa.Component.LinearSolver")
47+
node.addObject("RequiredPlugin", pluginName="Sofa.Component.ODESolver")
48+
node.addObject("RequiredPlugin", pluginName="Sofa.Component.Mass")
4949

5050
node.gravity = [0, -10, 0]
5151
createParticle(node, "particle", use_implicit_scheme, use_iterative_solver)
@@ -108,14 +108,14 @@ def simulate_beam(linear_solver_template):
108108

109109
root.addObject('DefaultAnimationLoop')
110110

111-
root.addObject('RequiredPlugin', name='Sofa.Component.Constraint.Projective')
112-
root.addObject('RequiredPlugin', name='Sofa.Component.Engine.Select')
113-
root.addObject('RequiredPlugin', name='Sofa.Component.LinearSolver.Direct')
114-
root.addObject('RequiredPlugin', name='Sofa.Component.Mass')
115-
root.addObject('RequiredPlugin', name='Sofa.Component.ODESolver.Backward')
116-
root.addObject('RequiredPlugin', name='Sofa.Component.SolidMechanics.FEM.Elastic')
117-
root.addObject('RequiredPlugin', name='Sofa.Component.StateContainer')
118-
root.addObject('RequiredPlugin', name='Sofa.Component.Topology.Container.Grid')
111+
root.addObject('RequiredPlugin', pluginName='Sofa.Component.Constraint.Projective')
112+
root.addObject('RequiredPlugin', pluginName='Sofa.Component.Engine.Select')
113+
root.addObject('RequiredPlugin', pluginName='Sofa.Component.LinearSolver.Direct')
114+
root.addObject('RequiredPlugin', pluginName='Sofa.Component.Mass')
115+
root.addObject('RequiredPlugin', pluginName='Sofa.Component.ODESolver.Backward')
116+
root.addObject('RequiredPlugin', pluginName='Sofa.Component.SolidMechanics.FEM.Elastic')
117+
root.addObject('RequiredPlugin', pluginName='Sofa.Component.StateContainer')
118+
root.addObject('RequiredPlugin', pluginName='Sofa.Component.Topology.Container.Grid')
119119

120120
root.addObject('EulerImplicitSolver', rayleighStiffness="0.1", rayleighMass="0.1")
121121
root.addObject('SparseLDLSolver', template=linear_solver_template)

‎bindings/Sofa/tests/Core/Mass.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ def simulate_beam(linear_solver_template):
1515

1616
root.addObject('DefaultAnimationLoop')
1717

18-
root.addObject('RequiredPlugin', name='Sofa.Component.StateContainer')
19-
root.addObject('RequiredPlugin', name='Sofa.Component.ODESolver.Backward')
20-
root.addObject('RequiredPlugin', name='Sofa.Component.LinearSolver.Direct')
21-
root.addObject('RequiredPlugin', name='Sofa.Component.Engine.Select')
22-
root.addObject('RequiredPlugin', name='Sofa.Component.Constraint.Projective')
23-
root.addObject('RequiredPlugin', name='Sofa.Component.SolidMechanics.FEM.Elastic')
24-
root.addObject('RequiredPlugin', name='Sofa.Component.Mass')
25-
root.addObject('RequiredPlugin', name='Sofa.Component.Topology.Container.Grid')
18+
root.addObject('RequiredPlugin', pluginName='Sofa.Component.StateContainer')
19+
root.addObject('RequiredPlugin', pluginName='Sofa.Component.ODESolver.Backward')
20+
root.addObject('RequiredPlugin', pluginName='Sofa.Component.LinearSolver.Direct')
21+
root.addObject('RequiredPlugin', pluginName='Sofa.Component.Engine.Select')
22+
root.addObject('RequiredPlugin', pluginName='Sofa.Component.Constraint.Projective')
23+
root.addObject('RequiredPlugin', pluginName='Sofa.Component.SolidMechanics.FEM.Elastic')
24+
root.addObject('RequiredPlugin', pluginName='Sofa.Component.Mass')
25+
root.addObject('RequiredPlugin', pluginName='Sofa.Component.Topology.Container.Grid')
2626

2727
root.addObject('EulerImplicitSolver', rayleighStiffness="0.1", rayleighMass="0.1")
2828
root.addObject('SparseLDLSolver', template=linear_solver_template)

‎bindings/Sofa/tests/Simulation/Node.py‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def test_kwargs_constructor(self):
4141

4242
def test_GetAttr(self):
4343
root = Sofa.Core.Node("rootNode")
44-
root.addObject("RequiredPlugin", name="Sofa.Component.StateContainer")
44+
root.addObject("RequiredPlugin", pluginName="Sofa.Component.StateContainer", name="Sofa.Component.StateContainer")
4545
c = root.addChild("child1")
4646
self.assertTrue(c is not None)
4747
self.assertTrue(root.child1 is not None)
@@ -52,7 +52,7 @@ def test_GetAttr(self):
5252

5353
def test_init(self):
5454
root = Sofa.Core.Node("rootNode")
55-
root.addObject("RequiredPlugin", name="Sofa.Component.StateContainer")
55+
root.addObject("RequiredPlugin", pluginName="Sofa.Component.StateContainer")
5656
c = root.addChild("child1")
5757
c = c.addObject("MechanicalObject", name="MO", position=[0.0,1.0,2.0]*100)
5858
root.init()
@@ -94,7 +94,7 @@ def test_removeChild(self):
9494

9595
def test_createObjectWithParam(self):
9696
root = Sofa.Core.Node("rootNode")
97-
root.addObject("RequiredPlugin", name="Sofa.Component.StateContainer")
97+
root.addObject("RequiredPlugin", pluginName="Sofa.Component.StateContainer")
9898
root.addObject("MechanicalObject", name="mechanical", position=[[0,0,0],[1,1,1],[2,2,2]])
9999

100100
def test_children_property(self):
@@ -124,7 +124,7 @@ def test_parents_property(self):
124124

125125
def test_objects_property(self):
126126
root = Sofa.Core.Node("rootNode")
127-
root.addObject("RequiredPlugin", name="Sofa.Component.StateContainer")
127+
root.addObject("RequiredPlugin", pluginName="Sofa.Component.StateContainer")
128128
child = root.addChild(Sofa.Core.Node("child1"))
129129
child.addObject("MechanicalObject", name="name1")
130130
child.addObject("MechanicalObject", name="name2")
@@ -134,7 +134,7 @@ def test_objects_property(self):
134134

135135
def test_objects_property_contains_method(self):
136136
root = Sofa.Core.Node("rootNode")
137-
root.addObject("RequiredPlugin", name="Sofa.Component.StateContainer")
137+
root.addObject("RequiredPlugin", pluginName="Sofa.Component.StateContainer")
138138
child = root.addChild(Sofa.Core.Node("child1"))
139139
child.addObject("MechanicalObject", name="name1")
140140
child.addObject("MechanicalObject", name="name2")
@@ -146,7 +146,7 @@ def test_objects_property_contains_method(self):
146146

147147
def test_objects_property_remove_at_method(self):
148148
root = Sofa.Core.Node("rootNode")
149-
root.addObject("RequiredPlugin", name="Sofa.Component.StateContainer")
149+
root.addObject("RequiredPlugin", pluginName="Sofa.Component.StateContainer")
150150
child = root.addChild(Sofa.Core.Node("child1"))
151151
child.addObject("MechanicalObject", name="name1")
152152
child.addObject("MechanicalObject", name="name2")
@@ -166,7 +166,7 @@ def test_data_property(self):
166166

167167
def test_getItem(self):
168168
root = Sofa.Core.Node("root")
169-
root.addObject("RequiredPlugin", name="Sofa.Component.StateContainer")
169+
root.addObject("RequiredPlugin", pluginName="Sofa.Component.StateContainer")
170170
node1 = root.addChild('node1')
171171
object1 = root.addObject("MechanicalObject", name="object1")
172172
node2 = node1.addChild('node2')
@@ -208,20 +208,20 @@ def test_getLink(self):
208208

209209
def test_hasObjectWithFastPath(self):
210210
root = Sofa.Core.Node("root")
211-
root.addObject("RequiredPlugin", name="Sofa.Component.StateContainer")
211+
root.addObject("RequiredPlugin", pluginName="Sofa.Component.StateContainer", name="Sofa.Component.StateContainer")
212212
self.assertTrue(root.hasObject("Sofa.Component.StateContainer"))
213213
self.assertFalse(root.hasObject("NonExistingObjectName"))
214214

215215
def test_hasObjectWithDefaultPythonFunction(self):
216216
root = Sofa.Core.Node("root")
217-
root.addObject("RequiredPlugin", name="Sofa.Component.StateContainer")
217+
root.addObject("RequiredPlugin", pluginName="Sofa.Component.StateContainer", name="Sofa.Component.StateContainer")
218218

219219
self.assertTrue(hasattr(root, "Sofa.Component.StateContainer"))
220220
self.assertFalse(hasattr(root, "NonExistingObjectName"))
221221

222222
def test_removeObject(self):
223223
root = Sofa.Core.Node("root")
224-
root.addObject("RequiredPlugin", name="Sofa.Component.StateContainer")
224+
root.addObject("RequiredPlugin", pluginName="Sofa.Component.StateContainer")
225225
child = root.addChild(Sofa.Core.Node("child1"))
226226

227227
obj1 = child.addObject("MechanicalObject", name="obj1")
@@ -271,29 +271,29 @@ def test_detachFromGraph(self):
271271

272272
def test_getMass(self):
273273
root = Sofa.Core.Node("root")
274-
root.addObject("RequiredPlugin", name="Sofa.Component.StateContainer")
274+
root.addObject("RequiredPlugin", pluginName="Sofa.Component.StateContainer")
275275
root.addObject("MechanicalObject")
276276
m = root.addObject("UniformMass", name="mass", vertexMass=0.1)
277277
self.assertEqual(m,root.getMass())
278278

279279
def test_getForceField(self):
280280
root = Sofa.Core.Node("root")
281-
root.addObject("RequiredPlugin", name="Sofa.Component.MechanicalLoad")
282-
root.addObject("RequiredPlugin", name="Sofa.Component.StateContainer")
281+
root.addObject("RequiredPlugin", pluginName="Sofa.Component.MechanicalLoad")
282+
root.addObject("RequiredPlugin", pluginName="Sofa.Component.StateContainer")
283283
root.addObject("MechanicalObject")
284284
ff = root.addObject('ConstantForceField', template="Vec3d", name="cff2")
285285
self.assertEqual(ff, root.getForceField(0))
286286

287287
def test_getMechanicalState(self):
288288
root = Sofa.Core.Node("root")
289-
root.addObject("RequiredPlugin", name="Sofa.Component.StateContainer")
289+
root.addObject("RequiredPlugin", pluginName="Sofa.Component.StateContainer")
290290
c = root.addObject("MechanicalObject")
291291
self.assertEqual(c, root.getMechanicalState())
292292

293293
def test_getMechanicalMapping(self):
294294
root = Sofa.Core.Node("root")
295-
root.addObject("RequiredPlugin", name="Sofa.Component.StateContainer")
296-
root.addObject("RequiredPlugin", name="Sofa.Component.Mapping.Linear")
295+
root.addObject("RequiredPlugin", pluginName="Sofa.Component.StateContainer")
296+
root.addObject("RequiredPlugin", pluginName="Sofa.Component.Mapping.Linear")
297297
root.addObject("MechanicalObject", name="t1")
298298
root.addObject("MechanicalObject", name="t2")
299299
mm = root.addObject("BarycentricMapping", input="@/t1", output="@/t2")

0 commit comments

Comments
 (0)