aboutsummaryrefslogtreecommitdiffstats
path: root/libbe/storage/util/settings_object.py
diff options
context:
space:
mode:
Diffstat (limited to 'libbe/storage/util/settings_object.py')
-rw-r--r--libbe/storage/util/settings_object.py184
1 files changed, 92 insertions, 92 deletions
diff --git a/libbe/storage/util/settings_object.py b/libbe/storage/util/settings_object.py
index 819698f..323d6e9 100644
--- a/libbe/storage/util/settings_object.py
+++ b/libbe/storage/util/settings_object.py
@@ -27,7 +27,7 @@ See Also
"""
import libbe
-from properties import Property, doc_property, local_property, \
+from .properties import Property, doc_property, local_property, \
defaulting_property, checked_property, fn_checked_property, \
cached_property, primed_property, change_hook_property, \
settings_property
@@ -324,7 +324,7 @@ if libbe.TESTING == True:
required_saved_properties=required_saved_properties)
def content_type(): return {}
expected = "A test property\n\nThis property defaults to None."
- self.failUnless(Test.content_type.__doc__ == expected,
+ self.assertTrue(Test.content_type.__doc__ == expected,
Test.content_type.__doc__)
def testSimplePropertyFromMemory(self):
"""Testing a minimal versioned property from memory"""
@@ -338,75 +338,75 @@ if libbe.TESTING == True:
required_saved_properties=required_saved_properties)
def content_type(): return {}
t = Test()
- self.failUnless(len(t.settings) == 0, len(t.settings))
+ self.assertTrue(len(t.settings) == 0, len(t.settings))
# accessing t.content_type triggers the priming, but
# t.storage.is_readable() == False, so nothing happens.
t.storage.readable = False
- self.failUnless(t.content_type == None, t.content_type)
- self.failUnless(t.settings == {}, t.settings)
- self.failUnless(len(t.settings) == 0, len(t.settings))
- self.failUnless(t.content_type == None, t.content_type)
+ self.assertTrue(t.content_type == None, t.content_type)
+ self.assertTrue(t.settings == {}, t.settings)
+ self.assertTrue(len(t.settings) == 0, len(t.settings))
+ self.assertTrue(t.content_type == None, t.content_type)
# accessing t.content_type triggers the priming again, and
# now that t.storage.is_readable() == True, this fills out
# t.settings with EMPTY data. At this point there should
# be one load and no saves.
t.storage.readable = True
- self.failUnless(t.content_type == None, t.content_type)
- self.failUnless(len(t.settings) == 1, len(t.settings))
- self.failUnless(t.settings["Content-type"] == EMPTY,
+ self.assertTrue(t.content_type == None, t.content_type)
+ self.assertTrue(len(t.settings) == 1, len(t.settings))
+ self.assertTrue(t.settings["Content-type"] == EMPTY,
t.settings["Content-type"])
- self.failUnless(t.content_type == None, t.content_type)
- self.failUnless(t.load_count == 1, t.load_count)
- self.failUnless(len(t.storage) == 0, len(t.storage))
+ self.assertTrue(t.content_type == None, t.content_type)
+ self.assertTrue(t.load_count == 1, t.load_count)
+ self.assertTrue(len(t.storage) == 0, len(t.storage))
# an explicit call to load settings forces a reload,
# but nothing else changes.
t.load_settings()
- self.failUnless(len(t.settings) == 1, len(t.settings))
- self.failUnless(t.settings["Content-type"] == EMPTY,
+ self.assertTrue(len(t.settings) == 1, len(t.settings))
+ self.assertTrue(t.settings["Content-type"] == EMPTY,
t.settings["Content-type"])
- self.failUnless(t.content_type == None, t.content_type)
- self.failUnless(t.load_count == 2, t.load_count)
- self.failUnless(len(t.storage) == 0, len(t.storage))
+ self.assertTrue(t.content_type == None, t.content_type)
+ self.assertTrue(t.load_count == 2, t.load_count)
+ self.assertTrue(len(t.storage) == 0, len(t.storage))
# now we set a value
t.content_type = 5
- self.failUnless(t.settings["Content-type"] == 5,
+ self.assertTrue(t.settings["Content-type"] == 5,
t.settings["Content-type"])
- self.failUnless(t.load_count == 2, t.load_count)
- self.failUnless(len(t.storage) == 1, len(t.storage))
- self.failUnless(t.storage == [{'Content-type':5}], t.storage)
+ self.assertTrue(t.load_count == 2, t.load_count)
+ self.assertTrue(len(t.storage) == 1, len(t.storage))
+ self.assertTrue(t.storage == [{'Content-type':5}], t.storage)
# getting its value changes nothing
- self.failUnless(t.content_type == 5, t.content_type)
- self.failUnless(t.settings["Content-type"] == 5,
+ self.assertTrue(t.content_type == 5, t.content_type)
+ self.assertTrue(t.settings["Content-type"] == 5,
t.settings["Content-type"])
- self.failUnless(t.load_count == 2, t.load_count)
- self.failUnless(len(t.storage) == 1, len(t.storage))
- self.failUnless(t.storage == [{'Content-type':5}], t.storage)
+ self.assertTrue(t.load_count == 2, t.load_count)
+ self.assertTrue(len(t.storage) == 1, len(t.storage))
+ self.assertTrue(t.storage == [{'Content-type':5}], t.storage)
# now we set another value
t.content_type = "text/plain"
- self.failUnless(t.content_type == "text/plain", t.content_type)
- self.failUnless(t.settings["Content-type"] == "text/plain",
+ self.assertTrue(t.content_type == "text/plain", t.content_type)
+ self.assertTrue(t.settings["Content-type"] == "text/plain",
t.settings["Content-type"])
- self.failUnless(t.load_count == 2, t.load_count)
- self.failUnless(len(t.storage) == 2, len(t.storage))
- self.failUnless(t.storage == [{'Content-type':5},
+ self.assertTrue(t.load_count == 2, t.load_count)
+ self.assertTrue(len(t.storage) == 2, len(t.storage))
+ self.assertTrue(t.storage == [{'Content-type':5},
{'Content-type':'text/plain'}],
t.storage)
# t._get_saved_settings() returns a dict of required or
# non-default values.
- self.failUnless(t._get_saved_settings() == \
+ self.assertTrue(t._get_saved_settings() == \
{"Content-type":"text/plain"},
t._get_saved_settings())
# now we clear to the post-primed value
t.content_type = EMPTY
- self.failUnless(t.settings["Content-type"] == EMPTY,
+ self.assertTrue(t.settings["Content-type"] == EMPTY,
t.settings["Content-type"])
- self.failUnless(t.content_type == None, t.content_type)
- self.failUnless(len(t.settings) == 1, len(t.settings))
- self.failUnless(t.settings["Content-type"] == EMPTY,
+ self.assertTrue(t.content_type == None, t.content_type)
+ self.assertTrue(len(t.settings) == 1, len(t.settings))
+ self.assertTrue(t.settings["Content-type"] == EMPTY,
t.settings["Content-type"])
- self.failUnless(t._get_saved_settings() == {},
+ self.assertTrue(t._get_saved_settings() == {},
t._get_saved_settings())
- self.failUnless(t.storage == [{'Content-type':5},
+ self.assertTrue(t.storage == [{'Content-type':5},
{'Content-type':'text/plain'},
{}],
t.storage)
@@ -433,16 +433,16 @@ if libbe.TESTING == True:
# which also pulls in prop-a.
t.prop_b = 'new-b'
settings = {'prop-b':'new-b', 'prop-a':'saved'}
- self.failUnless(t.settings == settings, t.settings)
- self.failUnless(t._get_saved_settings() == settings,
+ self.assertTrue(t.settings == settings, t.settings)
+ self.assertTrue(t._get_saved_settings() == settings,
t._get_saved_settings())
# test that _get_saved_settings() works even when settings
# were _not_ loaded beforehand
t = Test()
t.storage.append({'prop-a':'saved'})
settings ={'prop-a':'saved'}
- self.failUnless(t.settings == {}, t.settings)
- self.failUnless(t._get_saved_settings() == settings,
+ self.assertTrue(t.settings == {}, t.settings)
+ self.assertTrue(t._get_saved_settings() == settings,
t._get_saved_settings())
def testSimplePropertySetStorageSave(self):
"""Set a property, then attach storage and save"""
@@ -467,13 +467,13 @@ if libbe.TESTING == True:
t.prop_a = 'text/html'
t.storage = storage
t.save_settings()
- self.failUnless(t.prop_a == 'text/html', t.prop_a)
- self.failUnless(t.settings == {'prop-a':'text/html',
+ self.assertTrue(t.prop_a == 'text/html', t.prop_a)
+ self.assertTrue(t.settings == {'prop-a':'text/html',
'prop-b':EMPTY},
t.settings)
- self.failUnless(t.load_count == 1, t.load_count)
- self.failUnless(len(t.storage) == 1, len(t.storage))
- self.failUnless(t.storage == [{'prop-a':'text/html'}],
+ self.assertTrue(t.load_count == 1, t.load_count)
+ self.assertTrue(len(t.storage) == 1, len(t.storage))
+ self.assertTrue(t.storage == [{'prop-a':'text/html'}],
t.storage)
def testDefaultingProperty(self):
"""Testing a defaulting versioned property"""
@@ -488,24 +488,24 @@ if libbe.TESTING == True:
required_saved_properties=required_saved_properties)
def content_type(): return {}
t = Test()
- self.failUnless(t.settings == {}, t.settings)
- self.failUnless(t.content_type == "text/plain", t.content_type)
- self.failUnless(t.settings == {"Content-type":EMPTY},
+ self.assertTrue(t.settings == {}, t.settings)
+ self.assertTrue(t.content_type == "text/plain", t.content_type)
+ self.assertTrue(t.settings == {"Content-type":EMPTY},
t.settings)
- self.failUnless(t.load_count == 1, t.load_count)
- self.failUnless(len(t.storage) == 0, len(t.storage))
- self.failUnless(t._get_saved_settings() == {},
+ self.assertTrue(t.load_count == 1, t.load_count)
+ self.assertTrue(len(t.storage) == 0, len(t.storage))
+ self.assertTrue(t._get_saved_settings() == {},
t._get_saved_settings())
t.content_type = "text/html"
- self.failUnless(t.content_type == "text/html",
+ self.assertTrue(t.content_type == "text/html",
t.content_type)
- self.failUnless(t.settings == {"Content-type":"text/html"},
+ self.assertTrue(t.settings == {"Content-type":"text/html"},
t.settings)
- self.failUnless(t.load_count == 1, t.load_count)
- self.failUnless(len(t.storage) == 1, len(t.storage))
- self.failUnless(t.storage == [{'Content-type':'text/html'}],
+ self.assertTrue(t.load_count == 1, t.load_count)
+ self.assertTrue(len(t.storage) == 1, len(t.storage))
+ self.assertTrue(t.storage == [{'Content-type':'text/html'}],
t.storage)
- self.failUnless(t._get_saved_settings() == \
+ self.assertTrue(t._get_saved_settings() == \
{"Content-type":"text/html"},
t._get_saved_settings())
def testRequiredDefaultingProperty(self):
@@ -522,25 +522,25 @@ if libbe.TESTING == True:
require_save=True)
def content_type(): return {}
t = Test()
- self.failUnless(t.settings == {}, t.settings)
- self.failUnless(t.content_type == "text/plain", t.content_type)
- self.failUnless(t.settings == {"Content-type":EMPTY},
+ self.assertTrue(t.settings == {}, t.settings)
+ self.assertTrue(t.content_type == "text/plain", t.content_type)
+ self.assertTrue(t.settings == {"Content-type":EMPTY},
t.settings)
- self.failUnless(t.load_count == 1, t.load_count)
- self.failUnless(len(t.storage) == 0, len(t.storage))
- self.failUnless(t._get_saved_settings() == \
+ self.assertTrue(t.load_count == 1, t.load_count)
+ self.assertTrue(len(t.storage) == 0, len(t.storage))
+ self.assertTrue(t._get_saved_settings() == \
{"Content-type":"text/plain"},
t._get_saved_settings())
t.content_type = "text/html"
- self.failUnless(t.content_type == "text/html",
+ self.assertTrue(t.content_type == "text/html",
t.content_type)
- self.failUnless(t.settings == {"Content-type":"text/html"},
+ self.assertTrue(t.settings == {"Content-type":"text/html"},
t.settings)
- self.failUnless(t.load_count == 1, t.load_count)
- self.failUnless(len(t.storage) == 1, len(t.storage))
- self.failUnless(t.storage == [{'Content-type':'text/html'}],
+ self.assertTrue(t.load_count == 1, t.load_count)
+ self.assertTrue(len(t.storage) == 1, len(t.storage))
+ self.assertTrue(t.storage == [{'Content-type':'text/html'}],
t.storage)
- self.failUnless(t._get_saved_settings() == \
+ self.assertTrue(t._get_saved_settings() == \
{"Content-type":"text/html"},
t._get_saved_settings())
def testClassVersionedPropertyDefinition(self):
@@ -564,18 +564,18 @@ if libbe.TESTING == True:
require_save=True)
def content_type(): return {}
t = Test()
- self.failUnless(t._get_saved_settings() == \
+ self.assertTrue(t._get_saved_settings() == \
{"Content-type":"text/plain"},
t._get_saved_settings())
- self.failUnless(t.load_count == 1, t.load_count)
- self.failUnless(len(t.storage) == 0, len(t.storage))
+ self.assertTrue(t.load_count == 1, t.load_count)
+ self.assertTrue(len(t.storage) == 0, len(t.storage))
t.content_type = "text/html"
- self.failUnless(t._get_saved_settings() == \
+ self.assertTrue(t._get_saved_settings() == \
{"Content-type":"text/html"},
t._get_saved_settings())
- self.failUnless(t.load_count == 1, t.load_count)
- self.failUnless(len(t.storage) == 1, len(t.storage))
- self.failUnless(t.storage == [{'Content-type':'text/html'}],
+ self.assertTrue(t.load_count == 1, t.load_count)
+ self.assertTrue(len(t.storage) == 1, len(t.storage))
+ self.assertTrue(t.storage == [{'Content-type':'text/html'}],
t.storage)
def testMutableChangeHookedProperty(self):
"""Testing a mutable change-hooked property"""
@@ -591,26 +591,26 @@ if libbe.TESTING == True:
required_saved_properties=required_saved_properties)
def list_type(): return {}
t = Test()
- self.failUnless(len(t.storage) == 0, len(t.storage))
- self.failUnless(t.list_type == None, t.list_type)
- self.failUnless(len(t.storage) == 0, len(t.storage))
- self.failUnless(t.settings["List-type"]==EMPTY,
+ self.assertTrue(len(t.storage) == 0, len(t.storage))
+ self.assertTrue(t.list_type == None, t.list_type)
+ self.assertTrue(len(t.storage) == 0, len(t.storage))
+ self.assertTrue(t.settings["List-type"]==EMPTY,
t.settings["List-type"])
t.list_type = []
- self.failUnless(t.settings["List-type"] == [],
+ self.assertTrue(t.settings["List-type"] == [],
t.settings["List-type"])
- self.failUnless(len(t.storage) == 1, len(t.storage))
- self.failUnless(t.storage == [{'List-type':[]}],
+ self.assertTrue(len(t.storage) == 1, len(t.storage))
+ self.assertTrue(t.storage == [{'List-type':[]}],
t.storage)
t.list_type.append(5) # external modification not detected yet
- self.failUnless(len(t.storage) == 1, len(t.storage))
- self.failUnless(t.storage == [{'List-type':[]}],
+ self.assertTrue(len(t.storage) == 1, len(t.storage))
+ self.assertTrue(t.storage == [{'List-type':[]}],
t.storage)
- self.failUnless(t.settings["List-type"] == [5],
+ self.assertTrue(t.settings["List-type"] == [5],
t.settings["List-type"])
- self.failUnless(t.list_type == [5], t.list_type)# get triggers save
- self.failUnless(len(t.storage) == 2, len(t.storage))
- self.failUnless(t.storage == [{'List-type':[]},
+ self.assertTrue(t.list_type == [5], t.list_type)# get triggers save
+ self.assertTrue(len(t.storage) == 2, len(t.storage))
+ self.assertTrue(t.storage == [{'List-type':[]},
{'List-type':[5]}],
t.storage)
generated by cgit (git 2.34.1) at 2024-09-19 01:33:13 +0000