diff --git a/README.md b/README.md index 33fe45ea..5ab973d4 100644 --- a/README.md +++ b/README.md @@ -190,6 +190,21 @@ VS.NET Visual Studio 2022 is required to open and build the solution. The free community version of Visual Studio should suffice. +### Running tests + +- To run tests that require a database connection, you need: + - SqlServer running in (local) + - Check in `SQL Server Configuration Manager` that `Named Pipes` and `TCP/IP` protocols are enabled + - From `build-support` execute + - `create-integration-test-databases-and-users.sql` + - From `\test\Spring\Spring.Data.Integration.Tests\Data` execute + - `Spring.Data.Integration.Tests_Spring_database.sql` + - `Spring.Data.Integration.Tests_Credits_database.sql` + - `Spring.Data.Integration.Tests_Debits_database.sql` + - `Spring.Data.Integration.Tests_CreditsAndDebits_database.sql` + - Create a database named `quartz` and execute `tables_sqlServer_Below2016.sql` from [Quartz.NET](https://github.com/quartznet/quartznet/blob/main/database/tables/tables_sqlServer_Below2016.sql) + + ## Acknowledgements InnovaSys Document X! diff --git a/test/Spring/Spring.Core.Tests/Globalization/Formatters/CurrencyFormatterTests.cs b/test/Spring/Spring.Core.Tests/Globalization/Formatters/CurrencyFormatterTests.cs index d92e1edc..80a427a8 100644 --- a/test/Spring/Spring.Core.Tests/Globalization/Formatters/CurrencyFormatterTests.cs +++ b/test/Spring/Spring.Core.Tests/Globalization/Formatters/CurrencyFormatterTests.cs @@ -66,10 +66,10 @@ public class CurrencyFormatterTests fmt = new CurrencyFormatter(CultureInfoUtils.SerbianCyrillicCultureName); #if NETFRAMEWORK - Assert.AreEqual("1.234,00 дин.", fmt.Format(1234)); - Assert.AreEqual("1.234,56 дин.", fmt.Format(1234.56)); - Assert.AreEqual("-1.234,00 дин.", fmt.Format(-1234)); - Assert.AreEqual("-1.234,56 дин.", fmt.Format(-1234.56)); + Assert.AreEqual("1.234,00 дин.", fmt.Format(1234)); + Assert.AreEqual("1.234,56 дин.", fmt.Format(1234.56)); + Assert.AreEqual("-1.234,00 дин.", fmt.Format(-1234)); + Assert.AreEqual("-1.234,56 дин.", fmt.Format(-1234.56)); #else Assert.AreEqual("1.234 RSD", fmt.Format(1234)); Assert.AreEqual("1.235 RSD", fmt.Format(1234.56)); diff --git a/test/Spring/Spring.Core.Tests/Globalization/Formatters/FloatFormatterTests.cs b/test/Spring/Spring.Core.Tests/Globalization/Formatters/FloatFormatterTests.cs index cdbe1444..fd08d17c 100644 --- a/test/Spring/Spring.Core.Tests/Globalization/Formatters/FloatFormatterTests.cs +++ b/test/Spring/Spring.Core.Tests/Globalization/Formatters/FloatFormatterTests.cs @@ -56,8 +56,8 @@ public class FloatFormatterTests fmt = new FloatFormatter(FloatFormatter.DefaultFormat, "sr-SP-Latn"); #if NETFRAMEWORK - Assert.AreEqual("1234,00", fmt.Format(1234)); - Assert.AreEqual("-1234,00", fmt.Format(-1234)); + Assert.AreEqual("1234,00", fmt.Format(1234)); + Assert.AreEqual("-1234,00", fmt.Format(-1234)); #else Assert.AreEqual("1234,000", fmt.Format(1234)); Assert.AreEqual("-1234,000", fmt.Format(-1234)); diff --git a/test/Spring/Spring.Core.Tests/Globalization/Formatters/NumberFormatterTests.cs b/test/Spring/Spring.Core.Tests/Globalization/Formatters/NumberFormatterTests.cs index b33bc474..e53acaff 100644 --- a/test/Spring/Spring.Core.Tests/Globalization/Formatters/NumberFormatterTests.cs +++ b/test/Spring/Spring.Core.Tests/Globalization/Formatters/NumberFormatterTests.cs @@ -58,10 +58,10 @@ public class NumberFormatterTests fmt = new NumberFormatter("sr-SP-Latn"); #if NETFRAMEWORK - Assert.AreEqual("1.234,00", fmt.Format(1234)); - Assert.AreEqual("1.234,56", fmt.Format(1234.56)); - Assert.AreEqual("-1.234,00", fmt.Format(-1234)); - Assert.AreEqual("-1.234,56", fmt.Format(-1234.56)); + Assert.AreEqual("1.234,00", fmt.Format(1234)); + Assert.AreEqual("1.234,56", fmt.Format(1234.56)); + Assert.AreEqual("-1.234,00", fmt.Format(-1234)); + Assert.AreEqual("-1.234,56", fmt.Format(-1234.56)); #else Assert.AreEqual("1.234,000", fmt.Format(1234)); Assert.AreEqual("1.234,560", fmt.Format(1234.56)); @@ -104,10 +104,10 @@ public class NumberFormatterTests fmt.GroupSeparator = "'"; #if NETFRAMEWORK - Assert.AreEqual("1'23'4,00", fmt.Format(1234)); - Assert.AreEqual("1'23'4,56", fmt.Format(1234.56)); - Assert.AreEqual("-1'23'4,00", fmt.Format(-1234)); - Assert.AreEqual("-1'23'4,56", fmt.Format(-1234.56)); + Assert.AreEqual("1'23'4,00", fmt.Format(1234)); + Assert.AreEqual("1'23'4,56", fmt.Format(1234.56)); + Assert.AreEqual("-1'23'4,00", fmt.Format(-1234)); + Assert.AreEqual("-1'23'4,56", fmt.Format(-1234.56)); #else Assert.AreEqual("1'23'4,000", fmt.Format(1234)); Assert.AreEqual("1'23'4,560", fmt.Format(1234.56)); diff --git a/test/Spring/Spring.Core.Tests/Globalization/Formatters/PercentFormatterTests.cs b/test/Spring/Spring.Core.Tests/Globalization/Formatters/PercentFormatterTests.cs index fe0b56e7..6c3f9447 100644 --- a/test/Spring/Spring.Core.Tests/Globalization/Formatters/PercentFormatterTests.cs +++ b/test/Spring/Spring.Core.Tests/Globalization/Formatters/PercentFormatterTests.cs @@ -56,8 +56,8 @@ public class PercentFormatterTests fmt = new PercentFormatter("sr-SP-Latn"); #if NETFRAMEWORK - Assert.AreEqual("25,00%", fmt.Format(0.25)); - Assert.AreEqual("25,34%", fmt.Format(0.2534)); + Assert.AreEqual("25,00%", fmt.Format(0.25)); + Assert.AreEqual("25,34%", fmt.Format(0.2534)); #else Assert.AreEqual("25,000%", fmt.Format(0.25)); Assert.AreEqual("25,340%", fmt.Format(0.2534)); diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/VariableAccessorTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/VariableAccessorTests.cs index 3d351fe3..dbe63cf2 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/VariableAccessorTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/VariableAccessorTests.cs @@ -32,32 +32,37 @@ public class VariableAccessorTests private static readonly DateTime TESTDATETIME = new DateTime(2007, 07, 06, 11, 12, 13); private static readonly DateTime TESTDATETIME_DEFAULT = TESTDATETIME.AddDays(-1); - private readonly IVariableSource _testVariableSource = new DictionaryVariableSource(null, true) - .Add("ValidString", "String") - .Add("EmptyString", "") - .Add("ValidChar", "c") - .Add("InvalidChar", "12") - .Add("ValidBoolean", "true") - .Add("InvalidBoolean", "") - .Add("ValidByte", "1") - .Add("InvalidByte", "") - .Add("ValidInt16", "1") - .Add("InvalidInt16", "") - .Add("ValidInt32", "1") - .Add("InvalidInt32", "") - .Add("ValidInt64", "1") - .Add("InvalidInt64", "") - .Add("ValidFloat", "1") - .Add("InvalidFloat", "") - .Add("ValidDouble", "1") - .Add("InvalidDouble", "") - .Add("ValidDecimal", "1") - .Add("InvalidDecimal", "") - .Add("ValidGuid", TESTGUID.ToString()) - .Add("InvalidGuid", "") - .Add("ValidDateTime", TESTDATETIME.ToString(CultureInfo.InvariantCulture)) - .Add("InvalidDateTime", "blabla") - .Add("ValidDateTimeUtcRoundtripFormatted", TESTDATETIME.ToUniversalTime().ToString("u")); + private readonly IVariableSource _testVariableSource = GetTestVariableSource(); + + private static DictionaryVariableSource GetTestVariableSource() + { + return new DictionaryVariableSource(null, true) + .Add("ValidString", "String") + .Add("EmptyString", "") + .Add("ValidChar", "c") + .Add("InvalidChar", "12") + .Add("ValidBoolean", "true") + .Add("InvalidBoolean", "") + .Add("ValidByte", "1") + .Add("InvalidByte", "") + .Add("ValidInt16", "1") + .Add("InvalidInt16", "") + .Add("ValidInt32", "1") + .Add("InvalidInt32", "") + .Add("ValidInt64", "1") + .Add("InvalidInt64", "") + .Add("ValidFloat", "1") + .Add("InvalidFloat", "") + .Add("ValidDouble", "1") + .Add("InvalidDouble", "") + .Add("ValidDecimal", "1") + .Add("InvalidDecimal", "") + .Add("ValidGuid", TESTGUID.ToString()) + .Add("InvalidGuid", "") + .Add("ValidDateTime", TESTDATETIME.ToString()) + .Add("InvalidDateTime", "blabla") + .Add("ValidDateTimeUtcRoundtripFormatted", TESTDATETIME.ToUniversalTime().ToString("u")); + } [Test] public void AcceptsNullVariableSource() @@ -167,9 +172,24 @@ public class VariableAccessorTests } [Test] + [SetCulture("en-US")] public void GetDateTime() { - VariableAccessor va = new VariableAccessor(_testVariableSource); + var testVariables = GetTestVariableSource(); + DoGetDateTime(testVariables); + } + + [Test] + [SetCulture("it-IT")] + public void GetDateTimeIt() + { + var testVariables = GetTestVariableSource(); + DoGetDateTime(testVariables); + } + + public static void DoGetDateTime(DictionaryVariableSource testVariables) + { + var va = new VariableAccessor(testVariables); Assert.AreEqual(TESTDATETIME, va.GetDateTime("ValidDateTime", null, TESTDATETIME_DEFAULT)); Assert.AreEqual(TESTDATETIME.ToUniversalTime(), va.GetDateTime("ValidDateTimeUtcRoundtripFormatted", "u", TESTDATETIME_DEFAULT)); Assert.AreEqual(TESTDATETIME_DEFAULT, va.GetDateTime("InvalidDateTime", null, TESTDATETIME_DEFAULT, false)); diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/templateTests.xml b/test/Spring/Spring.Data.Integration.Tests/Data/templateTests.xml index 359a4ecc..2285c03a 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/templateTests.xml +++ b/test/Spring/Spring.Data.Integration.Tests/Data/templateTests.xml @@ -12,7 +12,7 @@ - + diff --git a/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/templateTests.xml b/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/templateTests.xml index 2fd66fd4..67d21491 100644 --- a/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/templateTests.xml +++ b/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/templateTests.xml @@ -25,8 +25,7 @@ - assembly://Spring.Data.NHibernate5.Integration.Tests/Spring.Data.NHibernate/TestObject.hbm.xml - + assembly://Spring.Data.NHibernate5.Integration.Tests/Spring.Data.NHibernate/TestObject.hbm.xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/Spring/Spring.Scheduling.Quartz3.Integration.Tests/Scheduling/Quartz/LocalDataSourceJobStoreTest.cs b/test/Spring/Spring.Scheduling.Quartz3.Integration.Tests/Scheduling/Quartz/LocalDataSourceJobStoreTest.cs index d13c8110..bdba8084 100644 --- a/test/Spring/Spring.Scheduling.Quartz3.Integration.Tests/Scheduling/Quartz/LocalDataSourceJobStoreTest.cs +++ b/test/Spring/Spring.Scheduling.Quartz3.Integration.Tests/Scheduling/Quartz/LocalDataSourceJobStoreTest.cs @@ -23,13 +23,18 @@ namespace Spring.Scheduling.Quartz.Integration.Tests; [TestFixture] public class LocalDataSourceJobStoreTest { - private IApplicationContext ctx; + private IApplicationContext _ctx; [SetUp] public void SetUp() { - ctx = new XmlApplicationContext( +#if NETFRAMEWORK + _ctx = new XmlApplicationContext( "assembly://Spring.Scheduling.Quartz3.Integration.Tests/Spring.Scheduling.Quartz/LocalDataSourceJobStoreTest.xml"); +#else + _ctx = new XmlApplicationContext( + "assembly://Spring.Scheduling.Quartz3.Integration.Tests/Spring.Scheduling.Quartz/LocalDataSourceJobStoreTest-core.xml"); +#endif } [Test] diff --git a/test/Spring/Spring.Scheduling.Quartz3.Integration.Tests/Spring.Scheduling.Quartz3.Integration.Tests.csproj b/test/Spring/Spring.Scheduling.Quartz3.Integration.Tests/Spring.Scheduling.Quartz3.Integration.Tests.csproj index 78f7e92b..dc5970b6 100644 --- a/test/Spring/Spring.Scheduling.Quartz3.Integration.Tests/Spring.Scheduling.Quartz3.Integration.Tests.csproj +++ b/test/Spring/Spring.Scheduling.Quartz3.Integration.Tests/Spring.Scheduling.Quartz3.Integration.Tests.csproj @@ -2,6 +2,10 @@ net8.0;$(TargetFullFrameworkVersion) + + + + @@ -13,8 +17,10 @@ + + \ No newline at end of file