Correct deprecated version aggregation. Fixes #719

Author: commonsensesoftware

src/Common/Versioning/ApiVersionModelExtensions.cs

@@ -59,6 +59,8 @@ public static ApiVersionModel Aggregate( this ApiVersionModel version, IEnumerab
                 deprecated.UnionWith( otherVersion.DeprecatedApiVersions );
             }
 
+            deprecated.ExceptWith( supported );
+
             return new ApiVersionModel( version, implemented.ToSortedReadOnlyList(), supported.ToSortedReadOnlyList(), deprecated.ToSortedReadOnlyList() );
         }
 
@@ -94,6 +96,8 @@ public static ApiVersionModel Aggregate( this IEnumerable<ApiVersionModel> versi
                 }
             }
 
+            deprecated.ExceptWith( supported );
+
             return new ApiVersionModel( supported, deprecated );
         }
     }

test/Test.Common/Versioning/ApiVersionModelExtensionsTest.cs

@@ -25,11 +25,11 @@ public void aggregate_should_merge_api_version_info()
             aggregatedModel.Should().BeEquivalentTo(
                 new
                 {
-                    IsApiVersionNeutral = expected.IsApiVersionNeutral,
-                    DeclaredApiVersions = expected.DeclaredApiVersions,
-                    ImplementedApiVersions = expected.ImplementedApiVersions,
-                    SupportedApiVersions = expected.SupportedApiVersions,
-                    DeprecatedApiVersions = expected.DeprecatedApiVersions
+                    expected.IsApiVersionNeutral,
+                    expected.DeclaredApiVersions,
+                    expected.ImplementedApiVersions,
+                    expected.SupportedApiVersions,
+                    expected.DeprecatedApiVersions
                 } );
         }
 
@@ -54,11 +54,34 @@ public void aggregate_should_merge_api_version_info_sequence()
             aggregatedModel.Should().BeEquivalentTo(
                 new
                 {
-                    IsApiVersionNeutral = expected.IsApiVersionNeutral,
-                    DeclaredApiVersions = expected.DeclaredApiVersions,
-                    ImplementedApiVersions = expected.ImplementedApiVersions,
-                    SupportedApiVersions = expected.SupportedApiVersions,
-                    DeprecatedApiVersions = expected.DeprecatedApiVersions
+                    expected.IsApiVersionNeutral,
+                    expected.DeclaredApiVersions,
+                    expected.ImplementedApiVersions,
+                    expected.SupportedApiVersions,
+                    expected.DeprecatedApiVersions
+                } );
+        }
+
+        [Fact]
+        public void aggregate_should_not_merge_deprecated_api_version_when_also_supported()
+        {
+            // arrange
+            var model1 = new ApiVersionModel( new[] { new ApiVersion( 1, 0 ) }, Enumerable.Empty<ApiVersion>() );
+            var model2 = new ApiVersionModel( new[] { new ApiVersion( 2, 0 ) }, new[] { new ApiVersion( 1, 0 ) } );
+            var expected = new ApiVersionModel( new[] { new ApiVersion( 1, 0 ), new ApiVersion( 2, 0 ) }, Enumerable.Empty<ApiVersion>() );
+
+            // act
+            var aggregatedModel = model1.Aggregate( model2 );
+
+            // assert
+            aggregatedModel.Should().BeEquivalentTo(
+                new
+                {
+                    expected.IsApiVersionNeutral,
+                    expected.DeclaredApiVersions,
+                    expected.ImplementedApiVersions,
+                    expected.SupportedApiVersions,
+                    expected.DeprecatedApiVersions
                 } );
         }
     }