Skip to content

Commit f672e72

Browse files
committed
1 parent 36eae62 commit f672e72

File tree

2 files changed

+30
-0
lines changed

2 files changed

+30
-0
lines changed

pyodata/v2/model.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2396,6 +2396,8 @@ class MetadataBuilder:
23962396
]
23972397

23982398
EDM_WHITELIST = [
2399+
'http://schemas.microsoft.com/ado/2006/04/edm',
2400+
'http://schemas.microsoft.com/ado/2007/05/edm',
23992401
'http://schemas.microsoft.com/ado/2008/09/edm',
24002402
'http://schemas.microsoft.com/ado/2009/11/edm',
24012403
'http://docs.oasis-open.org/odata/ns/edm'

tests/test_model_v2.py

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1137,6 +1137,34 @@ def test_whitelisted_edm_namespace(mock_from_etree, xml_builder_factory):
11371137
mock_from_etree.assert_called_once()
11381138

11391139

1140+
@patch.object(Schema, 'from_etree')
1141+
def test_whitelisted_edm_namespace_2006_04(mock_from_etree, xml_builder_factory):
1142+
"""Test correct handling of whitelisted Microsoft's edm namespace"""
1143+
1144+
xml_builder = xml_builder_factory()
1145+
xml_builder.namespaces['edm'] = 'http://schemas.microsoft.com/ado/2006/04/edm'
1146+
xml_builder.add_schema('', '')
1147+
xml = xml_builder.serialize()
1148+
1149+
MetadataBuilder(xml).build()
1150+
assert Schema.from_etree is mock_from_etree
1151+
mock_from_etree.assert_called_once()
1152+
1153+
1154+
@patch.object(Schema, 'from_etree')
1155+
def test_whitelisted_edm_namespace_2007_05(mock_from_etree, xml_builder_factory):
1156+
"""Test correct handling of whitelisted Microsoft's edm namespace"""
1157+
1158+
xml_builder = xml_builder_factory()
1159+
xml_builder.namespaces['edm'] = 'http://schemas.microsoft.com/ado/2007/05/edm'
1160+
xml_builder.add_schema('', '')
1161+
xml = xml_builder.serialize()
1162+
1163+
MetadataBuilder(xml).build()
1164+
assert Schema.from_etree is mock_from_etree
1165+
mock_from_etree.assert_called_once()
1166+
1167+
11401168
def test_enum_parsing(schema):
11411169
"""Test correct parsing of enum"""
11421170

0 commit comments

Comments
 (0)