ICE-5313 - more fixes for checksums

1 files changed, 61 insertions, 18 deletions

diff --git a/php/test/Ice/checksum/CTypes.ice b/php/test/Ice/checksum/CTypes.ice
index e8f3a7798ec..866147c6141 100644
--- a/php/test/Ice/checksum/CTypes.ice
+++ b/php/test/Ice/checksum/CTypes.ice
@@ -53,7 +53,7 @@ enum Enum4 { Enum41, Enum42, Enum43 };
 enum EnumExplicit0 { EnumExplicit01 = 1, EnumExplicit02 = 2, EnumExplicit03 = 3 };
 
 //
-// TEST: Enum with same explicit values different order.
+// TEST: Enum with same explicit values, different order.
 //
 enum EnumExplicit1 { EnumExplicit11 = 1, EnumExplicit12 = 2, EnumExplicit13 = 3 };
 
@@ -63,7 +63,7 @@ enum EnumExplicit1 { EnumExplicit11 = 1, EnumExplicit12 = 2, EnumExplicit13 = 3
 enum EnumExplicit2 { EnumExplicit21 = 1, EnumExplicit22 = 2, EnumExplicit23 = 3};
 
 //
-// TEST: Enum with explicit values removed enumerator.
+// TEST: Enum with explicit values, removed enumerator.
 //
 enum EnumExplicit3 { EnumExplicit31 = 1, EnumExplicit32 = 2, EnumExplicit33 = 3};
 
@@ -326,6 +326,56 @@ exception Exception6
 };
 
 //
+// TEST: Exception with optional members.
+//
+exception OptionalEx0
+{
+    string firstName;
+    optional(1) string secondName;
+    optional(2) string emailAddress;
+};
+
+//
+// TEST: Exception with optional members, different order, same tags.
+//
+exception OptionalEx1
+{
+    string firstName;
+    optional(1) string secondName;
+    optional(2) string emailAddress;
+};
+
+//
+// TEST: Exception with different optional members.
+//
+exception OptionalEx2
+{
+    string firstName;
+    string secondName;
+    optional(1) string emailAddress;
+};
+
+//
+// TEST: Exception with different optional members.
+//
+exception OptionalEx3
+{
+    string firstName;
+    optional(1) string secondName;
+    optional(2) string emailAddress;
+};
+
+//
+// TEST: Exception with optional members using different tags.
+//
+exception OptionalEx4
+{
+    string firstName;
+    optional(1) string secondName;
+    optional(2) string emailAddress;
+};
+
+//
 // TEST: Same
 //
 class BaseClass1
@@ -450,13 +500,6 @@ class Compact2(2)
 };
 
 //
-// TEST: Derived from class with compact, where parent ids doesn't match.
-//
-class Derived2 extends Compact2
-{
-};
-
-//
 // TEST: Class with optional members.
 //
 class Optional0
@@ -467,7 +510,7 @@ class Optional0
 };
 
 //
-// TEST: Class with optional members different order same tags.
+// TEST: Class with optional members, different order, same tags.
 //
 class Optional1
 {
@@ -507,25 +550,25 @@ class Optional4
 };
 
 //
-// TEST: Class with operation optional parameters.
+// TEST: Class with optional parameters.
 //
 class OptionalParameters0
 {
-    void op1(string firstName, optional(1) string secondName, 
+    void op1(string firstName, optional(1) string secondName,
              optional(2) string emailAddress);
 };
 
 //
-// TEST: Class with operation optional parameters different order.
+// TEST: Class with optional parameters, different order.
 //
 class OptionalParameters1
 {
-    void op1(string firstName, optional(1) string secondName, 
+    void op1(string firstName, optional(1) string secondName,
              optional(2) string emailAddress);
 };
 
 //
-// TEST: Class with operation optional parameters different tags.
+// TEST: Class with optional parameters, different tags.
 //
 class OptionalParameters2
 {
@@ -534,7 +577,7 @@ class OptionalParameters2
 };
 
 //
-// TEST: Class with operation different optional parameters.
+// TEST: Class with different optional parameters.
 //
 class OptionalParameters3
 {
@@ -543,7 +586,7 @@ class OptionalParameters3
 };
 
 //
-// TEST: Class with operation optional return type.
+// TEST: Class with optional return type.
 //
 class OptionalReturn0
 {
@@ -551,7 +594,7 @@ class OptionalReturn0
 };
 
 //
-// TEST: Class that change operation optional return type.
+// TEST: Class that changes optional return type.
 //
 class OptionalReturn2
 {