diff options
| author | Keith Wall <kwall@apache.org> | 2015-03-03 14:58:01 +0000 |
|---|---|---|
| committer | Keith Wall <kwall@apache.org> | 2015-03-03 14:58:01 +0000 |
| commit | 11a201863b9c989151cf117450785504a61df5ce (patch) | |
| tree | ba96c870aa9ed34edcac0bd07fc0e0138f715bbd /qpid/python/qpid/tests/util.py | |
| parent | 9dc57fe738f366d875c2319dafdfa2c50ce2f20b (diff) | |
| parent | 83120216de949c1cae3004c74475cc6c54cd61f1 (diff) | |
| download | qpid-python-11a201863b9c989151cf117450785504a61df5ce.tar.gz | |
merge from trunk
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1663719 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/python/qpid/tests/util.py')
| -rw-r--r-- | qpid/python/qpid/tests/util.py | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/qpid/python/qpid/tests/util.py b/qpid/python/qpid/tests/util.py index 9777443720..4e901218c2 100644 --- a/qpid/python/qpid/tests/util.py +++ b/qpid/python/qpid/tests/util.py @@ -21,26 +21,32 @@ from qpid.util import get_client_properties_with_defaults class UtilTest (TestCase): - def test_get_spec_recommended_client_properties(self): - client_properties = get_client_properties_with_defaults(provided_client_properties={"mykey":"myvalue"}) + def test_default_client_properties_08091(self): + client_properties = get_client_properties_with_defaults(version_property_key="version") self.assertTrue("product" in client_properties) self.assertTrue("version" in client_properties) self.assertTrue("platform" in client_properties) - def test_get_client_properties_with_provided_value(self): + def test_default_client_properties_010(self): + client_properties = get_client_properties_with_defaults(version_property_key="qpid.client_version") + self.assertTrue("product" in client_properties) + self.assertTrue("qpid.client_version" in client_properties) + self.assertTrue("platform" in client_properties) + + def test_client_properties_with_provided_value(self): client_properties = get_client_properties_with_defaults(provided_client_properties={"mykey":"myvalue"}) self.assertTrue("product" in client_properties) self.assertTrue("mykey" in client_properties) self.assertEqual("myvalue", client_properties["mykey"]) - def test_get_client_properties_with_no_provided_values(self): + def test_client_properties_with_provided_value_that_overrides_default(self): + client_properties = get_client_properties_with_defaults(provided_client_properties={"product":"myproduct"}) + self.assertEqual("myproduct", client_properties["product"]) + + def test_client_properties_with_no_provided_values(self): client_properties = get_client_properties_with_defaults(provided_client_properties=None) self.assertTrue("product" in client_properties) client_properties = get_client_properties_with_defaults() self.assertTrue("product" in client_properties) - def test_get_client_properties_with_provided_value_that_overrides_default(self): - client_properties = get_client_properties_with_defaults(provided_client_properties={"version":"myversion"}) - self.assertEqual("myversion", client_properties["version"]) - |