Clean up tests

patriksvensson · Jul 12, 2024 · d3ec66e · d3ec66e
1 parent 07d91f5
commit d3ec66e
Show file tree

Hide file tree

Showing 12 changed files with 39 additions and 74 deletions.
diff --git a/...upboard.Tests/Unit/FactCollectionTests.cs → src/Cupboard.Tests/FactCollectionTests.cs b/...upboard.Tests/Unit/FactCollectionTests.cs → src/Cupboard.Tests/FactCollectionTests.cs
diff --git a/src/Cupboard.Tests/Fixtures/FakeProcessRunnerFixture.cs b/src/Cupboard.Tests/Fixtures/FakeProcessRunnerFixture.cs
diff --git a/src/Cupboard.Tests/Fixtures/WindowsFact.cs b/src/Cupboard.Tests/Fixtures/WindowsFact.cs
diff --git a/...upboard.Tests/Unit/IO/ChmodParserTests.cs → src/Cupboard.Tests/IO/ChmodParserTests.cs b/...upboard.Tests/Unit/IO/ChmodParserTests.cs → src/Cupboard.Tests/IO/ChmodParserTests.cs
diff --git a/src/Cupboard.Tests/Unit/IO/ChmodTests.cs → src/Cupboard.Tests/IO/ChmodTests.cs b/src/Cupboard.Tests/Unit/IO/ChmodTests.cs → src/Cupboard.Tests/IO/ChmodTests.cs
diff --git a/...upboard.Tests/Unit/IO/RegistryKeyTests.cs → src/Cupboard.Tests/IO/RegistryKeyTests.cs b/...upboard.Tests/Unit/IO/RegistryKeyTests.cs → src/Cupboard.Tests/IO/RegistryKeyTests.cs
diff --git a/...pboard.Tests/Unit/ManifestContextTests.cs → src/Cupboard.Tests/ManifestContextTests.cs b/...pboard.Tests/Unit/ManifestContextTests.cs → src/Cupboard.Tests/ManifestContextTests.cs
diff --git a/...Unit/Providers/ChocolateyProviderTests.cs → ...ests/Providers/ChocolateyProviderTests.cs b/...Unit/Providers/ChocolateyProviderTests.cs → ...ests/Providers/ChocolateyProviderTests.cs
@@ -50,7 +50,7 @@ public override void Execute(ManifestContext context)
 
     public sealed class EnsureInstalled
     {
-        [WindowsFact]
+        [Fact]
         public void Should_Install_Package_If_Missing()
         {
             // Given
@@ -74,7 +74,7 @@ public void Should_Install_Package_If_Missing()
             fixture.Logger.WasLogged("The Chocolatey package [yellow]vscode[/] was installed");
         }
 
-        [WindowsFact]
+        [Fact]
         public void Should_Not_Install_Package_If_Present()
         {
             // Given
@@ -92,7 +92,7 @@ public void Should_Not_Install_Package_If_Present()
             fixture.Logger.WasLogged("The Chocolatey package [yellow]vscode[/] is already installed");
         }
 
-        [WindowsFact]
+        [Fact]
         public void Should_Install_Package_Version_If_Missing()
         {
             // Given
@@ -116,7 +116,7 @@ public void Should_Install_Package_Version_If_Missing()
             fixture.Logger.WasLogged("The Chocolatey package [yellow]vscode[/] was installed");
         }
 
-        [WindowsFact]
+        [Fact]
         public void Should_Install_Package_If_Lower_Version()
         {
             // Given
@@ -140,7 +140,7 @@ public void Should_Install_Package_If_Lower_Version()
             fixture.Logger.WasLogged("The Chocolatey package [yellow]vscode[/] was installed");
         }
 
-        [WindowsFact]
+        [Fact]
         public void Should_Install_Package_If_Lower_Version_With_No_NewLine()
         {
             // Given
@@ -164,7 +164,7 @@ public void Should_Install_Package_If_Lower_Version_With_No_NewLine()
             fixture.Logger.WasLogged("The Chocolatey package [yellow]vscode[/] was installed");
         }
 
-        [WindowsFact]
+        [Fact]
         public void Should_Not_Install_Package_Of_Same_Version()
         {
             // Given
@@ -182,7 +182,7 @@ public void Should_Not_Install_Package_Of_Same_Version()
             fixture.Logger.WasLogged("The Chocolatey package [yellow]vscode[/] is already installed");
         }
 
-        [WindowsFact]
+        [Fact]
         public void Should_Not_Install_Package_Of_Higher_Version()
         {
             // Given
@@ -200,7 +200,7 @@ public void Should_Not_Install_Package_Of_Higher_Version()
             fixture.Logger.WasLogged("The Chocolatey package [yellow]vscode[/] is already installed");
         }
 
-        [WindowsFact]
+        [Fact]
         public void Should_Install_Package_If_Higher_Version_With_Allow_Downgrade()
         {
             // Given
@@ -224,7 +224,7 @@ public void Should_Install_Package_If_Higher_Version_With_Allow_Downgrade()
             fixture.Logger.WasLogged("The Chocolatey package [yellow]vscode[/] was installed");
         }
 
-        [WindowsFact]
+        [Fact]
         public void Should_Install_Package_If_Lower_Version_With_Allow_Downgrade()
         {
             // Given
@@ -248,7 +248,7 @@ public void Should_Install_Package_If_Lower_Version_With_Allow_Downgrade()
             fixture.Logger.WasLogged("The Chocolatey package [yellow]vscode[/] was installed");
         }
 
-        [WindowsFact]
+        [Fact]
         public void Should_Not_Install_Package_Of_Same_Version_With_Allow_Downgrade()
         {
             // Given
@@ -269,7 +269,7 @@ public void Should_Not_Install_Package_Of_Same_Version_With_Allow_Downgrade()
 
     public sealed class EnsureUninstalled
     {
-        [WindowsFact]
+        [Fact]
         public void Should_Uninstall_Package_If_Present()
         {
             // Given
@@ -291,7 +291,7 @@ public void Should_Uninstall_Package_If_Present()
             fixture.Logger.WasLogged("The Chocolatey package [yellow]vscode[/] was uninstalled");
         }
 
-        [WindowsFact]
+        [Fact]
         public void Should_Not_Uninstall_Package_If_Absent()
         {
             // Given

diff --git a/...Tests/Unit/Providers/FileProviderTests.cs → ...oard.Tests/Providers/FileProviderTests.cs b/...Tests/Unit/Providers/FileProviderTests.cs → ...oard.Tests/Providers/FileProviderTests.cs
diff --git a/...Unit/Providers/PowerShellProviderTests.cs → ...ests/Providers/PowerShellProviderTests.cs b/...Unit/Providers/PowerShellProviderTests.cs → ...ests/Providers/PowerShellProviderTests.cs
@@ -44,7 +44,7 @@ public override void Execute(ManifestContext context)
             }
         }
 
-        [WindowsFact]
+        [Fact]
         public void Should_Run_Script()
         {
             // Given
@@ -62,7 +62,7 @@ public void Should_Run_Script()
             fixture.Logger.WasLogged("Running PowerShell script [yellow]C:/lol.ps1[/]");
         }
 
-        [WindowsFact]
+        [Fact]
         public void Should_Run_Command()
         {
             // Given
@@ -80,7 +80,7 @@ public void Should_Run_Command()
             fixture.Logger.WasLogged("Running PowerShell command: [yellow]Not really executed, but must be present[/]");
         }
 
-        [WindowsFact]
+        [Fact]
         public void Should_Skip_Running_Skip_If_Condition_Script_Does_Not_Have_Exit_Code_1()
         {
             // Given
@@ -101,7 +101,7 @@ public void Should_Skip_Running_Skip_If_Condition_Script_Does_Not_Have_Exit_Code
             fixture.Logger.WasLogged("Skipping PowerShell script since condition did not evaluate to 0 (zero)");
         }
 
-        [WindowsFact]
+        [Fact]
         public void Should_Return_Error_If_Script_Does_Not_Exist()
         {
             // Given
@@ -117,7 +117,7 @@ public void Should_Return_Error_If_Script_Does_Not_Exist()
             fixture.Logger.WasLogged("PowerShell script path does not exist");
         }
 
-        [WindowsFact]
+        [Fact]
         public void Should_Run_Script_Using_PowerShell_Core_On_Windows_If_Specified()
         {
             // Given

diff --git a/...Providers/VSCodeExtensionProviderTests.cs → ...Providers/VSCodeExtensionProviderTests.cs b/...Providers/VSCodeExtensionProviderTests.cs → ...Providers/VSCodeExtensionProviderTests.cs
@@ -12,7 +12,7 @@ public sealed class Install : Manifest
         {
             public override void Execute(ManifestContext context)
             {
-                context.Resource<VSCodeExtension>(ExtensionName)
+                context.Resource<VsCodeExtension>(ExtensionName)
                     .Ensure(PackageState.Installed);
             }
         }
@@ -21,7 +21,7 @@ public sealed class Uninstall : Manifest
         {
             public override void Execute(ManifestContext context)
             {
-                context.Resource<VSCodeExtension>(ExtensionName)
+                context.Resource<VsCodeExtension>(ExtensionName)
                     .Ensure(PackageState.Uninstalled);
             }
         }
@@ -31,7 +31,7 @@ public sealed class Windows
     {
         public sealed class EnsureInstalled
         {
-            [WindowsFact]
+            [Fact]
             public void Should_Install_Package_If_Missing()
             {
                 // Given
@@ -50,12 +50,12 @@ public void Should_Install_Package_If_Missing()
                 var result = fixture.Run("-y");
 
                 // Then
-                result.Report.GetState<VSCodeExtension>(ExtensionName).ShouldBe(ResourceState.Changed);
+                result.Report.GetState<VsCodeExtension>(ExtensionName).ShouldBe(ResourceState.Changed);
                 fixture.Logger.WasLogged($"Installing VSCode extension [yellow]{ExtensionName}[/]");
                 fixture.Logger.WasLogged($"The VSCode extension [yellow]{ExtensionName}[/] was installed");
             }
 
-            [WindowsFact]
+            [Fact]
             public void Should_Not_Install_Package_If_Present()
             {
                 // Given
@@ -69,14 +69,14 @@ public void Should_Not_Install_Package_If_Present()
                 var result = fixture.Run("-y");
 
                 // Then
-                result.Report.GetState<VSCodeExtension>(ExtensionName).ShouldBe(ResourceState.Unchanged);
+                result.Report.GetState<VsCodeExtension>(ExtensionName).ShouldBe(ResourceState.Unchanged);
                 fixture.Logger.WasLogged($"The VSCode extension [yellow]{ExtensionName}[/] is already installed");
             }
         }
 
         public sealed class EnsureUninstalled
         {
-            [WindowsFact]
+            [Fact]
             public void Should_Uninstall_Package_If_Present()
             {
                 // Given
@@ -94,12 +94,12 @@ public void Should_Uninstall_Package_If_Present()
                 var result = fixture.Run("-y");
 
                 // Then
-                result.Report.GetState<VSCodeExtension>(ExtensionName).ShouldBe(ResourceState.Changed);
+                result.Report.GetState<VsCodeExtension>(ExtensionName).ShouldBe(ResourceState.Changed);
                 fixture.Logger.WasLogged($"Uninstalling VSCode extension [yellow]{ExtensionName}[/]");
                 fixture.Logger.WasLogged($"The VSCode extension [yellow]{ExtensionName}[/] was uninstalled");
             }
 
-            [WindowsFact]
+            [Fact]
             public void Should_Not_Uninstall_Package_If_Absent()
             {
                 // Given
@@ -113,7 +113,7 @@ public void Should_Not_Uninstall_Package_If_Absent()
                 var result = fixture.Run("-y");
 
                 // Then
-                result.Report.GetState<VSCodeExtension>(ExtensionName).ShouldBe(ResourceState.Unchanged);
+                result.Report.GetState<VsCodeExtension>(ExtensionName).ShouldBe(ResourceState.Unchanged);
                 fixture.Logger.WasLogged($"The VSCode extension [yellow]{ExtensionName}[/] is already uninstalled");
             }
         }
@@ -123,7 +123,7 @@ public sealed class Linux
     {
         public sealed class EnsureInstalled
         {
-            [WindowsFact]
+            [Fact]
             public void Should_Install_Package_If_Missing()
             {
                 // Given
@@ -142,12 +142,12 @@ public void Should_Install_Package_If_Missing()
                 var result = fixture.Run("-y");
 
                 // Then
-                result.Report.GetState<VSCodeExtension>(ExtensionName).ShouldBe(ResourceState.Changed);
+                result.Report.GetState<VsCodeExtension>(ExtensionName).ShouldBe(ResourceState.Changed);
                 fixture.Logger.WasLogged($"Installing VSCode extension [yellow]{ExtensionName}[/]");
                 fixture.Logger.WasLogged($"The VSCode extension [yellow]{ExtensionName}[/] was installed");
             }
 
-            [WindowsFact]
+            [Fact]
             public void Should_Not_Install_Package_If_Present()
             {
                 // Given
@@ -161,14 +161,14 @@ public void Should_Not_Install_Package_If_Present()
                 var result = fixture.Run("-y");
 
                 // Then
-                result.Report.GetState<VSCodeExtension>(ExtensionName).ShouldBe(ResourceState.Unchanged);
+                result.Report.GetState<VsCodeExtension>(ExtensionName).ShouldBe(ResourceState.Unchanged);
                 fixture.Logger.WasLogged($"The VSCode extension [yellow]{ExtensionName}[/] is already installed");
             }
         }
 
         public sealed class EnsureUninstalled
         {
-            [WindowsFact]
+            [Fact]
             public void Should_Uninstall_Package_If_Present()
             {
                 // Given
@@ -186,12 +186,12 @@ public void Should_Uninstall_Package_If_Present()
                 var result = fixture.Run("-y");
 
                 // Then
-                result.Report.GetState<VSCodeExtension>(ExtensionName).ShouldBe(ResourceState.Changed);
+                result.Report.GetState<VsCodeExtension>(ExtensionName).ShouldBe(ResourceState.Changed);
                 fixture.Logger.WasLogged($"Uninstalling VSCode extension [yellow]{ExtensionName}[/]");
                 fixture.Logger.WasLogged($"The VSCode extension [yellow]{ExtensionName}[/] was uninstalled");
             }
 
-            [WindowsFact]
+            [Fact]
             public void Should_Not_Uninstall_Package_If_Absent()
             {
                 // Given
@@ -205,7 +205,7 @@ public void Should_Not_Uninstall_Package_If_Absent()
                 var result = fixture.Run("-y");
 
                 // Then
-                result.Report.GetState<VSCodeExtension>(ExtensionName).ShouldBe(ResourceState.Unchanged);
+                result.Report.GetState<VsCodeExtension>(ExtensionName).ShouldBe(ResourceState.Unchanged);
                 fixture.Logger.WasLogged($"The VSCode extension [yellow]{ExtensionName}[/] is already uninstalled");
             }
         }

diff --git a/...sts/Unit/Providers/WingetProviderTests.cs → ...rd.Tests/Providers/WingetProviderTests.cs b/...sts/Unit/Providers/WingetProviderTests.cs → ...rd.Tests/Providers/WingetProviderTests.cs
@@ -27,7 +27,7 @@ public override void Execute(ManifestContext context)
 
     public sealed class EnsureInstalled
     {
-        [WindowsFact]
+        [Fact]
         public void Should_Install_Package_If_Missing()
         {
             // Given
@@ -50,7 +50,7 @@ public void Should_Install_Package_If_Missing()
             fixture.Logger.WasLogged("The Winget package [yellow]GitHub.cli[/] was installed");
         }
 
-        [WindowsFact]
+        [Fact]
         public void Should_Not_Install_Package_If_Present_lol()
         {
             // Given
@@ -71,7 +71,7 @@ public void Should_Not_Install_Package_If_Present_lol()
 
     public sealed class EnsureUninstalled
     {
-        [WindowsFact]
+        [Fact]
         public void Should_Uninstall_Package_If_Present()
         {
             // Given
@@ -93,7 +93,7 @@ public void Should_Uninstall_Package_If_Present()
             fixture.Logger.WasLogged("The Winget package [yellow]GitHub.cli[/] was uninstalled");
         }
 
-        [WindowsFact]
+        [Fact]
         public void Should_Not_Uninstall_Package_If_Absent()
         {
             // Given