Updating Azure Tests

src/Orchard.Azure.Tests/App.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <appSettings>
-    <add key="AzureSDK" value="C:\Program Files\Microsoft SDKs\Windows Azure\" />
+    <add key="AzureSDK" value="C:\Program Files (x86)\Microsoft SDKs\Azure\" />
 
     <add key="Orchard.Azure.Settings.StorageConnectionString" value="UseDevelopmentStorage=true" />
     <add key="Orchard.Azure.Media.StorageConnectionString" value="UseDevelopmentStorage=true" />

src/Orchard.Azure.Tests/AzureVirtualEnvironmentTest.cs

@@ -1,28 +1,43 @@
-using System.Configuration;
+using System;
+using System.Configuration;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using Microsoft.WindowsAzure.Storage;
 using Microsoft.WindowsAzure.Storage.Blob;
 using NUnit.Framework;
 
 namespace Orchard.Azure.Tests {
     public abstract class AzureVirtualEnvironmentTest {
-        private Process _dsService;
+        private Process _storageEmulator;
 
         protected abstract void OnInit();
 
+        
         [TestFixtureSetUp]
         public void FixtureSetup() {
-            var count = Process.GetProcessesByName("DSService").Length;
+            if (!Process.GetProcessesByName("AzureStorageEmulator").Any()) {
-            if ( count == 0 ) {
+                var azureSDKPath = ConfigurationManager.AppSettings["AzureSDK"];
-                var start = new ProcessStartInfo {
+                var storageEmulatorRelativePath = "Storage Emulator\\AzureStorageEmulator.exe";
-                    Arguments = "/devstore:start",
+
-                    FileName = Path.Combine(ConfigurationManager.AppSettings["AzureSDK"], @"emulator\csrun.exe")
+                if (String.IsNullOrEmpty(azureSDKPath)) {
+                    throw new ConfigurationErrorsException("Could not find the AppSetting \"AzureSDK\" that indicates the path to the Azure SDK on the local file system.");
+                }
+
+                var storageEmulatorAbsolutePath = Path.Combine(azureSDKPath, storageEmulatorRelativePath);
+
+                if (!File.Exists(storageEmulatorAbsolutePath)) {
+                    throw new ConfigurationErrorsException("Could not find the executable to start the Azure Storage Emulator.");
+                }
+
+                var storageEmulatorStartInfo = new ProcessStartInfo {
+                    Arguments = "start",
+                    FileName = storageEmulatorAbsolutePath
                 };
 
-                _dsService = new Process { StartInfo = start };
+                _storageEmulator = new Process { StartInfo = storageEmulatorStartInfo };
-                _dsService.Start();
+                _storageEmulator.Start();
-                _dsService.WaitForExit();
+                _storageEmulator.WaitForExit();
             }
 
             OnInit();
@@ -30,34 +45,32 @@ namespace Orchard.Azure.Tests {
 
         [TestFixtureTearDown]
         public void FixtureTearDown() {
-
+            if (_storageEmulator != null)
-            if ( _dsService != null )
+                _storageEmulator.Close();
-                _dsService.Close();
         }
 
-        protected void DeleteAllBlobs(string containerName, CloudStorageAccount account)
+        protected void DeleteAllBlobs(string containerName, CloudStorageAccount account) {
-        {
             var blobClient = account.CreateCloudBlobClient();
             var container = blobClient.GetContainerReference(containerName);
 
-            foreach ( var blob in container.ListBlobs() ) {
+            foreach (var blob in container.ListBlobs()) {
-                if ( blob is CloudBlob ) {
+                if (blob is CloudBlob) {
-                    ( (CloudBlob)blob ).DeleteIfExists();
+                    ((CloudBlob)blob).DeleteIfExists();
                 }
 
-                if ( blob is CloudBlobDirectory ) {
+                if (blob is CloudBlobDirectory) {
                     DeleteAllBlobs((CloudBlobDirectory)blob);
                 }
             }
         }
 
         private static void DeleteAllBlobs(CloudBlobDirectory cloudBlobDirectory) {
-            foreach ( var blob in cloudBlobDirectory.ListBlobs() ) {
+            foreach (var blob in cloudBlobDirectory.ListBlobs()) {
-                if ( blob is CloudBlob ) {
+                if (blob is CloudBlob) {
-                    ( (CloudBlob)blob ).DeleteIfExists();
+                    ((CloudBlob)blob).DeleteIfExists();
                 }
 
-                if ( blob is CloudBlobDirectory ) {
+                if (blob is CloudBlobDirectory) {
                     DeleteAllBlobs((CloudBlobDirectory)blob);
                 }
             }

src/Orchard.Azure.Tests/FileSystems/Media/AzureBlobStorageProviderTests.cs

@@ -269,11 +269,11 @@ namespace Orchard.Azure.Tests.FileSystems.Media {
         }
 
         [Test]
-        public void UnknownMimeTypeShouldBeAssigned() {
+        public void DefaultMimeTypeShouldBeAssigned() {
             _azureBlobStorageProvider.CreateFile("foo1.xyz");
             var file = _azureBlobStorageProvider.Container.GetBlockBlobReference("default/foo1.xyz");
             file.FetchAttributes();
-            Assert.That(file.Properties.ContentType, Is.EqualTo("application/unknown"));
+            Assert.That(file.Properties.ContentType, Is.EqualTo("application/octet-stream"));
         }
 
 

src/Orchard.Azure.Tests/Orchard.Azure.Tests.csproj

@@ -80,16 +80,24 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Moq, Version=4.2.1510.2205, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll</HintPath>
+      <HintPath>..\packages\Moq.4.2.1510.2205\lib\NET40\Moq.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="nunit.framework, Version=2.5.2.9222, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+    <Reference Include="nunit.framework, Version=2.5.10.11092, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\NUnit.2.5.10.11092\lib\nunit.framework.dll</HintPath>
-      <HintPath>..\..\lib\nunit\nunit.framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="nunit.mocks, Version=2.5.10.11092, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.2.5.10.11092\lib\nunit.mocks.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="pnunit.framework, Version=1.0.4109.34242, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.2.5.10.11092\lib\pnunit.framework.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />

src/Orchard.Azure.Tests/packages.config

@@ -6,6 +6,8 @@
   <package id="Microsoft.Data.Services.Client" version="5.6.4" targetFramework="net452" />
   <package id="Moq" version="4.2.1510.2205" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net452" />
+  <package id="NUnit" version="2.5.10.11092" targetFramework="net452" />
   <package id="System.Spatial" version="5.6.4" targetFramework="net452" />
   <package id="WindowsAzure.Storage" version="5.0.2" targetFramework="net452" />
+  <package id="NUnit" version="2.5.10.11092" targetFramework="net452" />
 </packages>

src/Orchard.Core.Tests/Orchard.Core.Tests.csproj

@@ -73,8 +73,8 @@
       <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Moq, Version=4.0.10827.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+    <Reference Include="Moq, Version=4.2.1510.2205, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
+      <HintPath>..\packages\Moq.4.2.1510.2205\lib\NET40\Moq.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="NHibernate, Version=4.0.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">

src/Orchard.Core.Tests/packages.config

@@ -7,7 +7,7 @@
   <package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net452" />
   <package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net452" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net452" />
-  <package id="Moq" version="4.0.10827" targetFramework="net452" />
+  <package id="Moq" version="4.2.1510.2205" targetFramework="net452" />
   <package id="NHibernate" version="4.0.1.4000" targetFramework="net452" />
   <package id="NUnit" version="2.5.10.11092" targetFramework="net452" />
 </packages>

src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj

@@ -118,8 +118,8 @@
       <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Moq, Version=4.0.10827.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+    <Reference Include="Moq, Version=4.2.1510.2205, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
+      <HintPath>..\packages\Moq.4.2.1510.2205\lib\NET40\Moq.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">

src/Orchard.Tests.Modules/packages.config

@@ -11,7 +11,7 @@
   <package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net452" />
   <package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net452" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net452" />
-  <package id="Moq" version="4.0.10827" targetFramework="net452" />
+  <package id="Moq" version="4.2.1510.2205" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net452" />
   <package id="NHibernate" version="4.0.1.4000" targetFramework="net452" />
   <package id="NUnit" version="2.5.10.11092" targetFramework="net452" />

src/Orchard.Tests/Orchard.Framework.Tests.csproj

@@ -110,8 +110,8 @@
       <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Moq, Version=4.0.10827.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+    <Reference Include="Moq, Version=4.2.1510.2205, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
+      <HintPath>..\packages\Moq.4.2.1510.2205\lib\NET40\Moq.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">

src/Orchard.Tests/packages.config

@@ -13,7 +13,7 @@
   <package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net452" />
   <package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net452" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net452" />
-  <package id="Moq" version="4.0.10827" targetFramework="net452" />
+  <package id="Moq" version="4.2.1510.2205" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net452" />
   <package id="NHibernate" version="4.0.1.4000" targetFramework="net452" />
   <package id="NUnit" version="2.5.10.11092" targetFramework="net452" />

src/Orchard.Web/Modules/Orchard.Azure/Services/Environment/Configuration/AzureBlobShellSettingsManager.cs

@@ -21,13 +21,20 @@ namespace Orchard.Azure.Services.Environment.Configuration
         private readonly IShellSettingsManagerEventHandler _events;
 
         public AzureBlobShellSettingsManager(IMimeTypeProvider mimeTypeProvider, IShellSettingsManagerEventHandler events) {
+            _events = events;
+            Logger = NullLogger.Instance;
+
             var connectionString = CloudConfigurationManager.GetSetting(Constants.ShellSettingsStorageConnectionStringSettingName);
+
             var containerName = CloudConfigurationManager.GetSetting(Constants.ShellSettingsContainerNameSettingName);
             if (String.IsNullOrEmpty(containerName))
                 containerName = Constants.ShellSettingsDefaultContainerName;
+
             _fileSystem = new AzureFileSystem(connectionString, containerName, String.Empty, true, mimeTypeProvider);
-            _events = events;
+
-            Logger = NullLogger.Instance;
+            if (!_fileSystem.Container.Exists()) {
+                _fileSystem.Container.Create();
+            }
         }
 
         public ILogger Logger { get; set; }

src/Orchard.Web/Modules/Orchard.Projections/Tests/Orchard.Projections.Tests.csproj

@@ -47,8 +47,8 @@
       <HintPath>..\..\..\..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Moq, Version=4.0.10827.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+    <Reference Include="Moq, Version=4.2.1510.2205, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
+      <HintPath>..\..\..\..\packages\Moq.4.2.1510.2205\lib\NET40\Moq.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="NHibernate, Version=4.0.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">

src/Orchard.Web/Modules/Orchard.Projections/Tests/packages.config

@@ -3,7 +3,7 @@
   <package id="Autofac" version="3.5.2" targetFramework="net452" />
   <package id="FluentNHibernate" version="1.4.0.0" targetFramework="net452" />
   <package id="Iesi.Collections" version="4.0.1.4000" targetFramework="net452" />
-  <package id="Moq" version="4.0.10827" targetFramework="net452" />
+  <package id="Moq" version="4.2.1510.2205" targetFramework="net452" />
   <package id="NHibernate" version="4.0.1.4000" targetFramework="net452" />
   <package id="NUnit" version="2.5.10.11092" targetFramework="net452" />
 </packages>

src/Rebracer.xml

@@ -10,8 +10,8 @@
     <ToolsOptionsCategory name="Environment">
       <ToolsOptionsSubCategory name="TaskList">
         <PropertyValue name="CommentTokens" ArrayType="VT_VARIANT" ArrayElementCount="4">
-          <PropertyValue name="0">TODO:2</PropertyValue>
+          <PropertyValue name="0">HACK:2</PropertyValue>
-          <PropertyValue name="1">HACK:2</PropertyValue>
+          <PropertyValue name="1">TODO:2</PropertyValue>
           <PropertyValue name="2">UNDONE:2</PropertyValue>
           <PropertyValue name="3">UnresolvedMergeConflict:3</PropertyValue>
         </PropertyValue>

src/Tools/Orchard.Tests/Orchard.Tests.csproj

@@ -56,8 +56,8 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Moq, Version=4.0.10827.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+    <Reference Include="Moq, Version=4.2.1510.2205, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
+      <HintPath>..\..\packages\Moq.4.2.1510.2205\lib\NET40\Moq.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="nunit.framework, Version=2.5.10.11092, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">

src/Tools/Orchard.Tests/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Moq" version="4.0.10827" targetFramework="net452" />
+  <package id="Moq" version="4.2.1510.2205" targetFramework="net452" />
   <package id="NUnit" version="2.5.10.11092" targetFramework="net452" />
 </packages>