Skip to content

Commit

Permalink
Remove fluentAssertions package in Edm unit test project
Browse files Browse the repository at this point in the history
  • Loading branch information
@xuzhg
xuzhg committed Sep 17, 2019
1 parent eb1a43f commit e65ec66
Show file tree
Hide file tree
Showing 34 changed files with 799 additions and 809 deletions.
4 changes: 0 additions & 4 deletions ...tionalTests/Microsoft.OData.Edm.Tests/Build.NetFramework/Microsoft.OData.Edm.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,6 @@
<AssemblyOriginatorKeyFile>..\..\..\..\tools\StrongNamePublicKeys\testkey.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="FluentAssertions, Version=4.1.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\sln\packages\FluentAssertions.2.0.0.1\lib\net40\FluentAssertions.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.XML" />
<Reference Include="System.Xml.Linq" />
Expand Down
52 changes: 28 additions & 24 deletions test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/CsdlReaderTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
using System.Linq;
using System.Xml;
using System.Xml.Linq;
using FluentAssertions;
using Microsoft.OData.Edm.Csdl;
using Microsoft.OData.Edm.Csdl.CsdlSemantics;
using Microsoft.OData.Edm.Validation;
Expand Down Expand Up @@ -192,15 +191,15 @@ var csdl
var setA = model.FindDeclaredNavigationSource("Root");
var target = setA.NavigationPropertyBindings.First().Target;
Assert.True(target is IEdmContainedEntitySet);
target.Name.Should().Be("SetB");
Assert.Equal("SetB", target.Name);
var targetSegments = target.Path.PathSegments.ToList();
targetSegments.Count().Should().Be(2);
targetSegments[0].Should().Be("Root");
targetSegments[1].Should().Be("SetB");
Assert.Equal(2, targetSegments.Count());
Assert.Equal("Root", targetSegments[0]);
Assert.Equal("SetB", targetSegments[1]);
var pathSegments = setA.NavigationPropertyBindings.First().Path.PathSegments.ToList();
pathSegments.Count().Should().Be(2);
pathSegments[0].Should().Be("EntityA");
pathSegments[1].Should().Be("EntityAToB");
Assert.Equal(2, pathSegments.Count());
Assert.Equal("EntityA", pathSegments[0]);
Assert.Equal("EntityAToB", pathSegments[1]);
}

[Fact]
Expand Down Expand Up @@ -238,25 +237,26 @@ var csdl

IEdmModel model;
IEnumerable<EdmError> errors;
CsdlReader.TryParse(XElement.Parse(csdl).CreateReader(), out model, out errors).Should().BeTrue();
errors.Count().Should().Be(0);
var result = CsdlReader.TryParse(XElement.Parse(csdl).CreateReader(), out model, out errors);
Assert.True(result);
Assert.Empty(errors);
model.Validate(out errors);
errors.Count().Should().Be(0);
Assert.Empty(errors);

var educationSingleton = model.FindDeclaredNavigationSource("education");
var navPropBinding = educationSingleton.NavigationPropertyBindings.First();
var target = navPropBinding.Target;
target.Should().NotBeNull();
Assert.NotNull(target);
Assert.True(target is IEdmContainedEntitySet);
target.Name.Should().Be("users");
Assert.Equal("users", target.Name);
var targetSegments = target.Path.PathSegments.ToList();
targetSegments.Count().Should().Be(2);
targetSegments[0].Should().Be("education");
targetSegments[1].Should().Be("users");
Assert.Equal(2, targetSegments.Count());
Assert.Equal("education", targetSegments[0]);
Assert.Equal("users", targetSegments[1]);
var pathSegments = navPropBinding.Path.PathSegments.ToList();
pathSegments.Count().Should().Be(2);
pathSegments[0].Should().Be("classes");
pathSegments[1].Should().Be("members");
Assert.Equal(2, pathSegments.Count());
Assert.Equal("classes", pathSegments[0]);
Assert.Equal("members", pathSegments[1]);
}

[Fact]
Expand Down Expand Up @@ -537,8 +537,9 @@ public void ParsingInvalidXmlWithMultipleEntityContainersShouldThrow()
</edmx:DataServices>
</edmx:Edmx>";
Action parseAction = () => CsdlReader.Parse(XElement.Parse(EdmxwithMultipleEntityContainers).CreateReader());
parseAction.ShouldThrow<EdmParseException>().Where(e => e.Message.Contains(
Strings.CsdlParser_MetadataDocumentCannotHaveMoreThanOneEntityContainer)).And.Errors.Should().HaveCount(1);
var exception = Assert.Throws<EdmParseException>(parseAction);
Assert.Contains(Strings.CsdlParser_MetadataDocumentCannotHaveMoreThanOneEntityContainer, exception.Message);
Assert.Equal(1, exception.Errors.Count);
}

