Skip to content

Commit

Permalink
Merge pull request #52 from ericgreenmix/master
Browse files Browse the repository at this point in the history 
Fixes tests for #51. Arguments wasn't valid parsable JSON
  • Loading branch information
@frankhommers
frankhommers authored Oct 29, 2016
2 parents 3f8f7cb + 4c227d4 commit 1d8d7ae
Show file tree
Hide file tree
Showing 10 changed files with 67 additions and 63 deletions.
2 changes: 1 addition & 1 deletion src/Hangfire.PostgreSql.NetCore/App.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
Expand Down
24 changes: 12 additions & 12 deletions src/Hangfire.PostgreSql.NetCore/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
}
Expand Down
17 changes: 9 additions & 8 deletions src/Hangfire.PostgreSql/Hangfire.PostgreSql.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,20 +43,20 @@
<NoWarn>1591</NoWarn>
</PropertyGroup>
<ItemGroup>
<Reference Include="Dapper, Version=1.40.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Dapper.1.42\lib\net45\Dapper.dll</HintPath>
<Reference Include="Dapper, Version=1.50.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Dapper.1.50.2\lib\net45\Dapper.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Hangfire.Core, Version=1.6.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Hangfire.Core.1.6.3\lib\net45\Hangfire.Core.dll</HintPath>
<Reference Include="Hangfire.Core, Version=1.6.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Hangfire.Core.1.6.6\lib\net45\Hangfire.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Npgsql, Version=3.1.3.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7, processorArchitecture=MSIL">
<HintPath>..\..\packages\Npgsql.3.1.3\lib\net45\Npgsql.dll</HintPath>
<Reference Include="Npgsql, Version=3.1.8.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7, processorArchitecture=MSIL">
<HintPath>..\..\packages\Npgsql.3.1.8\lib\net45\Npgsql.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Owin">
Expand All @@ -69,6 +69,7 @@
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\Hangfire.PostgreSql.NetCore\EnqueuedAndFetchedCountDto.cs">
Expand Down
10 changes: 5 additions & 5 deletions src/Hangfire.PostgreSql/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Dapper" version="1.42" targetFramework="net45" />
<package id="Hangfire.Core" version="1.6.3" targetFramework="net45" />
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
<package id="Npgsql" version="3.1.3" targetFramework="net45" />
<package id="Dapper" version="1.50.2" targetFramework="net45" />
<package id="Hangfire.Core" version="1.6.6" targetFramework="net45" />
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
<package id="Npgsql" version="3.1.8" targetFramework="net45" />
<package id="Owin" version="1.0" targetFramework="net45" />
</packages>
</packages>
13 changes: 7 additions & 6 deletions tests/Hangfire.PostgreSql.NetCore.Tests/PostgreSqlConnectionFacts.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
Expand All @@ -269,7 +270,7 @@ public void GetStateData_ThrowsAnException_WhenJobIdIsNull()
connection => Assert.Throws<ArgumentNullException>(
() => connection.GetStateData(null)));
}

[Fact, CleanDatabase]
public void GetStateData_ReturnsNull_IfThereIsNoSuchState()
{
Expand Down
2 changes: 1 addition & 1 deletion tests/Hangfire.PostgreSql.NetCore.Tests/Utils/ConnectionUtils.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down
28 changes: 14 additions & 14 deletions tests/Hangfire.PostgreSql.NetCore.Tests/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -21,10 +25,6 @@
"frameworks": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
}
}
}
}
Expand Down
22 changes: 12 additions & 10 deletions tests/Hangfire.PostgreSql.Tests/Hangfire.PostgreSql.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,24 +40,24 @@
<HintPath>..\..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Dapper, Version=1.40.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Dapper.1.42\lib\net45\Dapper.dll</HintPath>
<Reference Include="Dapper, Version=1.50.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Dapper.1.50.2\lib\net451\Dapper.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Hangfire.Core, Version=1.6.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Hangfire.Core.1.6.3\lib\net45\Hangfire.Core.dll</HintPath>
<Reference Include="Hangfire.Core, Version=1.6.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Hangfire.Core.1.6.6\lib\net45\Hangfire.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Moq, Version=4.5.16.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
<HintPath>..\..\packages\Moq.4.5.16\lib\net45\Moq.dll</HintPath>
<Reference Include="Moq, Version=4.5.23.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
<HintPath>..\..\packages\Moq.4.5.23\lib\net45\Moq.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Npgsql, Version=3.1.3.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7, processorArchitecture=MSIL">
<HintPath>..\..\packages\Npgsql.3.1.3\lib\net451\Npgsql.dll</HintPath>
<Reference Include="Npgsql, Version=3.1.8.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7, processorArchitecture=MSIL">
<HintPath>..\..\packages\Npgsql.3.1.8\lib\net451\Npgsql.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Owin">
Expand All @@ -67,6 +67,8 @@
<Reference Include="System.Core" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
<Private>True</Private>
Expand Down
2 changes: 1 addition & 1 deletion tests/Hangfire.PostgreSql.Tests/app.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
Expand Down
10 changes: 5 additions & 5 deletions tests/Hangfire.PostgreSql.Tests/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Castle.Core" version="3.3.3" targetFramework="net45" />
<package id="Dapper" version="1.42" targetFramework="net45" />
<package id="Hangfire.Core" version="1.6.3" targetFramework="net45" />
<package id="Moq" version="4.5.16" targetFramework="net461" />
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
<package id="Npgsql" version="3.1.3" targetFramework="net461" />
<package id="Dapper" version="1.50.2" targetFramework="net461" />
<package id="Hangfire.Core" version="1.6.6" targetFramework="net461" />
<package id="Moq" version="4.5.23" targetFramework="net461" />
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" />
<package id="Npgsql" version="3.1.8" targetFramework="net461" />
<package id="Owin" version="1.0" targetFramework="net45" />
<package id="xunit" version="2.1.0" targetFramework="net45" />
<package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
Expand Down

0 comments on commit 1d8d7ae

Please sign in to comment.