Use the new QIviPagingModel for the model type in qface files

This extends the templates to return a QIviPagingModel for
all model types and also generate the backend interface
for all the models in the backend_simulator template.

The test template is extended to also generate a test for
the model where an item is fetched from the frontend and
the data provided by the backend.

Task-number: AUTOSUITE-421
Change-Id: I1eb26ddcf6d448559221925dd69701e137e5f8a0
Reviewed-by: Antti Hölttä <ahoelttae@luxoft.com>

1 files changed, 5 insertions, 4 deletions

diff --git a/src/tools/ivigenerator/generate.py b/src/tools/ivigenerator/generate.py
index 4838a22..6278d74 100755
--- a/src/tools/ivigenerator/generate.py
+++ b/src/tools/ivigenerator/generate.py
@@ -165,7 +165,7 @@ def test_type_value(symbol):
         values_string = ', '.join(test_type_value(e) for e in symbol.type.reference.fields)
         return '{0}{1}({2})'.format(prefix, symbol.type, values_string)
     elif symbol.type.is_model:
-        return 'new {0}{1}Model()'.format(prefix, symbol.type.nested)
+        return 'new QIviPagingModel()'
     return 'XXX'
 
 def default_value(symbol, zone='='):
@@ -176,7 +176,8 @@ def default_value(symbol, zone='='):
     if symbol.type.is_model:
         nested = symbol.type.nested
         # TODO: find a way of passing parent object
-        return 'new {0}Model(parent)'.format(nested)
+        return 'nullptr'
+        #return 'new {0}Model(parent)'.format(nested)
     if 'config_simulator' in symbol.tags and 'default' in symbol.tags['config_simulator']:
         res = symbol.tags['config_simulator']['default']
         if isinstance(res, dict):
@@ -222,7 +223,7 @@ def parameter_type(symbol):
         if nested.is_primitive:
             return '{0}VariantModel *{1}'.format(prefix, symbol)
         elif nested.is_complex:
-            return '{0}{1}Model *{2}'.format(prefix, nested, symbol)
+            return 'QIviPagingModel *{0}'.format(symbol)
     else:
         return 'const {0}{1} &{2}'.format(prefix, symbol.type, symbol)
     return 'QFace Error: Unknown parameter {0} of type {1}'.format(symbol, symbol.type)
@@ -251,7 +252,7 @@ def return_type(symbol):
         if nested.is_primitive:
             return '{0}VariantModel *'.format(prefix)
         elif nested.is_complex:
-            return '{0}{1}Model *'.format(prefix, nested)
+            return 'QIviPagingModel *'
     else:
         return '{0}{1}'.format(prefix, symbol.type)
     return 'QFace Error: Unknown symbol {0} of type {1}'.format(symbol, symbol.type)