added tests for DefaultIncludeExpressionExtractor / fixed ugly typo

spike83 · spike83 · commit 9e6a7c836b7f · 2016-08-18T08:17:04.000+02:00
diff --git a/JSONAPI.Autofac/JsonApiAutofacModule.cs b/JSONAPI.Autofac/JsonApiAutofacModule.cs
@@ -166,7 +166,7 @@ protected override void Load(ContainerBuilder builder)
 
             // Misc
             builder.RegisterType<DefaultSortExpressionExtractor>().As<ISortExpressionExtractor>().SingleInstance();
-            builder.RegisterType<DefauktIncludeExpressionExtractor>().As<IIncludeExpressionExtractor>().SingleInstance();
+            builder.RegisterType<DefaultIncludeExpressionExtractor>().As<IIncludeExpressionExtractor>().SingleInstance();
         }
     }
 }
diff --git a/JSONAPI.Tests/Http/DefaultIncludeExpressionExtractorTests.cs b/JSONAPI.Tests/Http/DefaultIncludeExpressionExtractorTests.cs
@@ -0,0 +1,57 @@
+&#65279;using System.Net.Http;
+using FluentAssertions;
+using JSONAPI.Http;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace JSONAPI.Tests.Http
+{
+    [TestClass]
+    public class DefaultIncludeExpressionExtractorTests
+    {
+        [TestMethod]
+        public void ExtractsSingleIncludeExpressionFromUri()
+        {
+            // Arrange
+            const string uri = "http://api.example.com/dummies?include=boss";
+            var request = new HttpRequestMessage(HttpMethod.Get, uri);
+
+            // Act
+            var extractor = new DefaultIncludeExpressionExtractor();
+            var inclExpressions = extractor.ExtractIncludeExpressions(request);
+
+            // Assert
+            inclExpressions.Should().BeEquivalentTo("boss");
+        }
+
+
+        [TestMethod]
+        public void ExtractsMultipleIncludeExpressionsFromUri()
+        {
+            // Arrange
+            const string uri = "http://api.example.com/dummies?include=boss,office-address";
+            var request = new HttpRequestMessage(HttpMethod.Get, uri);
+
+            // Act
+            var extractor = new DefaultIncludeExpressionExtractor();
+            var inclExpressions = extractor.ExtractIncludeExpressions(request);
+
+            // Assert
+            inclExpressions.Should().BeEquivalentTo("boss", "office-address");
+        }
+
+        [TestMethod]
+        public void ExtractsNothingWhenThereIsNoIncludeParam()
+        {
+            // Arrange
+            const string uri = "http://api.example.com/dummies";
+            var request = new HttpRequestMessage(HttpMethod.Get, uri);
+
+            // Act
+            var extractor = new DefaultIncludeExpressionExtractor();
+            var inclExpression = extractor.ExtractIncludeExpressions(request);
+
+            // Assert
+            inclExpression.Length.Should().Be(0);
+        }
+    }
+}
diff --git a/JSONAPI.Tests/JSONAPI.Tests.csproj b/JSONAPI.Tests/JSONAPI.Tests.csproj
@@ -91,6 +91,7 @@
     <Compile Include="Core\ResourceTypeRegistryTests.cs" />
     <Compile Include="Extensions\TypeExtensionsTests.cs" />
     <Compile Include="Http\BaseUrlServiceTest.cs" />
+    <Compile Include="Http\DefaultIncludeExpressionExtractorTests.cs" />
     <Compile Include="Http\DefaultSortExpressionExtractorTests.cs" />
     <Compile Include="Json\JsonApiFormatterTests.cs" />
     <Compile Include="Models\Author.cs" />
diff --git a/JSONAPI/Http/DefaultIncludeExpressionExtractor.cs b/JSONAPI/Http/DefaultIncludeExpressionExtractor.cs
@@ -6,7 +6,7 @@ namespace JSONAPI.Http
     /// <summary>
     /// Default implementation of <see cref="IIncludeExpressionExtractor" />
     /// </summary>
-    public class DefauktIncludeExpressionExtractor: IIncludeExpressionExtractor
+    public class DefaultIncludeExpressionExtractor: IIncludeExpressionExtractor
     {
         private const string IncludeQueryParamKey = "include";
 
diff --git a/JSONAPI/JSONAPI.csproj b/JSONAPI/JSONAPI.csproj
@@ -90,7 +90,7 @@
     <Compile Include="Core\ResourceTypeRelationship.cs" />
     <Compile Include="Core\ToManyResourceTypeRelationship.cs" />
     <Compile Include="Core\ToOneResourceTypeRelationship.cs" />
-    <Compile Include="Http\DefauktIncludeExpressionExtractor.cs" />
+    <Compile Include="Http\DefaultIncludeExpressionExtractor.cs" />
     <Compile Include="Http\DefaultSortExpressionExtractor.cs" />
     <Compile Include="Http\DocumentMaterializerLocator.cs" />
     <Compile Include="Http\IDocumentMaterializerLocator.cs" />

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ protected override void Load(ContainerBuilder builder)`
`166`	`166`
`167`	`167`	`// Misc`
`168`	`168`	`builder.RegisterType<DefaultSortExpressionExtractor>().As<ISortExpressionExtractor>().SingleInstance();`
`169`		`- builder.RegisterType<DefauktIncludeExpressionExtractor>().As<IIncludeExpressionExtractor>().SingleInstance();`
	`169`	`+ builder.RegisterType<DefaultIncludeExpressionExtractor>().As<IIncludeExpressionExtractor>().SingleInstance();`
`170`	`170`	`}`
`171`	`171`	`}`
`172`	`172`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ namespace JSONAPI.Http`
`6`	`6`	`/// <summary>`
`7`	`7`	`/// Default implementation of <see cref="IIncludeExpressionExtractor" />`
`8`	`8`	`/// </summary>`
`9`		`- public class DefauktIncludeExpressionExtractor: IIncludeExpressionExtractor`
	`9`	`+ public class DefaultIncludeExpressionExtractor: IIncludeExpressionExtractor`
`10`	`10`	`{`
`11`	`11`	`private const string IncludeQueryParamKey = "include";`
`12`	`12`