Removed test type_should_match_with_self_referencing_property_substitution.

Dependency resolving will always result in a dynamic type, even if clrtypes match.
Changed dependentProperties from a dictionary of tuples to a list of tuples.

Author: LuukN2

src/Common.OData.ApiExplorer/AspNet.OData/DefaultModelTypeBuilder.cs

@@ -67,7 +67,7 @@ public Type NewStructuredType( IEdmStructuredType structuredType, Type clrType,
             var structuralProperties = structuredType.Properties().ToDictionary( p => p.Name, StringComparer.OrdinalIgnoreCase );
             var clrTypeMatchesEdmType = true;
             var hasUnfinishedTypes = false;
-            var dependentProperties = new Dictionary<string, Tuple<EdmTypeKey, bool>>();
+            var dependentProperties = new List<Tuple<EdmTypeKey, bool, string>>();
 
             foreach ( var property in clrType.GetProperties( bindingFlags ) )
             {
@@ -98,8 +98,8 @@ public Type NewStructuredType( IEdmStructuredType structuredType, Type clrType,
                         {
                             clrTypeMatchesEdmType = false;
                             hasUnfinishedTypes = true;
-                            var keyTuple = new Tuple<EdmTypeKey, bool>( elementKey, true );
-                            dependentProperties.Add(property.Name,  keyTuple );
+                            var dependencyTuple = new Tuple<EdmTypeKey, bool, string>( elementKey, true, property.Name );
+                            dependentProperties.Add( dependencyTuple );
                             continue;
                         }
 
@@ -130,8 +130,8 @@ public Type NewStructuredType( IEdmStructuredType structuredType, Type clrType,
                     {
                         clrTypeMatchesEdmType = false;
                         hasUnfinishedTypes = true;
-                        var keyTuple = new Tuple<EdmTypeKey, bool>( propertyTypeKey, false );
-                        dependentProperties.Add(property.Name, keyTuple );
+                        var dependencyTuple = new Tuple<EdmTypeKey, bool, string>( propertyTypeKey, false, property.Name );
+                        dependentProperties.Add( dependencyTuple );
                         continue;
                     }
                 }
@@ -153,10 +153,9 @@ public Type NewStructuredType( IEdmStructuredType structuredType, Type clrType,
                 {
                     typeBuilder = CreateTypeBuilderFromSignature( signature );
                     var newPropertyDependencies = new List<PropertyDependency>();
-                    foreach ( var name in dependentProperties.Keys )
+                    foreach ( var dependencyTuple in dependentProperties )
                     {
-                        var keyTuple = dependentProperties[name];
-                        newPropertyDependencies.Add( new PropertyDependency( typeBuilder, keyTuple.Item1, name, keyTuple.Item2 ) );
+                        newPropertyDependencies.Add( new PropertyDependency( typeBuilder, dependencyTuple.Item1, dependencyTuple.Item2, dependencyTuple.Item3 ) );
                     }
 
                     dependencies.Add( typeKey, newPropertyDependencies );

src/Common.OData.ApiExplorer/AspNet.OData/PropertyDependency.cs

@@ -14,7 +14,7 @@ internal class PropertyDependency
         /// <param name="dependentOnTypeKey">The key of the type the property has a dependency on.</param>
         /// <param name="propertyName">The name of the property.</param>
         /// <param name="isCollection">Whether the property is a collection or not.</param>
-        internal PropertyDependency( TypeBuilder dependentType, EdmTypeKey dependentOnTypeKey, string propertyName, bool isCollection )
+        internal PropertyDependency( TypeBuilder dependentType, EdmTypeKey dependentOnTypeKey,  bool isCollection, string propertyName )
         {
             Arg.NotNull<TypeBuilder>( dependentType, nameof(dependentType) );
             Arg.NotNull<EdmTypeKey>( dependentOnTypeKey, nameof( dependentOnTypeKey ) );

test/Microsoft.AspNet.OData.Versioning.ApiExplorer.Tests/AspNet.OData/DefaultModelTypeBuilderTest.cs

@@ -132,24 +132,6 @@ public void type_should_match_edm_with_nested_entity_substitution()
             innerType.Should().HaveProperty<string>( nameof( Contact.LastName ) );
         }
 
-        [Fact]
-        public void type_should_match_with_self_referencing_property_substitution()
-        {
-            // arrange
-            var modelBuilder = new ODataConventionModelBuilder();
-
-            modelBuilder.EntitySet<Company>( "Companies" );
-
-            var context = NewContext( modelBuilder.GetEdmModel() );
-            var originalType = typeof( Company );
-
-            //act
-            var subsitutedType = originalType.SubstituteIfNecessary( context );
-
-            // assert
-            subsitutedType.Should().Be( typeof( Company ) );
-        }
-
         [Fact]
         public void type_should_use_self_referencing_property_substitution()
         {

test/Microsoft.AspNetCore.OData.Versioning.ApiExplorer.Tests/AspNet.OData/DefaultModelTypeBuilderTest.cs

@@ -132,24 +132,6 @@ public void type_should_match_edm_with_nested_entity_substitution()
             innerType.Should().HaveProperty<string>( nameof( Contact.LastName ) );
         }
 
-        [Fact]
-        public void type_should_match_with_self_referencing_property_substitution()
-        {
-            // arrange
-            var modelBuilder = new ODataConventionModelBuilder();
-
-            modelBuilder.EntitySet<Company>( "Companies" );
-
-            var context = NewContext( modelBuilder.GetEdmModel() );
-            var originalType = typeof( Company );
-
-            //act
-            var subsitutedType = originalType.SubstituteIfNecessary( context );
-
-            // assert
-            subsitutedType.Should().Be( typeof( Company ) );
-        }
-
         [Fact]
         public void type_should_use_self_referencing_property_substitution()
         {