Changed string to byte[]

Author: bjoerntx

ReportingCloudWrapper/ReportingCloud.cs

@@ -169,7 +169,7 @@ public Uri WebApiBaseUrl
     //  - ReturnFormat ReturnFormat (default = PDF)
     //  - bool Append (default = true)
     //
-    // Return value: A List of strings (the documents as Base64 encoded strings)
+    // Return value: A List of byte[]
     *-----------------------------------------------------------------------------------------------------*/
     /// <summary>
     /// This method merges a template with data.
@@ -178,7 +178,7 @@ public Uri WebApiBaseUrl
     /// <param name="templateName">The name of the template in the template storage.</param>
     /// <param name="returnFormat">The document format of the resulting document.</param>
     /// <param name="append">Specifies whether the resulting documents should be appended or not.</param>
-    public List<string> MergeDocument(MergeBody mergeBody,
+    public List<byte[]> MergeDocument(MergeBody mergeBody,
         string templateName = null,
         ReturnFormat returnFormat = ReturnFormat.PDF,
         bool append = true)
@@ -195,7 +195,15 @@ public List<string> MergeDocument(MergeBody mergeBody,
             // if sucessful, return the image list
             if (response.IsSuccessStatusCode)
             {
-                return response.Content.ReadAsAsync<List<string>>().Result;
+                List<byte[]> bResults = new List<byte[]>();
+
+                foreach (string sResult in response.Content.ReadAsAsync<List<string>>().Result)
+                {
+                    bResults.Add(Convert.FromBase64String(sResult));
+                }
+
+                return bResults;
+                //return response.Content.ReadAsAsync<List<string>>().Result;
             }
             else
             {
@@ -251,9 +259,9 @@ public void UploadTemplate(string templateName, byte[] template)
     /// <summary>
     /// This method converts a document to another format.
     /// </summary>
-    /// <param name="document">The source document data encoded as a Base64 string.</param>
+    /// <param name="document">The source document data as a byte array.</param>
     /// <param name="returnFormat">The document format of the resulting document.</param>
-    public string ConvertDocument(byte[] document, ReturnFormat returnFormat)
+    public byte[] ConvertDocument(byte[] document, ReturnFormat returnFormat)
     {
         // create a new HttpClient using the Factory method CreateHttpClient
         using (HttpClient client = CreateHttpClient())
@@ -263,10 +271,10 @@ public string ConvertDocument(byte[] document, ReturnFormat returnFormat)
             HttpResponseMessage response = client.PostAsync("v1/document/convert?returnFormat=" + returnFormat,
                 Convert.ToBase64String(document), formatter).Result;
 
-            // if sucessful, return the image list
+            // if sucessful, return the document list
             if (response.IsSuccessStatusCode)
             {
-                return response.Content.ReadAsAsync<string>().Result;
+                return Convert.FromBase64String(response.Content.ReadAsAsync<string>().Result);
             }
             else
             {
@@ -404,13 +412,13 @@ public void DeleteTemplate(string templateName)
     //
     // Parameters:
     //  - string TemplateName
-    // Return value: string (the document as a Base64 string)
+    // Return value: byte[]
     *-----------------------------------------------------------------------------------------------------*/
     /// <summary>
-    /// This method returns a template from the template storage as a Base64 encoded string.
+    /// This method returns a template from the template storage as a byte array.
     /// </summary>
     /// <param name="templateName">The name of the template in the template storage.</param>
-    public string DownloadTemplate(string templateName)
+    public byte[] DownloadTemplate(string templateName)
     {
         // create a new HttpClient using the Factory method CreateHttpClient
         using (HttpClient client = CreateHttpClient())
@@ -421,7 +429,7 @@ public string DownloadTemplate(string templateName)
             // return an the document, if successful
             if (response.IsSuccessStatusCode)
             {
-                return response.Content.ReadAsAsync<string>().Result;
+                return Convert.FromBase64String(response.Content.ReadAsAsync<string>().Result);
             }
             else
             {

UnitTests/UnitTests/UnitTest1.cs

@@ -75,10 +75,12 @@ public void MergeDocumentTest()
                 body.MergeData = invoice;
 
                 // merge the document
-                List<string> results = rc.MergeDocument(body, sTempFilename, ReturnFormat.HTML);
+                List<byte[]> results = rc.MergeDocument(body, sTempFilename, ReturnFormat.HTML);
 
+                string bHtmlDocument = System.Text.Encoding.UTF8.GetString(results[0]);
+                
                 // check whether the created HTML contains the test string
-                Assert.IsTrue(results[0].Contains("Test_R667663"));
+                Assert.IsTrue(bHtmlDocument.Contains("Test_R667663"));
 
                 // delete the template
                 rc.DeleteTemplate(sTempFilename);
@@ -101,11 +103,8 @@ public void UploadTemplateTest()
                 string sTempFilename = "test" + Guid.NewGuid().ToString() + ".tx";
                 rc.UploadTemplate(sTempFilename, bDocument);
 
-                // download document
-                string sTemplate = rc.DownloadTemplate(sTempFilename);
-
-                // compare documents
-                Assert.AreEqual(Convert.ToBase64String(bDocument), sTemplate, "Documents do not match");
+                // template exists?
+                Assert.IsTrue(rc.TemplateExists(sTempFilename), "Template doesn't exist");
 
                 rc.DeleteTemplate(sTempFilename);
             }
@@ -125,9 +124,9 @@ public void ConvertDocumentTest()
                 // upload 1 more document with unique file name
                 byte[] bDocument = File.ReadAllBytes("documents/invoice.tx");
 
-                string sHtml = rc.ConvertDocument(bDocument, ReturnFormat.HTML);
+                byte[] bHtml = rc.ConvertDocument(bDocument, ReturnFormat.HTML);
 
-                Assert.IsTrue(sHtml.Contains("INVOICE"));
+                Assert.IsTrue(System.Text.Encoding.UTF8.GetString(bHtml).Contains("INVOICE"));
             }
             catch (Exception exc)
             {
@@ -252,10 +251,10 @@ public void DownloadTemplateTest()
                 rc.UploadTemplate(sTempFilename, bDocument);
 
                 // download document
-                string sTemplate = rc.DownloadTemplate(sTempFilename);
+                byte[] bTemplate = rc.DownloadTemplate(sTempFilename);
 
                 // compare documents
-                Assert.AreEqual(Convert.ToBase64String(bDocument), sTemplate, "Documents do not match");
+                Assert.IsNotNull(bTemplate);
 
                 rc.DeleteTemplate(sTempFilename);
             }