Refactor tests and becnhmarks

Folleach · Folleach · commit d9d23fcaa593 · 2022-05-15T12:49:28.000+05:00
diff --git a/GeometryDashAPI.Benchmarks/BenchmarkSources/SampleLevel.txt b/GeometryDashAPI.Benchmarks/BenchmarkSources/SampleLevel.txt
diff --git a/GeometryDashAPI.Benchmarks/Benchmarks/GDParserBenchmark.cs b/GeometryDashAPI.Benchmarks/Benchmarks/GDParserBenchmark.cs
@@ -1,12 +1,11 @@
 ﻿using BenchmarkDotNet.Attributes;
-using GeometryDashAPI.Parser;
 using GeometryDashAPI.Parsers;
-using GeometryDashAPI.Tests.TestObjects;
+using TestObjects;
 
-namespace GeometryDashAPI.Tests
+namespace GeometryDashAPI.Tests.Benchmarks
 {
     [DisassemblyDiagnoser]
-    public class GDParserBenchmark
+    public class GdParserBenchmark
     {
         private string largeRaw;
 
diff --git a/GeometryDashAPI.Benchmarks/Benchmarks/LLParserBenchmark.cs b/GeometryDashAPI.Benchmarks/Benchmarks/LLParserBenchmark.cs
diff --git a/GeometryDashAPI.Benchmarks/Benchmarks/LevelLoadBenchmark.cs b/GeometryDashAPI.Benchmarks/Benchmarks/LevelLoadBenchmark.cs
diff --git a/GeometryDashAPI.Benchmarks/GeometryDashAPI.Benchmarks.csproj b/GeometryDashAPI.Benchmarks/GeometryDashAPI.Benchmarks.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <OutputType>Exe</OutputType>
+        <TargetFramework>net6.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\GeometryDashAPI\GeometryDashAPI.csproj" />
+      <ProjectReference Include="..\TestObjects\TestObjects.csproj" />
+    </ItemGroup>
+
+</Project>
diff --git a/GeometryDashAPI.Benchmarks/Program.cs b/GeometryDashAPI.Benchmarks/Program.cs
@@ -0,0 +1,7 @@
+﻿using System.Reflection;
+using BenchmarkDotNet.Configs;
+using BenchmarkDotNet.Running;
+
+BenchmarkSwitcher.FromAssembly(Assembly.GetAssembly(typeof(Program))).Run(args,
+    ManualConfig.Create(DefaultConfig.Instance)
+        .With(ConfigOptions.DisableOptimizationsValidator));
diff --git a/GeometryDashAPI.Tests/GeometryDashAPI.Tests.csproj b/GeometryDashAPI.Tests/GeometryDashAPI.Tests.csproj
@@ -2,14 +2,13 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <StartupObject>GeometryDashAPI.Tests.Program</StartupObject>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
     <PackageReference Include="FluentAssertions" Version="6.0.0-alpha0002" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
     <PackageReference Include="NUnit" Version="3.13.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0">
       <PrivateAssets>all</PrivateAssets>
@@ -19,10 +18,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\GeometryDashAPI\GeometryDashAPI.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Folder Include="BenchmarkSources" />
+    <ProjectReference Include="..\TestObjects\TestObjects.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/GeometryDashAPI.Tests/ObjectParserTests.cs b/GeometryDashAPI.Tests/ObjectParserTests.cs
@@ -1,12 +1,12 @@
 ﻿using System;
 using FluentAssertions;
-using GeometryDashAPI.Parser;
 using GeometryDashAPI.Parsers;
-using GeometryDashAPI.Tests.TestObjects;
 using NUnit.Framework;
+using TestObjects;
 
 namespace GeometryDashAPI.Tests
 {
+    [TestFixture]
     public class ObjectParserTests
     {
         [TestCase("33:1.4", 1.4)]
diff --git a/GeometryDashAPI.Tests/Program.cs b/GeometryDashAPI.Tests/Program.cs
@@ -5,13 +5,5 @@
 
 namespace GeometryDashAPI.Tests
 {
-    public class Program
-    {
-        public static void Main(string[] args)
-        {
-            BenchmarkSwitcher.FromAssembly(Assembly.GetAssembly(typeof(Program))).Run(args,
-                ManualConfig.Create(DefaultConfig.Instance)
-                    .With(ConfigOptions.DisableOptimizationsValidator));
-        }
-    }
+
 }
diff --git a/GeometryDashAPI.Tests/StructParserTests.cs b/GeometryDashAPI.Tests/StructParserTests.cs
@@ -1,7 +1,7 @@
 ﻿using FluentAssertions;
 using GeometryDashAPI.Parsers;
-using GeometryDashAPI.Tests.TestObjects;
 using NUnit.Framework;
+using TestObjects;
 
 namespace GeometryDashAPI.Tests
 {
diff --git a/GeometryDashAPI.sln b/GeometryDashAPI.sln
@@ -12,6 +12,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Examples", "Examples\Exampl
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GeometryDashAPI.Tests", "GeometryDashAPI.Tests\GeometryDashAPI.Tests.csproj", "{ADD42DF9-2846-451D-90B4-F7DD82CE1195}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GeometryDashAPI.Benchmarks", "GeometryDashAPI.Benchmarks\GeometryDashAPI.Benchmarks.csproj", "{E574D681-F12C-4DED-9691-C4CA82CB69AA}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestObjects", "TestObjects\TestObjects.csproj", "{7DF2D7F7-7348-43F1-A1B2-431942FBB797}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -30,6 +34,14 @@ Global
 		{ADD42DF9-2846-451D-90B4-F7DD82CE1195}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{ADD42DF9-2846-451D-90B4-F7DD82CE1195}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ADD42DF9-2846-451D-90B4-F7DD82CE1195}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E574D681-F12C-4DED-9691-C4CA82CB69AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E574D681-F12C-4DED-9691-C4CA82CB69AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E574D681-F12C-4DED-9691-C4CA82CB69AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E574D681-F12C-4DED-9691-C4CA82CB69AA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7DF2D7F7-7348-43F1-A1B2-431942FBB797}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7DF2D7F7-7348-43F1-A1B2-431942FBB797}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7DF2D7F7-7348-43F1-A1B2-431942FBB797}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7DF2D7F7-7348-43F1-A1B2-431942FBB797}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/TestObjects/AllTypes.cs b/TestObjects/AllTypes.cs
