Modify functional tests for Mint (#150)

* Modify functional tests for Mint, add functional tests to .netcore configuration so that it works on Linux
minio · Aug 2, 2017 · e006ab7 · e006ab7
1 parent fa6abda
commit e006ab7
Show file tree

Hide file tree

Showing 13 changed files with 440 additions and 304 deletions.
diff --git a/FileUploader/FileUploader.csproj b/FileUploader/FileUploader.csproj
@@ -55,6 +55,9 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Mint|AnyCPU'">
+    <OutputPath>bin\Mint\</OutputPath>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />

diff --git a/Minio.Core/Minio.Core.csproj b/Minio.Core/Minio.Core.csproj
@@ -29,6 +29,12 @@
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='net4.5.2|x86'" />
 
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mint|AnyCPU'" />
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mint|x64'" />
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mint|x86'" />
+
   <ItemGroup>
     <Compile Include="..\Minio\ApiEndpoints\BucketOperations.cs" Link="ApiEndpoints\BucketOperations.cs" />
     <Compile Include="..\Minio\ApiEndpoints\IBucketOperations.cs" Link="ApiEndpoints\IBucketOperations.cs" />

diff --git a/Minio.Examples/Minio.Client.Examples.Core/Minio.Client.Examples.Core.csproj b/Minio.Examples/Minio.Client.Examples.Core/Minio.Client.Examples.Core.csproj
@@ -22,6 +22,12 @@
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='.net4.5.2|AnyCPU'" />
 
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mint|AnyCPU'" />
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mint|x64'" />
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mint|x86'" />
+
   <ItemGroup>
     <Compile Include="..\Cases\BucketExists.cs" Link="Cases\BucketExists.cs" />
     <Compile Include="..\Cases\CopyObject.cs" Link="Cases\CopyObject.cs" />

diff --git a/Minio.Examples/Minio.Client.Examples.Net452/Minio.Client.Examples.Net452.csproj b/Minio.Examples/Minio.Client.Examples.Net452/Minio.Client.Examples.Net452.csproj
@@ -54,6 +54,9 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Mint|AnyCPU'">
+    <OutputPath>bin\Mint\</OutputPath>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />

diff --git a/Minio.Functional.Tests/FunctionalTest.cs b/Minio.Functional.Tests/FunctionalTest.cs
diff --git a/Minio.Functional.Tests/Minio.Functional.Tests.csproj b/Minio.Functional.Tests/Minio.Functional.Tests.csproj
@@ -7,15 +7,33 @@
     <RuntimeIdentifiers>
       ubuntu.16.04-x64;linuxmint.17.3-x64;win10-x64
     </RuntimeIdentifiers>
+    <PackageId>$(MSBuildProjectName)</PackageId>
+
 
   </PropertyGroup>
+
+  <Choose>  
+        <When Condition=" '$(Configuration)'=='Debug' ">  
+            <ItemGroup>  
+                    <ProjectReference Include="..\Minio.Core\Minio.Core.csproj" />
+            </ItemGroup>  
+        </When>
+        <When Condition=" '$(Configuration)'=='.netcore' ">
+          <ItemGroup>
+            <ProjectReference Include="..\Minio.Core\Minio.Core.csproj" />
+          </ItemGroup>
+        </When>
+        <When Condition=" '$(Configuration)'=='Mint' ">   
+            <ItemGroup>  
+              <PackageReference Include="Minio.Netcore" Version="1.0.0" />       
+            </ItemGroup> 
+        </When>  
+  </Choose>
 
   <ItemGroup>
     <PackageReference Include="MSTest.TestFramework" Version="1.1.11" />
     <PackageReference Include="System.Net.Primitives" Version="4.3.0" />
-  </ItemGroup>
+    <PackageReference Include="System.Reactive.Linq" Version="4.0.0-preview00001" />
 
-  <ItemGroup>
-    <ProjectReference Include="..\Minio.Core\Minio.Core.csproj" />
   </ItemGroup>
 </Project>
diff --git a/Minio.Net452/Minio.Net452.csproj b/Minio.Net452/Minio.Net452.csproj
@@ -43,7 +43,7 @@
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <!--<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == '.net4.5.2|AnyCPU'">
     <OutputPath>bin\.net4.5.2\</OutputPath>
@@ -52,7 +52,10 @@
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+    <!--<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>-->
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Mint|AnyCPU'">
+    <OutputPath>bin\Mint\</OutputPath>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">

diff --git a/Minio.Tests/Minio.Tests.csproj b/Minio.Tests/Minio.Tests.csproj
@@ -58,6 +58,9 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Mint|AnyCPU'">
+    <OutputPath>bin\Mint\</OutputPath>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">