fix tests, add invariant culture to all project (#85)

Transia-RnD · May 10, 2024 · 8c33566 · 8c33566
1 parent d94225e
commit 8c33566
Show file tree

Hide file tree

Showing 6 changed files with 146 additions and 138 deletions.
diff --git a/Tests/Xrpl.AddressCodec.Test/Xrpl.AddressCodec.Test.csproj b/Tests/Xrpl.AddressCodec.Test/Xrpl.AddressCodec.Test.csproj
@@ -1,42 +1,44 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <!-- <TargetFramework>netstandard2.0</TargetFramework> -->
-    <TargetFramework>net6.0</TargetFramework>
-    <RootNamespace>XrplTests</RootNamespace>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Remove="Microsoft.NET.Test.Sdk" />
-    <None Remove="MSTest.TestFramework" />
-    <None Remove="MSTest.TestAdapter" />
-    <None Remove="Flurl.Http" />
-    <None Remove="Newtonsoft.Json" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
-    <PackageReference Include="Flurl.Http" Version="3.2.4" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Base\Xrpl.AddressCodec\Xrpl.AddressCodec.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Condition=" '$(EnableDefaultEmbeddedResourceItems)' == 'true' " Update="Properties\Resources.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Condition=" '$(EnableDefaultCompileItems)' == 'true' " Update="Keypairs.Tests\Properties\Resources.Designer.cs">
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Update="Properties\Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
+	<PropertyGroup>
+		<!-- <TargetFramework>netstandard2.0</TargetFramework> -->
+		<TargetFramework>net6.0</TargetFramework>
+		<RootNamespace>XrplTests</RootNamespace>
+	</PropertyGroup>
+	<PropertyGroup>
+		<InvariantGlobalization>true</InvariantGlobalization>
+	</PropertyGroup>
+	<ItemGroup>
+		<None Remove="Microsoft.NET.Test.Sdk" />
+		<None Remove="MSTest.TestFramework" />
+		<None Remove="MSTest.TestAdapter" />
+		<None Remove="Flurl.Http" />
+		<None Remove="Newtonsoft.Json" />
+	</ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
+		<PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+		<PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
+		<PackageReference Include="Flurl.Http" Version="3.2.4" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+	</ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\..\Base\Xrpl.AddressCodec\Xrpl.AddressCodec.csproj" />
+	</ItemGroup>
+	<ItemGroup>
+		<EmbeddedResource Condition=" '$(EnableDefaultEmbeddedResourceItems)' == 'true' " Update="Properties\Resources.resx">
+			<Generator>PublicResXFileCodeGenerator</Generator>
+			<LastGenOutput>Resources.Designer.cs</LastGenOutput>
+		</EmbeddedResource>
+	</ItemGroup>
+	<ItemGroup>
+		<Compile Condition=" '$(EnableDefaultCompileItems)' == 'true' " Update="Keypairs.Tests\Properties\Resources.Designer.cs">
+			<DependentUpon>Resources.resx</DependentUpon>
+		</Compile>
+		<Compile Update="Properties\Resources.Designer.cs">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>Resources.resx</DependentUpon>
+		</Compile>
+	</ItemGroup>
 </Project>
diff --git a/Tests/Xrpl.BinaryCodec.Test/Xrpl.BinaryCodec.Test.csproj b/Tests/Xrpl.BinaryCodec.Test/Xrpl.BinaryCodec.Test.csproj
@@ -1,34 +1,36 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <!-- <TargetFramework>netstandard2.0</TargetFramework> -->
-    <TargetFramework>net6.0</TargetFramework>
-    <RootNamespace>XrplTests</RootNamespace>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Remove="Microsoft.NET.Test.Sdk" />
-    <None Remove="MSTest.TestFramework" />
-    <None Remove="MSTest.TestAdapter" />
-    <None Remove="Flurl.Http" />
-    <None Remove="Newtonsoft.Json" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
-    <PackageReference Include="Flurl.Http" Version="3.2.4" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Condition=" '$(EnableDefaultCompileItems)' == 'true' " Update="Keypairs.Tests\Properties\Resources.Designer.cs">
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Types\" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Base\Xrpl.BinaryCodec\Xrpl.BinaryCodec.csproj" />
-  </ItemGroup>
+	<PropertyGroup>
+		<!-- <TargetFramework>netstandard2.0</TargetFramework> -->
+		<TargetFramework>net6.0</TargetFramework>
+		<RootNamespace>XrplTests</RootNamespace>
+	</PropertyGroup>
+	<PropertyGroup>
+		<InvariantGlobalization>true</InvariantGlobalization>
+	</PropertyGroup>
+	<ItemGroup>
+		<None Remove="Microsoft.NET.Test.Sdk" />
+		<None Remove="MSTest.TestFramework" />
+		<None Remove="MSTest.TestAdapter" />
+		<None Remove="Flurl.Http" />
+		<None Remove="Newtonsoft.Json" />
+	</ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
+		<PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+		<PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
+		<PackageReference Include="Flurl.Http" Version="3.2.4" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+	</ItemGroup>
+	<ItemGroup>
+		<Compile Condition=" '$(EnableDefaultCompileItems)' == 'true' " Update="Keypairs.Tests\Properties\Resources.Designer.cs">
+			<DependentUpon>Resources.resx</DependentUpon>
+		</Compile>
+	</ItemGroup>
+	<ItemGroup>
+		<Folder Include="Types\" />
+	</ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\..\Base\Xrpl.BinaryCodec\Xrpl.BinaryCodec.csproj" />
+	</ItemGroup>
 </Project>
diff --git a/Tests/Xrpl.Keypairs.Test/Xrpl.Keypairs.Test.csproj b/Tests/Xrpl.Keypairs.Test/Xrpl.Keypairs.Test.csproj
@@ -1,38 +1,40 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <!-- <TargetFramework>netstandard2.0</TargetFramework> -->
-    <TargetFramework>net6.0</TargetFramework>
-    <RootNamespace>XrplTests</RootNamespace>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Remove="Microsoft.NET.Test.Sdk" />
-    <None Remove="MSTest.TestFramework" />
-    <None Remove="MSTest.TestAdapter" />
-    <None Remove="Flurl.Http" />
-    <None Remove="Newtonsoft.Json" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
-    <PackageReference Include="Flurl.Http" Version="3.2.4" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Condition=" '$(EnableDefaultEmbeddedResourceItems)' == 'true' " Update="Xrpl\Properties\Resources.resx">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Condition=" '$(EnableDefaultCompileItems)' == 'true' " Update="Keypairs.Tests\Properties\Resources.Designer.cs">
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Base\Xrpl.Keypairs\Xrpl.Keypairs.csproj" />
-  </ItemGroup>
+	<PropertyGroup>
+		<!-- <TargetFramework>netstandard2.0</TargetFramework> -->
+		<TargetFramework>net6.0</TargetFramework>
+		<RootNamespace>XrplTests</RootNamespace>
+	</PropertyGroup>
+	<PropertyGroup>
+		<InvariantGlobalization>true</InvariantGlobalization>
+	</PropertyGroup>
+	<ItemGroup>
+		<None Remove="Microsoft.NET.Test.Sdk" />
+		<None Remove="MSTest.TestFramework" />
+		<None Remove="MSTest.TestAdapter" />
+		<None Remove="Flurl.Http" />
+		<None Remove="Newtonsoft.Json" />
+	</ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
+		<PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+		<PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
+		<PackageReference Include="Flurl.Http" Version="3.2.4" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+	</ItemGroup>
+	<ItemGroup>
+		<EmbeddedResource Condition=" '$(EnableDefaultEmbeddedResourceItems)' == 'true' " Update="Xrpl\Properties\Resources.resx">
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+			<Generator>PublicResXFileCodeGenerator</Generator>
+			<LastGenOutput>Resources.Designer.cs</LastGenOutput>
+		</EmbeddedResource>
+	</ItemGroup>
+	<ItemGroup>
+		<Compile Condition=" '$(EnableDefaultCompileItems)' == 'true' " Update="Keypairs.Tests\Properties\Resources.Designer.cs">
+			<DependentUpon>Resources.resx</DependentUpon>
+		</Compile>
+	</ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\..\Base\Xrpl.Keypairs\Xrpl.Keypairs.csproj" />
+	</ItemGroup>
 </Project>
diff --git a/Tests/Xrpl.Tests/Client/TestSubscribe.cs b/Tests/Xrpl.Tests/Client/TestSubscribe.cs
@@ -158,7 +158,7 @@ public async Task TestSubscribe()
             bool isTested = false;
             bool isFinished = false;
 
-            var server = "wss://xrplcluster.com/";
+            var server = "wss://s1.ripple.com/";
 
             var client = new XrplClient(server);
 
@@ -189,10 +189,10 @@ public async Task TestSubscribe()
                 return Task.CompletedTask;
             };
 
