zoriya/octokit.net
1
0
Fork 0
mirror of https://github.com/zoriya/octokit.net.git synced 2026-06-12 06:00:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remember to unwrap generic types

Browse Source
This commit is contained in:
Kristian Hellang
2015-01-06 01:15:16 +01:00
parent c9838662dc
commit 574202a9ea
1 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Octokit.Tests.Conventions/ModelTests.cs
+21 -10
View File
@@ -49,7 +49,7 @@ namespace Octokit.Tests.Conventions
{
var methods = exportedType.GetMethods();
var modelTypes = methods.Select(method => UnwrapGenericArgument(method.ReturnType));
var modelTypes = methods.SelectMany(method => UnwrapGenericArguments(method.ReturnType));
if (includeRequestModels)
{
@@ -82,7 +82,7 @@ namespace Octokit.Tests.Conventions
{
var properties = modelType.GetProperties();
foreach (var propertyType in properties.Select(x => x.PropertyType))
foreach (var propertyType in properties.SelectMany(x => UnwrapGenericArguments(x.PropertyType)))
{
if (allModelTypes.Contains(propertyType))
{
@@ -100,20 +100,31 @@ namespace Octokit.Tests.Conventions
}
}
private static Type UnwrapGenericArgument(Type returnType)
private static IEnumerable<Type> UnwrapGenericArguments(Type returnType)
{
if (returnType.IsGenericType)
{
var argument = returnType.GetGenericArgument();
if (argument.IsModel())
var arguments = returnType.GetGenericArguments();
foreach (var argument in arguments)
{
return argument;
if (argument.IsModel())
{
yield return argument;
}
else
{
foreach (var unwrappedTypes in UnwrapGenericArguments(argument))
{
yield return unwrappedTypes;
}
}
}
return UnwrapGenericArgument(argument);
}
return returnType;
else
{
yield return returnType;
}
}
}
}