@@ -20,18 +20,19 @@ class AbstractClientTest < Test::Unit::TestCase assert_resets_client client.process_connect assert_equal [:client_connected, {}], client.dispatched_events.first + assert_dispatched :client_connected, 0, {} end should "dispatch :client_connected as the first event on process_connect" do assert_resets_client client.default_channels = ["#awesome", "#rock"] client.process_connect - assert_dispatched :client_connected, -2 + assert_dispatched :client_connected, -2, {} assert_dispatched :outgoing_nick, -1 - assert_equal 2, client.outgoing_commands.length + assert_equal 2, client.outgoing_commands.length assert_equal "NICK Haysoos\r\n", client.outgoing_commands[0] - assert_send_line "NICK Haysoos\r\n", 0 - assert_send_line "USER DemoUser 0 \* :Demo Users Name\r\n", 1 + assert_sent_line "NICK Haysoos\r\n", 0 + assert_sent_line "USER DemoUser 0 \* :Demo Users Name\r\n", 1 end should "dispatch :client_disconnect on process_disconnect" do @@ -50,7 +51,7 @@ class AbstractClientTest < Test::Unit::TestCase should "add an :incoming_line event for each incoming line" do assert_resets_client client.receive_line "SOME RANDOM LINE THAT HAS ZERO ACTUAL USE" - assert_equal [:incoming_line, {:line => "SOME RANDOM LINE THAT HAS ZERO ACTUAL USE"}], client.dispatched_events.first + assert_dispatched :incoming_line, 0, :line => "SOME RANDOM LINE THAT HAS ZERO ACTUAL USE" end teardown do test/abstract_client_test.rb @@ -44,8 +44,11 @@ class Test::Unit::TestCase return klass end - def assert_dispatched(name, position = -1) - assert_equal name, client.dispatched_events[position].first + def assert_dispatched(name, position = -1, opts = nil) + res = client.dispatched_events[position] + assert !res.nil? + assert_equal name, res[0] + assert_equal opts, res[1] if !opts.nil? end def assert_sent_line(line, position = -1) test/test_helper.rb 4479d9f97d1c37f5c84680f97947a301630fc674 Darcy Laycock sutto@sutto.net http://github.com/Sutto/marvin/commit/298fe7ee8369504b369e33111a9e49a37ad926fe 298fe7ee8369504b369e33111a9e49a37ad926fe 2009-09-10T07:25:27-07:00 2009-09-10T07:25:27-07:00 More assertion love 24cb2cc381411f2dbcded411847124ab90078499 Darcy Laycock sutto@sutto.net