-            Timer timer = new Timer(5000);
-            timer.Elapsed += (sender, e) =>
+            Timer timer = new Timer(7000);
+            timer.Elapsed += async (sender, e) =>
             {
-                client.Disconnect();
+                await client.Disconnect();
                 isFinished = true;
             };
             timer.Start();

diff --git a/Tests/Xrpl.Tests/Client/TestWebSocketClient.cs b/Tests/Xrpl.Tests/Client/TestWebSocketClient.cs
@@ -83,7 +83,7 @@ public async Task TestSubscribeWebSocket()
                 return Task.CompletedTask;
             };
 
-            Timer timer = new Timer(5000);
+            Timer timer = new Timer(7000);
             timer.Elapsed += (sender, e) =>
             {
                 Debug.WriteLine("TIMEOUT!!");

diff --git a/Tests/Xrpl.Tests/Xrpl.Tests.csproj b/Tests/Xrpl.Tests/Xrpl.Tests.csproj
@@ -1,31 +1,33 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <!-- <TargetFramework>netstandard2.0</TargetFramework> -->
-    <TargetFramework>net6.0</TargetFramework>
-    <RootNamespace>XrplTests</RootNamespace>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Remove="Microsoft.NET.Test.Sdk" />
-    <None Remove="MSTest.TestFramework" />
-    <None Remove="MSTest.TestAdapter" />
-    <None Remove="Flurl.Http" />
-    <None Remove="Newtonsoft.Json" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
-    <PackageReference Include="Flurl.Http" Version="3.2.4" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Condition=" '$(EnableDefaultCompileItems)' == 'true' " Update="Keypairs.Tests\Properties\Resources.Designer.cs">
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Xrpl\Xrpl.csproj" />
-  </ItemGroup>
+	<PropertyGroup>
+		<!-- <TargetFramework>netstandard2.0</TargetFramework> -->
+		<TargetFramework>net6.0</TargetFramework>
+		<RootNamespace>XrplTests</RootNamespace>
+	</PropertyGroup>
+	<PropertyGroup>
+		<InvariantGlobalization>true</InvariantGlobalization>
+	</PropertyGroup>
+	<ItemGroup>
+		<None Remove="Microsoft.NET.Test.Sdk" />
+		<None Remove="MSTest.TestFramework" />
+		<None Remove="MSTest.TestAdapter" />
+		<None Remove="Flurl.Http" />
+		<None Remove="Newtonsoft.Json" />
+	</ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
+		<PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+		<PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
+		<PackageReference Include="Flurl.Http" Version="3.2.4" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+	</ItemGroup>
+	<ItemGroup>
+		<Compile Condition=" '$(EnableDefaultCompileItems)' == 'true' " Update="Keypairs.Tests\Properties\Resources.Designer.cs">
+			<DependentUpon>Resources.resx</DependentUpon>
+		</Compile>
+	</ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\..\Xrpl\Xrpl.csproj" />
+	</ItemGroup>
 </Project>