JSON serialization: Fix WHILE and FOR body #3902

pekkaklarck · pekkaklarck · commit e23a60d66edb · 2023-01-18T11:13:57.000+02:00
diff --git a/src/robot/model/control.py b/src/robot/model/control.py
@@ -58,7 +58,8 @@ def to_dict(self):
         return {'type': self.type,
                 'variables': list(self.variables),
                 'flavor': self.flavor,
-                'values': list(self.values)}
+                'values': list(self.values),
+                'body': self.body.to_dicts()}
 
 
 @Body.register
@@ -85,9 +86,12 @@ def __str__(self):
         return f'WHILE    {self.condition}' + (f'    {self.limit}' if self.limit else '')
 
     def to_dict(self):
-        data = {'type': self.type, 'condition': self.condition}
+        data = {'type': self.type}
+        if self.condition:
+            data['condition'] = self.condition
         if self.limit:
             data['limit'] = self.limit
+        data['body'] = self.body.to_dicts()
         return data
 
 
diff --git a/utest/running/test_run_model.py b/utest/running/test_run_model.py
@@ -244,16 +244,17 @@ def test_keyword(self):
                      name='Setup', lineno=1)
 
     def test_for(self):
-        self._verify(For(), type='FOR', variables=[], flavor='IN', values=[])
-        self._verify(For(['${i}'], 'IN RANGE', ['10'], lineno=2), type='FOR',
-                     variables=['${i}'], flavor='IN RANGE', values=['10'], lineno=2)
+        self._verify(For(), type='FOR', variables=[], flavor='IN', values=[], body=[])
+        self._verify(For(['${i}'], 'IN RANGE', ['10'], lineno=2),
+                     type='FOR', variables=['${i}'], flavor='IN RANGE', values=['10'],
+                     body=[], lineno=2)
 
     def test_while(self):
-        self._verify(While(), type='WHILE', condition=None)
+        self._verify(While(), type='WHILE', body=[])
         self._verify(While('1 > 0', '1 min'),
-                     type='WHILE', condition='1 > 0', limit='1 min')
+                     type='WHILE', condition='1 > 0', limit='1 min', body=[])
         self._verify(While('True', lineno=3, error='x'),
-                     type='WHILE', condition='True', lineno=3, error='x')
+                     type='WHILE', condition='True', body=[], lineno=3, error='x')
 
     def test_if(self):
         self._verify(If(), type='IF/ELSE ROOT', body=[])
