@@ -30,23 +30,65 @@
 	unsigned char c;
 	unsigned int i;
 };
 
 @implementation TestsAppDelegate (OFInvocationTests)
-- (struct test_struct)invocationTestMethod: (unsigned char)c
-					  : (unsigned int)i
-					  : (struct test_struct *)ptr
-					  : (struct test_struct)st
+- (struct test_struct)invocationTestMethod1: (unsigned char)c
+					   : (unsigned int)i
+					   : (struct test_struct *)ptr
+					   : (struct test_struct)st
 {
 	return st;
 }
+
+- (int)invocationTestMethod2: (int)i1
+			    : (int)i2
+			    : (int)i3
+			    : (int)i4
+			    : (int)i5
+			    : (int)i6
+			    : (int)i7
+			    : (int)i8
+			    : (int)i9
+			    : (int)i10
+			    : (int)i11
+			    : (int)i12
+			    : (int)i13
+			    : (int)i14
+			    : (int)i15
+			    : (int)i16
+{
+	return (i1 + i2 + i3 + i4 + i5 + i6 + i7 + i8 + i9 + i10 + i11 +
+	    i12 + i13 + i14 + i15 + i16) / 16;
+}
+
+- (double)invocationTestMethod3: (double)d1
+			       : (double)d2
+			       : (double)d3
+			       : (double)d4
+			       : (double)d5
+			       : (double)d6
+			       : (double)d7
+			       : (double)d8
+			       : (double)d9
+			       : (double)d10
+			       : (double)d11
+			       : (double)d12
+			       : (double)d13
+			       : (double)d14
+			       : (double)d15
+			       : (double)d16
+{
+	return (d1 + d2 + d3 + d4 + d5 + d6 + d7 + d8 + d9 + d10 + d11 +
+	    d12 + d13 + d14 + d15 + d16) / 16;
+}
 
 - (void)invocationTests
 {
 	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
-	OFMethodSignature *sig = [self methodSignatureForSelector:
-	    @selector(invocationTestMethod::::)];
+	SEL selector = @selector(invocationTestMethod1::::);
+	OFMethodSignature *sig = [self methodSignatureForSelector: selector];
 	OFInvocation *invocation;
 	struct test_struct st, st2, *stp = &st, *stp2;
 	unsigned const char c = 0xAA;
 	unsigned char c2;
 	const unsigned int i = 0x55555555;
@@ -91,9 +133,50 @@
 	    stp == stp2)
 
 	TEST(@"-[getArgument:atIndex:] #4", R([invocation getArgument: &st2
 							      atIndex: 5]) &&
 	    memcmp(&st, &st2, sizeof(st)) == 0)
+
+#ifdef OF_INVOCATION_CAN_INVOKE
+	/* -[invoke] #1 */
+	selector = @selector(invocationTestMethod2::::::::::::::::);
+	invocation = [OFInvocation invocationWithMethodSignature:
+	    [self methodSignatureForSelector: selector]];
+
+	[invocation setArgument: &self
+			atIndex: 0];
+	[invocation setArgument: &selector
+			atIndex: 1];
+
+	for (int i = 1; i <= 16; i++)
+		[invocation setArgument: &i
+				atIndex: i + 1];
+
+	int intResult;
+	TEST(@"-[invoke] #1", R([invocation invoke]) &&
+	    R([invocation getReturnValue: &intResult]) && intResult == 8)
+
+	/* -[invoke] #2 */
+	selector = @selector(invocationTestMethod3::::::::::::::::);
+	invocation = [OFInvocation invocationWithMethodSignature:
+	    [self methodSignatureForSelector: selector]];
+
+	[invocation setArgument: &self
+			atIndex: 0];
+	[invocation setArgument: &selector
+			atIndex: 1];
+
+	for (int i = 1; i <= 16; i++) {
+		double d = i;
+		[invocation setArgument: &d
+				atIndex: i + 1];
+	}
+
+	double doubleResult;
+	TEST(@"-[invoke] #2", R([invocation invoke]) &&
+	    R([invocation getReturnValue: &doubleResult]) &&
+	    doubleResult == 8.5)
+#endif
 
 	[pool drain];
 }
 @end