← Back to branch summary

~ted/ubuntu-app-launch/snappy-backend-no-snap

« back to all changes in this revision

Viewing changes to tests/zg-test.cc

Updating to trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/zg-test.cc
49
49
 
50
50
static void zg_state_changed(DbusTestTask* task, DbusTestTaskState state, gpointer user_data)
51
51
{
52
 
    DbusTestTaskState* outstate = (DbusTestTaskState*)user_data;
 
52
    auto outstate = reinterpret_cast<DbusTestTaskState*>(user_data);
53
53
    *outstate = state;
54
54
}
55
55
 
68
68
 
69
69
    DbusTestProcess* zgevent = dbus_test_process_new(ZG_EVENT_TOOL);
70
70
    dbus_test_process_append_param(zgevent, "open");
71
 
    g_setenv("APP_ID", "foo", 1);
 
71
    g_setenv("APP_ID", "foo", TRUE);
72
72
    dbus_test_task_set_wait_for(DBUS_TEST_TASK(zgevent), "org.gnome.zeitgeist.Engine");
73
73
    dbus_test_task_set_name(DBUS_TEST_TASK(zgevent), "ZGEvent");
74
74
    DbusTestTaskState zgevent_state = DBUS_TEST_TASK_STATE_INIT;
87
87
    const DbusTestDbusMockCall* calls =
88
88
        dbus_test_dbus_mock_object_get_method_calls(mock, obj, "InsertEvents", &numcalls, NULL);
89
89
 
90
 
    ASSERT_NE(calls, nullptr);
91
 
    ASSERT_EQ(numcalls, 1);
 
90
    ASSERT_NE(nullptr, calls);
 
91
    ASSERT_EQ(1, numcalls);
92
92
 
93
93
    g_object_unref(zgevent);
94
94
    g_object_unref(mock);
112
112
 
113
113
    DbusTestProcess* zgevent = dbus_test_process_new(ZG_EVENT_TOOL);
114
114
    dbus_test_process_append_param(zgevent, "close");
115
 
    g_setenv("APP_ID", "foo", 1);
 
115
    g_setenv("APP_ID", "foo", TRUE);
116
116
    dbus_test_task_set_wait_for(DBUS_TEST_TASK(zgevent), "org.gnome.zeitgeist.Engine");
117
117
    dbus_test_task_set_name(DBUS_TEST_TASK(zgevent), "ZGEvent");
118
118
    DbusTestTaskState zgevent_state = DBUS_TEST_TASK_STATE_INIT;
121
121
 
122
122
    dbus_test_service_add_task(service, DBUS_TEST_TASK(zgevent));
123
123
 
124
 
    guint64 start = g_get_monotonic_time();
125
 
 
126
124
    dbus_test_service_start_tasks(service);
127
125
    grabBus();
128
126
 
129
127
    EXPECT_EVENTUALLY_EQ(DBUS_TEST_TASK_STATE_FINISHED, zgevent_state);
130
128
 
131
 
    guint64 end = g_get_monotonic_time();
132
 
 
133
 
    /* Fourteen seconds to do a two second op -- Jenkins is slow */
134
 
    EXPECT_LT(end - start, 14 * 1000 * 1000);
135
 
 
136
129
    g_object_unref(zgevent);
137
130
    g_object_unref(mock);
138
131
    g_object_unref(service);