Repository: olingo-odata2 Updated Branches: refs/heads/master adda9d5d6 -> f24fc8bf4
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/f24fc8bf/odata2-lib/odata-core/src/test/resources/Room_InlineEmployeesToTeam.xml ---------------------------------------------------------------------- diff --git a/odata2-lib/odata-core/src/test/resources/Room_InlineEmployeesToTeam.xml b/odata2-lib/odata-core/src/test/resources/Room_InlineEmployeesToTeam.xml new file mode 100644 index 0000000..95fd709 --- /dev/null +++ b/odata2-lib/odata-core/src/test/resources/Room_InlineEmployeesToTeam.xml @@ -0,0 +1,77 @@ +<?xml version='1.0' encoding='utf-8'?> +<entry xmlns="http://www.w3.org/2005/Atom"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xml:base="http://localhost:8080/olingo-odata2-ref-web/ReferenceScenario.svc/"; m:etag="W/"1""> + <id>http://localhost:8080/olingo-odata2-ref-web/ReferenceScenario.svc/Rooms('1')</id> + <title type="text">Room 1</title> + <updated>2016-11-30T11:10:06.334+05:30</updated> + <category term="RefScenario.Room" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"/> + <link href="Rooms('1')" rel="edit" title="Room"/> + <link href="Rooms('1')/nr_Employees" rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/nr_Employees"; title="nr_Employees" type="application/atom+xml;type=feed"> + <m:inline> + <feed xml:base="http://localhost:8080/olingo-odata2-ref-web/ReferenceScenario.svc/";> + <id>http://localhost:8080/olingo-odata2-ref-web/ReferenceScenario.svc/Employees</id> + <title type="text">Employees</title> + <updated>2016-11-30T11:10:06.335+05:30</updated> + <author> + <name/> + </author> + <link href="Rooms('1')/nr_Employees" rel="self" title="Employees"/> + <entry> + <id>http://localhost:8080/olingo-odata2-ref-web/ReferenceScenario.svc/Employees('1')</id> + <title type="text">Walter Winter</title> + <updated>1999-01-01T00:00:00Z</updated> + <category term="RefScenario.Employee" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"/> + <link href="Employees('1')" rel="edit" title="Employee"/> + <link href="Employees('1')/$value" rel="edit-media" type="image/jpeg"/> + <link href="Employees('1')/ne_Manager" rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/ne_Manager"; title="ne_Manager" type="application/atom+xml;type=entry"/> + <link href="Employees('1')/ne_Team" rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/ne_Team"; title="ne_Team" type="application/atom+xml;type=entry"> + <m:inline> + <entry xml:base="http://localhost:8080/olingo-odata2-ref-web/ReferenceScenario.svc/";> + <id>http://localhost:8080/olingo-odata2-ref-web/ReferenceScenario.svc/Teams('1')</id> + <title type="text">Team 1</title> + <updated>2016-11-30T11:10:06.336+05:30</updated> + <category term="RefScenario.Team" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"/> + <link href="Teams('1')" rel="edit" title="Team"/> + <link href="Teams('1')/nt_Employees" rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/nt_Employees"; title="nt_Employees" type="application/atom+xml;type=feed"/> + <content type="application/xml"> + <m:properties> + <d:Id>1</d:Id> + <d:Name>Team 1</d:Name> + <d:isScrumTeam>false</d:isScrumTeam> + </m:properties> + </content> + </entry> + </m:inline> + </link> + <link href="Employees('1')/ne_Room" rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/ne_Room"; title="ne_Room" type="application/atom+xml;type=entry"/> + <content type="image/jpeg" src="Employees('1')/$value"/> + <m:properties> + <d:EmployeeId>1</d:EmployeeId> + <d:EmployeeName>Walter Winter</d:EmployeeName> + <d:ManagerId>1</d:ManagerId> + <d:RoomId>1</d:RoomId> + <d:TeamId>1</d:TeamId> + <d:Location m:type="RefScenario.c_Location"> + <d:City m:type="RefScenario.c_City"> + <d:PostalCode>69124</d:PostalCode> + <d:CityName>Heidelberg</d:CityName> + </d:City> + <d:Country>Germany</d:Country> + </d:Location> + <d:Age>52</d:Age> + <d:EntryDate>1999-01-01T00:00:00</d:EntryDate> + <d:ImageUrl>Employees('1')/$value</d:ImageUrl> + </m:properties> + </entry> + </feed> + </m:inline> + </link> + <link href="Rooms('1')/nr_Building" rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/nr_Building"; title="nr_Building" type="application/atom+xml;type=entry"/> + <content type="application/xml"> + <m:properties> + <d:Id>1</d:Id> + <d:Name>Room 1</d:Name> + <d:Seats>1</d:Seats> + <d:Version>1</d:Version> + </m:properties> + </content> +</entry> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/f24fc8bf/odata2-lib/odata-core/src/test/resources/RoomsToEmployeesWithInlineTeams.xml ---------------------------------------------------------------------- diff --git a/odata2-lib/odata-core/src/test/resources/RoomsToEmployeesWithInlineTeams.xml b/odata2-lib/odata-core/src/test/resources/RoomsToEmployeesWithInlineTeams.xml new file mode 100644 index 0000000..898ce9e --- /dev/null +++ b/odata2-lib/odata-core/src/test/resources/RoomsToEmployeesWithInlineTeams.xml @@ -0,0 +1,104 @@ +<?xml version='1.0' encoding='utf-8'?> +<feed xmlns="http://www.w3.org/2005/Atom"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xml:base="http://localhost:8083/olingo-odata2-ref-web/ReferenceScenario.svc/";> + <id>http://localhost:8083/olingo-odata2-ref-web/ReferenceScenario.svc/Employees</id> + <title type="text">Employees</title> + <updated>2016-11-22T14:21:03.492+05:30</updated> + <author> + <name/> + </author> + <link href="Employees" rel="self" title="Employees"/> + <entry> + <id>http://localhost:8083/olingo-odata2-ref-web/ReferenceScenario.svc/Employees('2')</id> + <title type="text">Frederic Fall</title> + <updated>2003-07-01T00:00:00Z</updated> + <category term="RefScenario.Employee" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"/> + <link href="Employees('2')" rel="edit" title="Employee"/> + <link href="Employees('2')/$value" rel="edit-media" type="image/jpeg"/> + <link href="Employees('2')/ne_Manager" rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/ne_Manager"; title="ne_Manager" type="application/atom+xml;type=entry"/> + <link href="Employees('2')/ne_Team" rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/ne_Team"; title="ne_Team" type="application/atom+xml;type=entry"> + <m:inline> + <entry xml:base="http://localhost:8083/olingo-odata2-ref-web/ReferenceScenario.svc/";> + <id>http://localhost:8083/olingo-odata2-ref-web/ReferenceScenario.svc/Teams('1')</id> + <title type="text">Team 1</title> + <updated>2016-11-22T14:21:03.493+05:30</updated> + <category term="RefScenario.Team" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"/> + <link href="Teams('1')" rel="edit" title="Team"/> + <link href="Teams('1')/nt_Employees" rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/nt_Employees"; title="nt_Employees" type="application/atom+xml;type=feed"/> + <content type="application/xml"> + <m:properties> + <d:Id>1</d:Id> + <d:Name>Team 1</d:Name> + <d:isScrumTeam>false</d:isScrumTeam> + </m:properties> + </content> + </entry> + </m:inline> + </link> + <link href="Employees('2')/ne_Room" rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/ne_Room"; title="ne_Room" type="application/atom+xml;type=entry"/> + <content type="image/jpeg" src="Employees('2')/$value"/> + <m:properties> + <d:EmployeeId>2</d:EmployeeId> + <d:EmployeeName>Frederic Fall</d:EmployeeName> + <d:ManagerId>1</d:ManagerId> + <d:RoomId>2</d:RoomId> + <d:TeamId>1</d:TeamId> + <d:Location m:type="RefScenario.c_Location"> + <d:City m:type="RefScenario.c_City"> + <d:PostalCode>69190</d:PostalCode> + <d:CityName>Walldorf</d:CityName> + </d:City> + <d:Country>Germany</d:Country> + </d:Location> + <d:Age>32</d:Age> + <d:EntryDate>2003-07-01T00:00:00</d:EntryDate> + <d:ImageUrl>Employees('2')/$value</d:ImageUrl> + </m:properties> + </entry> + <entry> + <id>http://localhost:8083/olingo-odata2-ref-web/ReferenceScenario.svc/Employees('3')</id> + <title type="text">Jonathan Smith</title> + <updated>2016-11-22T14:21:03.493+05:30</updated> + <category term="RefScenario.Employee" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"/> + <link href="Employees('3')" rel="edit" title="Employee"/> + <link href="Employees('3')/$value" rel="edit-media" type="image/jpeg"/> + <link href="Employees('3')/ne_Manager" rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/ne_Manager"; title="ne_Manager" type="application/atom+xml;type=entry"/> + <link href="Employees('3')/ne_Team" rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/ne_Team"; title="ne_Team" type="application/atom+xml;type=entry"> + <m:inline> + <entry xml:base="http://localhost:8083/olingo-odata2-ref-web/ReferenceScenario.svc/";> + <id>http://localhost:8083/olingo-odata2-ref-web/ReferenceScenario.svc/Teams('1')</id> + <title type="text">Team 1</title> + <updated>2016-11-22T14:21:03.494+05:30</updated> + <category term="RefScenario.Team" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"/> + <link href="Teams('1')" rel="edit" title="Team"/> + <link href="Teams('1')/nt_Employees" rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/nt_Employees"; title="nt_Employees" type="application/atom+xml;type=feed"/> + <content type="application/xml"> + <m:properties> + <d:Id>1</d:Id> + <d:Name>Team 1</d:Name> + <d:isScrumTeam>false</d:isScrumTeam> + </m:properties> + </content> + </entry> + </m:inline> + </link> + <link href="Employees('3')/ne_Room" rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/ne_Room"; title="ne_Room" type="application/atom+xml;type=entry"/> + <content type="image/jpeg" src="Employees('3')/$value"/> + <m:properties> + <d:EmployeeId>3</d:EmployeeId> + <d:EmployeeName>Jonathan Smith</d:EmployeeName> + <d:ManagerId>1</d:ManagerId> + <d:RoomId>2</d:RoomId> + <d:TeamId>1</d:TeamId> + <d:Location m:type="RefScenario.c_Location"> + <d:City m:type="RefScenario.c_City"> + <d:PostalCode>69190</d:PostalCode> + <d:CityName>Walldorf</d:CityName> + </d:City> + <d:Country>Germany</d:Country> + </d:Location> + <d:Age>56</d:Age> + <d:EntryDate m:null="true"/> + <d:ImageUrl>Employees('3')/$value</d:ImageUrl> + </m:properties> + </entry> +</feed> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/f24fc8bf/odata2-lib/odata-core/src/test/resources/Rooms_InlineEmployeesTeams.xml ---------------------------------------------------------------------- diff --git a/odata2-lib/odata-core/src/test/resources/Rooms_InlineEmployeesTeams.xml b/odata2-lib/odata-core/src/test/resources/Rooms_InlineEmployeesTeams.xml new file mode 100644 index 0000000..5197d6d --- /dev/null +++ b/odata2-lib/odata-core/src/test/resources/Rooms_InlineEmployeesTeams.xml @@ -0,0 +1,238 @@ +<?xml version='1.0' encoding='utf-8'?> +<feed xmlns="http://www.w3.org/2005/Atom"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xml:base="http://localhost:8083/olingo-odata2-ref-web/ReferenceScenario.svc/";> + <id>http://localhost:8083/olingo-odata2-ref-web/ReferenceScenario.svc/Rooms</id> + <title type="text">Rooms</title> + <updated>2016-11-22T09:58:07.638+05:30</updated> + <author> + <name/> + </author> + <link href="Rooms" rel="self" title="Rooms"/> + <entry m:etag="W/"1""> + <id>http://localhost:8083/olingo-odata2-ref-web/ReferenceScenario.svc/Rooms('1')</id> + <title type="text">Room 1</title> + <updated>2016-11-22T09:58:07.638+05:30</updated> + <category term="RefScenario.Room" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"/> + <link href="Rooms('1')" rel="edit" title="Room"/> + <link href="Rooms('1')/nr_Employees" rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/nr_Employees"; title="nr_Employees" type="application/atom+xml;type=feed"> + <m:inline> + <feed xml:base="http://localhost:8083/olingo-odata2-ref-web/ReferenceScenario.svc/";> + <id>http://localhost:8083/olingo-odata2-ref-web/ReferenceScenario.svc/Employees</id> + <title type="text">Employees</title> + <updated>2016-11-22T09:58:07.639+05:30</updated> + <author> + <name/> + </author> + <link href="Rooms('1')/nr_Employees" rel="self" title="Employees"/> + <entry> + <id>http://localhost:8083/olingo-odata2-ref-web/ReferenceScenario.svc/Employees('1')</id> + <title type="text">Walter Winter</title> + <updated>1999-01-01T00:00:00Z</updated> + <category term="RefScenario.Employee" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"/> + <link href="Employees('1')" rel="edit" title="Employee"/> + <link href="Employees('1')/$value" rel="edit-media" type="image/jpeg"/> + <link href="Employees('1')/ne_Manager" rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/ne_Manager"; title="ne_Manager" type="application/atom+xml;type=entry"/> + <link href="Employees('1')/ne_Team" rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/ne_Team"; title="ne_Team" type="application/atom+xml;type=entry"> + <m:inline> + <entry xml:base="http://localhost:8083/olingo-odata2-ref-web/ReferenceScenario.svc/";> + <id>http://localhost:8083/olingo-odata2-ref-web/ReferenceScenario.svc/Teams('1')</id> + <title type="text">Team 1</title> + <updated>2016-11-22T09:58:07.639+05:30</updated> + <category term="RefScenario.Team" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"/> + <link href="Teams('1')" rel="edit" title="Team"/> + <link href="Teams('1')/nt_Employees" rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/nt_Employees"; title="nt_Employees" type="application/atom+xml;type=feed"/> + <content type="application/xml"> + <m:properties> + <d:Id>1</d:Id> + <d:Name>Team 1</d:Name> + <d:isScrumTeam>false</d:isScrumTeam> + </m:properties> + </content> + </entry> + </m:inline> + </link> + <link href="Employees('1')/ne_Room" rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/ne_Room"; title="ne_Room" type="application/atom+xml;type=entry"/> + <content type="image/jpeg" src="Employees('1')/$value"/> + <m:properties> + <d:EmployeeId>1</d:EmployeeId> + <d:EmployeeName>Walter Winter</d:EmployeeName> + <d:ManagerId>1</d:ManagerId> + <d:RoomId>1</d:RoomId> + <d:TeamId>1</d:TeamId> + <d:Location m:type="RefScenario.c_Location"> + <d:City m:type="RefScenario.c_City"> + <d:PostalCode>69124</d:PostalCode> + <d:CityName>Heidelberg</d:CityName> + </d:City> + <d:Country>Germany</d:Country> + </d:Location> + <d:Age>52</d:Age> + <d:EntryDate>1999-01-01T00:00:00</d:EntryDate> + <d:ImageUrl>Employees('1')/$value</d:ImageUrl> + </m:properties> + </entry> + </feed> + </m:inline> + </link> + <link href="Rooms('1')/nr_Building" rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/nr_Building"; title="nr_Building" type="application/atom+xml;type=entry"/> + <content type="application/xml"> + <m:properties> + <d:Id>1</d:Id> + <d:Name>Room 1</d:Name> + <d:Seats>1</d:Seats> + <d:Version>1</d:Version> + </m:properties> + </content> + </entry> + <entry m:etag="W/"1""> + <id>http://localhost:8080/olingo-odata2-ref-web/ReferenceScenario.svc/Rooms('10')</id> + <title type="text">Room 10</title> + <updated>2016-11-30T14:18:14.349+05:30</updated> + <category term="RefScenario.Room" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"/> + <link href="Rooms('10')" rel="edit" title="Room"/> + <link href="Rooms('10')/nr_Employees" rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/nr_Employees"; title="nr_Employees" type="application/atom+xml;type=feed"> + <m:inline> + <feed xml:base="http://localhost:8080/olingo-odata2-ref-web/ReferenceScenario.svc/";> + <id>http://localhost:8080/olingo-odata2-ref-web/ReferenceScenario.svc/Employees</id> + <title type="text">Employees</title> + <updated>2016-11-30T14:18:14.35+05:30</updated> + <author> + <name/> + </author> + <link href="Rooms('10')/nr_Employees" rel="self" title="Employees"/> + </feed> + </m:inline> + </link> + <link href="Rooms('10')/nr_Building" rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/nr_Building"; title="nr_Building" type="application/atom+xml;type=entry"/> + <content type="application/xml"> + <m:properties> + <d:Id>10</d:Id> + <d:Name>Room 10</d:Name> + <d:Seats>6</d:Seats> + <d:Version>1</d:Version> + </m:properties> + </content> + </entry> + <entry m:etag="W/"2""> + <id>http://localhost:8083/olingo-odata2-ref-web/ReferenceScenario.svc/Rooms('2')</id> + <title type="text">Room 2</title> + <updated>2016-11-22T09:58:07.645+05:30</updated> + <category term="RefScenario.Room" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"/> + <link href="Rooms('2')" rel="edit" title="Room"/> + <link href="Rooms('2')/nr_Employees" rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/nr_Employees"; title="nr_Employees" type="application/atom+xml;type=feed"> + <m:inline> + <feed xml:base="http://localhost:8083/olingo-odata2-ref-web/ReferenceScenario.svc/";> + <id>http://localhost:8083/olingo-odata2-ref-web/ReferenceScenario.svc/Employees</id> + <title type="text">Employees</title> + <updated>2016-11-22T09:58:07.646+05:30</updated> + <author> + <name/> + </author> + <link href="Rooms('2')/nr_Employees" rel="self" title="Employees"/> + <entry> + <id>http://localhost:8083/olingo-odata2-ref-web/ReferenceScenario.svc/Employees('2')</id> + <title type="text">Frederic Fall</title> + <updated>2003-07-01T00:00:00Z</updated> + <category term="RefScenario.Employee" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"/> + <link href="Employees('2')" rel="edit" title="Employee"/> + <link href="Employees('2')/$value" rel="edit-media" type="image/jpeg"/> + <link href="Employees('2')/ne_Manager" rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/ne_Manager"; title="ne_Manager" type="application/atom+xml;type=entry"/> + <link href="Employees('2')/ne_Team" rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/ne_Team"; title="ne_Team" type="application/atom+xml;type=entry"> + <m:inline> + <entry xml:base="http://localhost:8083/olingo-odata2-ref-web/ReferenceScenario.svc/";> + <id>http://localhost:8083/olingo-odata2-ref-web/ReferenceScenario.svc/Teams('1')</id> + <title type="text">Team 1</title> + <updated>2016-11-22T09:58:07.646+05:30</updated> + <category term="RefScenario.Team" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"/> + <link href="Teams('1')" rel="edit" title="Team"/> + <link href="Teams('1')/nt_Employees" rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/nt_Employees"; title="nt_Employees" type="application/atom+xml;type=feed"/> + <content type="application/xml"> + <m:properties> + <d:Id>1</d:Id> + <d:Name>Team 1</d:Name> + <d:isScrumTeam>false</d:isScrumTeam> + </m:properties> + </content> + </entry> + </m:inline> + </link> + <link href="Employees('2')/ne_Room" rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/ne_Room"; title="ne_Room" type="application/atom+xml;type=entry"/> + <content type="image/jpeg" src="Employees('2')/$value"/> + <m:properties> + <d:EmployeeId>2</d:EmployeeId> + <d:EmployeeName>Frederic Fall</d:EmployeeName> + <d:ManagerId>1</d:ManagerId> + <d:RoomId>2</d:RoomId> + <d:TeamId>1</d:TeamId> + <d:Location m:type="RefScenario.c_Location"> + <d:City m:type="RefScenario.c_City"> + <d:PostalCode>69190</d:PostalCode> + <d:CityName>Walldorf</d:CityName> + </d:City> + <d:Country>Germany</d:Country> + </d:Location> + <d:Age>32</d:Age> + <d:EntryDate>2003-07-01T00:00:00</d:EntryDate> + <d:ImageUrl>Employees('2')/$value</d:ImageUrl> + </m:properties> + </entry> + <entry> + <id>http://localhost:8083/olingo-odata2-ref-web/ReferenceScenario.svc/Employees('3')</id> + <title type="text">Jonathan Smith</title> + <updated>2016-11-22T09:58:07.646+05:30</updated> + <category term="RefScenario.Employee" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"/> + <link href="Employees('3')" rel="edit" title="Employee"/> + <link href="Employees('3')/$value" rel="edit-media" type="image/jpeg"/> + <link href="Employees('3')/ne_Manager" rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/ne_Manager"; title="ne_Manager" type="application/atom+xml;type=entry"/> + <link href="Employees('3')/ne_Team" rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/ne_Team"; title="ne_Team" type="application/atom+xml;type=entry"> + <m:inline> + <entry xml:base="http://localhost:8083/olingo-odata2-ref-web/ReferenceScenario.svc/";> + <id>http://localhost:8083/olingo-odata2-ref-web/ReferenceScenario.svc/Teams('1')</id> + <title type="text">Team 1</title> + <updated>2016-11-22T09:58:07.646+05:30</updated> + <category term="RefScenario.Team" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"/> + <link href="Teams('1')" rel="edit" title="Team"/> + <link href="Teams('1')/nt_Employees" rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/nt_Employees"; title="nt_Employees" type="application/atom+xml;type=feed"/> + <content type="application/xml"> + <m:properties> + <d:Id>1</d:Id> + <d:Name>Team 1</d:Name> + <d:isScrumTeam>false</d:isScrumTeam> + </m:properties> + </content> + </entry> + </m:inline> + </link> + <link href="Employees('3')/ne_Room" rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/ne_Room"; title="ne_Room" type="application/atom+xml;type=entry"/> + <content type="image/jpeg" src="Employees('3')/$value"/> + <m:properties> + <d:EmployeeId>3</d:EmployeeId> + <d:EmployeeName>Jonathan Smith</d:EmployeeName> + <d:ManagerId>1</d:ManagerId> + <d:RoomId>2</d:RoomId> + <d:TeamId>1</d:TeamId> + <d:Location m:type="RefScenario.c_Location"> + <d:City m:type="RefScenario.c_City"> + <d:PostalCode>69190</d:PostalCode> + <d:CityName>Walldorf</d:CityName> + </d:City> + <d:Country>Germany</d:Country> + </d:Location> + <d:Age>56</d:Age> + <d:EntryDate m:null="true"/> + <d:ImageUrl>Employees('3')/$value</d:ImageUrl> + </m:properties> + </entry> + </feed> + </m:inline> + </link> + <link href="Rooms('2')/nr_Building" rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/nr_Building"; title="nr_Building" type="application/atom+xml;type=entry"/> + <content type="application/xml"> + <m:properties> + <d:Id>2</d:Id> + <d:Name>Room 2</d:Name> + <d:Seats>5</d:Seats> + <d:Version>2</d:Version> + </m:properties> + </content> + </entry> +</feed> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/f24fc8bf/odata2-lib/odata-core/src/test/resources/Rooms_InlineEmployees_InlineBuildings.xml ---------------------------------------------------------------------- diff --git a/odata2-lib/odata-core/src/test/resources/Rooms_InlineEmployees_InlineBuildings.xml b/odata2-lib/odata-core/src/test/resources/Rooms_InlineEmployees_InlineBuildings.xml new file mode 100644 index 0000000..7fd635a --- /dev/null +++ b/odata2-lib/odata-core/src/test/resources/Rooms_InlineEmployees_InlineBuildings.xml @@ -0,0 +1,197 @@ +<?xml version='1.0' encoding='utf-8'?> +<feed xmlns="http://www.w3.org/2005/Atom"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xml:base="http://localhost:8083/olingo-odata2-ref-web/ReferenceScenario.svc/";> + <id>http://localhost:8083/olingo-odata2-ref-web/ReferenceScenario.svc/Rooms</id> + <title type="text">Rooms</title> + <updated>2016-11-22T11:53:04.928+05:30</updated> + <author> + <name/> + </author> + <link href="Rooms" rel="self" title="Rooms"/> + <entry m:etag="W/"1""> + <id>http://localhost:8083/olingo-odata2-ref-web/ReferenceScenario.svc/Rooms('1')</id> + <title type="text">Room 1</title> + <updated>2016-11-22T11:53:04.928+05:30</updated> + <category term="RefScenario.Room" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"/> + <link href="Rooms('1')" rel="edit" title="Room"/> + <link href="Rooms('1')/nr_Employees" rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/nr_Employees"; title="nr_Employees" type="application/atom+xml;type=feed"> + <m:inline> + <feed xml:base="http://localhost:8083/olingo-odata2-ref-web/ReferenceScenario.svc/";> + <id>http://localhost:8083/olingo-odata2-ref-web/ReferenceScenario.svc/Employees</id> + <title type="text">Employees</title> + <updated>2016-11-22T11:53:04.931+05:30</updated> + <author> + <name/> + </author> + <link href="Rooms('1')/nr_Employees" rel="self" title="Employees"/> + <entry> + <id>http://localhost:8083/olingo-odata2-ref-web/ReferenceScenario.svc/Employees('1')</id> + <title type="text">Walter Winter</title> + <updated>1999-01-01T00:00:00Z</updated> + <category term="RefScenario.Employee" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"/> + <link href="Employees('1')" rel="edit" title="Employee"/> + <link href="Employees('1')/$value" rel="edit-media" type="image/jpeg"/> + <link href="Employees('1')/ne_Manager" rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/ne_Manager"; title="ne_Manager" type="application/atom+xml;type=entry"/> + <link href="Employees('1')/ne_Team" rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/ne_Team"; title="ne_Team" type="application/atom+xml;type=entry"/> + <link href="Employees('1')/ne_Room" rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/ne_Room"; title="ne_Room" type="application/atom+xml;type=entry"/> + <content type="image/jpeg" src="Employees('1')/$value"/> + <m:properties> + <d:EmployeeId>1</d:EmployeeId> + <d:EmployeeName>Walter Winter</d:EmployeeName> + <d:ManagerId>1</d:ManagerId> + <d:RoomId>1</d:RoomId> + <d:TeamId>1</d:TeamId> + <d:Location m:type="RefScenario.c_Location"> + <d:City m:type="RefScenario.c_City"> + <d:PostalCode>69124</d:PostalCode> + <d:CityName>Heidelberg</d:CityName> + </d:City> + <d:Country>Germany</d:Country> + </d:Location> + <d:Age>52</d:Age> + <d:EntryDate>1999-01-01T00:00:00</d:EntryDate> + <d:ImageUrl>Employees('1')/$value</d:ImageUrl> + </m:properties> + </entry> + </feed> + </m:inline> + </link> + <link href="Rooms('1')/nr_Building" rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/nr_Building"; title="nr_Building" type="application/atom+xml;type=entry"> + <m:inline> + <entry xml:base="http://localhost:8083/olingo-odata2-ref-web/ReferenceScenario.svc/";> + <id>http://localhost:8083/olingo-odata2-ref-web/ReferenceScenario.svc/Buildings('1')</id> + <title type="text">Buildings</title> + <updated>2016-11-22T11:53:04.936+05:30</updated> + <author> + <name>Building 1</name> + </author> + <category term="RefScenario.Building" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"/> + <link href="Buildings('1')" rel="edit" title="Building"/> + <link href="Buildings('1')/nb_Rooms" rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/nb_Rooms"; title="nb_Rooms" type="application/atom+xml;type=feed"/> + <content type="application/xml"> + <m:properties> + <d:Id>1</d:Id> + <d:Name>Building 1</d:Name> + <d:Image m:null="true"/> + </m:properties> + </content> + </entry> + </m:inline> + </link> + <content type="application/xml"> + <m:properties> + <d:Id>1</d:Id> + <d:Name>Room 1</d:Name> + <d:Seats>1</d:Seats> + <d:Version>1</d:Version> + </m:properties> + </content> + </entry> + <entry m:etag="W/"2""> + <id>http://localhost:8083/olingo-odata2-ref-web/ReferenceScenario.svc/Rooms('2')</id> + <title type="text">Room 2</title> + <updated>2016-11-22T11:53:04.95+05:30</updated> + <category term="RefScenario.Room" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"/> + <link href="Rooms('2')" rel="edit" title="Room"/> + <link href="Rooms('2')/nr_Employees" rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/nr_Employees"; title="nr_Employees" type="application/atom+xml;type=feed"> + <m:inline> + <feed xml:base="http://localhost:8083/olingo-odata2-ref-web/ReferenceScenario.svc/";> + <id>http://localhost:8083/olingo-odata2-ref-web/ReferenceScenario.svc/Employees</id> + <title type="text">Employees</title> + <updated>2016-11-22T11:53:04.95+05:30</updated> + <author> + <name/> + </author> + <link href="Rooms('2')/nr_Employees" rel="self" title="Employees"/> + <entry> + <id>http://localhost:8083/olingo-odata2-ref-web/ReferenceScenario.svc/Employees('2')</id> + <title type="text">Frederic Fall</title> + <updated>2003-07-01T00:00:00Z</updated> + <category term="RefScenario.Employee" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"/> + <link href="Employees('2')" rel="edit" title="Employee"/> + <link href="Employees('2')/$value" rel="edit-media" type="image/jpeg"/> + <link href="Employees('2')/ne_Manager" rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/ne_Manager"; title="ne_Manager" type="application/atom+xml;type=entry"/> + <link href="Employees('2')/ne_Team" rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/ne_Team"; title="ne_Team" type="application/atom+xml;type=entry"/> + <link href="Employees('2')/ne_Room" rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/ne_Room"; title="ne_Room" type="application/atom+xml;type=entry"/> + <content type="image/jpeg" src="Employees('2')/$value"/> + <m:properties> + <d:EmployeeId>2</d:EmployeeId> + <d:EmployeeName>Frederic Fall</d:EmployeeName> + <d:ManagerId>1</d:ManagerId> + <d:RoomId>2</d:RoomId> + <d:TeamId>1</d:TeamId> + <d:Location m:type="RefScenario.c_Location"> + <d:City m:type="RefScenario.c_City"> + <d:PostalCode>69190</d:PostalCode> + <d:CityName>Walldorf</d:CityName> + </d:City> + <d:Country>Germany</d:Country> + </d:Location> + <d:Age>32</d:Age> + <d:EntryDate>2003-07-01T00:00:00</d:EntryDate> + <d:ImageUrl>Employees('2')/$value</d:ImageUrl> + </m:properties> + </entry> + <entry> + <id>http://localhost:8083/olingo-odata2-ref-web/ReferenceScenario.svc/Employees('3')</id> + <title type="text">Jonathan Smith</title> + <updated>2016-11-22T11:53:04.951+05:30</updated> + <category term="RefScenario.Employee" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"/> + <link href="Employees('3')" rel="edit" title="Employee"/> + <link href="Employees('3')/$value" rel="edit-media" type="image/jpeg"/> + <link href="Employees('3')/ne_Manager" rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/ne_Manager"; title="ne_Manager" type="application/atom+xml;type=entry"/> + <link href="Employees('3')/ne_Team" rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/ne_Team"; title="ne_Team" type="application/atom+xml;type=entry"/> + <link href="Employees('3')/ne_Room" rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/ne_Room"; title="ne_Room" type="application/atom+xml;type=entry"/> + <content type="image/jpeg" src="Employees('3')/$value"/> + <m:properties> + <d:EmployeeId>3</d:EmployeeId> + <d:EmployeeName>Jonathan Smith</d:EmployeeName> + <d:ManagerId>1</d:ManagerId> + <d:RoomId>2</d:RoomId> + <d:TeamId>1</d:TeamId> + <d:Location m:type="RefScenario.c_Location"> + <d:City m:type="RefScenario.c_City"> + <d:PostalCode>69190</d:PostalCode> + <d:CityName>Walldorf</d:CityName> + </d:City> + <d:Country>Germany</d:Country> + </d:Location> + <d:Age>56</d:Age> + <d:EntryDate m:null="true"/> + <d:ImageUrl>Employees('3')/$value</d:ImageUrl> + </m:properties> + </entry> + </feed> + </m:inline> + </link> + <link href="Rooms('2')/nr_Building" rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/nr_Building"; title="nr_Building" type="application/atom+xml;type=entry"> + <m:inline> + <entry xml:base="http://localhost:8083/olingo-odata2-ref-web/ReferenceScenario.svc/";> + <id>http://localhost:8083/olingo-odata2-ref-web/ReferenceScenario.svc/Buildings('2')</id> + <title type="text">Buildings</title> + <updated>2016-11-22T11:53:04.952+05:30</updated> + <author> + <name>Building 2</name> + </author> + <category term="RefScenario.Building" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"/> + <link href="Buildings('2')" rel="edit" title="Building"/> + <link href="Buildings('2')/nb_Rooms" rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/nb_Rooms"; title="nb_Rooms" type="application/atom+xml;type=feed"/> + <content type="application/xml"> + <m:properties> + <d:Id>2</d:Id> + <d:Name>Building 2</d:Name> + <d:Image m:null="true"/> + </m:properties> + </content> + </entry> + </m:inline> + </link> + <content type="application/xml"> + <m:properties> + <d:Id>2</d:Id> + <d:Name>Room 2</d:Name> + <d:Seats>5</d:Seats> + <d:Version>2</d:Version> + </m:properties> + </content> + </entry> +</feed> \ No newline at end of file
