From 4a950cc35ddb80fcc0ed8f7682bc200207cb6d38 Mon Sep 17 00:00:00 2001 From: Fredrik Wendt Date: Tue, 8 Jun 2010 21:54:48 +0100 Subject: [PATCH] added new test suite that runs all automated tests Signed-off-by: Fredrik Wendt --- package/test/automatic_tests.py | 32 ++++++++++++++++++++++++++ package/test/integration/test_gravatar.py | 2 +- package/test/integration/test_linkedinapi.py | 2 +- package/test/integration/test_twitter.py | 2 +- package/test/unit/test_gravatar.py | 2 +- 5 files changed, 36 insertions(+), 4 deletions(-) create mode 100644 package/test/automatic_tests.py create mode 100644 package/test/integration/__init__.py create mode 100644 package/test/unit/__init__.py diff --git a/package/test/automatic_tests.py b/package/test/automatic_tests.py new file mode 100644 index 0000000..54ad88e --- /dev/null +++ b/package/test/automatic_tests.py @@ -0,0 +1,32 @@ +#!/usr/bin/python2.5 + +import unittest + +from unit.test_facebook import TestFacebookService +from unit.test_gravatar import TestGravatarService +from unit.test_linkedin import TestLinkedInService +from unit.test_twitter import TestTwitterService + +from integration.test_gravatar import IntegrationTestGravatarService +from integration.test_linkedinapi import IntegrationTestLinkedInApi +from integration.test_twitter import IntegrationTestTwitterService + +import integration + +class AutomaticTestsSuite(unittest.TestSuite): + + def suite(): + suite = unittest.TestSuite() + suite.addTest(unittest.makeSuite(TestFacebookService)) + suite.addTest(unittest.makeSuite(TestGravatarService)) + suite.addTest(unittest.makeSuite(TestLinkedInService)) + suite.addTest(unittest.makeSuite(TestTwitterService)) + + suite.addTest(unittest.makeSuite(IntegrationTestGravatarService)) + suite.addTest(unittest.makeSuite(IntegrationTestLinkedInApi)) + suite.addTest(unittest.makeSuite(IntegrationTestTwitterService)) + + + +if __name__ == '__main__': + unittest.main() diff --git a/package/test/integration/__init__.py b/package/test/integration/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/package/test/integration/test_gravatar.py b/package/test/integration/test_gravatar.py index 7d2617e..7a774d3 100644 --- a/package/test/integration/test_gravatar.py +++ b/package/test/integration/test_gravatar.py @@ -10,7 +10,7 @@ class FakeContact(): def get_name(self): return self.urls[0] -class TestGravatarService(unittest.TestCase): +class IntegrationTestGravatarService(unittest.TestCase): def setUp(self): self.testee = Service('maemohermes@wendt.se', 'b14ec179822b') diff --git a/package/test/integration/test_linkedinapi.py b/package/test/integration/test_linkedinapi.py index a713ae4..d2d7887 100644 --- a/package/test/integration/test_linkedinapi.py +++ b/package/test/integration/test_linkedinapi.py @@ -16,7 +16,7 @@ class FakeGConf(dict): def set_string(self, key, value): self.__setitem__(key, value) -class TestLinkedInApi(unittest.TestCase): +class IntegrationTestLinkedInApi(unittest.TestCase): def setUp(self): self.gconf = FakeGConf({ diff --git a/package/test/integration/test_twitter.py b/package/test/integration/test_twitter.py index 7f5a8af..cb6f3e0 100644 --- a/package/test/integration/test_twitter.py +++ b/package/test/integration/test_twitter.py @@ -3,7 +3,7 @@ from org.maemo.hermes.engine.names import canonical import unittest import twitter -class TestTwitterService(unittest.TestCase): +class IntegrationTestTwitterService(unittest.TestCase): """Tests that needs human interaction (such as for authorization)""" def setUp(self): diff --git a/package/test/unit/__init__.py b/package/test/unit/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/package/test/unit/test_gravatar.py b/package/test/unit/test_gravatar.py index eab4873..cd612ff 100644 --- a/package/test/unit/test_gravatar.py +++ b/package/test/unit/test_gravatar.py @@ -13,7 +13,7 @@ class FakeContact(): class TestGravatarService(unittest.TestCase): def setUp(self): - self._setUp('maemohermes@wendt.se', 'b14ec179822b') + self._setUp('', '') def test_that_a_person_with_two_addresses_and_one_gravatar_works(self): self._fake_server_response({self.missing_address: None, -- 1.7.9.5