remove Verify

SimonCropp · Sep 15, 2023 · 736c75b · 736c75b
1 parent ea2c5da
commit 736c75b
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 19 deletions.
diff --git a/src/NoRefsTests/NoRefsTests.csproj b/src/NoRefsTests/NoRefsTests.csproj
@@ -29,8 +29,6 @@
     <Compile Remove="..\Tests\NamedTupleSample.cs" />
     <Compile Remove="..\Tests\RangeIndexUsage.cs" />
     <Compile Remove="..\Tests\PolyfillExtensionsTests_*.cs" />
-    <PackageReference Include="Verify.NUnit" Version="21.1.3" />
-    <PackageReference Include="Verify.DiffPlex" Version="2.2.1" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />

diff --git a/src/PublicTests/PublicTests.csproj b/src/PublicTests/PublicTests.csproj
@@ -24,8 +24,6 @@
       <Link>Pollyfill\PlatformCompatibility\%(RecursiveDir)%(Filename).cs</Link>
     </Compile>
     <Compile Include="..\Tests\*.cs" Exclude="..\Tests\BuildApiTest.cs;..\Tests\NullabilitySync.cs" />
-    <PackageReference Include="Verify.NUnit" Version="21.1.3" />
-    <PackageReference Include="Verify.DiffPlex" Version="2.2.1" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />

diff --git a/src/Tests/BuildApiTest.cs b/src/Tests/BuildApiTest.cs
@@ -16,7 +16,7 @@ class BuildApiTest
     [Test]
     public void Run()
     {
-        var solutionDirectory = VerifyTests.AttributeReader.GetSolutionDirectory();
+        var solutionDirectory = SolutionDirectoryFinder.Find();
         var path = Path.Combine(solutionDirectory, @"Consume\bin\Debug\netstandard2.0\Consume.dll");
         var md = Path.Combine(solutionDirectory, @"..\api_list.include.md");
         File.Delete(md);

diff --git a/src/Tests/ModuleInitializer.cs b/src/Tests/ModuleInitializer.cs
diff --git a/src/Tests/NullabilitySync.cs b/src/Tests/NullabilitySync.cs
@@ -1,11 +1,10 @@
 #if NET8_0 && DEBUG
 using System.Net.Http;
-using VerifyTests;
 
 [TestFixture]
 public class NullabilitySync
 {
-    static string solutionDir = AttributeReader.GetSolutionDirectory();
+    static string solutionDir = SolutionDirectoryFinder.Find();
     static string dir = Path.Combine(solutionDir, "PolyFill", "Nullability");
 
     [Test]

diff --git a/src/Tests/SolutionDirectoryFinder.cs b/src/Tests/SolutionDirectoryFinder.cs
@@ -0,0 +1,36 @@
+using System.Diagnostics.CodeAnalysis;
+
+static class SolutionDirectoryFinder
+{
+    public static string Find([CallerFilePath] string sourceFile = "")
+    {
+        if (!TryFind(sourceFile, out var solutionDirectory))
+        {
+            throw new("Could not find solution directory");
+        }
+
+        return solutionDirectory;
+    }
+
+    public static bool TryFind(string sourceFile, [NotNullWhen(true)] out string? path)
+    {
+        var currentDirectory = sourceFile;
+        do
+        {
+            if (Directory.GetFiles(currentDirectory, "*.sln").Any())
+            {
+                path = currentDirectory;
+                return true;
+            }
+
+            var parent = Directory.GetParent(currentDirectory);
+            if (parent == null)
+            {
+                path = null;
+                return false;
+            }
+
+            currentDirectory = parent.FullName;
+        } while (true);
+    }
+}
diff --git a/src/Tests/Tests.csproj b/src/Tests/Tests.csproj
@@ -23,8 +23,6 @@
       <Link>Pollyfill\PlatformCompatibility\%(RecursiveDir)%(Filename).cs</Link>
     </Compile>
     <PackageReference Include="Mono.Cecil" Version="0.11.5" />
-    <PackageReference Include="Verify.NUnit" Version="21.1.3" />
-    <PackageReference Include="Verify.DiffPlex" Version="2.2.1" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />

diff --git a/src/UnsafeTests/UnsafeTests.csproj b/src/UnsafeTests/UnsafeTests.csproj
@@ -24,8 +24,6 @@
       <Link>Pollyfill\PlatformCompatibility\%(RecursiveDir)%(Filename).cs</Link>
     </Compile>
     <Compile Include="..\Tests\*.cs" Exclude="..\Tests\BuildApiTest.cs;..\Tests\NullabilitySync.cs" />
-    <PackageReference Include="Verify.NUnit" Version="21.1.3" />
-    <PackageReference Include="Verify.DiffPlex" Version="2.2.1" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />