227 } |
227 } |
228 } |
228 } |
229 |
229 |
230 int DialerService::dial(const QString& number, bool asyncAnswer) |
230 int DialerService::dial(const QString& number, bool asyncAnswer) |
231 { |
231 { |
232 XQSERVICE_DEBUG_PRINT("DialerService::dial: %s,%d", qPrintable(number), asyncAnswer); |
232 Q_UNUSED(asyncAnswer); |
233 XQRequestInfo info = requestInfo(); |
233 |
|
234 XQRequestInfo info = requestInfo(); |
|
235 QString testCase = (info.info(TESTCASE_INFO_KEY)).toString(); |
|
236 XQSERVICE_DEBUG_PRINT("XQTESTER serviceapp,%s,DialerService::dial", qPrintable(testCase)); |
234 |
237 |
235 XQSERVICE_DEBUG_PRINT("\tRequest info: id=%d,sid=%X,vid=%X", info.id(), info.clientSecureId(), info.clientVendorId()); |
238 XQSERVICE_DEBUG_PRINT("\tRequest info: id=%d,sid=%X,vid=%X", info.id(), info.clientSecureId(), info.clientVendorId()); |
236 QSet<int> caps = info.clientCapabilities(); |
239 QSet<int> caps = info.clientCapabilities(); |
237 QSetIterator<int> i(caps); |
240 QSetIterator<int> i(caps); |
238 while (i.hasNext()) |
241 while (i.hasNext()) |
239 qDebug() << "Has capability " << i.next(); |
242 qDebug() << "Has capability " << i.next(); |
240 XQSERVICE_DEBUG_PRINT("\tRequest info: embed=%d,sync=%d", info.isEmbedded(), info.isSynchronous()); |
243 XQSERVICE_DEBUG_PRINT("\tRequest info: embed=%d,sync=%d", info.isEmbedded(), info.isSynchronous()); |
241 |
244 |
|
245 bool isAsync = !info.isSynchronous(); |
242 QString label = "Dialer::dial:\n"; |
246 QString label = "Dialer::dial:\n"; |
243 label += QString("number=%1\n").arg(number); |
247 label += QString("number=%1\n").arg(number); |
244 label += QString("asyncAnswer=%1\n").arg(asyncAnswer); |
248 label += QString("async=%1\n").arg(isAsync); |
245 |
249 |
246 connect(this, SIGNAL(returnValueDelivered()), this, SLOT(handleAnswerDelivered())); |
250 connect(this, SIGNAL(returnValueDelivered()), this, SLOT(handleAnswerDelivered())); |
247 |
251 |
248 mNumber = number ; |
252 mNumber = number ; |
249 mServiceApp->setLabelNumber(label, number); |
253 mServiceApp->setLabelNumber(label, number); |
250 int ret = 0; |
254 int ret = 0; |
251 if (asyncAnswer) |
255 if (isAsync) |
252 { |
256 { |
253 mAsyncReqIds.insertMulti(info.clientSecureId(), setCurrentRequestAsync()); |
257 mAsyncReqIds.insertMulti(info.clientSecureId(), setCurrentRequestAsync()); |
254 connect(this, SIGNAL(clientDisconnected()), this, SLOT(handleClientDisconnect())); |
258 connect(this, SIGNAL(clientDisconnected()), this, SLOT(handleClientDisconnect())); |
255 } |
259 } |
256 else |
260 else |
284 |
288 |
285 } |
289 } |
286 |
290 |
287 QVariant DialerService::testVariant(QVariant variant) |
291 QVariant DialerService::testVariant(QVariant variant) |
288 { |
292 { |
|
293 XQRequestInfo info = requestInfo(); |
|
294 QString testCase = (info.info(TESTCASE_INFO_KEY)).toString(); |
|
295 XQSERVICE_DEBUG_PRINT("XQTESTER serviceapp,%s,DialerService::testVariant", qPrintable(testCase)); |
|
296 |
289 XQSERVICE_DEBUG_PRINT("DialerService::testVariant::variant(%d,%d,%s)", |
297 XQSERVICE_DEBUG_PRINT("DialerService::testVariant::variant(%d,%d,%s)", |
290 variant.type(), variant.userType(), variant.typeName()); |
298 variant.type(), variant.userType(), variant.typeName()); |
291 XQSERVICE_DEBUG_PRINT("DialerService::testVariant::variant value=%s", qPrintable(variant.toString())); |
299 XQSERVICE_DEBUG_PRINT("DialerService::testVariant::variant value=%s", qPrintable(variant.toString())); |
292 |
300 |
293 if (variant.typeName() == QLatin1String("QStringList")) |
301 if (variant.typeName() == QLatin1String("QStringList")) |
447 } |
455 } |
448 } |
456 } |
449 |
457 |
450 int NewDialerService::dial(const QString& number, bool asyncAnswer) |
458 int NewDialerService::dial(const QString& number, bool asyncAnswer) |
451 { |
459 { |
452 XQSERVICE_DEBUG_PRINT("NewDialerService::dial: %s,%d", qPrintable(number), asyncAnswer); |
460 Q_UNUSED(asyncAnswer); |
453 XQRequestInfo info = requestInfo(); |
461 |
454 |
462 XQRequestInfo info = requestInfo(); |
|
463 QString testCase = (info.info(TESTCASE_INFO_KEY)).toString(); |
|
464 XQSERVICE_DEBUG_PRINT("XQTESTER serviceapp,%s,NewDialerService::dial", qPrintable(testCase)); |
|
465 |
455 XQSERVICE_DEBUG_PRINT("\tRequest info: id=%d,sid=%X,vid=%X", info.id(), info.clientSecureId(), info.clientVendorId()); |
466 XQSERVICE_DEBUG_PRINT("\tRequest info: id=%d,sid=%X,vid=%X", info.id(), info.clientSecureId(), info.clientVendorId()); |
456 QSet<int> caps = info.clientCapabilities(); |
467 QSet<int> caps = info.clientCapabilities(); |
457 QSetIterator<int> i(caps); |
468 QSetIterator<int> i(caps); |
458 while (i.hasNext()) |
469 while (i.hasNext()) |
459 qDebug() << "Has capability " << i.next(); |
470 qDebug() << "Has capability " << i.next(); |
460 XQSERVICE_DEBUG_PRINT("\tRequest info: embed=%d,sync=%d", info.isEmbedded(), info.isSynchronous()); |
471 XQSERVICE_DEBUG_PRINT("\tRequest info: embed=%d,sync=%d", info.isEmbedded(), info.isSynchronous()); |
461 |
472 |
|
473 bool isAsync = !info.isSynchronous(); |
|
474 |
462 QString label = "NewDialer::dial:\n"; |
475 QString label = "NewDialer::dial:\n"; |
463 label += QString("number=%1\n").arg(number); |
476 label += QString("number=%1\n").arg(number); |
464 label += QString("asyncAnswer=%1\n").arg(asyncAnswer); |
477 label += QString("async=%1\n").arg(isAsync); |
465 |
478 |
466 connect(this, SIGNAL(returnValueDelivered()), this, SLOT(handleAnswerDelivered())); |
479 connect(this, SIGNAL(returnValueDelivered()), this, SLOT(handleAnswerDelivered())); |
467 |
480 |
468 mNumber = number ; |
481 mNumber = number ; |
469 mServiceApp->setLabelNumber(label, number); |
482 mServiceApp->setLabelNumber(label, number); |
470 int ret = 0; |
483 int ret = 0; |
471 if (asyncAnswer) |
484 if (isAsync) |
472 { |
485 { |
473 mAsyncReqIds.insertMulti(info.clientSecureId(), setCurrentRequestAsync()); |
486 mAsyncReqIds.insertMulti(info.clientSecureId(), setCurrentRequestAsync()); |
474 connect(this, SIGNAL(clientDisconnected()), this, SLOT(handleClientDisconnect())); |
487 connect(this, SIGNAL(clientDisconnected()), this, SLOT(handleClientDisconnect())); |
475 } |
488 } |
476 else |
489 else |
504 |
517 |
505 } |
518 } |
506 |
519 |
507 QVariant NewDialerService::testVariant(QVariant variant) |
520 QVariant NewDialerService::testVariant(QVariant variant) |
508 { |
521 { |
|
522 XQRequestInfo info = requestInfo(); |
|
523 QString testCase = (info.info(TESTCASE_INFO_KEY)).toString(); |
|
524 XQSERVICE_DEBUG_PRINT("XQTESTER serviceapp,%s,NewDialerService::testVariant", qPrintable(testCase)); |
|
525 |
509 XQSERVICE_DEBUG_PRINT("NewDialerService::testVariant::variant(%d,%d,%s)", |
526 XQSERVICE_DEBUG_PRINT("NewDialerService::testVariant::variant(%d,%d,%s)", |
510 variant.type(), variant.userType(), variant.typeName()); |
527 variant.type(), variant.userType(), variant.typeName()); |
511 XQSERVICE_DEBUG_PRINT("NewDialerService::testVariant::variant value=%s", qPrintable(variant.toString())); |
528 XQSERVICE_DEBUG_PRINT("NewDialerService::testVariant::variant value=%s", qPrintable(variant.toString())); |
512 |
529 |
513 if (variant.typeName() == QLatin1String("QStringList")) |
530 if (variant.typeName() == QLatin1String("QStringList")) |
719 return view(uri, true); |
736 return view(uri, true); |
720 } |
737 } |
721 |
738 |
722 bool UriService::view(const QString& uri, bool retValue) |
739 bool UriService::view(const QString& uri, bool retValue) |
723 { |
740 { |
724 XQSERVICE_DEBUG_PRINT("UriService::view(2)"); |
741 XQRequestInfo info = requestInfo(); |
725 QString label = "IUri::view\n:"; |
742 QString testCase = (info.info(TESTCASE_INFO_KEY)).toString(); |
|
743 XQSERVICE_DEBUG_PRINT("XQTESTER serviceapp,%s,UriService::view", qPrintable(testCase)); |
|
744 |
|
745 QString label = "IUriView::view\n:"; |
726 label += QString ("Uri=%1\n").arg(uri); |
746 label += QString ("Uri=%1\n").arg(uri); |
727 label += QString ("retValue=%1\n").arg(retValue); |
747 label += QString ("retValue=%1\n").arg(retValue); |
728 QString param = QString ("retValue=%1\n").arg(retValue); |
748 QString param = QString ("retValue=%1\n").arg(retValue); |
729 |
749 |
730 XQRequestInfo info = requestInfo(); |
750 bool isAsync = !info.isSynchronous();; |
731 bool asyncAnswer = !info.isSynchronous();; |
|
732 connect(this, SIGNAL(returnValueDelivered()), this, SLOT(handleAnswerDelivered())); |
751 connect(this, SIGNAL(returnValueDelivered()), this, SLOT(handleAnswerDelivered())); |
733 |
752 |
734 mRetValue = retValue; |
753 mRetValue = retValue; |
735 mServiceApp->setLabelNumber(label,param); |
754 mServiceApp->setLabelNumber(label,param); |
736 if (asyncAnswer) |
755 if (isAsync) |
737 { |
756 { |
738 mAsyncReqIds.insertMulti(info.clientSecureId(), setCurrentRequestAsync()); |
757 mAsyncReqIds.insertMulti(info.clientSecureId(), setCurrentRequestAsync()); |
739 connect(this, SIGNAL(clientDisconnected()), this, SLOT(handleClientDisconnect())); |
758 connect(this, SIGNAL(clientDisconnected()), this, SLOT(handleClientDisconnect())); |
740 } |
759 } |
741 |
760 |
796 return view(uri, true); |
815 return view(uri, true); |
797 } |
816 } |
798 |
817 |
799 bool NewUriService::view(const QString& uri, bool retValue) |
818 bool NewUriService::view(const QString& uri, bool retValue) |
800 { |
819 { |
801 XQSERVICE_DEBUG_PRINT("NewUriService::view(2)"); |
820 XQRequestInfo info = requestInfo(); |
802 QString label = "New IUri::view\n:"; |
821 QString testCase = (info.info(TESTCASE_INFO_KEY)).toString(); |
|
822 XQSERVICE_DEBUG_PRINT("XQTESTER serviceapp,%s,NewUriService::view", qPrintable(testCase)); |
|
823 |
|
824 QString label = "New IUriView::view\n:"; |
803 label += QString ("Uri=%1\n").arg(uri); |
825 label += QString ("Uri=%1\n").arg(uri); |
804 label += QString ("retValue=%1\n").arg(retValue); |
826 label += QString ("retValue=%1\n").arg(retValue); |
805 QString param = QString ("retValue=%1\n").arg(retValue); |
827 QString param = QString ("retValue=%1\n").arg(retValue); |
806 |
828 |
807 XQRequestInfo info = requestInfo(); |
829 bool isAsync = !info.isSynchronous();; |
808 bool asyncAnswer = !info.isSynchronous();; |
|
809 connect(this, SIGNAL(returnValueDelivered()), this, SLOT(handleAnswerDelivered())); |
830 connect(this, SIGNAL(returnValueDelivered()), this, SLOT(handleAnswerDelivered())); |
810 |
831 |
811 mRetValue = retValue; |
832 mRetValue = retValue; |
812 mServiceApp->setLabelNumber(label,param); |
833 mServiceApp->setLabelNumber(label,param); |
813 if (asyncAnswer) |
834 if (isAsync) |
814 { |
835 { |
815 mAsyncReqIds.insertMulti(info.clientSecureId(), setCurrentRequestAsync()); |
836 mAsyncReqIds.insertMulti(info.clientSecureId(), setCurrentRequestAsync()); |
816 connect(this, SIGNAL(clientDisconnected()), this, SLOT(handleClientDisconnect())); |
837 connect(this, SIGNAL(clientDisconnected()), this, SLOT(handleClientDisconnect())); |
817 } |
838 } |
818 |
839 |
867 } |
888 } |
868 } |
889 } |
869 |
890 |
870 bool FileService::view(QString file) |
891 bool FileService::view(QString file) |
871 { |
892 { |
872 XQSERVICE_DEBUG_PRINT("FileService::view(QString)"); |
893 XQRequestInfo info = requestInfo(); |
873 QString label = "IFile::view\n:"; |
894 QString testCase = (info.info(TESTCASE_INFO_KEY)).toString(); |
|
895 XQSERVICE_DEBUG_PRINT("XQTESTER serviceapp,%s,FileService::view", qPrintable(testCase)); |
|
896 |
|
897 QString label = "IFileView::view\n:"; |
874 QString param = QString ("File=%1\n").arg(file); |
898 QString param = QString ("File=%1\n").arg(file); |
875 |
899 |
876 XQRequestInfo info = requestInfo(); |
900 bool isAsync = !info.isSynchronous();; |
877 bool asyncAnswer = !info.isSynchronous();; |
|
878 connect(this, SIGNAL(returnValueDelivered()), this, SLOT(handleAnswerDelivered())); |
901 connect(this, SIGNAL(returnValueDelivered()), this, SLOT(handleAnswerDelivered())); |
879 |
902 |
880 mServiceApp->setLabelNumber(label,param); |
903 mServiceApp->setLabelNumber(label,param); |
881 if (asyncAnswer) |
904 if (isAsync) |
882 { |
905 { |
883 mAsyncReqIds.insertMulti(info.clientSecureId(), setCurrentRequestAsync()); |
906 mAsyncReqIds.insertMulti(info.clientSecureId(), setCurrentRequestAsync()); |
884 connect(this, SIGNAL(clientDisconnected()), this, SLOT(handleClientDisconnect())); |
907 connect(this, SIGNAL(clientDisconnected()), this, SLOT(handleClientDisconnect())); |
885 } |
908 } |
886 |
909 |
906 sf.close(); |
929 sf.close(); |
907 delete data; |
930 delete data; |
908 } |
931 } |
909 |
932 |
910 XQRequestInfo info = requestInfo(); |
933 XQRequestInfo info = requestInfo(); |
911 bool asyncAnswer = !info.isSynchronous();; |
934 bool isAsync = !info.isSynchronous();; |
912 |
935 |
913 mServiceApp->setLabelNumber(label,param); |
936 mServiceApp->setLabelNumber(label,param); |
914 if (asyncAnswer) |
937 if (isAsync) |
915 { |
938 { |
916 mAsyncReqIds.insertMulti(info.clientSecureId(), setCurrentRequestAsync()); |
939 mAsyncReqIds.insertMulti(info.clientSecureId(), setCurrentRequestAsync()); |
917 connect(this, SIGNAL(clientDisconnected()), this, SLOT(handleClientDisconnect())); |
940 connect(this, SIGNAL(clientDisconnected()), this, SLOT(handleClientDisconnect())); |
918 } |
941 } |
919 return true; |
942 return true; |
969 } |
992 } |
970 } |
993 } |
971 |
994 |
972 bool NewFileService::view(QString file) |
995 bool NewFileService::view(QString file) |
973 { |
996 { |
974 XQSERVICE_DEBUG_PRINT("NewFileService::view(QString)"); |
997 XQRequestInfo info = requestInfo(); |
975 QString label = "New IFile::view\n:"; |
998 QString testCase = (info.info(TESTCASE_INFO_KEY)).toString(); |
|
999 XQSERVICE_DEBUG_PRINT("XQTESTER serviceapp,%s,NewFileService::view", qPrintable(testCase)); |
|
1000 |
|
1001 QString label = "New IFileView::view\n:"; |
976 QString param = QString ("File=%1\n").arg(file); |
1002 QString param = QString ("File=%1\n").arg(file); |
977 |
1003 |
978 XQRequestInfo info = requestInfo(); |
1004 bool isAsync = !info.isSynchronous();; |
979 bool asyncAnswer = !info.isSynchronous();; |
|
980 connect(this, SIGNAL(returnValueDelivered()), this, SLOT(handleAnswerDelivered())); |
1005 connect(this, SIGNAL(returnValueDelivered()), this, SLOT(handleAnswerDelivered())); |
981 |
1006 |
982 mServiceApp->setLabelNumber(label,param); |
1007 mServiceApp->setLabelNumber(label,param); |
983 if (asyncAnswer) |
1008 if (isAsync) |
984 { |
1009 { |
985 mAsyncReqIds.insertMulti(info.clientSecureId(), setCurrentRequestAsync()); |
1010 mAsyncReqIds.insertMulti(info.clientSecureId(), setCurrentRequestAsync()); |
986 connect(this, SIGNAL(clientDisconnected()), this, SLOT(handleClientDisconnect())); |
1011 connect(this, SIGNAL(clientDisconnected()), this, SLOT(handleClientDisconnect())); |
987 } |
1012 } |
988 |
1013 |
1008 sf.close(); |
1033 sf.close(); |
1009 delete data; |
1034 delete data; |
1010 } |
1035 } |
1011 |
1036 |
1012 XQRequestInfo info = requestInfo(); |
1037 XQRequestInfo info = requestInfo(); |
1013 bool asyncAnswer = !info.isSynchronous();; |
1038 bool isAsync = !info.isSynchronous();; |
1014 |
1039 |
1015 mServiceApp->setLabelNumber(label,param); |
1040 mServiceApp->setLabelNumber(label,param); |
1016 if (asyncAnswer) |
1041 if (isAsync) |
1017 { |
1042 { |
1018 mAsyncReqIds.insertMulti(info.clientSecureId(), setCurrentRequestAsync()); |
1043 mAsyncReqIds.insertMulti(info.clientSecureId(), setCurrentRequestAsync()); |
1019 connect(this, SIGNAL(clientDisconnected()), this, SLOT(handleClientDisconnect())); |
1044 connect(this, SIGNAL(clientDisconnected()), this, SLOT(handleClientDisconnect())); |
1020 } |
1045 } |
1021 return true; |
1046 return true; |