Move skipped tests to use traits, fix bug in printer

macsux · macsux · commit f07b4f17113c · 2024-10-07T12:53:47.000-04:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -53,7 +53,7 @@ jobs:
           (cd Rewrite && dotnet build Rewrite.sln --no-restore)
       - name: test-cs
         if: "!startsWith(github.event.head_commit.message, '[lst-change]')"
-        run: (cd Rewrite && dotnet test Rewrite.sln)
+        run: (cd Rewrite && dotnet test Rewrite.sln --filter "Category!=KnownBug & Category!=Exploratory")
 
       - name: publish-java-snapshots
         if: github.event_name != 'pull_request'
diff --git a/Rewrite/Directory.Build.props b/Rewrite/Directory.Build.props
@@ -12,7 +12,9 @@
         <VersionPrefix>0.8.7</VersionPrefix>
         <RewriteRemoteVersion>0.8.4-rc.*</RewriteRemoteVersion>
         <RewriteRemoteDir Condition="'$(RewriteRemoteDir)'==''">..\..\..\..\..\moderneinc\rewrite-remote\Rewrite.Remote</RewriteRemoteDir>
-        <DefineConstants>TRACE;DEBUG;REMOTE_PRINTER</DefineConstants>
+        <RemotePrinter>True</RemotePrinter>
+        <DebugVisitor>False</DebugVisitor>
+        <SanitizeStackTrace>True</SanitizeStackTrace>
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(RELEASE_PUBLICATION)'!=''">
@@ -23,4 +25,10 @@
     </PropertyGroup>
 
     <Import Project="Directory.Build.props.user" Condition="Exists('Directory.Build.props.user')"/>
+
+    <PropertyGroup>
+      <DefineConstants Condition="'$(RemotePrinter)'">$(DefineConstants);REMOTE_PRINTER</DefineConstants>
+      <DefineConstants Condition="'$(DebugVisitor)'">$(DefineConstants);DEBUG_VISITOR</DefineConstants>
+      <DefineConstants Condition="'$(SanitizeStackTrace)'">$(DefineConstants);SANITIZE_STACK_TRACE</DefineConstants>
+    </PropertyGroup>
 </Project>
diff --git a/Rewrite/Directory.Build.targets b/Rewrite/Directory.Build.targets
@@ -3,7 +3,7 @@
         <None Include="$(SolutionDir)resources\$(PackageIcon)" Pack="true" PackagePath="" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="JetBrains.Annotations" Version="2023.3.0" PrivateAssets="all"/>
+        <PackageReference Include="JetBrains.Annotations" Version="2024.2.0" PrivateAssets="all"/>
     </ItemGroup>
     <ItemGroup>
         <Using Include="JetBrains.Annotations" />
@@ -14,4 +14,4 @@
                 DestinationFiles="$(TargetDir)$(PackageIcon)"
                 SkipUnchangedFiles="true"/>
     </Target>
-</Project>
+</Project>
diff --git a/Rewrite/Rewrite.Sources.sln b/Rewrite/Rewrite.Sources.sln
@@ -30,6 +30,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_solution", "_solution", "{
 		Directory.Build.props = Directory.Build.props
 		Directory.Build.targets = Directory.Build.targets
 		README.md = README.md
+		Directory.Build.props.user = Directory.Build.props.user
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rewrite.CSharp.Test", "..\..\..\moderneinc\rewrite-remote\Rewrite.Remote\src\Rewrite.CSharp.Test\Rewrite.CSharp.Test.csproj", "{E3A7B93C-310E-4109-8F80-C469215FB93B}"
diff --git a/Rewrite/src/Rewrite.Core/Internal/ExceptionUtils.cs b/Rewrite/src/Rewrite.Core/Internal/ExceptionUtils.cs
@@ -6,6 +6,7 @@ public static class ExceptionUtils
 {
     public static string SanitizeStackTrace(this Exception exception, Type until)
     {
+#if SANITIZE_STACK_TRACE
         var sanitized = "";
         sanitized = string.Join("\n", sanitized, exception.GetType().Name + ": " + exception.Message);
 
@@ -26,5 +27,8 @@ public static string SanitizeStackTrace(this Exception exception, Type until)
         }
 
         return sanitized;
+#else
+        return exception.ToString();
+#endif
     }
 }
