2009-07-02 Atsushi Enomoto <[email protected]>

	* ContractDescriptionGenerator.cs : actually it had to fill all of
	  the interface methods (and implementation methods).

	* ContractDescriptionTest.cs : make sure the contract actually
	  contains operations from the base types.


svn path=/trunk/mcs/; revision=137307

Author: atsushieno

mcs/class/System.ServiceModel/System.ServiceModel.Description/ChangeLog

@@ -1,3 +1,8 @@
+2009-07-02  Atsushi Enomoto  <[email protected]>
+
+	* ContractDescriptionGenerator.cs : actually it had to fill all of
+	  the interface methods (and implementation methods).
+
 2009-07-02  Atsushi Enomoto  <[email protected]>
 
 	* ContractDescriptionGenerator.cs : do not reject derived service

mcs/class/System.ServiceModel/System.ServiceModel.Description/ContractDescriptionGenerator.cs

@@ -136,10 +136,13 @@ public static ContractDescription GetContract (
 				cd.ProtectionLevel = sca.ProtectionLevel;
 
 			// FIXME: load Behaviors
-			MethodInfo [] contractMethods = exactContractType.GetMethods ();
+			MethodInfo [] contractMethods = exactContractType.IsInterface ? GetAllMethods (exactContractType) : exactContractType.GetMethods ();
 			MethodInfo [] serviceMethods = contractMethods;
 			if (givenServiceType != null && exactContractType.IsInterface) {
-				serviceMethods = givenServiceType.GetInterfaceMap (exactContractType).TargetMethods;
+				var l = new List<MethodInfo> ();
+				foreach (Type t in GetAllInterfaceTypes (exactContractType))
+					l.AddRange (givenServiceType.GetInterfaceMap (t).TargetMethods);
+				serviceMethods = l.ToArray ();
 			}
 
 			for (int i = 0; i < contractMethods.Length; ++i)
@@ -176,6 +179,22 @@ public static ContractDescription GetContract (
 			return cd;
 		}
 
+		static MethodInfo [] GetAllMethods (Type type)
+		{
+			var l = new List<MethodInfo> ();
+			foreach (var t in GetAllInterfaceTypes (type))
+				l.AddRange (t.GetMethods ());
+			return l.ToArray ();
+		}
+
+		static IEnumerable<Type> GetAllInterfaceTypes (Type type)
+		{
+			yield return type;
+			foreach (var t in type.GetInterfaces ())
+				foreach (var tt in GetAllInterfaceTypes (t))
+					yield return tt;
+		}
+
 		static OperationDescription GetOrCreateOperation (
 			ContractDescription cd, MethodInfo mi, MethodInfo serviceMethod,
 			OperationContractAttribute oca,

mcs/class/System.ServiceModel/Test/System.ServiceModel.Description/ChangeLog

@@ -1,3 +1,8 @@
+2009-07-02  Atsushi Enomoto  <[email protected]>
+
+	* ContractDescriptionTest.cs : make sure the contract actually
+	  contains operations from the base types.
+
 2009-07-02  Atsushi Enomoto  <[email protected]>
 
 	* ContractDescriptionTest.cs : added test for derived contract type.

mcs/class/System.ServiceModel/Test/System.ServiceModel.Description/ContractDescriptionTest.cs

@@ -413,8 +413,12 @@ public void TestContractFromObject () {
 		[Test]
 		public void GetDerivedContract ()
 		{
-			ContractDescription.GetContract (typeof (IFoo3));
-			ContractDescription.GetContract (typeof (Foo3));
+			var cd = ContractDescription.GetContract (typeof (IFoo3));
+			Assert.AreEqual (typeof (IFoo3), cd.ContractType, "#1");
+			Assert.AreEqual (3, cd.Operations.Count, "#2");
+			cd = ContractDescription.GetContract (typeof (Foo3));
+			Assert.AreEqual (typeof (IFoo3), cd.ContractType, "#3");
+			Assert.AreEqual (3, cd.Operations.Count, "#4");
 		}
 
 		// It is for testing attribute search in interfaces.