Revision: 90590508ce88
Author: Janne Härkönen <[email protected]>
Date: Wed Jun 15 08:53:17 2011
Log: fixed importer tests after cleanup
http://code.google.com/p/robotframework/source/detail?r=90590508ce88
Modified:
/utest/running/test_importer.py
=======================================
--- /utest/running/test_importer.py Wed Aug 5 06:04:14 2009
+++ /utest/running/test_importer.py Wed Jun 15 08:53:17 2011
@@ -1,24 +1,24 @@
import unittest
-from robot.running.importer import _LibraryCache
+from robot.running.importer import ImportCache
from robot.utils.asserts import *
class TestLibraryCache(unittest.TestCase):
def setUp(self):
- self.cache = _LibraryCache()
+ self.cache = ImportCache()
self.cache[('lib', ['a1', 'a2'])] = 'Library'
self.cache['res'] = 'Resource'
-
+
def test_add_library(self):
- assert_equals(self.cache._keys, [('lib', ['a1', 'a2']), 'res'])
- assert_equals(self.cache._libs, ['Library', 'Resource'])
+ assert_equals(self.cache._keys, [['lib', ['a1', 'a2']], 'res'])
+ assert_equals(self.cache._items, ['Library', 'Resource'])
def test_get_existing_library(self):
assert_equals(self.cache['res'], 'Resource')
- assert_equals(self.cache[('lib', ['a1', 'a2'])], 'Library')
- assert_equals(self.cache[('lib', ['a1', 'a2'])], 'Library')
+ assert_equals(self.cache[('lib', ['a1', 'a2'])], 'Library')
+ assert_equals(self.cache[('lib', ['a1', 'a2'])], 'Library')
assert_equals(self.cache['res'], 'Resource')
def test_get_non_existing_library(self):
@@ -26,10 +26,10 @@
assert_raises(KeyError, self.cache.__getitem__, ('lib1',
['wrong']))
def test_has_library(self):
- assert_true(self.cache.has_key(('lib', ['a1', 'a2'])))
- assert_false(self.cache.has_key(('lib', ['a1', 'a2', 'wrong'])))
- assert_false(self.cache.has_key('nonex'))
-
+ assert_true(('lib', ['a1', 'a2']) in self.cache)
+ assert_false(('lib', ['a1', 'a2', 'wrong']) in self.cache)
+ assert_false('nonex' in self.cache)
+
if __name__ == '__main__':
unittest.main()
