diff -r 8ad6c097bc5b -r b381eaa774ab tests/smstrade.py --- a/tests/smstrade.py Thu Feb 23 16:59:49 2012 +0100 +++ b/tests/smstrade.py Sat Feb 25 16:12:07 2012 +0100 @@ -13,14 +13,16 @@ class TestSMStradeProvider(unittest.TestCase): def getProvider(self, c=None): - ret={"key":"XXXXXX", + _c={"key":"XXXXXXXX", "typ":"smstrade", } if c: - ret.update(c) + _c.update(c) - return Smstrade("test",ret.items()) + ret = Smstrade("test") + ret.load(_c.items()) + return ret @patch("urllib.urlopen") def testSendSMS(self,mock_urlopen): @@ -28,7 +30,7 @@ f.readlines.return_value = ["100","12345678","0.055","1"] mock_urlopen.return_value = f - params = ["key=XXXXXX","to=00491701234567", "message=Hello+World", "route=gold", "message_id=1", "cost=1","count=1",'charset=utf-8'] + params = ["key=XXXXXXXX","to=00491701234567", "message=Hello+World", "route=gold", "message_id=1", "cost=1","count=1",'charset=utf-8'] params.sort() p=self.getProvider() @@ -49,11 +51,10 @@ testStatusCode.todo = "to implement" def testNeededOption(self): - c={"key":"XXXXXXXX","typ":"smstrade"} - s=Smstrade("test",c.items()) + s= self.getProvider() self.assertEqual(s.key, "XXXXXXXX") - self.assertRaises(NeededOption,Smstrade,"test",[]) + self.assertRaises(NeededOption, s.load,[]) def testSendFunc(self): s = self.getProvider()