Fix RequestId is empty in exception message (#289)

* Fix RequestId is empty in exception message

* Fix unit test error

Author: doublnt

aliyun-net-sdk-core.Tests/Units/DefaultAcsClient.cs

@@ -209,7 +209,7 @@ public void DoAction2()
 
             var result = instance.DoAction(request, true, 1, "cn-hangzhou", credentials, signer, FormatType.JSON, null);
 
-           Assert.Equal(result,response);
+            Assert.Equal(result, response);
         }
 
         [Fact]
@@ -445,7 +445,7 @@ public void GetAcsResponseWhenStatusIsNotSuccess()
             var ex = Record.Exception(testCode400);
             Assert.NotNull(ex);
             Assert.IsType<ClientException>(ex);
-            Assert.Equal("ThisIsCode : ThisIsMessage", ex.Message);
+            Assert.Contains("ThisIsCode : ThisIsMessage", ex.Message);
 
             // 502 Error
             instance = MockDefaultAcsClient(502);
@@ -456,7 +456,7 @@ public void GetAcsResponseWhenStatusIsNotSuccess()
             ex = Record.Exception(testCode400);
             Assert.NotNull(ex);
             Assert.IsType<ServerException>(ex);
-            Assert.Equal("ThisIsCode : ThisIsMessage, the request url is empty, the RequestId is ThisIsRequestId.", ex.Message);
+            Assert.Contains("ThisIsCode : ThisIsMessage, the request url is empty, the RequestId is ThisIsRequestId.", ex.Message);
         }
 
         [Fact]
@@ -852,7 +852,7 @@ public void TestIncompleteSignature()
                 var result = instance.GetAcsResponse(request, "cn-hangzhou", credentials);
             });
 
-            Assert.Equal(
+            Assert.Contains(
                 "IncompleteSignature : The request signature does not conform to Aliyun standards. server string to sign is:Error Signature",
                 signatureException.Message);
 
@@ -864,7 +864,7 @@ public void TestIncompleteSignature()
                 var result = instance.GetAcsResponse(request, "cn-hangzhou", credentials);
             });
 
-            Assert.Equal("SDK.InvalidAccessKeySecret : Specified Access Key Secret is not valid.",
+            Assert.Contains("SDK.InvalidAccessKeySecret : Specified Access Key Secret is not valid.",
                 invalidException.Message);
         }
 
@@ -882,7 +882,7 @@ public void TestSignatureDoesNotMatch()
                 var result = instance.GetAcsResponse(request, "cn-hangzhou", credentials);
             });
 
-            Assert.Equal(
+            Assert.Contains(
                 "SignatureDoesNotMatch : signature does not conform to standards. server string to sign is:Error Signature",
                 signatureException.Message);
 
@@ -894,7 +894,7 @@ public void TestSignatureDoesNotMatch()
                 var result = instance.GetAcsResponse(request, "cn-hangzhou", credentials);
             });
 
-            Assert.Equal("SDK.InvalidAccessKeySecret : Specified Access Key Secret is not valid.",
+            Assert.Contains("SDK.InvalidAccessKeySecret : Specified Access Key Secret is not valid.",
                 invalidException.Message);
         }
 

aliyun-net-sdk-core.Tests/Units/Exceptions/ClientException.cs

@@ -31,7 +31,7 @@ public void Instance1()
             var exception = new ClientException("200", "message", "requestId");
             Assert.Equal("200", exception.ErrorCode);
             Assert.Equal("message", exception.ErrorMessage);
-            Assert.Null(exception.RequestId);
+            Assert.Equal("requestId", exception.RequestId);
         }
 
         [Fact]

aliyun-net-sdk-core/Exceptions/ClientException.cs

@@ -1,4 +1,4 @@
-/*
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -23,8 +23,13 @@ namespace Aliyun.Acs.Core.Exceptions
 {
     public class ClientException : Exception
     {
-        public ClientException(string errCode, string errMsg, string requestId) : this(errCode, errMsg)
+        public ClientException(string errCode, string errMsg, string requestId) : base(
+            string.Format("{0} : {1} + [ RequestId : {2} ]", errCode, errMsg, requestId))
         {
+            ErrorType = ErrorType.Client;
+            ErrorMessage = errMsg;
+            RequestId = requestId;
+            ErrorCode = errCode;
         }
 
         public ClientException(string errCode, string errMsg) : base(errCode + " : " + errMsg)

aliyun-net-sdk-core/Exceptions/ServerException.cs

@@ -1,4 +1,4 @@
-/*
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -22,7 +22,7 @@ namespace Aliyun.Acs.Core.Exceptions
     public class ServerException : ClientException
     {
         public ServerException(string errorCode, string errorMessage, string requestId) :
-            this(errorCode, errorMessage)
+            base(errorCode, errorMessage, requestId)
         {
             RequestId = requestId;
         }

aliyun-sdk-feature-test/Credential/CredentialsTest.cs

@@ -72,7 +72,7 @@ public void STSAssumeRoleCredentialWithPolicyTest()
 
             var exception = Assert.Throws<ClientException>(() => { response = client.GetAcsResponse(request); });
 
-            Assert.Equal(
+            Assert.Contains(
                 "Forbidden.RAM : User not authorized to operate on the specified resource, or this API doesn't support RAM.",
                 exception.Message);
         }