Skip to content

Caliing DynamicProxy proxy methods with multidimensional array parameters #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 19, 2014
Merged

Caliing DynamicProxy proxy methods with multidimensional array parameters #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
58b20b0
Uncomment Do2 and Do4 in IClassWithMultiDimentionalArray used for Pro…
Mar 19, 2014
ef42157
Call methods with multidimensional array parameters in ProxyTypeWithM…
Mar 19, 2014
8ec7e4e
Fix GetClosedParameterType to work correctly with multidimensional ar…
Mar 19, 2014
f7332d5
Unignore test BasicClassProxyTestCase.ProxyTypeWithMultiDimentionalAr…
Mar 19, 2014
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
1 change: 0 additions & 1 deletion src/Castle.Core.Tests/BasicClassProxyTestCase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,6 @@ public void ProducesInvocationsThatCantChangeTarget()
}

[Test]
[Ignore("Multi dimensional arrays seems to not work at all")]
public void ProxyTypeWithMultiDimentionalArrayAsParameters()
{
LogInvocationInterceptor log = new LogInvocationInterceptor();
Expand Down
6 changes: 5 additions & 1 deletion src/Castle.Core.Tests/BasicInterfaceProxyTestCase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,13 @@ public void Indexer()
[Test]
public void ProxyTypeWithMultiDimentionalArrayAsParameter()
{
generator.CreateInterfaceProxyWithTarget<IClassWithMultiDimentionalArray>(
var proxy = generator.CreateInterfaceProxyWithTarget<IClassWithMultiDimentionalArray>(
new ClassWithMultiDimentionalArray(),
new LogInvocationInterceptor());
proxy.Do(new[] { 1, 2, 3 });
proxy.Do2(new[,] { { 1, 2 }, { 3, 4 } });
proxy.Do3(new[] { "a", "b", "c" });
proxy.Do4(new[,] { { "a", "b" }, { "c", "d" } });
}

[Test]
Expand Down
4 changes: 2 additions & 2 deletions src/Castle.Core.Tests/InterClasses/IClassWithMultiDimentionalArray.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ public interface IClassWithMultiDimentionalArray
{
void Do(int[] args);

// void Do2(int[,] args);
void Do2(int[,] args);

void Do3(string[] args);

// void Do4(string[,] args);
void Do4(string[,] args);
}
}
5 changes: 4 additions & 1 deletion src/Castle.Core/DynamicProxy/Internal/TypeUtil.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,10 @@ public static Type GetClosedParameterType(this AbstractTypeEmitter type, Type pa
if (parameter.IsArray)
{
var elementType = GetClosedParameterType(type, parameter.GetElementType());
return elementType.MakeArrayType();
int rank = parameter.GetArrayRank();
return rank == 1
? elementType.MakeArrayType()
: elementType.MakeArrayType(rank);
}

if (parameter.IsByRef)
Expand Down