@@ -1,4 +1,6 @@
-﻿namespace GeometryDashAPI.Tests.TestObjects
+﻿using GeometryDashAPI;
+
+namespace TestObjects
 {
     public class AllTypes : GameObject
     {
diff --git a/TestObjects/ComplexParserObjects.cs b/TestObjects/ComplexParserObjects.cs
@@ -1,6 +1,6 @@
-﻿using System.Collections.Generic;
+﻿using GeometryDashAPI;
 
-namespace GeometryDashAPI.Tests.TestObjects
+namespace TestObjects
 {
     public class ComplexParserObject : GameStruct
     {
diff --git a/TestObjects/LargeObject.cs b/TestObjects/LargeObject.cs
@@ -1,4 +1,6 @@
-﻿namespace GeometryDashAPI.Tests.TestObjects
+﻿using GeometryDashAPI;
+
+namespace TestObjects
 {
     public class LargeObject : GameObject
     {
diff --git a/TestObjects/MultipleSense.cs b/TestObjects/MultipleSense.cs
@@ -1,4 +1,6 @@
-﻿namespace GeometryDashAPI.Tests.TestObjects
+﻿using GeometryDashAPI;
+
+namespace TestObjects
 {
     public class MultipleSense : GameObject
     {
diff --git a/TestObjects/ObjectSample.cs b/TestObjects/ObjectSample.cs
@@ -1,6 +1,6 @@
 ﻿using GeometryDashAPI;
 
-namespace GeometryDashAPI.Tests.TestObjects
+namespace TestObjects
 {
     public class ObjectSample : GameObject
     {
diff --git a/TestObjects/SampleContainer.cs b/TestObjects/SampleContainer.cs
@@ -1,4 +1,6 @@
-﻿namespace GeometryDashAPI.Tests.TestObjects
+﻿using GeometryDashAPI;
+
+namespace TestObjects
 {
     public class SampleContainer : GameObject
     {
diff --git a/TestObjects/StructSample.cs b/TestObjects/StructSample.cs
@@ -1,4 +1,6 @@
-﻿namespace GeometryDashAPI.Tests.TestObjects
+﻿using GeometryDashAPI;
+
+namespace TestObjects
 {
     public class StructSample : GameStruct
     {
diff --git a/TestObjects/TestObjects.csproj b/TestObjects/TestObjects.csproj
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net6.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\GeometryDashAPI\GeometryDashAPI.csproj" />
+    </ItemGroup>
+
+</Project>

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,11 @@`
`1`	`1`	`using BenchmarkDotNet.Attributes;`
`2`		`-using GeometryDashAPI.Parser;`
`3`	`2`	`using GeometryDashAPI.Parsers;`
`4`		`-using GeometryDashAPI.Tests.TestObjects;`
	`3`	`+using TestObjects;`
`5`	`4`
`6`		`-namespace GeometryDashAPI.Tests`
	`5`	`+namespace GeometryDashAPI.Tests.Benchmarks`
`7`	`6`	`{`
`8`	`7`	`[DisassemblyDiagnoser]`
`9`		`- public class GDParserBenchmark`
	`8`	`+ public class GdParserBenchmark`
`10`	`9`	`{`
`11`	`10`	`private string largeRaw;`
`12`	`11`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,12 @@`
`1`	`1`	`using System;`
`2`	`2`	`using FluentAssertions;`
`3`		`-using GeometryDashAPI.Parser;`
`4`	`3`	`using GeometryDashAPI.Parsers;`
`5`		`-using GeometryDashAPI.Tests.TestObjects;`
`6`	`4`	`using NUnit.Framework;`
	`5`	`+using TestObjects;`
`7`	`6`
`8`	`7`	`namespace GeometryDashAPI.Tests`
`9`	`8`	`{`
	`9`	`+ [TestFixture]`
`10`	`10`	`public class ObjectParserTests`
`11`	`11`	`{`
`12`	`12`	`[TestCase("33:1.4", 1.4)]`
Original file line number	Diff line number	Diff line change
`@@ -5,13 +5,5 @@`
`5`	`5`
`6`	`6`	`namespace GeometryDashAPI.Tests`
`7`	`7`	`{`
`8`		`- public class Program`
`9`		`- {`
`10`		`- public static void Main(string[] args)`
`11`		`- {`
`12`		`- BenchmarkSwitcher.FromAssembly(Assembly.GetAssembly(typeof(Program))).Run(args,`
`13`		`- ManualConfig.Create(DefaultConfig.Instance)`
`14`		`- .With(ConfigOptions.DisableOptimizationsValidator));`
`15`		`- }`
`16`		`- }`
	`8`	`+`
`17`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using FluentAssertions;`
`2`	`2`	`using GeometryDashAPI.Parsers;`
`3`		`-using GeometryDashAPI.Tests.TestObjects;`
`4`	`3`	`using NUnit.Framework;`
	`4`	`+using TestObjects;`
`5`	`5`
`6`	`6`	`namespace GeometryDashAPI.Tests`
`7`	`7`	`{`