Fix various test failures.

OData · Mar 28, 2017 · a215f9e · a215f9e
1 parent b4e83ae
commit a215f9e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/test/FunctionalTests/Tests/DataEdmLib/FunctionalTests/CsdlParsingTests.cs b/test/FunctionalTests/Tests/DataEdmLib/FunctionalTests/CsdlParsingTests.cs
@@ -1069,7 +1069,7 @@ public void IgnoreUnexpectedAttributeAndElementInSchema()
             bool parsed = CsdlReader.TryParse(XmlReader.Create(new StringReader(edmx)), true, out model, out errors);
 
             Assert.IsTrue(parsed, "parsed");
-            Assert.AreEqual(4, errors.Count());
+            Assert.AreEqual(3, errors.Count());
             Assert.AreEqual("C1", model.EntityContainer.Name, "model.EntityContainers.First().Name = C1");
             Assert.AreEqual("Customers", model.EntityContainer.Elements.Single().Name, "model.EntityContainers.Single().Elements.Single().Name = Customers");
             Assert.AreEqual("NS1.Customer", model.SchemaElements.Single(e => e.FullName() == "NS1.Customer").FullName(), "model.SchemaElements.Single().FullName() = NS1.Customer");

diff --git a/test/FunctionalTests/Tests/DataEdmLib/FunctionalTests/SemanticValidationTests.cs b/test/FunctionalTests/Tests/DataEdmLib/FunctionalTests/SemanticValidationTests.cs
@@ -96,7 +96,8 @@ public void InterfaceValidatorAutoCheck()
                     skip != typeof(IEdmIntegerValue) &&
                     skip != typeof(IEdmDirectValueAnnotationBinding) &&
                     skip != typeof(IEdmTimeOfDayValue) &&
-                    skip != typeof(IEdmEnumMemberValue)
+                    skip != typeof(IEdmEnumMemberValue) &&
+                    skip != typeof(IEdmEntitySet) // IncludeInServiceDocument is optional
                     )
                 {
                     Assert.AreEqual(0, skip.GetProperties().Length, "It is not safe to skip interfaces with properties.");

diff --git a/test/FunctionalTests/Tests/DataOData/Tests/OData.Common.Tests/PublicApi/PublicApi.bsl b/test/FunctionalTests/Tests/DataOData/Tests/OData.Common.Tests/PublicApi/PublicApi.bsl
@@ -487,6 +487,7 @@ public enum Microsoft.OData.Edm.EdmContainerElementKind : int {
 }
 
 public enum Microsoft.OData.Edm.EdmExpressionKind : int {
+	AnnotationPath = 25
 	BinaryConstant = 1
 	BooleanConstant = 2
 	Cast = 15
@@ -718,6 +719,7 @@ public interface Microsoft.OData.Edm.IEdmEntityReferenceTypeReference : IEdmElem
 }
 
 public interface Microsoft.OData.Edm.IEdmEntitySet : IEdmElement, IEdmEntityContainerElement, IEdmEntitySetBase, IEdmNamedElement, IEdmNavigationSource, IEdmVocabularyAnnotatable {
+	bool IncludeInServiceDocument  { public abstract get; }
 }
 
 public interface Microsoft.OData.Edm.IEdmEntitySetBase : IEdmElement, IEdmNamedElement, IEdmNavigationSource {
@@ -2309,6 +2311,7 @@ public class Microsoft.OData.Edm.EdmEntityContainer : Microsoft.OData.Edm.EdmEle
 	public virtual Microsoft.OData.Edm.EdmActionImport AddActionImport (string name, Microsoft.OData.Edm.IEdmAction action, Microsoft.OData.Edm.IEdmExpression entitySet)
 	public void AddElement (Microsoft.OData.Edm.IEdmEntityContainerElement element)
 	public virtual Microsoft.OData.Edm.EdmEntitySet AddEntitySet (string name, Microsoft.OData.Edm.IEdmEntityType elementType)
+	public virtual Microsoft.OData.Edm.EdmEntitySet AddEntitySet (string name, Microsoft.OData.Edm.IEdmEntityType elementType, bool includeInServiceDocument)
 	public virtual Microsoft.OData.Edm.EdmFunctionImport AddFunctionImport (Microsoft.OData.Edm.IEdmFunction function)
 	public virtual Microsoft.OData.Edm.EdmFunctionImport AddFunctionImport (string name, Microsoft.OData.Edm.IEdmFunction function)
 	public virtual Microsoft.OData.Edm.EdmFunctionImport AddFunctionImport (string name, Microsoft.OData.Edm.IEdmFunction function, Microsoft.OData.Edm.IEdmExpression entitySet)
@@ -2334,9 +2337,11 @@ public class Microsoft.OData.Edm.EdmEntityReferenceTypeReference : Microsoft.ODa
 
 public class Microsoft.OData.Edm.EdmEntitySet : Microsoft.OData.Edm.EdmEntitySetBase, IEdmElement, IEdmEntityContainerElement, IEdmEntitySet, IEdmEntitySetBase, IEdmNamedElement, IEdmNavigationSource, IEdmVocabularyAnnotatable {
 	public EdmEntitySet (Microsoft.OData.Edm.IEdmEntityContainer container, string name, Microsoft.OData.Edm.IEdmEntityType elementType)
+	public EdmEntitySet (Microsoft.OData.Edm.IEdmEntityContainer container, string name, Microsoft.OData.Edm.IEdmEntityType elementType, bool includeInServiceDocument)
 
 	Microsoft.OData.Edm.IEdmEntityContainer Container  { public virtual get; }
 	Microsoft.OData.Edm.EdmContainerElementKind ContainerElementKind  { public virtual get; }
+	bool IncludeInServiceDocument  { public virtual get; }
 	Microsoft.OData.Edm.IEdmPathExpression Path  { public virtual get; }
 	Microsoft.OData.Edm.IEdmType Type  { public virtual get; }
 }