Cherry pick branch 'genexuslabs:storage-unittest-localstack' into beta

genexuslabs · Jan 8, 2025 · 9e2c7c2 · 9e2c7c2
1 parent 9824d05
commit 9e2c7c2
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 26 deletions.
diff --git a/dotnet/test/DotNetCoreUnitTest/DotNetCoreUnitTest.csproj b/dotnet/test/DotNetCoreUnitTest/DotNetCoreUnitTest.csproj
@@ -41,6 +41,7 @@
 	<ItemGroup>		
 		<Compile Include="..\DotNetUnitTest\ImageUtils\ImageUtilTest.cs" Link="ImageUtils\ImageUtilTest.cs" />		
 		<Compile Include="..\DotNetUnitTest\StringUtil\StringUtilTests.cs" Link="StringUtil\StringUtilTests.cs" />
+		<Compile Include="..\DotNetUnitTest\WindowOnlyFact.cs" Link="WindowOnlyFact.cs" />
 
 	</ItemGroup>
 	<ItemGroup>

diff --git a/dotnet/test/DotNetUnitTest/Domain/GxHttpClientTest.cs b/dotnet/test/DotNetUnitTest/Domain/GxHttpClientTest.cs
@@ -6,6 +6,7 @@
 using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
+using DotNetUnitTest;
 using GeneXus.Application;
 using GeneXus.Http.Client;
 using Xunit;
@@ -60,7 +61,7 @@ public void HttpClientInvalidURLWithCustomPort()
 			}
 		}
 
-		[Fact]
+		[WindowsOnlyFact]
 		public void HttpClientCookieHeader()
 		{
 			string headerValue = "CognitoIdentityServiceProvider.3tgmin25m9bkg6vgi7vpavu7a9.M00000936.refreshToken=eyJjdHkiOiJKV1QiLCJlbmMiSkRCAmMpYqndvORnWLTfHw; CognitoIdentityServiceProvider.3tgmin25m9bkg6vgi7vpavu7a9.LastAuthUser=M00000936";

diff --git a/dotnet/test/DotNetUnitTest/Domain/ShellTest.cs b/dotnet/test/DotNetUnitTest/Domain/ShellTest.cs
@@ -1,5 +1,5 @@
 using System.IO;
-using System.Runtime.InteropServices;
+using DotNetUnitTest;
 using GeneXus.Utils;
 using Xunit;
 
@@ -8,52 +8,36 @@ namespace xUnitTesting
 
 	public class ShellTest
 	{
-		[Fact]
+		[WindowsOnlyFact]
 		public void ExecutableTest()
 		{
-			if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-			{
-				return;  // Skip test on non-Windows platforms
-			}
 			string fileName = "hello.bat";
 			File.WriteAllText(fileName, "echo \"hello %1\"");
 			int errorCode = GXUtil.Shell($"{fileName}  test", 1, 1);
 			Assert.Equal(0, errorCode);
 		}
-		[Fact]
+		[WindowsOnlyFact]
 		public void ExecutableWithSpacesTest()
 		{
-			if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-			{
-				return;  // Skip test on non-Windows platforms
-			}
 			string fileName = "hello world.bat";
 			File.WriteAllText(fileName, "echo \"hello %1\"");
 			int errorCode = GXUtil.Shell($"'{fileName}'  test", 1, 1);
 			Assert.Equal(0, errorCode);
 		}
 
-		[Fact]
+		[WindowsOnlyFact]
 		public void WorkingDirWithSpacesTest()
 		{
-			if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-			{
-				return;  // Skip test on non-Windows platforms
-			}
 			string fileName = Path.Combine(Directory.GetCurrentDirectory(), "my dir", "hello world.bat");
 			FileInfo fi = new FileInfo(fileName);
 			Directory.CreateDirectory(fi.DirectoryName);
 			File.WriteAllText(fileName, "echo \"hello %1\"");
 			int errorCode = GXUtil.Shell($"'{fileName}'  test", 1, 1);
 			Assert.Equal(0, errorCode);
 		}
-		[Fact]
+		[WindowsOnlyFact]
 		public void WorkingDirForFullQualifiedBat()
 		{
-			if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-			{
-				return;  // Skip test on non-Windows platforms
-			}
 			string pathName = Directory.GetParent(Directory.GetCurrentDirectory()).FullName; //bat is in a different directory to the current dir
 			string fileName = Path.Combine(pathName, "TestCurrentDir.bat");
 			string outputFileName = Path.Combine(Directory.GetCurrentDirectory(), "output.txt"); //Current dir of the process must be the main current dir

diff --git a/dotnet/test/DotNetUnitTest/FileIO/FileIOTests.cs b/dotnet/test/DotNetUnitTest/FileIO/FileIOTests.cs
@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using DotNetUnitTest;
 using GeneXus.Configuration;
 using GeneXus.Printer;
 using GeneXus.Services;
@@ -16,7 +17,7 @@ public FileIOTests()
 			Config.ConfigFileName = Path.Combine(BaseDir, "client.exe.config");
 #endif
 		}
-		[Fact]
+		[WindowsOnlyFact]
 		public void FileSharedToCopy()
 		{
 			string target = @"\\192.168.86.3\printer";
@@ -26,7 +27,7 @@ public void FileSharedToCopy()
 			Assert.Equal(-1, f.ErrCode);
 			Assert.NotEqual(new NullReferenceException().Message, f.ErrDescription);
 		}
-		[Fact]
+		[WindowsOnlyFact]
 		public void FileSourceTest()
 		{
 			GxFileInfo fi = new GxFileInfo(string.Empty);
@@ -101,7 +102,7 @@ public void GXDBFilePathTest()
 			}
 		}
 
-		[Fact]
+		[WindowsOnlyFact]
 		public void PathUtilGetValidFileName()
 		{
 			string path = "file:///C:/Models/Upload/CSharpModel/web/PublicTempStorage/multimedia/Screen%20Shot%202016-02-15%20at%2011.41.55%20AM_ff107a3ba9fb4564bb4e1bf7f74d5fbf.png";

diff --git a/dotnet/test/DotNetUnitTest/PDF/PDFTests.cs b/dotnet/test/DotNetUnitTest/PDF/PDFTests.cs
@@ -4,6 +4,7 @@
 using System.Reflection;
 using System.Threading.Tasks;
 using com.genexus.reports;
+using DotNetUnitTest;
 using GeneXus.Programs;
 using GeneXus.Utils;
 using Xunit;
@@ -27,7 +28,7 @@ public void ConcurrencyPDFSearchPaths()
 			});
 
 		}
-		[Fact]
+		[WindowsOnlyFact]
 		public void ExtractTextFromPDF()
 		{
 			string text = DocumentHandler.GetText("sample.pdf", "pdf");