values are in value objects now

[tiramisu.git] / test / test_option_setting.py

diff --git a/test/test_option_setting.py b/test/test_option_setting.py
index 2997178..3a5a4db 100644 (file)
--- a/test/test_option_setting.py
+++ b/test/test_option_setting.py
@@ -51,10 +51,10 @@ def test_reset():
     config = Config(descr)
     config.string = "foo"
     assert config.string == "foo"
-    assert config._cfgimpl_value_owners['string'] == owners.user
+    assert config._cfgimpl_values.owners[s] == owners.user
     config.unwrap_from_path("string").reset(config)
     assert config.string == 'string'
-    assert config._cfgimpl_value_owners['string'] == owners.default
+    assert config._cfgimpl_values.owners[s] == owners.default
 
 def test_reset_with_multi():
     s = StrOption("string", "", default=["string"], default_multi="string" , multi=True)
@@ -63,13 +63,13 @@ def test_reset_with_multi():
 #    config.string = []
     config.unwrap_from_path("string").reset(config)
     assert config.string == ["string"]
-    assert config._cfgimpl_value_owners['string'] == 'default'
+    assert config._cfgimpl_values.owners[s] == 'default'
     config.string = ["eggs", "spam", "foo"]
-    assert config._cfgimpl_value_owners['string'] == 'user'
+    assert config._cfgimpl_values.owners[s] == 'user'
     config.string = []
     config.unwrap_from_path("string").reset(config)
 #    assert config.string == ["string"]
-    assert config._cfgimpl_value_owners['string'] == 'default'
+    assert config._cfgimpl_values.owners[s] == 'default'
     raises(ConfigError, "config.string = None")
 
 def test_default_with_multi():
@@ -111,10 +111,10 @@ def test_access_with_multi_default():
     s = StrOption("string", "", default=["string"], multi=True)
     descr = OptionDescription("options", "", [s])
     config = Config(descr)
-    assert config._cfgimpl_value_owners["string"] == 'default'
+    assert config._cfgimpl_values.owners[s] == 'default'
     config.string = ["foo", "bar"]
     assert config.string == ["foo", "bar"]
-    assert config._cfgimpl_value_owners["string"] == 'user'
+    assert config._cfgimpl_values.owners[s] == 'user'
 
 #def test_attribute_access_with_multi2():
 #    s = StrOption("string", "", default="string", multi=True)
@@ -227,7 +227,7 @@ def test_multi_with_bool():
     config = Config(descr)
     assert descr.bool.multi == True
     config.bool = [True, False]
-    assert config._cfgimpl_values['bool'] == [True, False]
+    assert config._cfgimpl_context._cfgimpl_values[s] == [True, False]
     assert config.bool == [True, False]
 
 def test_multi_with_bool_two():
@@ -323,22 +323,22 @@ def test_set_symlink_option():
     assert config.s1.b == False
     assert config.c == False
 
-#____________________________________________________________
-def test_config_impl_values():
-    descr = make_description()
-    config = Config(descr)
-    config.bool = False
-#    gcdummy.setoption(config, True, "user")
-#    config.setoption("gc.dummy", True, "user")
-    #config.gc.dummy = True
-#    config.setoption("bool", False, "user")
-    config.set(dummy=False)
-    assert config.gc._cfgimpl_values == {'dummy': False, 'float': 2.3, 'name': 'ref'}
-    ## acces to the option object
-#    config.gc._cfgimpl_descr.dummy.setoption(config, True, "user")
-    assert config.gc.dummy == False
-#    config.set(dummy=True)
-#    assert config.gc.dummy == True
+##____________________________________________________________
+#def test_config_impl_values():
+#    descr = make_description()
+#    config = Config(descr)
+#    config.bool = False
+##    gcdummy.setoption(config, True, "user")
+##    config.setoption("gc.dummy", True, "user")
+#    #config.gc.dummy = True
+##    config.setoption("bool", False, "user")
+#    config.set(dummy=False)
+#    assert config.gc._cfgimpl_context._cfgimpl_values.values == {'dummy': False, 'float': 2.3, 'name': 'ref'}
+#    ## acces to the option object
+##    config.gc._cfgimpl_descr.dummy.setoption(config, True, "user")
+#    assert config.gc.dummy == False
+##    config.set(dummy=True)
+##    assert config.gc.dummy == True
 
 #____________________________________________________________
 def test_accepts_multiple_changes_from_option():