- Updated xunit & scoping testes on failed test cases

ugurak · Mar 1, 2017 · 08ec268 · 08ec268
1 parent f543b30
commit 08ec268
Show file tree

Hide file tree

Showing 21 changed files with 56 additions and 477 deletions.
diff --git a/Source/MOSA.sln b/Source/MOSA.sln
@@ -156,8 +156,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{F0EFF742
 		..\appveyor.yml = ..\appveyor.yml
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mosa.VisualStudio.Extension", "Mosa.VisualStudio.Extension\Mosa.VisualStudio.Extension.csproj", "{88BD905E-2936-4B56-873A-64A30AB884CA}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -757,18 +755,6 @@ Global
 		{FD266261-809F-483C-99CF-F26A7C143E52}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{FD266261-809F-483C-99CF-F26A7C143E52}.Release|x86.ActiveCfg = Release|Any CPU
 		{FD266261-809F-483C-99CF-F26A7C143E52}.Release|x86.Build.0 = Release|Any CPU
-		{88BD905E-2936-4B56-873A-64A30AB884CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{88BD905E-2936-4B56-873A-64A30AB884CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{88BD905E-2936-4B56-873A-64A30AB884CA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{88BD905E-2936-4B56-873A-64A30AB884CA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{88BD905E-2936-4B56-873A-64A30AB884CA}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{88BD905E-2936-4B56-873A-64A30AB884CA}.Debug|x86.Build.0 = Debug|Any CPU
-		{88BD905E-2936-4B56-873A-64A30AB884CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{88BD905E-2936-4B56-873A-64A30AB884CA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{88BD905E-2936-4B56-873A-64A30AB884CA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{88BD905E-2936-4B56-873A-64A30AB884CA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{88BD905E-2936-4B56-873A-64A30AB884CA}.Release|x86.ActiveCfg = Release|Any CPU
-		{88BD905E-2936-4B56-873A-64A30AB884CA}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -826,6 +812,5 @@ Global
 		{1717C7EB-06ED-434B-BA3C-E4FF9644EEDF} = {AC7C3CDA-E0E8-408C-BB32-DBCBB905E3E1}
 		{0B0260F3-A2BF-4AC4-8D28-9ADE1EBC697C} = {1F29608A-4C39-42C7-B981-154F92B9EDAC}
 		{FD266261-809F-483C-99CF-F26A7C143E52} = {1F29608A-4C39-42C7-B981-154F92B9EDAC}
-		{88BD905E-2936-4B56-873A-64A30AB884CA} = {1F29608A-4C39-42C7-B981-154F92B9EDAC}
 	EndGlobalSection
 EndGlobal
diff --git a/Source/Mosa.Compiler.Framework.xUnit/Mosa.Compiler.Framework.xUnit.csproj b/Source/Mosa.Compiler.Framework.xUnit/Mosa.Compiler.Framework.xUnit.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
-  <Import Project="..\packages\xunit.runner.visualstudio.2.2.0-rc4-build1270\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\packages\xunit.runner.visualstudio.2.2.0-rc4-build1270\build\net20\xunit.runner.visualstudio.props')" />
+  <Import Project="..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props')" />
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
     <ProductVersion>9.0.21022</ProductVersion>
@@ -109,16 +109,16 @@
       <HintPath>..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.assert, Version=2.2.0.3536, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.assert.2.2.0-rc4-build3536\lib\netstandard1.1\xunit.assert.dll</HintPath>
+    <Reference Include="xunit.assert, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.assert.2.2.0\lib\netstandard1.1\xunit.assert.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.core, Version=2.2.0.3536, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.extensibility.core.2.2.0-rc4-build3536\lib\netstandard1.1\xunit.core.dll</HintPath>
+    <Reference Include="xunit.core, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.extensibility.core.2.2.0\lib\netstandard1.1\xunit.core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.execution.desktop, Version=2.2.0.3536, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.extensibility.execution.2.2.0-rc4-build3536\lib\net452\xunit.execution.desktop.dll</HintPath>
+    <Reference Include="xunit.execution.desktop, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.extensibility.execution.2.2.0\lib\net452\xunit.execution.desktop.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
@@ -136,6 +136,6 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\xunit.runner.visualstudio.2.2.0-rc4-build1270\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.2.0-rc4-build1270\build\net20\xunit.runner.visualstudio.props'))" />
+    <Error Condition="!Exists('..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props'))" />
   </Target>
 </Project>
diff --git a/Source/Mosa.Compiler.Framework.xUnit/packages.config b/Source/Mosa.Compiler.Framework.xUnit/packages.config
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="xunit" version="2.2.0-rc4-build3536" targetFramework="net461" />
+  <package id="xunit" version="2.2.0" targetFramework="net461" />
   <package id="xunit.abstractions" version="2.0.1" targetFramework="net461" />
-  <package id="xunit.assert" version="2.2.0-rc4-build3536" targetFramework="net461" />
-  <package id="xunit.core" version="2.2.0-rc4-build3536" targetFramework="net461" />
-  <package id="xunit.extensibility.core" version="2.2.0-rc4-build3536" targetFramework="net461" />
-  <package id="xunit.extensibility.execution" version="2.2.0-rc4-build3536" targetFramework="net461" />
-  <package id="xunit.runner.console" version="2.2.0-rc4-build3536" targetFramework="net461" developmentDependency="true" />
-  <package id="xunit.runner.visualstudio" version="2.2.0-rc4-build1270" targetFramework="net461" developmentDependency="true" />
+  <package id="xunit.assert" version="2.2.0" targetFramework="net461" />
+  <package id="xunit.core" version="2.2.0" targetFramework="net461" />
+  <package id="xunit.extensibility.core" version="2.2.0" targetFramework="net461" />
+  <package id="xunit.extensibility.execution" version="2.2.0" targetFramework="net461" />
+  <package id="xunit.runner.console" version="2.2.0" targetFramework="net461" developmentDependency="true" />
+  <package id="xunit.runner.visualstudio" version="2.2.0" targetFramework="net461" developmentDependency="true" />
 </packages>
diff --git a/Source/Mosa.UnitTest.Collection.xUnit/ListFixture.cs b/Source/Mosa.UnitTest.Collection.xUnit/ListFixture.cs
@@ -78,6 +78,12 @@ public void Foreach()
 			Assert.Equal(Mosa.UnitTest.Collection.ListTests.Foreach(), Run<int>("Mosa.UnitTest.Collection.ListTests.Foreach"));
 		}
 
+		[Fact]
+		public void CheckPopulate()
+		{
+			Assert.Equal(Mosa.UnitTest.Collection.ListTests.CheckPopulate(), Run<bool>("Mosa.UnitTest.Collection.ListTests.CheckPopulate"));
+		}
+
 		[Fact]
 		public void ForeachNested()
 		{

diff --git a/Source/Mosa.UnitTest.Collection.xUnit/Mosa.UnitTest.Collection.xUnit.csproj b/Source/Mosa.UnitTest.Collection.xUnit/Mosa.UnitTest.Collection.xUnit.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\xunit.runner.visualstudio.2.2.0-rc4-build1270\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\packages\xunit.runner.visualstudio.2.2.0-rc4-build1270\build\net20\xunit.runner.visualstudio.props')" />
+  <Import Project="..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -46,16 +46,16 @@
       <HintPath>..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.assert, Version=2.2.0.3536, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.assert.2.2.0-rc4-build3536\lib\netstandard1.1\xunit.assert.dll</HintPath>
+    <Reference Include="xunit.assert, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.assert.2.2.0\lib\netstandard1.1\xunit.assert.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.core, Version=2.2.0.3536, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.extensibility.core.2.2.0-rc4-build3536\lib\netstandard1.1\xunit.core.dll</HintPath>
+    <Reference Include="xunit.core, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.extensibility.core.2.2.0\lib\netstandard1.1\xunit.core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.execution.desktop, Version=2.2.0.3536, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.extensibility.execution.2.2.0-rc4-build3536\lib\net452\xunit.execution.desktop.dll</HintPath>
+    <Reference Include="xunit.execution.desktop, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.extensibility.execution.2.2.0\lib\net452\xunit.execution.desktop.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
@@ -178,7 +178,7 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\xunit.runner.visualstudio.2.2.0-rc4-build1270\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.2.0-rc4-build1270\build\net20\xunit.runner.visualstudio.props'))" />
+    <Error Condition="!Exists('..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/Source/Mosa.UnitTest.Collection.xUnit/packages.config b/Source/Mosa.UnitTest.Collection.xUnit/packages.config
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="xunit" version="2.2.0-rc4-build3536" targetFramework="net461" />
+  <package id="xunit" version="2.2.0" targetFramework="net461" />
   <package id="xunit.abstractions" version="2.0.1" targetFramework="net461" />
-  <package id="xunit.assert" version="2.2.0-rc4-build3536" targetFramework="net461" />
-  <package id="xunit.core" version="2.2.0-rc4-build3536" targetFramework="net461" />
-  <package id="xunit.extensibility.core" version="2.2.0-rc4-build3536" targetFramework="net461" />
-  <package id="xunit.extensibility.execution" version="2.2.0-rc4-build3536" targetFramework="net461" />
-  <package id="xunit.runner.visualstudio" version="2.2.0-rc4-build1270" targetFramework="net461" developmentDependency="true" />
+  <package id="xunit.assert" version="2.2.0" targetFramework="net461" />
+  <package id="xunit.core" version="2.2.0" targetFramework="net461" />
+  <package id="xunit.extensibility.core" version="2.2.0" targetFramework="net461" />
+  <package id="xunit.extensibility.execution" version="2.2.0" targetFramework="net461" />
+  <package id="xunit.runner.visualstudio" version="2.2.0" targetFramework="net461" developmentDependency="true" />
 </packages>
diff --git a/Source/Mosa.UnitTest.Collection/ListTests.cs b/Source/Mosa.UnitTest.Collection/ListTests.cs
@@ -114,9 +114,9 @@ private static List<int> Populate(int count)
 
 		public static bool PopulateList()
 		{
-			var list = Populate(9);
+			var list = Populate(6);
 
-			return list.Count == 9;
+			return list.Count == 6;
 		}
 
 		private static int SumAll(List<int> list)
@@ -131,16 +131,31 @@ private static int SumAll(List<int> list)
 			return sum;
 		}
 
+		public static bool CheckPopulate()
+		{
+			int size = 50;
+
+			var list = Populate(size);
+
+			for (int i = 0; i < size; i++)
+			{
+				if (list[i] != i * 101)
+					return false;
+			}
+
+			return true;
+		}
+
 		public static int Foreach()
 		{
-			var list = Populate(10);
+			var list = Populate(6);
 
 			return SumAll(list);
 		}
 
 		public static int ForeachNested()
 		{
-			var list = Populate(3);
+			var list = Populate(6);
 			int sum = 0;
 
 			foreach (var item in list)

diff --git a/Source/Mosa.UnitTest.Engine/UnitTestEngine.cs b/Source/Mosa.UnitTest.Engine/UnitTestEngine.cs
@@ -65,7 +65,7 @@ public UnitTestEngine()
 				EnableSSA = true,
 				EnableIROptimizations = true,
 				EnableSparseConditionalConstantPropagation = true,
-				EnableInlinedMethods = false,
+				EnableInlinedMethods = true,
 
 				Emulator = EmulatorType.Qemu,
 				ImageFormat = ImageFormat.IMG,

diff --git a/Source/Mosa.VisualStudio.Extension/Key.snk b/Source/Mosa.VisualStudio.Extension/Key.snk
diff --git a/Source/Mosa.VisualStudio.Extension/Mosa Icon.png b/Source/Mosa.VisualStudio.Extension/Mosa Icon.png