Skip to content

Commit

Permalink
Issue OData#200: Enable unqualified functions on open types.
Browse files Browse the repository at this point in the history
  • Loading branch information
@VikingsFan
TomDu authored and VikingsFan committed Dec 7, 2015
1 parent 490ff86 commit b0c3133
Show file tree
Hide file tree
Showing 4 changed files with 447 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/Microsoft.OData.Core/UriParser/Parsers/FunctionOverloadResolver.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,8 @@ internal static bool ResolveOperationFromList(string identifier, IEnumerable<str
if (bindingType != null)
{
// TODO: look up actual container names here?
if (bindingType.IsOpenType() && !identifier.Contains("."))
// When using extension, there may be function call with unqualified name. So loose the restriction here.
if (bindingType.IsOpenType() && !identifier.Contains(".") && resolver.GetType() == typeof(ODataUriResolver))
{
matchingOperation = null;
return false;
Expand Down
236 changes: 236 additions & 0 deletions ...alTests/Tests/DataOData/Tests/OData.Query.TDD.Tests/Metadata/OpenTypeExtensionTestBase.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,236 @@
//---------------------------------------------------------------------
// <copyright file="OpenTypeExtensionTestBase.cs" company="Microsoft">
// Copyright (C) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information.
// </copyright>
//---------------------------------------------------------------------

namespace Microsoft.Test.OData.Query.TDD.Tests
{
using System;
using FluentAssertions;
using Microsoft.OData.Core;
using Microsoft.OData.Core.UriParser;
using Microsoft.OData.Core.UriParser.Metadata;
using Microsoft.OData.Edm;
using Microsoft.OData.Edm.Library;
using Microsoft.OData.Edm.Library.Values;

public class OpenTypeExtensionTestBase
{
#region Test init
protected readonly Uri ServiceRoot = new Uri("http://host");
protected static IEdmModel Model;
protected static IEdmStructuralProperty PersonNameProp;
protected static IEdmProperty PersonPen;
protected static IEdmNavigationProperty PersonNavPen;
protected static IEdmNavigationProperty PersonNavPen2;
protected static IEdmStructuralProperty AddrProperty;
protected static IEdmStructuralProperty ZipCodeProperty;
protected static IEdmStructuralProperty PencilId;
protected static IEdmComplexType AddrType;
protected static IEdmEntityType PersonType;
protected static IEdmEntityType StarPencil;
protected static IEdmEntitySet PeopleSet;
protected static IEdmOperation FindPencil2P;
protected static IEdmOperation FindPencil1P;
protected static IEdmOperation FindPencilsCon;
protected static IEdmOperation FindPencilsConNT;
protected static EdmAction ChangeZip;
protected static EdmFunction GetZip;
protected static IEdmEntitySet PencilSet;

static OpenTypeExtensionTestBase()
{
var model = new EdmModel();
Model = model;

var person = new EdmEntityType("TestNS", "Person", null, false, true);
var personId = person.AddStructuralProperty("ID", EdmPrimitiveTypeKind.Int32);
PersonNameProp = person.AddStructuralProperty("Name", EdmPrimitiveTypeKind.String);
PersonPen = person.AddStructuralProperty("pen", EdmPrimitiveTypeKind.Binary);
person.AddKeys(personId);
PersonType = person;

var address = new EdmComplexType("TestNS", "Address", null, false, true);
AddrType = address;
ZipCodeProperty = address.AddStructuralProperty("ZipCode", EdmPrimitiveTypeKind.String);
AddrProperty = person.AddStructuralProperty("Addr", new EdmComplexTypeReference(address, false));

var pencil = new EdmEntityType("TestNS", "Pencil");
var pencilId = pencil.AddStructuralProperty("Id", EdmPrimitiveTypeKind.Int32);
PencilId = pencilId;
var pid = pencil.AddStructuralProperty("Pid", EdmPrimitiveTypeKind.Int32);
pencil.AddKeys(pencilId);

var starPencil = new EdmEntityType("TestNS", "StarPencil", pencil);
model.AddElement(starPencil);
var starPencilUpper = new EdmEntityType("TestNS", "STARPENCIL");
model.AddElement(starPencilUpper);
StarPencil = starPencil;

var navInfo = new EdmNavigationPropertyInfo()
{
Name = "Pen",
ContainsTarget = false,
Target = pencil,
TargetMultiplicity = EdmMultiplicity.One
};

PersonNavPen = person.AddUnidirectionalNavigation(navInfo);

var navInfo2 = new EdmNavigationPropertyInfo()
{
Name = "Pen2",
ContainsTarget = true,
Target = pencil,
TargetMultiplicity = EdmMultiplicity.One
};

PersonNavPen2 = person.AddUnidirectionalNavigation(navInfo2);

var container = new EdmEntityContainer("Default", "Con1");
var personSet = container.AddEntitySet("People", person);
PencilSet = container.AddEntitySet("PencilSet", pencil);
personSet.AddNavigationTarget(PersonNavPen, PencilSet);
PeopleSet = personSet;

var pencilRef = new EdmEntityTypeReference(pencil, false);
EdmFunction findPencil1 = new EdmFunction("TestNS", "FindPencil", pencilRef, true, null, false);
findPencil1.AddParameter("qid", new EdmEntityTypeReference(PersonType, false));
model.AddElement(findPencil1);
FindPencil1P = findPencil1;

EdmFunction findPencil = new EdmFunction("TestNS", "FindPencil", pencilRef, true, null, false);
findPencil.AddParameter("qid", new EdmEntityTypeReference(PersonType, false));
findPencil.AddParameter("pid", EdmCoreModel.Instance.GetInt32(false));
model.AddElement(findPencil);
FindPencil2P = findPencil;

EdmFunction findPencilsCon = new EdmFunction("TestNS", "FindPencilsCon", new EdmCollectionTypeReference(new EdmCollectionType(pencilRef)), true, null, false);
FindPencilsCon = findPencilsCon;
findPencilsCon.AddParameter("qid", new EdmEntityTypeReference(PersonType, false));
model.AddElement(findPencilsCon);

EdmFunction findPencilsConNT = new EdmFunction("TestNT", "FindPencilsCon", new EdmCollectionTypeReference(new EdmCollectionType(pencilRef)), true, null, false);
FindPencilsConNT = findPencilsConNT;
findPencilsConNT.AddParameter("qid", new EdmEntityTypeReference(PersonType, false));
model.AddElement(findPencilsConNT);

ChangeZip = new EdmAction("TestNS", "ChangeZip", null, true, null);
ChangeZip.AddParameter("address", new EdmComplexTypeReference(address, false));
ChangeZip.AddParameter("newZip", EdmCoreModel.Instance.GetString(false));
model.AddElement(ChangeZip);

GetZip = new EdmFunction("TestNS", "GetZip", EdmCoreModel.Instance.GetString(false), true, null, true);
GetZip.AddParameter("address", new EdmComplexTypeReference(address, false));
model.AddElement(GetZip);

model.AddElement(person);
model.AddElement(address);
model.AddElement(pencil);
model.AddElement(container);
}
#endregion

#region TestMethod
protected void TestUriParserExtension<TResult>(
string originalStr,
string caseInsensitiveStr,
Func<ODataUriParser, TResult> parse,
Action<TResult> verify,
string errorMessage,
IEdmModel model,
Action<ODataUriParser> parserSet)
{
Uri originalCase = new Uri(originalStr, UriKind.Relative);
Uri caseInsensitiveCase = new Uri(caseInsensitiveStr, UriKind.Relative);
TestExtension(
() => new ODataUriParser(model, originalCase),
() => new ODataUriParser(model, caseInsensitiveCase),
parse,
verify,
errorMessage,
model,
parserSet);
}

protected void TestExtension<TParser, TResult>(
Func<TParser> getOriginalParser,
Func<TParser> getCaseInsensitiveParser,
Func<TParser, TResult> parse,
Action<TResult> verify,
string errorMessage,
IEdmModel model,
Action<TParser> parserSet)
{
// Original case should pass
TParser parser = getOriginalParser();
verify(parse(parser));

// Original case should pass with CaseInsensitive parser
parser = getOriginalParser();
parserSet(parser);
verify(parse(parser));

// CaseInsensitive case should fail with original parser, or null result excepted when error message be null.
if (errorMessage != null)
{
Action action = () => parse(getCaseInsensitiveParser());
action.ShouldThrow<ODataException>().WithMessage(errorMessage);
}
else
{
parse(getCaseInsensitiveParser());
}

// CaseInsensitive case should pass with CaseInsensitive parser
parser = getCaseInsensitiveParser();
parserSet(parser);
verify(parse(parser));
}

protected void TestConflict<TResult>(
string originalStr,
Func<ODataUriParser, TResult> parse,
Action<TResult> verify,
string conflictMessage,
IEdmModel model,
ODataUriResolver resolver)
{
Uri originalCase = new Uri(originalStr, UriKind.Relative);

if (verify != null)
{
// Original case should pass
ODataUriParser parser = new ODataUriParser(model, originalCase);
verify(parse(parser));
}

// Original case should fail with CaseInsensitive parser with errorMessage
Action action = () => parse(new ODataUriParser(model, originalCase) { Resolver = resolver });
action.ShouldThrow<ODataException>().WithMessage(conflictMessage);
}

protected void TestNotExist<TResult>(
string originalStr,
Func<ODataUriParser, TResult> parse,
string message,
IEdmModel model,
Action<ODataUriParser> parserSet)
{
Uri originalCase = new Uri(originalStr, UriKind.Relative);

// Original case should fail with message
ODataUriParser parser = new ODataUriParser(model, originalCase);
Action action = () => parse(parser);
action.ShouldThrow<ODataException>().WithMessage(message);

// Original case should fail with CaseInsensitive parser with same errorMessage
parser = new ODataUriParser(model, originalCase);
parserSet(parser);
action = () => parse(parser);
action.ShouldThrow<ODataException>().WithMessage(message);
}
#endregion
}
}
Loading

0 comments on commit b0c3133

Please sign in to comment.