Merge remote-tracking branch 'origin/3.7' into swift

3 files changed, 12 insertions, 27 deletions

diff --git a/objective-c/test/Ice/metrics/AllTests.m b/objective-c/test/Ice/metrics/AllTests.m
index 6e4049afb62..986d86cd3c0 100644
--- a/objective-c/test/Ice/metrics/AllTests.m
+++ b/objective-c/test/Ice/metrics/AllTests.m
@@ -917,7 +917,7 @@ metricsAllTests(id<ICECommunicator> communicator)
     tprintf("testing invocation metrics... ");
 
     [props setObject:@"operation" forKey:@"IceMX.Metrics.View.Map.Invocation.GroupBy"];
-    [props setObject:@"localPort" forKey:@"IceMX.Metrics.View.Map.Invocation.Map.Remote.GroupBy"];
+    [props setObject:@"id" forKey:@"IceMX.Metrics.View.Map.Invocation.Map.Remote.GroupBy"];
     updateProps(clientProps, serverProps, update, props, @"Invocation");
     test([[[serverMetrics getMetricsView:@"View" timestamp:&timestamp] objectForKey:@"Invocation"] count] == 0);
 
@@ -1077,31 +1077,9 @@ metricsAllTests(id<ICECommunicator> communicator)
     checkFailure(clientMetrics, @"Invocation", im1.id_, @"::Ice::UnknownException", 3);
 
     im1 = (ICEMXInvocationMetrics*)[map objectForKey:@"fail"];
-    test(im1.current <= 1 && im1.total == 3 && im1.failures == 3 && im1.retry == 3 && [im1.remotes count] == 6);
-
-    test(((ICEMXMetrics*)[im1.remotes objectAtIndex:0]).current == 0 &&
-         ((ICEMXMetrics*)[im1.remotes objectAtIndex:0]).total == 1 &&
-         ((ICEMXMetrics*)[im1.remotes objectAtIndex:0]).failures == 1);
-
-    test(((ICEMXMetrics*)[im1.remotes objectAtIndex:1]).current == 0 &&
-         ((ICEMXMetrics*)[im1.remotes objectAtIndex:1]).total == 1 &&
-         ((ICEMXMetrics*)[im1.remotes objectAtIndex:1]).failures == 1);
-
-    test(((ICEMXMetrics*)[im1.remotes objectAtIndex:2]).current == 0 &&
-         ((ICEMXMetrics*)[im1.remotes objectAtIndex:2]).total == 1 &&
-         ((ICEMXMetrics*)[im1.remotes objectAtIndex:2]).failures == 1);
-
-    test(((ICEMXMetrics*)[im1.remotes objectAtIndex:3]).current == 0 &&
-         ((ICEMXMetrics*)[im1.remotes objectAtIndex:3]).total == 1 &&
-         ((ICEMXMetrics*)[im1.remotes objectAtIndex:3]).failures == 1);
-
-    test(((ICEMXMetrics*)[im1.remotes objectAtIndex:4]).current == 0 &&
-         ((ICEMXMetrics*)[im1.remotes objectAtIndex:4]).total == 1 &&
-         ((ICEMXMetrics*)[im1.remotes objectAtIndex:4]).failures == 1);
-
-    test(((ICEMXMetrics*)[im1.remotes objectAtIndex:5]).current == 0 &&
-         ((ICEMXMetrics*)[im1.remotes objectAtIndex:5]).total == 1 &&
-         ((ICEMXMetrics*)[im1.remotes objectAtIndex:5]).failures == 1);
+    test(im1.current <= 1 && im1.total == 3 && im1.failures == 3 && im1.retry == 3 && [im1.remotes count] == 1);
+    rim1 = (ICEMXRemoteMetrics*)[im1.remotes objectAtIndex:0];
+    test(rim1.current == 0 && rim1.total == 6 && rim1.failures == 6);
 
     checkFailure(clientMetrics, @"Invocation", im1.id_, @"::Ice::ConnectionLostException", 3);
 
diff --git a/objective-c/test/Ice/timeout/AllTests.m b/objective-c/test/Ice/timeout/AllTests.m
index 24de082b966..64be1128004 100644
--- a/objective-c/test/Ice/timeout/AllTests.m
+++ b/objective-c/test/Ice/timeout/AllTests.m
@@ -229,7 +229,7 @@ timeoutAllTests(id<ICECommunicator> communicator)
         //
         // Expect Success.
         //
