Repository: reef Updated Branches: refs/heads/master f6a1c09f5 -> f0579fe76
[REEF-1177] Delete mstest packages from .csproj files This change * removes Microsoft.VisualStudio.QualityTools.UnitTestFramework from .csproj files, so that new mstest tests can't be created without being evident. * migrates ReefFunctionalTest.cs to xUnit. JIRA: [REEF-1177](https://issues.apache.org/jira/browse/REEF-1177) Pull request: This closes #824 Project: http://git-wip-us.apache.org/repos/asf/reef/repo Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/f0579fe7 Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/f0579fe7 Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/f0579fe7 Branch: refs/heads/master Commit: f0579fe76030afabee7afde4f4803648aca5370d Parents: f6a1c09 Author: Mariia Mykhailova <[email protected]> Authored: Thu Feb 4 16:25:57 2016 -0800 Committer: Dongjoon Hyun <[email protected]> Committed: Thu Feb 4 17:29:40 2016 -0800 ---------------------------------------------------------------------- .../Org.Apache.REEF.Client.Tests.csproj | 1 - .../Org.Apache.REEF.Common.Tests.csproj | 1 - .../Org.Apache.REEF.Evaluator.Tests.csproj | 1 - .../Org.Apache.REEF.IMRU.Tests.csproj | 1 - .../Org.Apache.REEF.IO.Tests.csproj | 1 - .../Org.Apache.REEF.Network.Tests.csproj | 1 - .../Org.Apache.REEF.Tang.Tests.csproj | 1 - .../Functional/ReefFunctionalTest.cs | 14 +++++++------- .../Org.Apache.REEF.Tests.csproj | 1 - .../Org.Apache.REEF.Wake.Tests.csproj | 1 - 10 files changed, 7 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/reef/blob/f0579fe7/lang/cs/Org.Apache.REEF.Client.Tests/Org.Apache.REEF.Client.Tests.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Client.Tests/Org.Apache.REEF.Client.Tests.csproj b/lang/cs/Org.Apache.REEF.Client.Tests/Org.Apache.REEF.Client.Tests.csproj index 6d72cdc..2c05264 100644 --- a/lang/cs/Org.Apache.REEF.Client.Tests/Org.Apache.REEF.Client.Tests.csproj +++ b/lang/cs/Org.Apache.REEF.Client.Tests/Org.Apache.REEF.Client.Tests.csproj @@ -36,7 +36,6 @@ under the License. <BuildPackage>false</BuildPackage> </PropertyGroup> <ItemGroup> - <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" /> <Reference Include="NSubstitute, Version=1.8.2.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL"> <HintPath>$(PackagesDir)\NSubstitute.1.8.2.0\lib\net45\NSubstitute.dll</HintPath> <Private>True</Private> http://git-wip-us.apache.org/repos/asf/reef/blob/f0579fe7/lang/cs/Org.Apache.REEF.Common.Tests/Org.Apache.REEF.Common.Tests.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common.Tests/Org.Apache.REEF.Common.Tests.csproj b/lang/cs/Org.Apache.REEF.Common.Tests/Org.Apache.REEF.Common.Tests.csproj index af74e47..92dc72e 100644 --- a/lang/cs/Org.Apache.REEF.Common.Tests/Org.Apache.REEF.Common.Tests.csproj +++ b/lang/cs/Org.Apache.REEF.Common.Tests/Org.Apache.REEF.Common.Tests.csproj @@ -35,7 +35,6 @@ under the License. <BuildPackage>false</BuildPackage> </PropertyGroup> <ItemGroup> - <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" /> <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL"> <HintPath>$(PackagesDir)\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath> <Private>True</Private> http://git-wip-us.apache.org/repos/asf/reef/blob/f0579fe7/lang/cs/Org.Apache.REEF.Evaluator.Tests/Org.Apache.REEF.Evaluator.Tests.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Evaluator.Tests/Org.Apache.REEF.Evaluator.Tests.csproj b/lang/cs/Org.Apache.REEF.Evaluator.Tests/Org.Apache.REEF.Evaluator.Tests.csproj index 8046a27..da0fe33 100644 --- a/lang/cs/Org.Apache.REEF.Evaluator.Tests/Org.Apache.REEF.Evaluator.Tests.csproj +++ b/lang/cs/Org.Apache.REEF.Evaluator.Tests/Org.Apache.REEF.Evaluator.Tests.csproj @@ -41,7 +41,6 @@ under the License. </PropertyGroup> <ItemGroup> <Reference Include="System" /> - <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" /> <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL"> <HintPath>$(PackagesDir)\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath> <Private>True</Private> http://git-wip-us.apache.org/repos/asf/reef/blob/f0579fe7/lang/cs/Org.Apache.REEF.IMRU.Tests/Org.Apache.REEF.IMRU.Tests.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.IMRU.Tests/Org.Apache.REEF.IMRU.Tests.csproj b/lang/cs/Org.Apache.REEF.IMRU.Tests/Org.Apache.REEF.IMRU.Tests.csproj index 29c729d..950896d 100644 --- a/lang/cs/Org.Apache.REEF.IMRU.Tests/Org.Apache.REEF.IMRU.Tests.csproj +++ b/lang/cs/Org.Apache.REEF.IMRU.Tests/Org.Apache.REEF.IMRU.Tests.csproj @@ -36,7 +36,6 @@ under the License. <RestorePackages>true</RestorePackages> </PropertyGroup> <ItemGroup> - <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" /> <Reference Include="System" /> <Reference Include="System.Core" /> <Reference Include="System.Xml.Linq" /> http://git-wip-us.apache.org/repos/asf/reef/blob/f0579fe7/lang/cs/Org.Apache.REEF.IO.Tests/Org.Apache.REEF.IO.Tests.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.IO.Tests/Org.Apache.REEF.IO.Tests.csproj b/lang/cs/Org.Apache.REEF.IO.Tests/Org.Apache.REEF.IO.Tests.csproj index 5a6c3b6..eb1aa89 100644 --- a/lang/cs/Org.Apache.REEF.IO.Tests/Org.Apache.REEF.IO.Tests.csproj +++ b/lang/cs/Org.Apache.REEF.IO.Tests/Org.Apache.REEF.IO.Tests.csproj @@ -35,7 +35,6 @@ under the License. <BuildPackage>false</BuildPackage> </PropertyGroup> <ItemGroup> - <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" /> <Reference Include="System" /> <Reference Include="System.Core" /> <Reference Include="System.Xml.Linq" /> http://git-wip-us.apache.org/repos/asf/reef/blob/f0579fe7/lang/cs/Org.Apache.REEF.Network.Tests/Org.Apache.REEF.Network.Tests.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Network.Tests/Org.Apache.REEF.Network.Tests.csproj b/lang/cs/Org.Apache.REEF.Network.Tests/Org.Apache.REEF.Network.Tests.csproj index 337d18d..8c5730e 100644 --- a/lang/cs/Org.Apache.REEF.Network.Tests/Org.Apache.REEF.Network.Tests.csproj +++ b/lang/cs/Org.Apache.REEF.Network.Tests/Org.Apache.REEF.Network.Tests.csproj @@ -41,7 +41,6 @@ under the License. <BuildPackage>false</BuildPackage> </PropertyGroup> <ItemGroup> - <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" /> <Reference Include="System" /> <Reference Include="System.Reactive.Core"> <HintPath>$(PackagesDir)\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll</HintPath> http://git-wip-us.apache.org/repos/asf/reef/blob/f0579fe7/lang/cs/Org.Apache.REEF.Tang.Tests/Org.Apache.REEF.Tang.Tests.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/Org.Apache.REEF.Tang.Tests.csproj b/lang/cs/Org.Apache.REEF.Tang.Tests/Org.Apache.REEF.Tang.Tests.csproj index 3d40d24..7cfd196 100644 --- a/lang/cs/Org.Apache.REEF.Tang.Tests/Org.Apache.REEF.Tang.Tests.csproj +++ b/lang/cs/Org.Apache.REEF.Tang.Tests/Org.Apache.REEF.Tang.Tests.csproj @@ -41,7 +41,6 @@ under the License. <Reference Include="Newtonsoft.Json"> <HintPath>$(PackagesDir)\Newtonsoft.Json.$(NewtonsoftJsonVersion)\lib\net45\Newtonsoft.Json.dll</HintPath> </Reference> - <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" /> <Reference Include="protobuf-net"> <HintPath>$(PackagesDir)\protobuf-net.$(ProtobufVersion)\lib\net40\protobuf-net.dll</HintPath> </Reference> http://git-wip-us.apache.org/repos/asf/reef/blob/f0579fe7/lang/cs/Org.Apache.REEF.Tests/Functional/ReefFunctionalTest.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/ReefFunctionalTest.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/ReefFunctionalTest.cs index 64442ee..8a31934 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Functional/ReefFunctionalTest.cs +++ b/lang/cs/Org.Apache.REEF.Tests/Functional/ReefFunctionalTest.cs @@ -22,7 +22,6 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; using System.Timers; -using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.WindowsAzure.Storage; using Microsoft.WindowsAzure.Storage.Blob; using Org.Apache.REEF.Client.API; @@ -33,6 +32,7 @@ using Org.Apache.REEF.Tang.Interface; using Org.Apache.REEF.Utilities; using Org.Apache.REEF.Utilities.Diagnostics; using Org.Apache.REEF.Utilities.Logging; +using Xunit; using Timer = System.Timers.Timer; namespace Org.Apache.REEF.Tests.Functional @@ -163,14 +163,14 @@ namespace Org.Apache.REEF.Tests.Functional string[] successIndicators = lines.Where(s => s.Contains(successIndication)).ToArray(); string[] failedTaskIndicators = lines.Where(s => s.Contains(failedTaskIndication)).ToArray(); string[] failedIndicators = lines.Where(s => s.Contains(failedEvaluatorIndication)).ToArray(); - Assert.AreEqual(numberOfEvaluatorsToClose, successIndicators.Length); - Assert.AreEqual(numberOfTasksToFail, failedTaskIndicators.Length); - Assert.AreEqual(numberOfEvaluatorsToFail, failedIndicators.Length); + Assert.Equal(numberOfEvaluatorsToClose, successIndicators.Length); + Assert.Equal(numberOfTasksToFail, failedTaskIndicators.Length); + Assert.Equal(numberOfEvaluatorsToFail, failedIndicators.Length); } else { Console.WriteLine("Cannot read from log file"); - Assert.Fail(); + Assert.True(false); } } @@ -193,12 +193,12 @@ namespace Org.Apache.REEF.Tests.Functional if (lines != null) { string[] successIndicators = lines.Where(s => s.Contains(message)).ToArray(); - Assert.AreEqual(numberOfoccurances, successIndicators.Count()); + Assert.Equal(numberOfoccurances, successIndicators.Count()); } else { Console.WriteLine("Cannot read from log file"); - Assert.Fail(); + Assert.True(false); } } http://git-wip-us.apache.org/repos/asf/reef/blob/f0579fe7/lang/cs/Org.Apache.REEF.Tests/Org.Apache.REEF.Tests.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/Org.Apache.REEF.Tests.csproj b/lang/cs/Org.Apache.REEF.Tests/Org.Apache.REEF.Tests.csproj index 7ed135f..759f1ba 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Org.Apache.REEF.Tests.csproj +++ b/lang/cs/Org.Apache.REEF.Tests/Org.Apache.REEF.Tests.csproj @@ -51,7 +51,6 @@ under the License. <HintPath>$(PackagesDir)\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll</HintPath> <Private>True</Private> </Reference> - <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" /> <Reference Include="Microsoft.WindowsAzure.Storage, Version=6.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <HintPath>$(PackagesDir)\WindowsAzure.Storage.6.1.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath> <Private>True</Private> http://git-wip-us.apache.org/repos/asf/reef/blob/f0579fe7/lang/cs/Org.Apache.REEF.Wake.Tests/Org.Apache.REEF.Wake.Tests.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Wake.Tests/Org.Apache.REEF.Wake.Tests.csproj b/lang/cs/Org.Apache.REEF.Wake.Tests/Org.Apache.REEF.Wake.Tests.csproj index 265a181..8e9e765 100644 --- a/lang/cs/Org.Apache.REEF.Wake.Tests/Org.Apache.REEF.Wake.Tests.csproj +++ b/lang/cs/Org.Apache.REEF.Wake.Tests/Org.Apache.REEF.Wake.Tests.csproj @@ -35,7 +35,6 @@ under the License. <BuildPackage>false</BuildPackage> </PropertyGroup> <ItemGroup> - <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" /> <Reference Include="System" /> <Reference Include="System.Core" /> <Reference Include="System.Reactive.Core">
