diff --git a/src/Hangfire.PostgreSql.NetCore/App.config b/src/Hangfire.PostgreSql.NetCore/App.config index 9ca82da5..0a0c8e67 100644 --- a/src/Hangfire.PostgreSql.NetCore/App.config +++ b/src/Hangfire.PostgreSql.NetCore/App.config @@ -4,7 +4,7 @@ - + diff --git a/src/Hangfire.PostgreSql.NetCore/project.json b/src/Hangfire.PostgreSql.NetCore/project.json index 4651f813..83e81202 100644 --- a/src/Hangfire.PostgreSql.NetCore/project.json +++ b/src/Hangfire.PostgreSql.NetCore/project.json @@ -4,21 +4,21 @@ "embed": "*.sql", "define": [ "NETCORE1" ] }, - "dependencies": { - "Dapper": "1.50.2", - "Hangfire.AspNetCore": "1.6.3", - "Hangfire.Core": "1.6.3", - "Newtonsoft.Json": "9.0.1", - "Npgsql": "3.1.7", - "System.Runtime.Serialization.Formatters": "4.0.0-rc3-24212-01" - }, + "dependencies": { + "Dapper": "1.50.2", + "Hangfire.AspNetCore": "1.6.6", + "Hangfire.Core": "1.6.6", + "Microsoft.NETCore.App": { + "version": "1.0.1-*", + "type": "platform" + }, + "Newtonsoft.Json": "9.0.1", + "Npgsql": "3.1.8", + "System.Runtime.Serialization.Formatters": "4.0.0-rc3-24212-01" + }, "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.0.0-*", - "type": "platform" - } } } } diff --git a/src/Hangfire.PostgreSql/Hangfire.PostgreSql.csproj b/src/Hangfire.PostgreSql/Hangfire.PostgreSql.csproj index bde7ba8f..24ea4573 100644 --- a/src/Hangfire.PostgreSql/Hangfire.PostgreSql.csproj +++ b/src/Hangfire.PostgreSql/Hangfire.PostgreSql.csproj @@ -43,20 +43,20 @@ 1591 - - ..\..\packages\Dapper.1.42\lib\net45\Dapper.dll + + ..\..\packages\Dapper.1.50.2\lib\net45\Dapper.dll True - - ..\..\packages\Hangfire.Core.1.6.3\lib\net45\Hangfire.Core.dll + + ..\..\packages\Hangfire.Core.1.6.6\lib\net45\Hangfire.Core.dll True - - ..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll + + ..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll True - - ..\..\packages\Npgsql.3.1.3\lib\net45\Npgsql.dll + + ..\..\packages\Npgsql.3.1.8\lib\net45\Npgsql.dll True @@ -69,6 +69,7 @@ + diff --git a/src/Hangfire.PostgreSql/packages.config b/src/Hangfire.PostgreSql/packages.config index 9fd416a4..8dec55e7 100644 --- a/src/Hangfire.PostgreSql/packages.config +++ b/src/Hangfire.PostgreSql/packages.config @@ -1,8 +1,8 @@  - - - - + + + + - + \ No newline at end of file diff --git a/tests/Hangfire.PostgreSql.NetCore.Tests/PostgreSqlConnectionFacts.cs b/tests/Hangfire.PostgreSql.NetCore.Tests/PostgreSqlConnectionFacts.cs index 267fc225..7ba33c3c 100644 --- a/tests/Hangfire.PostgreSql.NetCore.Tests/PostgreSqlConnectionFacts.cs +++ b/tests/Hangfire.PostgreSql.NetCore.Tests/PostgreSqlConnectionFacts.cs @@ -241,18 +241,19 @@ public void GetJobData_ReturnsResult_WhenJobExists() { var job = Job.FromExpression(() => SampleMethod("wrong")); - var jobId = sql.Query( + var jobId = (int) sql.Query( arrangeSql, new { invocationData = JobHelper.ToJson(InvocationData.Serialize(job)), stateName = "Succeeded", - arguments = "['Arguments']" - }).Single(); + arguments = "[\"\\\"Arguments\\\"\"]" + }).Single().id; - var result = connection.GetJobData(((int) jobId.id).ToString()); + var result = connection.GetJobData(jobId.ToString()); + var now = DateTime.UtcNow.AddMinutes(-1); - Assert.NotNull(result); + Assert.NotNull(result); Assert.NotNull(result.Job); Assert.Equal("Succeeded", result.State); Assert.Equal("Arguments", result.Job.Args[0]); @@ -269,7 +270,7 @@ public void GetStateData_ThrowsAnException_WhenJobIdIsNull() connection => Assert.Throws( () => connection.GetStateData(null))); } - + [Fact, CleanDatabase] public void GetStateData_ReturnsNull_IfThereIsNoSuchState() { diff --git a/tests/Hangfire.PostgreSql.NetCore.Tests/Utils/ConnectionUtils.cs b/tests/Hangfire.PostgreSql.NetCore.Tests/Utils/ConnectionUtils.cs index 984ddef0..1d78a759 100644 --- a/tests/Hangfire.PostgreSql.NetCore.Tests/Utils/ConnectionUtils.cs +++ b/tests/Hangfire.PostgreSql.NetCore.Tests/Utils/ConnectionUtils.cs @@ -14,7 +14,7 @@ public static class ConnectionUtils private const string DefaultDatabaseName = @"hangfire_tests"; private const string DefaultSchemaName = @"hangfire"; - private const string DefaultConnectionStringTemplate = @"Server=127.0.0.1;Port=5432;Database={0};Integrated Security=true;"; + private const string DefaultConnectionStringTemplate = @"Server=10.211.55.2;Port=5432;Database=postgres;User Id=postgres;Password=password;"; public static string GetDatabaseName() { diff --git a/tests/Hangfire.PostgreSql.NetCore.Tests/project.json b/tests/Hangfire.PostgreSql.NetCore.Tests/project.json index 44458392..7f746576 100644 --- a/tests/Hangfire.PostgreSql.NetCore.Tests/project.json +++ b/tests/Hangfire.PostgreSql.NetCore.Tests/project.json @@ -2,16 +2,20 @@ "title": "Hangfire.PostgreSql.NetCore", "version": "1.0.0-*", "testRunner": "xunit", - "dependencies": { - "Castle.Core": "4.0.0-beta001", - "Dapper": "1.50.2", - "xunit": "2.2.0-*", - "dotnet-test-xunit": "2.2.0-preview2-*", - "Hangfire.PostgreSql.NetCore": "1.4.3", - "Moq": "4.6.36-alpha", - "Npgsql": "3.1.7", - "Microsoft.Extensions.Testing.Abstractions": "1.0.0-preview2-003121" - }, + "dependencies": { + "Castle.Core": "4.0.0-beta001", + "Dapper": "1.50.2", + "xunit": "2.2.0-*", + "dotnet-test-xunit": "2.2.0-preview2-*", + "Hangfire.PostgreSql.NetCore": "1.4.3", + "Moq": "4.6.36-alpha", + "Npgsql": "3.1.8", + "Microsoft.Extensions.Testing.Abstractions": "1.0.0-preview2-003121", + "Microsoft.NETCore.App": { + "version": "1.0.1-*", + "type": "platform" + } + }, "buildOptions": { "embed": [ "Clean.sql" @@ -21,10 +25,6 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.0.0-*", - "type": "platform" - } } } } diff --git a/tests/Hangfire.PostgreSql.Tests/Hangfire.PostgreSql.Tests.csproj b/tests/Hangfire.PostgreSql.Tests/Hangfire.PostgreSql.Tests.csproj index ff29fcab..d5252b26 100644 --- a/tests/Hangfire.PostgreSql.Tests/Hangfire.PostgreSql.Tests.csproj +++ b/tests/Hangfire.PostgreSql.Tests/Hangfire.PostgreSql.Tests.csproj @@ -40,24 +40,24 @@ ..\..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll True - - ..\..\packages\Dapper.1.42\lib\net45\Dapper.dll + + ..\..\packages\Dapper.1.50.2\lib\net451\Dapper.dll True - - ..\..\packages\Hangfire.Core.1.6.3\lib\net45\Hangfire.Core.dll + + ..\..\packages\Hangfire.Core.1.6.6\lib\net45\Hangfire.Core.dll True - - ..\..\packages\Moq.4.5.16\lib\net45\Moq.dll + + ..\..\packages\Moq.4.5.23\lib\net45\Moq.dll True - - ..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll + + ..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll True - - ..\..\packages\Npgsql.3.1.3\lib\net451\Npgsql.dll + + ..\..\packages\Npgsql.3.1.8\lib\net451\Npgsql.dll True @@ -67,6 +67,8 @@ + + ..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll True diff --git a/tests/Hangfire.PostgreSql.Tests/app.config b/tests/Hangfire.PostgreSql.Tests/app.config index 6954e928..9566343d 100644 --- a/tests/Hangfire.PostgreSql.Tests/app.config +++ b/tests/Hangfire.PostgreSql.Tests/app.config @@ -4,7 +4,7 @@ - + diff --git a/tests/Hangfire.PostgreSql.Tests/packages.config b/tests/Hangfire.PostgreSql.Tests/packages.config index 96268fae..6f7aec9d 100644 --- a/tests/Hangfire.PostgreSql.Tests/packages.config +++ b/tests/Hangfire.PostgreSql.Tests/packages.config @@ -1,11 +1,11 @@  - - - - - + + + + +