Merge pull request #18 from valentk777/FewTodoDone

Hardcoded path to absolute path changed

Author: EgorBo

benchmarks/Benchmarks.csproj

@@ -8,9 +8,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.11.4" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
-    <PackageReference Include="SpanJson" Version="2.0.6" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.12.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
+    <PackageReference Include="SpanJson" Version="2.0.14" />
   </ItemGroup>
 
   <ItemGroup>

benchmarks/BenchmarksBase.cs

@@ -2,8 +2,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Reflection;
-using System.Text;
 using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Configs;
 using BenchmarkDotNet.Jobs;
@@ -26,8 +24,8 @@ public ConfigWithCustomEnvVars()
 
         public IEnumerable<object[]> TestData()
         {
-            var testDataDir = @"C:\prj\simdjsonsharp\jsonexamples"; // TODO: fix absolute path
-            string[] files = Directory.GetFiles(testDataDir, "*.json", SearchOption.AllDirectories).ToArray();
+            string jsonExamples = Environment.GetEnvironmentVariable("pathToJsonExamples");
+            string[] files = Directory.GetFiles(jsonExamples, "*.json", SearchOption.AllDirectories).ToArray();
 
             foreach (var file in files)
             {

benchmarks/Program.cs

@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using System.Reflection;
 using BenchmarkDotNet.Running;
 
 namespace Benchmarks
@@ -8,6 +9,13 @@ public class Program
     {
         public static void Main(string[] args)
         {
+            const string envVariable = "pathToJsonExamples";
+            if (Environment.GetEnvironmentVariable(envVariable) == null)
+            {
+                string root = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+                string path = Path.Join(Directory.GetParent(root).Parent.Parent.Parent.FullName, "jsonexamples");
+                Environment.SetEnvironmentVariable(envVariable, path);
+            }
             BenchmarkSwitcher.FromAssembly(typeof(Program).Assembly).Run(args);
         }
     }

src/BindingsForNativeLib/BindingsGenerator/BindingsGenerator.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CppAst" Version="0.5.8" />
+    <PackageReference Include="CppAst" Version="0.5.9" />
     <PackageReference Include="CppPinvokeGenerator" Version="0.1.4" />
   </ItemGroup>
 

tests/MinifierTests.cs

@@ -8,6 +8,14 @@ namespace SimdJsonSharp.Tests
 {
     public class MinifierTests
     {
+        private string testDataDir;
+
+        public MinifierTests()
+        {
+            string currentDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+            testDataDir = Path.Join(Directory.GetParent(currentDir).Parent.Parent.Parent.FullName, "jsonexamples");
+        }
+
         //[Fact]
         public void ValidateMinifier()
         {
@@ -24,9 +32,6 @@ public void ValidateMinifier()
         [Fact]
         public unsafe void ValidateMinimizedJson()
         {
-            string currentDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
-            string testDataDir = Path.Combine(currentDir, @"../../../../jsonexamples");
-
             string[] files = Directory.GetFiles(testDataDir, "*.json", SearchOption.AllDirectories);
             // 20 files, ~15Mb of JSON
             Assert.NotEmpty(files);
@@ -46,9 +51,6 @@ public unsafe void ValidateMinimizedJson()
         [Fact]
         public unsafe void ValidateMinimizedJsonN()
         {
-            string currentDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
-            string testDataDir = Path.Combine(currentDir, @"../../../../jsonexamples");
-
             string[] files = Directory.GetFiles(testDataDir, "*.json", SearchOption.AllDirectories);
             // 20 files, ~15Mb of JSON
             Assert.NotEmpty(files);

tests/SimdJsonSharp.Tests.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.2" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
       <PrivateAssets>all</PrivateAssets>

tests/ValidateTestFilesTests.cs

@@ -15,7 +15,7 @@ public class ValidateTestFilesTests
         public ValidateTestFilesTests()
         {
             string currentDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
-            testDataDir = Path.Combine(currentDir, @"C:\prj\simdjson\jsonexamples");
+            testDataDir = Path.Join(Directory.GetParent(currentDir).Parent.Parent.Parent.FullName, "jsonexamples");
         }
 
         [Fact]