Skip to content

Commit

Permalink
Add messages
Browse files Browse the repository at this point in the history
  • Loading branch information
@jeremypw
jeremypw committed Nov 24, 2024
1 parent 848360d commit cfe960c
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 42 deletions.
8 changes: 6 additions & 2 deletions src/Application.vala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ stdout.printf (" options lookup OPTION_REMAINING \n");
options.insert ("commandline", "^&ay", commandline.escape ());
}

stdout.printf (" return -1 \n");
stdout.printf (" return -1 from handle_local_options \n");
return -1;
}

Expand Down Expand Up @@ -233,8 +233,11 @@ stdout.printf (" return -1 \n");
protected override void startup () {
stdout.printf (" App startup \n");
base.startup ();
stdout.printf (" after base startup \n");
Granite.init ();
stdout.printf (" after Granite init \n");
Adw.init ();
stdout.printf (" after Adw init \n");

saved_state = new GLib.Settings ("io.elementary.terminal.saved-state");
settings = new GLib.Settings ("io.elementary.terminal.settings");
Expand All @@ -257,7 +260,7 @@ stdout.printf (" App startup \n");
);
}


stdout.printf (" adding actions \n");
var new_window_action = new SimpleAction ("new-window", null);
new_window_action.activate.connect (() => {
new MainWindow (this, active_window == null).present ();
Expand All @@ -271,6 +274,7 @@ stdout.printf (" App startup \n");

set_accels_for_action ("app.new-window", { "<Control><Shift>N" });
set_accels_for_action ("app.quit", { "<Control><Shift>Q" });
stdout.printf (" after startup \n");
}

protected override int command_line (ApplicationCommandLine command_line) {
Expand Down
80 changes: 40 additions & 40 deletions src/tests/Application.vala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ namespace Terminal.Test.Application {
application.close ();
});

stdout.printf ("# End of setup\n");
stdout.printf (" End of setup\n");
assert (application is GLib.Application);
}

Expand All @@ -44,30 +44,30 @@ assert (application is GLib.Application);

private void cli (string[] args, LocalOptionsCallback callback) {
setup ();
stdout.printf ("# cli after setup \n");
stdout.printf (" cli after setup \n");
application.handle_local_options.connect_after ((dict) => {
callback (dict);
application.quit ();
return 0;
});
stdout.printf ("# Run application \n");
stdout.printf (" Run application \n");
if (application.run (args) != 0) {
GLib.Test.fail ();
}
stdout.printf ("# End of cli \n");
stdout.printf (" End of cli \n");
}

private void option (string? options, string platform_data, CommandLineCallback callback) {
ulong oneshot = 0;
setup ();
stdout.printf ("# Enter option after setup\n");
message (" Enter option after setup\n");
assert (application != null);
assert (application is GLib.Application);
stdout.printf ("# Setup oneshot \n");
stdout.printf (" Setup oneshot \n");
oneshot = application.command_line.connect ((nil) => {
stdout.printf ("# oneshot callback\n");
stdout.printf (" oneshot callback\n");
application.disconnect (oneshot);
stdout.printf ("# calling commandline with nil\n");
stdout.printf (" calling commandline with nil\n");
// Opens primary instance (no options)
application.command_line (nil);
ApplicationCommandLine? cmdline = null;
Expand All @@ -77,26 +77,26 @@ stdout.printf ("# calling commandline with nil\n");
"options", new Variant.parsed (options),
"platform-data", new Variant.parsed (platform_data)
);
stdout.printf ("# calling commandline with cmdline\n");
stdout.printf (" calling commandline with cmdline\n");
// Invoke commandline again with required options
application.command_line (cmdline);
}

stdout.printf ("# about to iterate\n");
stdout.printf (" about to iterate\n");
iterate_context ();
stdout.printf ("# calling callback with cmdline\n");
stdout.printf (" calling callback with cmdline\n");
callback (cmdline);
stdout.printf ("# quit app\n");
stdout.printf (" quit app\n");
application.quit ();
return 0;
});

stdout.printf ("# Run application \n");
stdout.printf (" Run application \n");
if (application.run (null) != 0) {
stdout.printf ("# Test fail \n");
stdout.printf (" Test fail \n");
GLib.Test.fail ();
}
stdout.printf ("# End of option \n");
stdout.printf (" End of option \n");
}

