summaryrefslogtreecommitdiff
path: root/ick2/persistent_tests.py
diff options
context:
space:
mode:
Diffstat (limited to 'ick2/persistent_tests.py')
-rw-r--r--ick2/persistent_tests.py44
1 files changed, 13 insertions, 31 deletions
diff --git a/ick2/persistent_tests.py b/ick2/persistent_tests.py
index 802ca8b..3d72342 100644
--- a/ick2/persistent_tests.py
+++ b/ick2/persistent_tests.py
@@ -24,69 +24,51 @@ import ick2
class PersistentStateTestsMixIn:
- def get_token(self):
- raise NotImplementedError()
-
def test_has_no_resources_initially(self):
- token = self.get_token()
- self.assertEqual(self.state.get_resource_ids(token, 'silly'), [])
+ self.assertEqual(self.state.get_resource_ids('silly'), [])
def test_has_no_resource_initially(self):
- token = self.get_token()
with self.assertRaises(ick2.NotFound):
- self.state.get_resource(token, 'silly', '#1')
+ self.state.get_resource('silly', '#1')
def test_creates_resource(self):
as_dict = {'foo': 'bar'}
r = ick2.resource_from_dict(as_dict)
+ self.state.write_resource('silly', '#1', r)
+ self.assertTrue(self.state.has_resource('silly', '#1'))
+ self.assertEqual(self.state.get_resource_ids('silly'), ['#1'])
- token = self.get_token()
- self.state.write_resource(token, 'silly', '#1', r)
- self.assertTrue(self.state.has_resource(token, 'silly', '#1'))
- self.assertEqual(self.state.get_resource_ids(token, 'silly'), ['#1'])
-
- r2 = self.state.get_resource(token, 'silly', '#1')
+ r2 = self.state.get_resource('silly', '#1')
self.assertTrue(isinstance(r2, ick2.Resource))
self.assertEqual(r.as_dict(), r2.as_dict())
def test_removes_resource(self):
as_dict = {'foo': 'bar'}
r = ick2.resource_from_dict(as_dict)
-
- token = self.get_token()
- self.state.write_resource(token, 'silly', '#1', r)
- self.state.remove_resource(token, 'silly', '#1')
- self.assertFalse(self.state.has_resource(token, 'silly', '#1'))
- self.assertEqual(self.state.get_resource_ids(token, 'silly'), [])
+ self.state.write_resource('silly', '#1', r)
+ self.state.remove_resource('silly', '#1')
+ self.assertFalse(self.state.has_resource('silly', '#1'))
+ self.assertEqual(self.state.get_resource_ids('silly'), [])
def test_raises_error_removing_nonexistent_resource_kind(self):
- token = self.get_token()
with self.assertRaises(ick2.NotFound):
- self.state.remove_resource(token, 'silly', '#1')
+ self.state.remove_resource('silly', '#1')
def test_raises_error_removing_nonexistent_resource(self):
as_dict = {'foo': 'bar'}
r = ick2.resource_from_dict(as_dict)
-
- token = self.get_token()
- self.state.write_resource(token, 'silly', '#1', r)
+ self.state.write_resource('silly', '#1', r)
with self.assertRaises(ick2.NotFound):
- self.state.remove_resource(token, 'silly', '#2')
+ self.state.remove_resource('silly', '#2')
class MemoryPersistentStateTests(unittest.TestCase, PersistentStateTestsMixIn):
- def get_token(self):
- return 'DUMMY-TOKEN'
-
def setUp(self):
self.state = ick2.MemoryPersistentState()
class MuckPersistentStateTests(unittest.TestCase, PersistentStateTestsMixIn):
- def get_token(self):
- return 'DUMMY-TOKEN'
-
def setUp(self):
self.state = ick2.MuckPersistentState()