summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuergen Ryannel <juergen@ryannel.org>2020-02-06 11:24:19 +0100
committerDominik Holland <dominik.holland@googlemail.com>2022-01-27 13:50:04 +0100
commit73a51f9b4bf4fe01be21f851d7f3c757e1cbafc8 (patch)
treeada08ab25aadfcfad9a1c40194f8a1e0ee6df064
parent357de1ea810803f119042166424282e3361aaf1a (diff)
downloadqtivi-qface-73a51f9b4bf4fe01be21f851d7f3c757e1cbafc8.tar.gz
fixed all tests
-rw-r--r--qface/helper/qtcpp.py6
-rw-r--r--tests/test_qtcpp_helper.py14
2 files changed, 10 insertions, 10 deletions
diff --git a/qface/helper/qtcpp.py b/qface/helper/qtcpp.py
index 5e150ed..de9e329 100644
--- a/qface/helper/qtcpp.py
+++ b/qface/helper/qtcpp.py
@@ -74,9 +74,9 @@ class Filters(object):
return '{0} {1}'.format(symbol.type, symbol)
elif symbol.type.is_list:
nested = Filters.returnType(symbol.type.nested)
- return 'const QVariantList& {1}'.format(nested, symbol)
+ return 'const QVariantList &{1}'.format(nested, symbol)
elif symbol.type.is_model:
- return 'QAbstractItemModel* {0}'.format(symbol)
+ return 'QAbstractItemModel *{0}'.format(symbol)
elif symbol.type.is_complex:
if symbol.type.is_interface:
return '{0}Base *{1}'.format(symbol.type, symbol)
@@ -109,7 +109,7 @@ class Filters(object):
nested = Filters.returnType(symbol.type.nested)
return 'QVariantList'.format(nested)
elif symbol.type.is_model:
- return 'QAbstractItemModel* '
+ return 'QAbstractItemModel *'
elif symbol.type.is_complex:
if symbol.type.is_interface:
return '{0}Base *'.format(symbol.type)
diff --git a/tests/test_qtcpp_helper.py b/tests/test_qtcpp_helper.py
index 083d16f..3a12b0f 100644
--- a/tests/test_qtcpp_helper.py
+++ b/tests/test_qtcpp_helper.py
@@ -98,12 +98,12 @@ def test_return_type():
# check for model of primitive
prop = interface._propertyMap['model001']
answer = qtcpp.Filters.returnType(prop)
- assert answer == 'VariantModel *'
+ assert answer == 'QAbstractItemModel *'
# check for model of structs
prop = interface._propertyMap['model002']
answer = qtcpp.Filters.returnType(prop)
- assert answer == 'VariantModel *'
+ assert answer == 'QAbstractItemModel *'
def test_default_value():
@@ -139,7 +139,7 @@ def test_default_value():
# check for flag
prop = interface._propertyMap['state']
answer = qtcpp.Filters.defaultValue(prop)
- assert answer == '0'
+ assert answer == 'ApplicationState::ApplicationStateEnum::Suspended'
# check for list of primitive
prop = interface._propertyMap['list001']
@@ -154,12 +154,12 @@ def test_default_value():
# check for model of primitive
prop = interface._propertyMap['model001']
answer = qtcpp.Filters.defaultValue(prop)
- assert answer == 'new VariantModel(this)'
+ assert answer == 'nullptr'
# check for model of structs
prop = interface._propertyMap['model002']
answer = qtcpp.Filters.defaultValue(prop)
- assert answer == 'new VariantModel(this)'
+ assert answer == 'nullptr'
def test_parameter_type():
@@ -206,12 +206,12 @@ def test_parameter_type():
# check for model of primitive
prop = interface._propertyMap['model001']
answer = qtcpp.Filters.parameterType(prop)
- assert answer == 'VariantModel *{0}'.format(prop.name)
+ assert answer == 'QAbstractItemModel *{0}'.format(prop.name)
# check for model of structs
prop = interface._propertyMap['model002']
answer = qtcpp.Filters.parameterType(prop)
- assert answer == 'VariantModel *{0}'.format(prop.name)
+ assert answer == 'QAbstractItemModel *{0}'.format(prop.name)
def test_namespace():