private void action (string name, Variant? @value, ActivateCallback callback) {
Expand Down Expand Up @@ -131,27 +131,27 @@ stdout.printf ("# End of option \n");
Environment.set_current_dir (Environment.get_home_dir ());

// local command line: any instance from terminal
GLib.Test.add_func ("/application/cli/commandline", () => {
stdout.printf ("# Starting cli/commandline\n");
cli ({ "io.elementary.terminal", "--commandline=true" }, (dict) => {
stdout.printf ("# Callback cli 1\n");
assert_true ("commandline" in dict);
unowned var commandline = dict.lookup_value ("commandline", null).get_bytestring ();
assert_cmpstr (commandline, CompareOperator.EQ, "true");
});
// GLib.Test.add_func ("/application/cli/commandline", () => {
// stdout.printf (" Starting cli/commandline\n");
// cli ({ "io.elementary.terminal", "--commandline=true" }, (dict) => {
// stdout.printf (" Callback cli 1\n");
// assert_true ("commandline" in dict);
// unowned var commandline = dict.lookup_value ("commandline", null).get_bytestring ();
// assert_cmpstr (commandline, CompareOperator.EQ, "true");
// });

cli ({ "io.elementary.terminal", "-x", "echo", "-e", "true\tfalse" }, (dict) => {
assert_true ("commandline" in dict);
unowned var commandline = dict.lookup_value ("commandline", null).get_bytestring ();
assert_cmpstr (commandline, CompareOperator.EQ, "echo -e true\\tfalse");
});
// cli ({ "io.elementary.terminal", "-x", "echo", "-e", "true\tfalse" }, (dict) => {
// assert_true ("commandline" in dict);
// unowned var commandline = dict.lookup_value ("commandline", null).get_bytestring ();
// assert_cmpstr (commandline, CompareOperator.EQ, "echo -e true\\tfalse");
// });

cli ({ "io.elementary.terminal", "--commandline", "echo", "true" }, (dict) => {
assert_true ("commandline" in dict);
unowned var commandline = dict.lookup_value ("commandline", null).get_bytestring ();
assert_cmpstr (commandline, CompareOperator.EQ, "echo true");
});
});
// cli ({ "io.elementary.terminal", "--commandline", "echo", "true" }, (dict) => {
// assert_true ("commandline" in dict);
// unowned var commandline = dict.lookup_value ("commandline", null).get_bytestring ();
// assert_cmpstr (commandline, CompareOperator.EQ, "echo true");
// });
// });

// GLib.Test.add_func ("/application/cli/working-directory", () => {
// unowned var working_directory = GLib.Test.get_dir (GLib.Test.FileType.DIST);
Expand All @@ -168,17 +168,17 @@ stdout.printf ("# Callback cli 1\n");

// primary command line: first instance from terminal. any instance from dbus.
GLib.Test.add_func ("/application/command-line/new-tab", () => {
stdout.printf ("# Starting command-line/new-tab\n");
stdout.printf (" Starting command-line/new-tab\n");
int default_tabs = 0;
option (null, "@a{sv} {}", () => {
stdout.printf ("# null option callback\n");
stdout.printf (" null option callback\n");
unowned var window = (MainWindow) application.active_window;
assert_nonnull (window);
default_tabs = (int) window.notebook.n_pages;
});

// option ("{'new-tab':<true>}", "@a{sv} {}", () => {
// stdout.printf ("# new tab true callback\n");
// stdout.printf (" new tab true callback\n");
// unowned var window = (MainWindow) application.active_window;
// assert_nonnull (window);
// var n_tabs = (int) window.notebook.n_pages;
Expand All @@ -195,9 +195,9 @@ stdout.printf ("# null option callback\n");

// GLib.Test.add_func ("/application/command-line/new-window", () => {
// option ("{'new-window':<true>}", "@a{sv} {}", () => {
// stdout.printf ("# in callback\n");
// stdout.printf (" in callback\n");
// var n_windows = (int) application.get_windows ().length ();
// stdout.printf ("# got n windows %i\n", n_windows);
// stdout.printf (" got n windows %i\n", n_windows);
// assert_cmpint (n_windows, CompareOperator.EQ, 2);
// });

Expand All @@ -210,7 +210,7 @@ stdout.printf ("# null option callback\n");
// GLib.Test.add_func ("/application/command-line/execute", () => {
// int default_tabs = 0;
// option (null, "@a{sv} {}", () => {
// stdout.printf ("# null option callback\n");
// stdout.printf (" null option callback\n");
// unowned var window = (MainWindow) application.active_window;
// assert_nonnull (window);
// default_tabs = (int) window.notebook.n_pages;
Expand Down

0 comments on commit cfe960c

Please sign in to comment.