From f93425d5b50863912a84dbfb7028eb4ff4554432 Mon Sep 17 00:00:00 2001 From: stubbfel Date: Fri, 18 Jul 2014 22:58:59 +0200 Subject: [PATCH 1/2] add configfiles --- src/config/__init__.py | 1 + src/config/config.py | 1 + src/feed/__init__.py | 1 + src/feed/feed.py | 1 + testenv/testfeeds/podcast/sbk-config.json | 0 testenv/tests/config/__init__.py | 1 + testenv/tests/config/testconfig.py | 12 +++++++++++ testenv/tests/feed/__init__.py | 1 + testenv/tests/feed/testfeed.py | 26 +++++++++++++++++++++++ 9 files changed, 44 insertions(+) create mode 100644 src/config/__init__.py create mode 100644 src/config/config.py create mode 100644 src/feed/__init__.py create mode 100644 src/feed/feed.py create mode 100644 testenv/testfeeds/podcast/sbk-config.json create mode 100644 testenv/tests/config/__init__.py create mode 100644 testenv/tests/config/testconfig.py create mode 100644 testenv/tests/feed/__init__.py create mode 100644 testenv/tests/feed/testfeed.py diff --git a/src/config/__init__.py b/src/config/__init__.py new file mode 100644 index 0000000..f8bf4e8 --- /dev/null +++ b/src/config/__init__.py @@ -0,0 +1 @@ +__author__ = 'dev' diff --git a/src/config/config.py b/src/config/config.py new file mode 100644 index 0000000..f8bf4e8 --- /dev/null +++ b/src/config/config.py @@ -0,0 +1 @@ +__author__ = 'dev' diff --git a/src/feed/__init__.py b/src/feed/__init__.py new file mode 100644 index 0000000..f8bf4e8 --- /dev/null +++ b/src/feed/__init__.py @@ -0,0 +1 @@ +__author__ = 'dev' diff --git a/src/feed/feed.py b/src/feed/feed.py new file mode 100644 index 0000000..f8bf4e8 --- /dev/null +++ b/src/feed/feed.py @@ -0,0 +1 @@ +__author__ = 'dev' diff --git a/testenv/testfeeds/podcast/sbk-config.json b/testenv/testfeeds/podcast/sbk-config.json new file mode 100644 index 0000000..e69de29 diff --git a/testenv/tests/config/__init__.py b/testenv/tests/config/__init__.py new file mode 100644 index 0000000..f8bf4e8 --- /dev/null +++ b/testenv/tests/config/__init__.py @@ -0,0 +1 @@ +__author__ = 'dev' diff --git a/testenv/tests/config/testconfig.py b/testenv/tests/config/testconfig.py new file mode 100644 index 0000000..ee73c95 --- /dev/null +++ b/testenv/tests/config/testconfig.py @@ -0,0 +1,12 @@ +__author__ = 'dev' + +import unittest + + +class MyTestCase(unittest.TestCase): + def test_something(self): + self.assertEqual(True, False) + + +if __name__ == '__main__': + unittest.main() diff --git a/testenv/tests/feed/__init__.py b/testenv/tests/feed/__init__.py new file mode 100644 index 0000000..f8bf4e8 --- /dev/null +++ b/testenv/tests/feed/__init__.py @@ -0,0 +1 @@ +__author__ = 'dev' diff --git a/testenv/tests/feed/testfeed.py b/testenv/tests/feed/testfeed.py new file mode 100644 index 0000000..1619356 --- /dev/null +++ b/testenv/tests/feed/testfeed.py @@ -0,0 +1,26 @@ +__author__ = 'dev' + +import unittest +from feed.feed import Feed + + +class TestFeed(unittest.TestCase): + + def test_load_new_feed(self, url): + self.assertTrue(False) + + def test_load_existing_feed(self, path): + self.assertTrue(False) + + def test_load_feed(self, path): + self.assertTrue(False) + + def test_setup_feed(self, name, url, feed_type): + self.assertTrue(False) + + def test_setup_feed(self, name, url, feed_type): + self.assertTrue(False) + + +if __name__ == '__main__': + unittest.main() From 17be6d4aff828d7284ebae7870e8f92cc4b68773 Mon Sep 17 00:00:00 2001 From: stubbfel Date: Fri, 18 Jul 2014 23:00:06 +0200 Subject: [PATCH 2/2] ad configes files --- src/config/config.py | 7 +++++ src/feed/feed.py | 5 ++++ testenv/testfeeds/podcast/sbk-config.json | 4 +++ testenv/tests/config/testconfig.py | 31 ++++++++++++++++++++--- testenv/tests/feed/testfeed.py | 2 -- 5 files changed, 44 insertions(+), 5 deletions(-) diff --git a/src/config/config.py b/src/config/config.py index f8bf4e8..23c211f 100644 --- a/src/config/config.py +++ b/src/config/config.py @@ -1 +1,8 @@ __author__ = 'dev' + +Config = { + "FeedLinkTypes" : {"application/x-bittorrent","mp3"}, + "FeedTypes" : {"podcast","rss"}, + "FeedStorageFolder" : "testfeeds", + "FeedStoragePrefix" : { "0" : "FeedTypes"} +} \ No newline at end of file diff --git a/src/feed/feed.py b/src/feed/feed.py index f8bf4e8..7118ff8 100644 --- a/src/feed/feed.py +++ b/src/feed/feed.py @@ -1 +1,6 @@ __author__ = 'dev' + +class Feed: + + def __init__(self): + self.valid_file_types = {"application/x-bittorrent","mp3"} \ No newline at end of file diff --git a/testenv/testfeeds/podcast/sbk-config.json b/testenv/testfeeds/podcast/sbk-config.json index e69de29..b59dcbe 100644 --- a/testenv/testfeeds/podcast/sbk-config.json +++ b/testenv/testfeeds/podcast/sbk-config.json @@ -0,0 +1,4 @@ +{ + "FeedUrl" : "http://www.staatsbuergerkunde-podcast.de/feed/mp3-rss/" + "LinkType" : "application/x-bittorrent" +} \ No newline at end of file diff --git a/testenv/tests/config/testconfig.py b/testenv/tests/config/testconfig.py index ee73c95..74d7927 100644 --- a/testenv/tests/config/testconfig.py +++ b/testenv/tests/config/testconfig.py @@ -1,11 +1,36 @@ __author__ = 'dev' import unittest +import os.path +from config.config import Config -class MyTestCase(unittest.TestCase): - def test_something(self): - self.assertEqual(True, False) +class TestConfig(unittest.TestCase): + + def test_key_not_exists(self): + value = Config.get("not_existing_config_key") + self.assertIsNone(value) + + def test_feed_types(self): + types = Config.get("FeedTypes") + self.assertIsNotNone(types) + self.assertIsInstance(types, set) + + def test_feed_link_types(self): + types = Config.get("FeedLinkTypes") + self.assertIsNotNone(types) + self.assertIsInstance(types, set) + + def test_feed_storage_folder(self): + path = Config.get("FeedStorageFolder") + self.assertIsNotNone(path) + self.assertIsInstance(path, str) + self.assertTrue(os.path.isdir(path)) + + def test_feed_storage_prefix(self): + prefix = Config.get("FeedStoragePrefix") + self.assertIsNotNone(prefix) + self.assertIsInstance(prefix, dict) if __name__ == '__main__': diff --git a/testenv/tests/feed/testfeed.py b/testenv/tests/feed/testfeed.py index 1619356..51ca99e 100644 --- a/testenv/tests/feed/testfeed.py +++ b/testenv/tests/feed/testfeed.py @@ -18,8 +18,6 @@ class TestFeed(unittest.TestCase): def test_setup_feed(self, name, url, feed_type): self.assertTrue(False) - def test_setup_feed(self, name, url, feed_type): - self.assertTrue(False) if __name__ == '__main__':