Merge pull request #193 from sharwell/fix-192

Fix 192

Author: sharwell

src/corelib/Providers/Rackspace/CloudFilesProvider.cs

@@ -808,7 +808,11 @@ public void UpdateObjectMetadata(string container, string objectName, Dictionary
 
             var urlPath = new Uri(string.Format("{0}/{1}/{2}", GetServiceEndpointCloudFiles(identity, region, useInternalUrl), _encodeDecodeProvider.UrlEncode(container), _encodeDecodeProvider.UrlEncode(objectName)));
 
-            ExecuteRESTRequest(identity, urlPath, HttpMethod.POST, headers: headers);
+            RequestSettings settings = BuildDefaultRequestSettings();
+            // make sure the content type is not changed by the metadata operation
+            settings.ContentType = null;
+
+            ExecuteRESTRequest(identity, urlPath, HttpMethod.POST, headers: headers, settings: settings);
         }
 
         /// <inheritdoc />
@@ -1095,10 +1099,7 @@ public void CopyObject(string sourceContainer, string sourceObjectName, string d
             else
             {
                 // make sure to preserve the content type during the copy operation
-                Dictionary<string, string> sourceHeaders = GetObjectHeaders(sourceContainer, sourceObjectName, region, useInternalUrl, identity);
-                string contentType;
-                if (sourceHeaders.TryGetValue("Content-Type", out contentType))
-                    settings.ContentType = contentType;
+                settings.ContentType = null;
             }
 
             ExecuteRESTRequest(identity, urlPath, HttpMethod.COPY, headers: headers, settings: settings);

src/testing/integration/Providers/Rackspace/UserObjectStorageTests.cs

@@ -780,6 +780,17 @@ private static Dictionary<string, string> GetContainerMetadataWithPrefix(IObject
             return FilterMetadataPrefix(metadata, prefix);
         }
 
+        private static string GetObjectContentType(IObjectStorageProvider provider, string containerName, string objectName)
+        {
+            Dictionary<string, string> headers = provider.GetObjectHeaders(containerName, objectName);
+
+            string contentType;
+            if (!headers.TryGetValue("Content-Type", out contentType))
+                return null;
+
+            return contentType.ToLowerInvariant();
+        }
+
         #endregion
 
         #region Objects
@@ -853,19 +864,23 @@ public void TestUpdateObjectMetaData()
             string containerName = TestContainerPrefix + Path.GetRandomFileName();
             string objectName = Path.GetRandomFileName();
             string objectData = "";
+            string contentType = "text/plain-jane";
 
             ObjectStore result = provider.CreateContainer(containerName);
             Assert.AreEqual(ObjectStore.ContainerCreated, result);
 
             Stream stream = new MemoryStream(Encoding.UTF8.GetBytes(objectData));
-            provider.CreateObject(containerName, stream, objectName);
+            provider.CreateObject(containerName, stream, objectName, contentType);
+            Assert.AreEqual(contentType, GetObjectContentType(provider, containerName, objectName));
+
             Dictionary<string, string> metadata = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
             {
                 { "Key1", "Value 1" },
                 { "Key2", "Value ²" },
             };
 
             provider.UpdateObjectMetadata(containerName, objectName, new Dictionary<string, string>(metadata, StringComparer.OrdinalIgnoreCase));
+            Assert.AreEqual(contentType, GetObjectContentType(provider, containerName, objectName));
 
             Dictionary<string, string> actualMetadata = provider.GetObjectMetaData(containerName, objectName);
             Console.WriteLine("Object Metadata");
@@ -880,6 +895,7 @@ public void TestUpdateObjectMetaData()
                 { "Key2", "Value 2" }
             };
             provider.UpdateObjectMetadata(containerName, objectName, new Dictionary<string, string>(updatedMetadata, StringComparer.OrdinalIgnoreCase));
+            Assert.AreEqual(contentType, GetObjectContentType(provider, containerName, objectName));
 
             actualMetadata = provider.GetObjectMetaData(containerName, objectName);
             Console.WriteLine("Object Metadata");
@@ -1311,13 +1327,14 @@ public void TestCopyObject()
             string copiedName = Path.GetRandomFileName();
             // another random name counts as random content
             string fileData = Path.GetRandomFileName();
+            string contentType = "text/plain-jane";
 
             ObjectStore containerResult = provider.CreateContainer(containerName);
             Assert.AreEqual(ObjectStore.ContainerCreated, containerResult);
 
             using (MemoryStream uploadStream = new MemoryStream(Encoding.UTF8.GetBytes(fileData)))
             {
-                provider.CreateObject(containerName, uploadStream, objectName);
+                provider.CreateObject(containerName, uploadStream, objectName, contentType);
             }
 
             using (MemoryStream downloadStream = new MemoryStream())
@@ -1355,9 +1372,8 @@ public void TestCopyObject()
             }
 
             // make sure the content type was not changed by the copy operation
-            Dictionary<string, string> originalHeaders = provider.GetObjectHeaders(containerName, objectName);
-            Dictionary<string, string> copiedHeaders = provider.GetObjectHeaders(containerName, objectName);
-            Assert.AreEqual(originalHeaders["Content-Type"], copiedHeaders["Content-Type"]);
+            Assert.AreEqual(contentType, GetObjectContentType(provider, containerName, objectName));
+            Assert.AreEqual(contentType, GetObjectContentType(provider, containerName, copiedName));
 
             /* Cleanup
              */