Author: mvidner Date: Wed Jul 1 13:28:08 2009 New Revision: 57818 URL: http://svn.opensuse.org/viewcvs/yast?rev=57818&view=rev Log: Added interfaces to test DBus->YCP value conversion (bnc#516492). Modified: trunk/core/dbus/namespace_service/testsuite/modules/TEST.ycp trunk/core/dbus/namespace_service/testsuite/org.freedesktop.DBus.Introspectable.Introspect.test Modified: trunk/core/dbus/namespace_service/testsuite/modules/TEST.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/dbus/namespace_service/tests... ============================================================================== --- trunk/core/dbus/namespace_service/testsuite/modules/TEST.ycp (original) +++ trunk/core/dbus/namespace_service/testsuite/modules/TEST.ycp Wed Jul 1 13:28:08 2009 @@ -1,4 +1,3 @@ - // This is a testing module for the YaST DBuse service // Some methods are not called during tests, but the correct signature is checked in the introspection test @@ -78,7 +77,53 @@ global define void Void() {return;} -global define any ParamMap(map<string,any> m) -{return m;} +// ParamFoo: test DBus->YCP conversion +global define any ParamAny(any p) +{return p;} + +//Valid YCP but useless +//global define any ParamVoid(void p) +//{return p;} + +global define any ParamBoolean(boolean p) +{return p;} + +global define any ParamInteger(integer p) +{return p;} + +global define any ParamFloat(float p) +{return p;} + +global define any ParamString(string p) +{return p;} + +global define any ParamLocale(locale p) +{return p;} + +global define any ParamByteblock(byteblock p) +{return p;} + +global define any ParamPath(path p) +{return p;} + +global define any ParamSymbol(symbol p) +{return p;} + +global define any ParamList(list p) +{return p;} + +// FIXME this fails, expecting a plain string +//global define any ParamTerm(term p) +//{return p;} + +// inconsistent name, the first test +global define any ParamMap(map<string,any> p) +{return p;} + +global define any ParamMapA(map p) +{return p;} + +global define any ParamBlock(block<any> p) +{return p;} } Modified: trunk/core/dbus/namespace_service/testsuite/org.freedesktop.DBus.Introspectable.Introspect.test URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/dbus/namespace_service/tests... ============================================================================== --- trunk/core/dbus/namespace_service/testsuite/org.freedesktop.DBus.Introspectable.Introspect.test (original) +++ trunk/core/dbus/namespace_service/testsuite/org.freedesktop.DBus.Introspectable.Introspect.test Wed Jul 1 13:28:08 2009 @@ -28,7 +28,17 @@ <method name='MapStringAny'><arg name='ret' type='a{sv}' direction='out'/></method> <method name='MapStringListString'><arg name='ret' type='a{sas}' direction='out'/></method> <method name='MapStringString'><arg name='ret' type='a{ss}' direction='out'/></method> + <method name='ParamAny'><arg name='ret' type='v' direction='out'/><arg name='param' type='v' direction='in'/></method> + <method name='ParamBoolean'><arg name='ret' type='v' direction='out'/><arg name='param' type='b' direction='in'/></method> + <method name='ParamFloat'><arg name='ret' type='v' direction='out'/><arg name='param' type='d' direction='in'/></method> + <method name='ParamInteger'><arg name='ret' type='v' direction='out'/><arg name='param' type='x' direction='in'/></method> + <method name='ParamList'><arg name='ret' type='v' direction='out'/><arg name='param' type='av' direction='in'/></method> + <method name='ParamLocale'><arg name='ret' type='v' direction='out'/><arg name='param' type='s' direction='in'/></method> <method name='ParamMap'><arg name='ret' type='v' direction='out'/><arg name='param' type='a{sv}' direction='in'/></method> + <method name='ParamMapA'><arg name='ret' type='v' direction='out'/><arg name='param' type='a{sv}' direction='in'/></method> + <method name='ParamPath'><arg name='ret' type='v' direction='out'/><arg name='param' type='s' direction='in'/></method> + <method name='ParamString'><arg name='ret' type='v' direction='out'/><arg name='param' type='s' direction='in'/></method> + <method name='ParamSymbol'><arg name='ret' type='v' direction='out'/><arg name='param' type='s' direction='in'/></method> <method name='String'><arg name='ret' type='s' direction='out'/></method> <method name='Symbol'><arg name='ret' type='s' direction='out'/></method> <method name='Void'></method> @@ -54,7 +64,19 @@ <method name='MapStringAny'><arg name='ret' type='(bsv)' direction='out'/></method> <method name='MapStringListString'><arg name='ret' type='(bsv)' direction='out'/></method> <method name='MapStringString'><arg name='ret' type='(bsv)' direction='out'/></method> + <method name='ParamAny'><arg name='ret' type='(bsv)' direction='out'/><arg name='param' type='(bsv)' direction='in'/></method> + <method name='ParamBlock'><arg name='ret' type='(bsv)' direction='out'/><arg name='param' type='(bsv)' direction='in'/></method> + <method name='ParamBoolean'><arg name='ret' type='(bsv)' direction='out'/><arg name='param' type='(bsv)' direction='in'/></method> + <method name='ParamByteblock'><arg name='ret' type='(bsv)' direction='out'/><arg name='param' type='(bsv)' direction='in'/></method> + <method name='ParamFloat'><arg name='ret' type='(bsv)' direction='out'/><arg name='param' type='(bsv)' direction='in'/></method> + <method name='ParamInteger'><arg name='ret' type='(bsv)' direction='out'/><arg name='param' type='(bsv)' direction='in'/></method> + <method name='ParamList'><arg name='ret' type='(bsv)' direction='out'/><arg name='param' type='(bsv)' direction='in'/></method> + <method name='ParamLocale'><arg name='ret' type='(bsv)' direction='out'/><arg name='param' type='(bsv)' direction='in'/></method> <method name='ParamMap'><arg name='ret' type='(bsv)' direction='out'/><arg name='param' type='(bsv)' direction='in'/></method> + <method name='ParamMapA'><arg name='ret' type='(bsv)' direction='out'/><arg name='param' type='(bsv)' direction='in'/></method> + <method name='ParamPath'><arg name='ret' type='(bsv)' direction='out'/><arg name='param' type='(bsv)' direction='in'/></method> + <method name='ParamString'><arg name='ret' type='(bsv)' direction='out'/><arg name='param' type='(bsv)' direction='in'/></method> + <method name='ParamSymbol'><arg name='ret' type='(bsv)' direction='out'/><arg name='param' type='(bsv)' direction='in'/></method> <method name='String'><arg name='ret' type='(bsv)' direction='out'/></method> <method name='Symbol'><arg name='ret' type='(bsv)' direction='out'/></method> <method name='Void'></method> -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org