Merge pull request #3431 from imcarolwang/fixtestissue

Fix XmlSerilizerFormat test issue
dotnet · Mar 5, 2019 · 1083786 · 1083786
2 parents 7f0e6db + 291af9c
commit 1083786
Show file tree

Hide file tree

Showing 8 changed files with 559 additions and 143 deletions.
diff --git a/src/System.Private.ServiceModel/tests/Common/Scenarios/Endpoints.cs b/src/System.Private.ServiceModel/tests/Common/Scenarios/Endpoints.cs
@@ -104,7 +104,7 @@ public static string XmlSFAttribute_Address
         get { return GetEndpointAddress("XmlSFAttribute.svc//XmlSFAttribute"); }
     }
 
-    public static string BasciHttpRpcEncSingleNs_Address
+    public static string BasicHttpRpcEncSingleNs_Address
     {
         get { return GetEndpointAddress("BasicHttpRpcEncSingleNs.svc//Basic"); }
     }

diff --git a/src/System.Private.ServiceModel/tests/Common/Scenarios/ServiceInterfaces.cs b/src/System.Private.ServiceModel/tests/Common/Scenarios/ServiceInterfaces.cs
@@ -647,41 +647,123 @@ public interface IXmlSFAttribute
     void TestXmlSerializerSupportsFaults_False();
 }
 
-[ServiceContract(Namespace = "http://contoso.com/calc"), XmlSerializerFormat]
-public interface ICalculator
+[ServiceContract(Namespace = "http://contoso.com/calc")]
+[XmlSerializerFormat(Style = OperationFormatStyle.Rpc, Use = OperationFormatUse.Encoded)]
+public interface ICalculatorRpcEnc
 {
-    [OperationContract, XmlSerializerFormat]
+    [OperationContract]
     int Sum2(int i, int j);
 
-    [OperationContract, XmlSerializerFormat]
+    [OperationContract]
     int Sum(IntParams par);
 
-    [OperationContract, XmlSerializerFormat]
+    [OperationContract]
     float Divide(FloatParams par);
 
-    [OperationContract, XmlSerializerFormat]
+    [OperationContract]
     string Concatenate(IntParams par);
 
-    [OperationContract, XmlSerializerFormat]
+    [OperationContract]
     void AddIntParams(Guid guid, IntParams par);
 
-    [OperationContract, XmlSerializerFormat]
+    [OperationContract]
     IntParams GetAndRemoveIntParams(Guid guid);
 
-    [OperationContract, XmlSerializerFormat]
+    [OperationContract]
     DateTime ReturnInputDateTime(DateTime dt);
 
-    [OperationContract, XmlSerializerFormat]
+    [OperationContract]
     byte[] CreateSet(ByteParams par);
 }
 
-[ServiceContract, XmlSerializerFormat]
-public interface IHelloWorld
+[ServiceContract(Namespace = "http://contoso.com/calc")]
+[XmlSerializerFormat(Style = OperationFormatStyle.Rpc, Use = OperationFormatUse.Literal)]
+public interface ICalculatorRpcLit
 {
-    [OperationContract, XmlSerializerFormat]
+    [OperationContract]
+    int Sum2(int i, int j);
+
+    [OperationContract]
+    int Sum(IntParams par);
+
+    [OperationContract]
+    float Divide(FloatParams par);
+
+    [OperationContract]
+    string Concatenate(IntParams par);
+
+    [OperationContract]
+    void AddIntParams(Guid guid, IntParams par);
+
+    [OperationContract]
+    IntParams GetAndRemoveIntParams(Guid guid);
+
+    [OperationContract]
+    DateTime ReturnInputDateTime(DateTime dt);
+
+    [OperationContract]
+    byte[] CreateSet(ByteParams par);
+}
+
+[ServiceContract(Namespace = "http://contoso.com/calc")]
+[XmlSerializerFormat(Style = OperationFormatStyle.Document, Use = OperationFormatUse.Literal)]
+public interface ICalculatorDocLit
+{
+    [OperationContract]
+    int Sum2(int i, int j);
+
+    [OperationContract]
+    int Sum(IntParams par);
+
+    [OperationContract]
+    float Divide(FloatParams par);
+
+    [OperationContract]
+    string Concatenate(IntParams par);
+
+    [OperationContract]
+    void AddIntParams(Guid guid, IntParams par);
+
+    [OperationContract]
+    IntParams GetAndRemoveIntParams(Guid guid);
+
+    [OperationContract]
+    DateTime ReturnInputDateTime(DateTime dt);
+
+    [OperationContract]
+    byte[] CreateSet(ByteParams par);
+}
+
+[ServiceContract]
+[XmlSerializerFormat(Style = OperationFormatStyle.Rpc, Use = OperationFormatUse.Encoded)]
+public interface IHelloWorldRpcEnc
+{
+    [OperationContract]
     void AddString(Guid guid, string testString);
 
-    [OperationContract, XmlSerializerFormat]
+    [OperationContract]
+    string GetAndRemoveString(Guid guid);
+}
+
+[ServiceContract]
+[XmlSerializerFormat(Style = OperationFormatStyle.Rpc, Use = OperationFormatUse.Literal)]
+public interface IHelloWorldRpcLit
+{
+    [OperationContract]
+    void AddString(Guid guid, string testString);
+
+    [OperationContract]
+    string GetAndRemoveString(Guid guid);
+}
+
+[ServiceContract]
+[XmlSerializerFormat(Style = OperationFormatStyle.Document, Use = OperationFormatUse.Literal)]
+public interface IHelloWorldDocLit
+{
+    [OperationContract]
+    void AddString(Guid guid, string testString);
+
+    [OperationContract]    
     string GetAndRemoveString(Guid guid);
 }