Skip to content

Commit 3e6d8b6

Browse files
author
Stephen Jennings
committed
make unit tests buildable and passing on .NET Core
1 parent 1d5009c commit 3e6d8b6

7 files changed

Lines changed: 54 additions & 44 deletions

File tree

src/Turbocharged.Beanstalk.Tests/ConnectionFacts.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System;
22
using System.Collections.Generic;
3-
using System.Configuration;
43
using System.Linq;
54
using System.Reflection;
65
using System.Text;
@@ -24,8 +23,8 @@ public class ConnectionFacts : IDisposable
2423

2524
public ConnectionFacts()
2625
{
27-
hostname = Environment.GetEnvironmentVariable("BEANSTALK_HOSTNAME") ?? ConfigurationManager.AppSettings["Hostname"];
28-
port = Convert.ToInt32(Environment.GetEnvironmentVariable("BEANSTALK_PORT") ?? ConfigurationManager.AppSettings["Port"]);
26+
hostname = Settings.BeanstalkHostName;
27+
port = Settings.BeanstalkPort;
2928
connectionString = string.Format("{0}:{1}", hostname, port);
3029
}
3130

src/Turbocharged.Beanstalk.Tests/MiscellaneousFacts.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class MiscellaneousFacts
1313
[Fact]
1414
public void EnsureNoAsyncVoidTests()
1515
{
16-
AssertNoAsyncVoidMethods(GetType().Assembly);
16+
AssertNoAsyncVoidMethods(GetType().GetTypeInfo().Assembly);
1717
}
1818

1919
static void AssertNoAsyncVoidMethods(Assembly assembly)

src/Turbocharged.Beanstalk.Tests/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 36 deletions
This file was deleted.

src/Turbocharged.Beanstalk.Tests/SerializationFacts.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System;
22
using System.Collections.Generic;
3-
using System.Configuration;
43
using System.Linq;
54
using System.Reflection;
65
using System.Text;
@@ -26,8 +25,8 @@ public class SerializationFacts : IDisposable
2625

2726
public SerializationFacts()
2827
{
29-
hostname = Environment.GetEnvironmentVariable("BEANSTALK_HOSTNAME") ?? ConfigurationManager.AppSettings["Hostname"];
30-
port = Convert.ToInt32(Environment.GetEnvironmentVariable("BEANSTALK_PORT") ?? ConfigurationManager.AppSettings["Port"]);
28+
hostname = Settings.BeanstalkHostName;
29+
port = Settings.BeanstalkPort;
3130
connectionString = string.Format("{0}:{1}", hostname, port);
3231
options = new WorkerOptions { Tubes = { "jobjects" } };
3332
config = new ConnectionConfiguration
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
using Microsoft.Extensions.Configuration;
2+
using System;
3+
using System.IO;
4+
5+
namespace Turbocharged.Beanstalk.Tests
6+
{
7+
public static class Settings
8+
{
9+
static IConfigurationRoot Configuration { get; } =
10+
new ConfigurationBuilder()
11+
.SetBasePath(Directory.GetCurrentDirectory())
12+
.AddJsonFile("settings.json")
13+
.Build();
14+
15+
public static string BeanstalkHostName
16+
{
17+
get
18+
{
19+
var fromEnv = Environment.GetEnvironmentVariable("BEANSTALK_HOSTNAME");
20+
return fromEnv ?? Configuration["beanstalk.hostname"];
21+
}
22+
}
23+
24+
public static int BeanstalkPort
25+
{
26+
get
27+
{
28+
var fromEnv = Environment.GetEnvironmentVariable("BEANSTALK_PORT");
29+
return int.Parse(fromEnv ?? Configuration["beanstalk.port"]);
30+
}
31+
}
32+
}
33+
}
Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,24 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFramework>netcoreapp1.1</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
8+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="1.1.2" />
9+
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="1.1.2" />
10+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.2" />
811
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
912
<PackageReference Include="xunit" Version="2.2.0" />
1013
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
1114
</ItemGroup>
1215

16+
<ItemGroup>
17+
<ProjectReference Include="..\Turbocharged.Beanstalk\Turbocharged.Beanstalk.csproj" />
18+
</ItemGroup>
19+
20+
<ItemGroup>
21+
<None Include="settings.json" CopyToOutputDirectory="PreserveNewest" />
22+
</ItemGroup>
23+
1324
</Project>
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"beanstalk.hostname": "localhost",
3+
"beanstalk.port": 11300
4+
}

0 commit comments

Comments
 (0)