FCL/sf/app/recents: comparison logsui/logsapp/tsrc/ut

equal deleted inserted replaced

-:e52d42f9500c
+:41c0a814d878
 #include <hbinstance.h>
 #include "hbstubs_helper.h"
 #include <hbmessagebox.h>
 #include <hbapplication.h>
 #include <hbcolorscheme.h>
+#include <hbview.h>
+#include <hbactivitymanager.h>
 #include <QCoreApplication>
+#include <QApplication>
 #include <QTimer>
 #include <QGesture>
 int actionCount = 0;
 Qt::Orientation windowOrientation = Qt::Vertical;
 bool testQuitCalled = false;
 Qt::GestureState testState = Qt::NoGesture;
 bool testIsWidgetOpen = false;
 bool testIsWidgetRaised = false;
 QColor testColor = Qt::white;
+QList<HbView *> testViews;
+QList<QVariantHash> testActivities;
+HbActivityManager testActivityManager;
+Hb::ActivationReason testActivationReason = Hb::ActivationReasonNormal;
+QString testActivityId = "LogsViewMatches";
 void HbStubHelper::reset()
 {
 actionCount = 0;
 testMenuShown = false;
 testSingleShotTimer = false;
 testQuitCalled = false;
 testIsWidgetRaised = false;
 testDialogShown = false;
 testColor = Qt::white;
+testActivationReason = Hb::ActivationReasonNormal;
+testActivityId = "LogsViewMatches";
+testActivities.clear();
 }
 int HbStubHelper::widgetActionsCount()
 void HbStubHelper::setColorScheme(QColor col)
 {
 testColor = col;
 }
+void HbStubHelper::setActivityReason(Hb::ActivationReason reason)
+{
+testActivationReason = reason;
+}
+void HbStubHelper::setActivityId(QString activityId)
+{
+testActivityId = activityId;
+}
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//
+QCoreApplication::QCoreApplication(int &argc, char **argv)
+{
+}
+void QCoreApplication::quit()
+{
+testQuitCalled = true;
+}
+QApplication::QApplication(QApplication::QS60MainApplicationFactory factory, int &argc, char **argv, int version)
+: QCoreApplication(argc, argv)
+{
+}
+QApplication::~QApplication()
+{
+}
 bool QGraphicsWidget::close()
 {
 testIsWidgetOpen = false;
 }
 void QWidget::raise()
 {
 testIsWidgetRaised = true;
 }
-// -----------------------------------------------------------------------------
+QPixmap QPixmap::grabWidget(QWidget *widget, const QRect &rect)
-//
+{
-// -----------------------------------------------------------------------------
+Q_UNUSED(widget);
-//
+Q_UNUSED(rect);
-HbApplication::HbApplication(int &/*argc*/, char */*argv*/[])
+return QPixmap();
+}
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//
+HbActivityManager::HbActivityManager(QObject *parent) : QObject(parent)
+{
+}
+HbActivityManager::~HbActivityManager()
+{
+}
+bool HbActivityManager::addActivity(const QString &activityId, const QVariant &data, const QVariantHash &parameters)
+{
+testActivities.append(parameters);
+}
+bool HbActivityManager::removeActivity(const QString &activityId)
+{
+if ( !testActivities.isEmpty() ){
+testActivities.takeFirst();
+}
+}
+QList<QVariantHash> HbActivityManager::activities() const
+{
+return testActivities;
+}
+bool HbActivityManager::waitActivity()
+{
+return true;
+}
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//
+HbApplication::HbApplication(int &argc, char *argv[]) :
+QApplication(0, argc, argv, 0)
 {
 }
 HbApplication::~HbApplication()
 {
 void HbApplication::quit()
 {
 testQuitCalled = true;
 }
-void QCoreApplication::quit()
+HbActivityManager *HbApplication::activityManager()
 {
-testQuitCalled = true;
+return &testActivityManager;
+}
+Hb::ActivationReason HbApplication::activateReason() const
+{
+return testActivationReason;
+}
+QVariantHash HbApplication::activateParams() const
+{
+return QVariantHash();
+}
+QString HbApplication::activateId() const
+{
+return testActivityId;
+}
+QVariant HbApplication::activateData()
+{
+return QVariant();
 }
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
 {
 Q_UNUSED(parent)
 Q_UNUSED(windowFlags)
 testViewCount = 0;
 testWindow = this;
+testViews.clear();
 }
 HbMainWindow::~HbMainWindow()
 {
 testWindow = 0;
 return windowOrientation;
 }
 QRectF HbMainWindow::layoutRect() const
 {
-return QRectF(0, 0, 100,100);
+if (windowOrientation == Qt::Vertical) {
+return QRectF(0, 0, 360, 640);
+} else {
+return QRectF(0, 0, 640, 360);
+}
 }
 HbView *HbMainWindow::addView(QGraphicsWidget *widget)
 {
-Q_UNUSED(widget)
 testViewCount++;
+testViews.append( static_cast<HbView*>(widget) );
 }
 void HbMainWindow::setCurrentView(HbView *view, bool animate, Hb::ViewSwitchFlags flags)
 {
 Q_UNUSED(animate)
 Q_UNUSED(flags)
 testView = view;
 }
-int HbMainWindow::viewCount() const
+QList<HbView *> HbMainWindow::views() const
 {
-return testViewCount;
+return testViews;
 }
 HbView *HbMainWindow::currentView() const
 {
 return testView;
 }
 } else if (string == "Cancel") {
 	selectedActionString = "secondary";
 }
 }
-HbAction *HbDialog::exec()
-{
-if (selectedActionString == "primary")	{
-return primaryAction();
-} else {
-return 0;
-}
-}
 void QTimer::singleShot(int msec, QObject *receiver, const char *member)
 {
 testSingleShotTimer = true;
 }

changeset 6	41c0a814d878
parent 4	e52d42f9500c
child 8	6c9acdc6adc0