[Fact]
Expand Down Expand Up @@ -786,14 +787,17 @@ private string GetStringAnnotation(IEdmModel model, IEdmVocabularyAnnotatable ta
private void RunValidTest(Func<XmlReader, IEdmModel> parse)
{
var result = parse(this.validReader);
result.Should().NotBeNull();
result.EntityContainer.FullName().Should().Be("Test.Container");
Assert.NotNull(result);
Assert.Equal("Test.Container", result.EntityContainer.FullName());
}

private void RunInvalidTest(Func<XmlReader, IEdmModel> parse)
{
Action parseAction = () => parse(this.invalidReader);
parseAction.ShouldThrow<EdmParseException>().WithMessage(ErrorStrings.EdmParseException_ErrorsEncounteredInEdmx(ErrorMessage)).And.Errors.Should().OnlyContain(e => e.ToString() == ErrorMessage);

EdmParseException exception = Assert.Throws<EdmParseException>(parseAction);
Assert.Equal(ErrorStrings.EdmParseException_ErrorsEncounteredInEdmx(ErrorMessage), exception.Message);
Assert.Single(exception.Errors, e => e.ToString() == ErrorMessage);
}

private static IEdmModel GetEdmModel(string types = "", string properties = "")
Expand Down
2 changes: 0 additions & 2 deletions test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/CsdlWriterTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,10 @@
using System.IO;
using System.Linq;
using System.Xml;

using Microsoft.OData.Edm.Csdl;
using Microsoft.OData.Edm.Validation;
using Microsoft.OData.Edm.Vocabularies;
using Microsoft.OData.Edm.Vocabularies.V1;

using Xunit;

namespace Microsoft.OData.Edm.Tests.Csdl
Expand Down
45 changes: 23 additions & 22 deletions test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/EdmEnumValueParserTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

using System.Collections.Generic;
using System.Linq;
using FluentAssertions;
using Microsoft.OData.Edm.Csdl;
using Xunit;

Expand All @@ -24,8 +23,8 @@ public void TryParseEnumMemberOfOneValueShouldBeTrue()
string enumPath = " Ns.Color/Blue ";
List<IEdmSchemaType> types = new List<IEdmSchemaType> { enumType, complexType };
IEnumerable<IEdmEnumMember> parsedMember;
EdmEnumValueParser.TryParseEnumMember(enumPath, BuildModelFromTypes(types), null, out parsedMember).Should().BeTrue();
parsedMember.Single().Should().Be(blue);
Assert.True(EdmEnumValueParser.TryParseEnumMember(enumPath, BuildModelFromTypes(types), null, out parsedMember));
Assert.Equal(blue, parsedMember.Single());
}

[Fact]
Expand All @@ -38,10 +37,10 @@ public void TryParseEnumMemberOfInvalidStringsShouldBeFalse()
string enumPath = " ";
List<IEdmSchemaType> types = new List<IEdmSchemaType> { enumType, complexType };
IEnumerable<IEdmEnumMember> parsedMember;
EdmEnumValueParser.TryParseEnumMember(enumPath, BuildModelFromTypes(types), null, out parsedMember).Should().BeFalse();
Assert.False(EdmEnumValueParser.TryParseEnumMember(enumPath, BuildModelFromTypes(types), null, out parsedMember));

enumPath = " / ";
EdmEnumValueParser.TryParseEnumMember(enumPath, BuildModelFromTypes(types), null, out parsedMember).Should().BeFalse();
Assert.False(EdmEnumValueParser.TryParseEnumMember(enumPath, BuildModelFromTypes(types), null, out parsedMember));
}

[Fact]
Expand All @@ -51,10 +50,10 @@ public void TryParseEnumMemberOfMultipleInvalidTypeShouldBeTrue()
string enumPath = "Ns.Color/Blue Ns.Color/Red";
List<IEdmSchemaType> types = new List<IEdmSchemaType> { complexType };
IEnumerable<IEdmEnumMember> parsedMember;
EdmEnumValueParser.TryParseEnumMember(enumPath, BuildModelFromTypes(types), null, out parsedMember).Should().BeTrue();
parsedMember.Count().Should().Be(2);
parsedMember.First().Name.Should().Be("Blue");
parsedMember.ElementAt(1).Name.Should().Be("Red");
Assert.True(EdmEnumValueParser.TryParseEnumMember(enumPath, BuildModelFromTypes(types), null, out parsedMember));
Assert.Equal(2, parsedMember.Count());
Assert.Equal("Blue", parsedMember.First().Name);
Assert.Equal("Red", parsedMember.ElementAt(1).Name);
}

