Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions JSONAPI.Tests/Json/JsonApiMediaFormaterTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,11 @@ public void SetupModels()

}

private enum TestEnum
{

}

[TestMethod]
public void CanWritePrimitiveTest()
{
Expand All @@ -89,6 +94,8 @@ public void CanWritePrimitiveTest()
Assert.IsTrue(formatter.CanWriteTypeAsPrimitive(typeof(DateTime?)), "CanWriteTypeAsPrimitive returned wrong answer for nullable DateTime!");
Assert.IsTrue(formatter.CanWriteTypeAsPrimitive(typeof(DateTimeOffset?)), "CanWriteTypeAsPrimitive returned wrong answer for nullable DateTimeOffset!");
Assert.IsTrue(formatter.CanWriteTypeAsPrimitive(typeof(Guid?)), "CanWriteTypeAsPrimitive returned wrong answer for nullable Guid!");
Assert.IsTrue(formatter.CanWriteTypeAsPrimitive(typeof(TestEnum)), "CanWriteTypeAsPrimitive returned wrong answer for enum!");
Assert.IsTrue(formatter.CanWriteTypeAsPrimitive(typeof(TestEnum?)), "CanWriteTypeAsPrimitive returned wrong answer for nullable enum!");
Assert.IsFalse(formatter.CanWriteTypeAsPrimitive(typeof(Object)), "CanWriteTypeAsPrimitive returned wrong answer for Object!");
}

Expand Down
4 changes: 4 additions & 0 deletions JSONAPI/Json/JsonApiFormatter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@ public bool CanWriteTypeAsPrimitive(Type objectType)
|| typeof(System.DateTime?).IsAssignableFrom(objectType)
|| typeof(System.DateTimeOffset?).IsAssignableFrom(objectType)
|| typeof(String).IsAssignableFrom(objectType)
|| objectType.IsEnum
|| (objectType.IsGenericType &&
objectType.GetGenericTypeDefinition() == typeof(Nullable<>) &&
objectType.GetGenericArguments()[0].IsEnum)
)
return true;
else return false;
Expand Down