Merge pull request #561 from sebastienros/dev

New release
sebastienros · Dec 4, 2018 · 04359cc · 04359cc
2 parents 832dba9 + 2e3ed39
commit 04359cc
Show file tree

Hide file tree

Showing 94 changed files with 7,077 additions and 5,893 deletions.
diff --git a/Jint.Benchmark/Jint.Benchmark.csproj b/Jint.Benchmark/Jint.Benchmark.csproj
@@ -19,7 +19,7 @@
     <None Include="..\Jint.Tests.CommonScripts\Scripts\**" CopyToOutputDirectory="PreserveNewest" LinkBase="SunSpider" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.11.0" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.11.2" />
     <ProjectReference Include="..\Jint\Jint.csproj" />
     <PackageReference Include="Jurassic" Version="3.0.0-alpha2" />
     <PackageReference Include="NiL.JS.NetCore" Version="2.5.1200" />

diff --git a/Jint.Tests.CommonScripts/Jint.Tests.CommonScripts.csproj b/Jint.Tests.CommonScripts/Jint.Tests.CommonScripts.csproj
@@ -9,11 +9,11 @@
     <ProjectReference Include="..\Jint\Jint.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
-    <PackageReference Include="xunit" Version="2.4.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
+    <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.analyzers" Version="0.10.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
-    <PackageReference Include="xunit.runner.console" Version="2.4.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.console" Version="2.4.1" />
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
   </ItemGroup>
 </Project>
diff --git a/Jint.Tests.Ecma/EcmaTest.cs b/Jint.Tests.Ecma/EcmaTest.cs
@@ -109,10 +109,41 @@ protected void RunTest(SourceFile sourceFile)
 
     public class Chapter15 : EcmaTest
     {
+        // couple of tests are really slow, run in parallel
+        internal const string SlowTest1 = "ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A2.5_T1.js";
+        internal const string SlowTest2 = "ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A2.5_T1.js";
+
         [Theory(DisplayName = "Ecma Chapter 15")]
         [MemberData(nameof(SourceFiles), parameters: new object[] {"ch15", false })]
         [MemberData(nameof(SourceFiles), parameters: new object[] {"ch15", true }, Skip = "Skipped")]
         protected void RunTest(SourceFile sourceFile)
+        {
+            if (sourceFile.Source == SlowTest1 || sourceFile.Source == SlowTest2)
+            {
+                return;
+            }
+
+            RunTestInternal(sourceFile);
+        }
+    }
+
+    public class Chapter15_SlowTest1 : EcmaTest
+    {
+        [Theory(DisplayName = "Ecma Chapter 15 Slow Test 1")]
+        [MemberData(nameof(SourceFiles), parameters: new object[] {Chapter15.SlowTest1, false })]
+        [MemberData(nameof(SourceFiles), parameters: new object[] {Chapter15.SlowTest1, true }, Skip = "Skipped")]
+        protected void RunTest(SourceFile sourceFile)
+        {
+            RunTestInternal(sourceFile);
+        }
+    }
+
+    public class Chapter15_SlowTest2 : EcmaTest
+    {
+        [Theory(DisplayName = "Ecma Chapter 15 Slow Test 2")]
+        [MemberData(nameof(SourceFiles), parameters: new object[] {Chapter15.SlowTest2, false })]
+        [MemberData(nameof(SourceFiles), parameters: new object[] {Chapter15.SlowTest2, true }, Skip = "Skipped")]
+        protected void RunTest(SourceFile sourceFile)
         {
             RunTestInternal(sourceFile);
         }
@@ -220,6 +251,14 @@ public static IEnumerable<object[]> SourceFiles(string prefix, bool skipped)
                     continue;
                 }
 
+                if (sourceFile.Skip
+                    && (sourceFile.Reason == "part of new test suite"
+                        || sourceFile.Reason.IndexOf("configurable", StringComparison.OrdinalIgnoreCase) > -1))
+                {
+                    // we consider this obsolete and we don't need to process at all
+                    continue;
+                }
+
                 if (skipped == sourceFile.Skip)
                 {
                     results.Add(new object [] { sourceFile });

diff --git a/Jint.Tests.Ecma/Jint.Tests.Ecma.csproj b/Jint.Tests.Ecma/Jint.Tests.Ecma.csproj
@@ -6,11 +6,11 @@
     <ProjectReference Include="..\Jint\Jint.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
-    <PackageReference Include="xunit" Version="2.4.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
+    <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.analyzers" Version="0.10.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
-    <PackageReference Include="xunit.runner.console" Version="2.4.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.console" Version="2.4.1" />
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
   </ItemGroup>
 </Project>
diff --git a/Jint.Tests.Ecma/SingleTest.cs b/Jint.Tests.Ecma/SingleTest.cs
@@ -21,7 +21,7 @@ public class SingleTest : EcmaTest
         [RunnableInDebugOnly]
         public void TestSingle()
         {
-            const string Target = @"ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-10.js";
+            const string Target = @"ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A3_T3.js";
             var sourceFile = SourceFiles(Target, false)
                 .SelectMany(x => x)
                 .Cast<SourceFile>()