[Fact]
Expand All @@ -67,7 +66,7 @@ public void TryParseEnumMemberOfInvalidPathShouldBeFalse()
string enumPath = "Ns.Color//Blue";
List<IEdmSchemaType> types = new List<IEdmSchemaType> { enumType, complexType };
IEnumerable<IEdmEnumMember> parsedMember;
EdmEnumValueParser.TryParseEnumMember(enumPath, BuildModelFromTypes(types), null, out parsedMember).Should().BeFalse();
Assert.False(EdmEnumValueParser.TryParseEnumMember(enumPath, BuildModelFromTypes(types), null, out parsedMember));
}

[Fact]
Expand All @@ -80,9 +79,9 @@ public void TryParseEnumMemberOfInvalidEnumTypeShouldBeTrue()
string enumPath = "Ns.Colors/Blue";
List<IEdmSchemaType> types = new List<IEdmSchemaType> { enumType, complexType };
IEnumerable<IEdmEnumMember> parsedMember;
EdmEnumValueParser.TryParseEnumMember(enumPath, BuildModelFromTypes(types), null, out parsedMember).Should().BeTrue();
parsedMember.Count().Should().Be(1);
parsedMember.First().Name.Should().Be("Blue");
Assert.True(EdmEnumValueParser.TryParseEnumMember(enumPath, BuildModelFromTypes(types), null, out parsedMember));
var mem = Assert.Single(parsedMember);
Assert.Equal("Blue", mem.Name);
}

[Fact]
Expand All @@ -95,7 +94,7 @@ public void TryParseEnumMemberOfInvalidEnumMemberShouldBeFalse()
string enumPath = "Ns.Color/Green";
List<IEdmSchemaType> types = new List<IEdmSchemaType> { enumType, complexType };
IEnumerable<IEdmEnumMember> parsedMember;
EdmEnumValueParser.TryParseEnumMember(enumPath, BuildModelFromTypes(types), null, out parsedMember).Should().BeFalse();
Assert.False(EdmEnumValueParser.TryParseEnumMember(enumPath, BuildModelFromTypes(types), null, out parsedMember));
}

[Fact]
Expand All @@ -108,10 +107,10 @@ public void TryParseEnumMemberWithFlagsOfTwoValuesShouldBeTrue()
string enumPath = " Ns.Permission/Read Ns.Permission/Write ";
List<IEdmSchemaType> types = new List<IEdmSchemaType> { enumType, complexType };
IEnumerable<IEdmEnumMember> parsedMember;
EdmEnumValueParser.TryParseEnumMember(enumPath, BuildModelFromTypes(types), null, out parsedMember).Should().BeTrue();
parsedMember.Count().Should().Be(2);
parsedMember.First().Should().Be(read);
parsedMember.Last().Should().Be(write);
Assert.True(EdmEnumValueParser.TryParseEnumMember(enumPath, BuildModelFromTypes(types), null, out parsedMember));
Assert.Equal(2, parsedMember.Count());
Assert.Equal(read, parsedMember.First());
Assert.Equal(write, parsedMember.Last());
}

[Fact]
Expand All @@ -124,7 +123,7 @@ public void TryParseEnumMemberWithoutFlagsOfTwoValueShouldBeFalse()
string enumPath = "Ns.Permission/Read Ns.Permission/Write";
List<IEdmSchemaType> types = new List<IEdmSchemaType> { enumType, complexType };
IEnumerable<IEdmEnumMember> parsedMember;
EdmEnumValueParser.TryParseEnumMember(enumPath, BuildModelFromTypes(types), null, out parsedMember).Should().BeFalse();
Assert.False(EdmEnumValueParser.TryParseEnumMember(enumPath, BuildModelFromTypes(types), null, out parsedMember));
}

[Fact]
Expand All @@ -138,9 +137,11 @@ public void TryParseEnumMemberWithFlagsOfMultiValueShouldBeTrue()
string enumPath = "Ns.Permission/Read Ns.Permission/Write Ns.Permission/ReadWrite";
List<IEdmSchemaType> types = new List<IEdmSchemaType> { enumType, complexType };
IEnumerable<IEdmEnumMember> parsedMember;
EdmEnumValueParser.TryParseEnumMember(enumPath, BuildModelFromTypes(types), null, out parsedMember).Should().BeTrue();
parsedMember.Count().Should().Be(3);
parsedMember.Should().Contain(read).And.Contain(write).And.Contain(readwrite);
Assert.True(EdmEnumValueParser.TryParseEnumMember(enumPath, BuildModelFromTypes(types), null, out parsedMember));
Assert.Equal(3, parsedMember.Count());
Assert.Contains(read, parsedMember);
Assert.Contains(write, parsedMember);
Assert.Contains(readwrite, parsedMember);
}

private static IEdmModel BuildModelFromTypes(IEnumerable<IEdmSchemaType> types)
Expand Down
Loading

0 comments on commit e65ec66

Please sign in to comment.