Merge 0.9->0.10

[prosody.git] / tests / test_core_s2smanager.lua

diff --git a/tests/test_core_s2smanager.lua b/tests/test_core_s2smanager.lua
index 219d9df5679dca57623fdee5dd072677784d33af..d2dbf8301565ef0384c12adf3b78ae148db72b7f 100644 (file)
--- a/tests/test_core_s2smanager.lua
+++ b/tests/test_core_s2smanager.lua
@@ -1,22 +1,14 @@
--- Prosody IM v0.2
--- Copyright (C) 2008 Matthew Wild
--- Copyright (C) 2008 Waqas Hussain
--- 
--- This program is free software; you can redistribute it and/or
--- modify it under the terms of the GNU General Public License
--- as published by the Free Software Foundation; either version 2
--- of the License, or (at your option) any later version.
--- 
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
--- 
--- You should have received a copy of the GNU General Public License
--- along with this program; if not, write to the Free Software
--- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+-- Prosody IM
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
+--
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
 --
 
+env = {
+       prosody = { events = require "util.events".new() };
+};
 
 function compare_srv_priorities(csp)
        local r1 = { priority = 10, weight = 0 }
@@ -24,7 +16,7 @@ function compare_srv_priorities(csp)
        local r3 = { priority = 1000, weight = 2 }
        local r4 = { priority = 1000, weight = 2 }
        local r5 = { priority = 1000, weight = 5 }
-       
+
        assert_equal(csp(r1, r1), false);
        assert_equal(csp(r1, r2), true);
        assert_equal(csp(r1, r3), true);
@@ -41,18 +33,18 @@ function compare_srv_priorities(csp)
        assert_equal(csp(r3, r2), false);
        assert_equal(csp(r3, r3), false);
        assert_equal(csp(r3, r4), false);
-       assert_equal(csp(r3, r5), true);
+       assert_equal(csp(r3, r5), false);
 
        assert_equal(csp(r4, r1), false);
        assert_equal(csp(r4, r2), false);
        assert_equal(csp(r4, r3), false);
        assert_equal(csp(r4, r4), false);
-       assert_equal(csp(r4, r5), true);
+       assert_equal(csp(r4, r5), false);
 
        assert_equal(csp(r5, r1), false);
        assert_equal(csp(r5, r2), false);
-       assert_equal(csp(r5, r3), false);
-       assert_equal(csp(r5, r4), false);
+       assert_equal(csp(r5, r3), true);
+       assert_equal(csp(r5, r4), true);
        assert_equal(csp(r5, r5), false);
 
 end