diff --git a/Rewrite/src/Rewrite.Java/JavaPrinter.cs b/Rewrite/src/Rewrite.Java/JavaPrinter.cs
@@ -8,7 +8,7 @@ namespace Rewrite.RewriteJava;
 public class JavaPrinter<P> : JavaVisitor<PrintOutputCapture<P>>
 {
     private static readonly Func<string, string> JAVA_MARKER_WRAPPER =
-        o => $"/*~~{o}{(string.IsNullOrEmpty(o) ? "" : "~~")}*/";
+        o => $"/*~~{o}{(string.IsNullOrEmpty(o) ? "" : "~~")}>*/";
 
     public JavaPrinter()
     {
diff --git a/Rewrite/tests/Rewrite.CSharp.Tests/CSharpTypeAttributionTests.cs b/Rewrite/tests/Rewrite.CSharp.Tests/CSharpTypeAttributionTests.cs
@@ -9,23 +9,24 @@
 
 namespace Rewrite.CSharp.Tests;
 
-using static Assertions;
+using static Rewrite.RewriteCSharp.Test.Api.Assertions;
 
 public class CSharpTypeAttributionTests : RewriteTest
 {
-    [Fact(Skip = "For now we dont support Methods")]
+    [Fact]
+    [KnownBug]
     void ClosureImplicitParameterAttributed()
     {
         RewriteRun(
             CSharp(
                 """
-                public class Program 
+                public class Program
                 {
                     public T? register<T>(String name, Type type, Action<T> configurationAction)
                     {
                         return default;
                     }
-                    
+
                     public void Main()
                     {
                         register("test", typeof(Program), (string t) => { });
@@ -70,4 +71,4 @@ class TestJavaVisitor(bool attributed) : JavaVisitor<int>
             return variable;
         }
     }
-}
+}
diff --git a/Rewrite/tests/Rewrite.CSharp.Tests/FindClassDeclarationTests.cs b/Rewrite/tests/Rewrite.CSharp.Tests/FindClassDeclarationTests.cs
@@ -89,7 +89,8 @@ class Foo()
         );
     }
 
-    [Fact(Skip = "For now we dont extract types")]
+    [Fact]
+    [KnownBug]
     public void ClassWithoutBody2()
     {
         RewriteRun(
diff --git a/Rewrite/tests/Rewrite.CSharp.Tests/PlayTests.cs b/Rewrite/tests/Rewrite.CSharp.Tests/PlayTests.cs
@@ -9,9 +9,10 @@ namespace Rewrite.CSharp.Tests.Tree;
 using static Assertions;
 
 [Collection(Collections.PrinterAccess)]
+[Exploratory]
 public class PlayTests(ITestOutputHelper _output) : RewriteTest
 {
-    [Fact(Skip = "Ignored")]
+    [Fact]
     public void MyTest()
     {
         var root = new CSharpParser.Builder().Build().Parse(
@@ -27,7 +28,7 @@ void Bar()
         _output.WriteLine(newRoot.ToString());
     }
 
-    [Fact(Skip = "Ignored")]
+    [Fact]
     public void ParseTests()
     {
         var root = new CSharpParser.Builder().Build().Parse(
diff --git a/Rewrite/tests/Rewrite.CSharp.Tests/Rewrite.CSharp.Tests.csproj b/Rewrite/tests/Rewrite.CSharp.Tests/Rewrite.CSharp.Tests.csproj
@@ -12,14 +12,32 @@
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <PackageReference Include="FluentAssertions" Version="7.0.0-alpha.4" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0-release-24352-06" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
         <PackageReference Include="Nuke.Common" Version="8.1.0" />
-        <PackageReference Include="xunit" Version="2.8.1" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1"/>
+        <PackageReference Include="xunit" Version="2.9.2" />
+        <PackageReference Include="Xunit.OpenCategories" Version="1.1.0.4" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
     </ItemGroup>
 
     <ItemGroup>
+        <Using Include="Xunit.Assert" Alias="Assert"/>
+        <Using Include="Nuke.Common"/>
+        <Using Include="Nuke.Common"/>
+        <Using Include="Nuke.Common.IO"/>
+        <Using Include="FluentAssertions"/>
+        <Using Include="Rewrite.Core"/>
+        <Using Include="Rewrite.Test"/>
+        <Using Include="Rewrite.MSBuild"/>
+        <Using Include="Rewrite.RewriteCSharp"/>
+        <Using Include="Rewrite.RewriteJava.Tree"/>
+        <Using Include="Rewrite.RewriteCSharp.Tree"/>
+        <Using Include="Rewrite.RewriteCSharp.Test.Api"/>
         <Using Include="Xunit"/>
+        <Using Include="Xunit.Abstractions"/>
+        <Using Include="Xunit.OpenCategories"/>
     </ItemGroup>
 
     <ItemGroup>
diff --git a/Rewrite/tests/Rewrite.CSharp.Tests/Solutions/SolutionTests.cs b/Rewrite/tests/Rewrite.CSharp.Tests/Solutions/SolutionTests.cs
@@ -1,17 +1,7 @@
 ﻿using System.Diagnostics;
 using System.Runtime.ExceptionServices;
 using System.Text.RegularExpressions;
-using FluentAssertions;
-using Nuke.Common;
-using Nuke.Common.IO;
-using Rewrite.Core;
-using Rewrite.MSBuild;
-using Rewrite.RewriteCSharp;
-using Rewrite.RewriteCSharp.Test;
 using Rewrite.RewriteCSharp.Test.Api;
-using Rewrite.Test;
-using Xunit.Abstractions;
-using Assert = Xunit.Assert;
 
 namespace Rewrite.CSharp.Tests.Solutions;
 
@@ -27,8 +17,9 @@ public SolutionTests(ITestOutputHelper output)
         _output = output;
     }
 
-    [Theory(Skip = "Run manually")]
+    [Theory]
     [MemberData(nameof(Fixtures))]
+    [Exploratory]
     public async Task ParseSolution(AbsolutePath solutionPath)
     {
         var cancellationToken = new CancellationTokenSource(TimeSpan.FromSeconds(1000)).Token;
diff --git a/Rewrite/tests/Rewrite.CSharp.Tests/Tree/ArrayTypeTests.cs b/Rewrite/tests/Rewrite.CSharp.Tests/Tree/ArrayTypeTests.cs
@@ -23,7 +23,8 @@ public class Foo
         );
     }
 
-    [Fact(Skip = "Still work in progress")]
+    [Fact]
+    [KnownBug]
     public void TwoDimensional()
     {
         RewriteRun(
diff --git a/Rewrite/tests/Rewrite.CSharp.Tests/Tree/ClassDeclarationTests.cs b/Rewrite/tests/Rewrite.CSharp.Tests/Tree/ClassDeclarationTests.cs
@@ -99,7 +99,8 @@ class Foo<T>;
         );
     }
 
-    [Fact(Skip = SkipReason.NotYetImplemented)]
+    [Fact]
+    [KnownBug]
     public void TypeParameterWithTypeConstraint()
     {
         RewriteRun(
@@ -111,7 +112,8 @@ class Foo<T> where T : System.String;
         );
     }
 
-    [Fact(Skip = SkipReason.NotYetImplemented)]
+    [Fact]
+    [KnownBug]
     public void TypeParameterWithClassConstraint()
     {
         RewriteRun(
@@ -123,7 +125,8 @@ class Foo<T> where T : class;
         );
     }
 
-    [Fact(Skip = SkipReason.NotYetImplemented)]
+    [Fact]
+    [KnownBug]
     public void TypeParameterWithEnumConstraint()
     {
         RewriteRun(
@@ -135,7 +138,8 @@ class Foo<T> where T : enum;
         );
     }
 
-    [Fact(Skip = SkipReason.NotYetImplemented)]
+    [Fact]
+    [KnownBug]
     public void TypeParameterWithNewConstraint()
     {
         RewriteRun(
@@ -147,7 +151,8 @@ public void TypeParameterWithNewConstraint()
         );
     }
 
-    [Fact(Skip = SkipReason.NotYetImplemented)]
+    [Fact]
+    [KnownBug]
     public void TypeParameterWithMultipleConstraints()
     {
         RewriteRun(
diff --git a/Rewrite/tests/Rewrite.CSharp.Tests/Tree/MemberAccessTests.cs b/Rewrite/tests/Rewrite.CSharp.Tests/Tree/MemberAccessTests.cs
@@ -9,7 +9,8 @@ namespace Rewrite.CSharp.Tests.Tree;
 [Collection(Collections.PrinterAccess)]
 public class MemberAccessTests : RewriteTest
 {
-    [Fact(Skip = SkipReason.NotYetImplemented)]
+    [Fact]
+    [KnownBug]
     public void MultilineLinq()
     {
         var src = CSharp(
diff --git a/Rewrite/tests/Rewrite.CSharp.Tests/Tree/MethodDeclarationTests.cs b/Rewrite/tests/Rewrite.CSharp.Tests/Tree/MethodDeclarationTests.cs
@@ -237,7 +237,8 @@ class Test {
         );
     }
 
-    [Fact(Skip = SkipReason.NotYetImplemented)]
+    [Fact]
+    [KnownBug]
     void GenericMethodDeclarationWithSingleTypeConstraint()
     {
         RewriteRun(
@@ -253,7 +254,8 @@ void Method<T>() where T : System.String
 
 
 
-    [Fact(Skip = SkipReason.NotYetImplemented)]
+    [Fact]
+    [KnownBug]
     public void GenericMethodDeclarationWithClassConstraint()
     {
         RewriteRun(
@@ -267,7 +269,8 @@ void Method<T>() where T : class
         );
     }
 
-    [Fact(Skip = SkipReason.NotYetImplemented)]
+    [Fact]
+    [KnownBug]
     public void GenericMethodDeclarationWithEnumConstraint()
     {
         RewriteRun(
@@ -281,7 +284,8 @@ void Method<T>() where T : enum
         );
     }
 
-    [Fact(Skip = SkipReason.NotYetImplemented)]
+    [Fact]
+    [KnownBug]
     public void GenericMethodDeclarationWithNewConstraint()
     {
         RewriteRun(
@@ -295,7 +299,8 @@ class Test {
         );
     }
 
-    [Fact(Skip = SkipReason.NotYetImplemented)]
+    [Fact]
+    [KnownBug]
     public void TypeParameterWithMultipleConstraints()
     {
         RewriteRun(
diff --git a/Rewrite/tests/Rewrite.CSharp.Tests/Tree/MethodInvocationTests.cs b/Rewrite/tests/Rewrite.CSharp.Tests/Tree/MethodInvocationTests.cs
@@ -93,7 +93,7 @@ static string M<T>()
         );
     }
 
-    [Fact(Skip = "Skip until new remoting package is published")]
+    [Fact]
     public void InvocationOfDelegateReturnedByMethod()
     {
         RewriteRun(
diff --git a/Rewrite/tests/Rewrite.CSharp.Tests/Tree/NewClassTests.cs b/Rewrite/tests/Rewrite.CSharp.Tests/Tree/NewClassTests.cs
@@ -283,7 +283,8 @@ public void Test() {
         );
     }
 
-    [Fact(Skip="We don't support GlobalStatementSyntax")]
+    [Fact]
+    [KnownBug]
     void DictionaryDictionaryCreation()
     {
         RewriteRun(
diff --git a/Rewrite/tests/Rewrite.CSharp.Tests/Tree/NullSafeExpressionTests.cs b/Rewrite/tests/Rewrite.CSharp.Tests/Tree/NullSafeExpressionTests.cs
@@ -10,7 +10,8 @@ namespace Rewrite.CSharp.Tests.Tree;
 [Collection(Collections.PrinterAccess)]
 public class NullSafeExpressionTests : RewriteTest
 {
-    [Fact(Skip = "not yet working")]
+    [Fact]
+    [KnownBug]
     public void Space()
     {
         RewriteRun(
diff --git a/Rewrite/tests/Rewrite.CSharp.Tests/Tree/PropertyDeclarationTests.cs b/Rewrite/tests/Rewrite.CSharp.Tests/Tree/PropertyDeclarationTests.cs
@@ -128,7 +128,8 @@ class Manager
         );
     }
 
-    [Fact(Skip = SkipReason.NotYetImplemented)]
+    [Fact]
+    [KnownBug]
     void BinaryExpressionProperty()
     {
         var sourceSpec = CSharp(

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ public static class ExceptionUtils`
`6`	`6`	`{`
`7`	`7`	`public static string SanitizeStackTrace(this Exception exception, Type until)`
`8`	`8`	`{`
	`9`	`+#if SANITIZE_STACK_TRACE`
`9`	`10`	`var sanitized = "";`
`10`	`11`	`sanitized = string.Join("\n", sanitized, exception.GetType().Name + ": " + exception.Message);`
`11`	`12`
`@@ -26,5 +27,8 @@ public static string SanitizeStackTrace(this Exception exception, Type until)`
`26`	`27`	`}`
`27`	`28`
`28`	`29`	`return sanitized;`
	`30`	`+#else`
	`31`	`+ return exception.ToString();`
	`32`	`+#endif`
`29`	`33`	`}`
`30`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ namespace Rewrite.RewriteJava;`
`8`	`8`	`public class JavaPrinter<P> : JavaVisitor<PrintOutputCapture<P>>`
`9`	`9`	`{`
`10`	`10`	`private static readonly Func<string, string> JAVA_MARKER_WRAPPER =`
`11`		`- o => $"/~~{o}{(string.IsNullOrEmpty(o) ? "" : "~~")}/";`
	`11`	`+ o => $"/~~{o}{(string.IsNullOrEmpty(o) ? "" : "~~")}>/";`
`12`	`12`
`13`	`13`	`public JavaPrinter()`
`14`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,23 +9,24 @@`
`9`	`9`
`10`	`10`	`namespace Rewrite.CSharp.Tests;`
`11`	`11`
`12`		`-using static Assertions;`
	`12`	`+using static Rewrite.RewriteCSharp.Test.Api.Assertions;`
`13`	`13`
`14`	`14`	`public class CSharpTypeAttributionTests : RewriteTest`
`15`	`15`	`{`
`16`		`- [Fact(Skip = "For now we dont support Methods")]`
	`16`	`+ [Fact]`
	`17`	`+ [KnownBug]`
`17`	`18`	`void ClosureImplicitParameterAttributed()`
`18`	`19`	`{`
`19`	`20`	`RewriteRun(`
`20`	`21`	`CSharp(`
`21`	`22`	`"""`
`22`		`- public class Program`
	`23`	`+ public class Program`
`23`	`24`	`{`
`24`	`25`	`public T? register<T>(String name, Type type, Action<T> configurationAction)`
`25`	`26`	`{`
`26`	`27`	`return default;`
`27`	`28`	`}`
`28`		`-`
	`29`	`+`
`29`	`30`	`public void Main()`
`30`	`31`	`{`
`31`	`32`	`register("test", typeof(Program), (string t) => { });`
`@@ -70,4 +71,4 @@ class TestJavaVisitor(bool attributed) : JavaVisitor<int>`
`70`	`71`	`return variable;`
`71`	`72`	`}`
`72`	`73`	`}`
`73`		`-}`
	`74`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,8 @@ class Foo()`
`89`	`89`	`);`
`90`	`90`	`}`
`91`	`91`
`92`		`- [Fact(Skip = "For now we dont extract types")]`
	`92`	`+ [Fact]`
	`93`	`+ [KnownBug]`
`93`	`94`	`public void ClassWithoutBody2()`
`94`	`95`	`{`
`95`	`96`	`RewriteRun(`
Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,10 @@ namespace Rewrite.CSharp.Tests.Tree;`
`9`	`9`	`using static Assertions;`
`10`	`10`
`11`	`11`	`[Collection(Collections.PrinterAccess)]`
	`12`	`+[Exploratory]`
`12`	`13`	`public class PlayTests(ITestOutputHelper _output) : RewriteTest`
`13`	`14`	`{`
`14`		`- [Fact(Skip = "Ignored")]`
	`15`	`+ [Fact]`
`15`	`16`	`public void MyTest()`
`16`	`17`	`{`
`17`	`18`	`var root = new CSharpParser.Builder().Build().Parse(`
`@@ -27,7 +28,7 @@ void Bar()`
`27`	`28`	`_output.WriteLine(newRoot.ToString());`
`28`	`29`	`}`
`29`	`30`
`30`		`- [Fact(Skip = "Ignored")]`
	`31`	`+ [Fact]`
`31`	`32`	`public void ParseTests()`
`32`	`33`	`{`
`33`	`34`	`var root = new CSharpParser.Builder().Build().Parse(`