← Back to branch summary

~ci-train-bot/ubuntu-app-launch/ubuntu-app-launch-ubuntu-zesty-2384

« back to all changes in this revision

Viewing changes to tests/libual-test.cc

  • Committer: Bileto Bot
  • Author(s): Ted Gould
  • Date: 2017-01-24 14:14:25 UTC
  • mfrom: (265.5.15 signal-instances)
  • Revision ID: ci-train-bot@canonical.com-20170124141425-9m2d50jkjptte6r7
Make the signals support finding the instance of the application (LP: #1589637)

Approved by: Marcus Tomlinson

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/libual-test.cc
752
752
                "/", /* path */
753
753
                "com.canonical.UbuntuAppLaunch", /* interface */
754
754
                "UnityStartingBroadcast", /* signal */
755
 
                g_variant_new("(s)", "com.test.good_application_1.2.3"), /* params, the same */
 
755
                g_variant_new("(ss)", "com.test.good_application_1.2.3", "goodinstance"), /* params, the same */
756
756
                NULL);
757
757
 
758
758
        EXPECT_EVENTUALLY_EQ("com.test.good_application_1.2.3", last_observer);
817
817
                        "/", /* path */
818
818
                        "com.canonical.UbuntuAppLaunch", /* interface */
819
819
                        "UnityResumeResponse", /* signal */
820
 
                        g_variant_new("(s)", "com.test.good_application_1.2.3"), /* params, the same */
 
820
                        g_variant_new("(ss)", "com.test.good_application_1.2.3", "goodinstance"), /* params, the same */
821
821
                        NULL);
822
822
 
823
823
                pause(50); /* Ensure all the events come through */
974
974
                "/", /* path */
975
975
                "com.canonical.UbuntuAppLaunch", /* interface */
976
976
                "ApplicationFailed", /* signal */
977
 
                g_variant_new("(ss)", "com.test.good_application_1.2.3", "crash"), /* params, the same */
978
 
                NULL);
979
 
 
980
 
        EXPECT_EVENTUALLY_EQ("com.test.good_application_1.2.3", last_observer);
981
 
 
982
 
        last_observer.clear();
983
 
 
984
 
        g_dbus_connection_emit_signal(session,
985
 
                NULL, /* destination */
986
 
                "/", /* path */
987
 
                "com.canonical.UbuntuAppLaunch", /* interface */
988
 
                "ApplicationFailed", /* signal */
989
 
                g_variant_new("(ss)", "com.test.good_application_1.2.3", "blahblah"), /* params, the same */
990
 
                NULL);
991
 
 
992
 
        EXPECT_EVENTUALLY_EQ("com.test.good_application_1.2.3", last_observer);
993
 
 
994
 
        last_observer.clear();
995
 
 
996
 
        g_dbus_connection_emit_signal(session,
997
 
                NULL, /* destination */
998
 
                "/", /* path */
999
 
                "com.canonical.UbuntuAppLaunch", /* interface */
1000
 
                "ApplicationFailed", /* signal */
1001
 
                g_variant_new("(ss)", "com.test.good_application_1.2.3", "start-failure"), /* params, the same */
 
977
                g_variant_new("(sss)", "com.test.good_application_1.2.3", "goodinstance", "crash"), /* params, the same */
 
978
                NULL);
 
979
 
 
980
        EXPECT_EVENTUALLY_EQ("com.test.good_application_1.2.3", last_observer);
 
981
 
 
982
        last_observer.clear();
 
983
 
 
984
        g_dbus_connection_emit_signal(session,
 
985
                NULL, /* destination */
 
986
                "/", /* path */
 
987
                "com.canonical.UbuntuAppLaunch", /* interface */
 
988
                "ApplicationFailed", /* signal */
 
989
                g_variant_new("(sss)", "com.test.good_application_1.2.3", "goodinstance", "blahblah"), /* params, the same */
 
990
                NULL);
 
991
 
 
992
        EXPECT_EVENTUALLY_EQ("com.test.good_application_1.2.3", last_observer);
 
993
 
 
994
        last_observer.clear();
 
995
 
 
996
        g_dbus_connection_emit_signal(session,
 
997
                NULL, /* destination */
 
998
                "/", /* path */
 
999
                "com.canonical.UbuntuAppLaunch", /* interface */
 
1000
                "ApplicationFailed", /* signal */
 
1001
                g_variant_new("(sss)", "com.test.good_application_1.2.3", "goodinstance", "start-failure"), /* params, the same */
1002
1002
                NULL);
1003
1003
 
1004
1004
        EXPECT_EVENTUALLY_EQ(true, last_observer.empty());