-        id<TestTimeoutTimeoutPrx> to = [TestTimeoutTimeoutPrx uncheckedCast:[obj ice_invocationTimeout:500]];
+        id<TestTimeoutTimeoutPrx> to = [TestTimeoutTimeoutPrx uncheckedCast:[obj ice_invocationTimeout:1000]];
         TestTimeoutCallback* cb = [TestTimeoutCallback create];
         [to begin_sleep:100 response:^ { [cb response]; } exception:^(ICEException* ex) { [cb exception:ex]; }];
         [cb check];
diff --git a/objective-c/test/ios/controller/Objective-C Test Controller.xcodeproj/project.pbxproj b/objective-c/test/ios/controller/Objective-C Test Controller.xcodeproj/project.pbxproj
index c931c4e3a7a..bb0f4b1531d 100644
--- a/objective-c/test/ios/controller/Objective-C Test Controller.xcodeproj/project.pbxproj
+++ b/objective-c/test/ios/controller/Objective-C Test Controller.xcodeproj/project.pbxproj
@@ -355,6 +355,8 @@
 		14CF14CC215A4A7800499968 /* ObjectsDerivedEx.ice in Sources */ = {isa = PBXBuildFile; fileRef = 14CF14BC215A491100499968 /* ObjectsDerivedEx.ice */; };
 		14FFBAA01E29361A00EA55AF /* ExternalAccessory.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 14FFBA9F1E29361A00EA55AF /* ExternalAccessory.framework */; };
 		14FFBAA11E29362900EA55AF /* ExternalAccessory.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 14FFBA9F1E29361A00EA55AF /* ExternalAccessory.framework */; };
+		820CD39F22D737950056BEDA /* ObjectsForward.ice in Sources */ = {isa = PBXBuildFile; fileRef = 820CD39C22D65C8E0056BEDA /* ObjectsForward.ice */; };
+		820CD3A022D737A50056BEDA /* ObjectsForward.ice in Sources */ = {isa = PBXBuildFile; fileRef = 820CD39C22D65C8E0056BEDA /* ObjectsForward.ice */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXBuildRule section */
@@ -594,6 +596,7 @@
 		14CF14BC215A491100499968 /* ObjectsDerivedEx.ice */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = ObjectsDerivedEx.ice; path = ../../Ice/objects/ObjectsDerivedEx.ice; sourceTree = "<group>"; };
 		14CF14BE215A491100499968 /* ObjectsDerived.ice */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = ObjectsDerived.ice; path = ../../Ice/objects/ObjectsDerived.ice; sourceTree = "<group>"; };
 		14FFBA9F1E29361A00EA55AF /* ExternalAccessory.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ExternalAccessory.framework; path = System/Library/Frameworks/ExternalAccessory.framework; sourceTree = SDKROOT; };
+		820CD39C22D65C8E0056BEDA /* ObjectsForward.ice */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = ObjectsForward.ice; path = ../../Ice/objects/ObjectsForward.ice; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -1133,6 +1136,7 @@
 		14CF1432215A47DF00499968 /* objects */ = {
 			isa = PBXGroup;
 			children = (
+				820CD39C22D65C8E0056BEDA /* ObjectsForward.ice */,
 				14A4CE08215A4C06002AD8F7 /* ObjectsTest.ice */,
 				14CF14BE215A491100499968 /* ObjectsDerived.ice */,
 				14CF14BC215A491100499968 /* ObjectsDerivedEx.ice */,
@@ -1227,6 +1231,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 			);
@@ -1275,6 +1280,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				820CD39F22D737950056BEDA /* ObjectsForward.ice in Sources */,
 				14A4CE0A215A4C31002AD8F7 /* ObjectsTest.ice in Sources */,
 				14CF14CB215A4A7800499968 /* ObjectsDerived.ice in Sources */,
 				14CF14CC215A4A7800499968 /* ObjectsDerivedEx.ice in Sources */,
@@ -1449,6 +1455,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				820CD3A022D737A50056BEDA /* ObjectsForward.ice in Sources */,
 				14A4CE0B215A4C3E002AD8F7 /* ObjectsTest.ice in Sources */,
 				14A4CE0C215A4C3E002AD8F7 /* ObjectsDerived.ice in Sources */,
 				14A4CE0D215A4C3E002AD8F7 /* ObjectsDerivedEx.ice in Sources */,