Skip to content

Commit 94e9ac0

Browse files
Fix broken tests
1 parent ef1c767 commit 94e9ac0

File tree

4 files changed

+12
-67
lines changed

4 files changed

+12
-67
lines changed

src/Stravaig.ShortCode.Tests/ShortCodeTests.cs

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
using System;
21
using System.Collections.Generic;
32
using NUnit.Framework;
43
using Shouldly;
5-
using Stravaig.ShortCode.Tests.__helpers;
4+
using Stravaig.Jailbreak;
65

76
namespace Stravaig.ShortCode.Tests
87
{
@@ -12,9 +11,8 @@ public class ShortCodeTests
1211
[SetUp]
1312
public void Reset()
1413
{
15-
var staticType = typeof(ShortCode);
16-
var constructor = staticType.TypeInitializer ?? throw new InvalidOperationException($"{nameof(ShortCode)} is expected to have a static constructor.");
17-
constructor.Invoke(null, Array.Empty<object>());
14+
dynamic shortCode = typeof(ShortCode).Jailbreak();
15+
shortCode.Init();
1816
}
1917

2018
[Test]
@@ -76,7 +74,7 @@ public void SetCharacterSpace_HappyPath(string value, string characterSpace)
7674
public void Use_SetsTheInternalGeneratorToRandom()
7775
{
7876
ShortCode.Use<RandomCodeGenerator>();
79-
dynamic shortCode = new StaticJailbreak(typeof(ShortCode));
77+
dynamic shortCode = typeof(ShortCode).Jailbreak();
8078
IShortCodeGenerator generator = (IShortCodeGenerator)shortCode._randomGenerator;
8179

8280
generator.ShouldNotBeNull();
@@ -87,7 +85,7 @@ public void Use_SetsTheInternalGeneratorToRandom()
8785
public void Use_SetsTheInternalGeneratorToGuid()
8886
{
8987
ShortCode.Use<GuidCodeGenerator>();
90-
dynamic shortCode = new StaticJailbreak(typeof(ShortCode));
88+
dynamic shortCode = typeof(ShortCode).Jailbreak();
9189
IShortCodeGenerator generator = (IShortCodeGenerator)shortCode._randomGenerator;
9290

9391
generator.ShouldNotBeNull();
@@ -98,7 +96,7 @@ public void Use_SetsTheInternalGeneratorToGuid()
9896
public void Use_SetsTheInternalGeneratorToCryptographicallyRandom()
9997
{
10098
ShortCode.Use<CryptographicallyRandomCodeGenerator>();
101-
dynamic shortCode = new StaticJailbreak(typeof(ShortCode));
99+
dynamic shortCode = typeof(ShortCode).Jailbreak();
102100
IShortCodeGenerator generator = (IShortCodeGenerator)shortCode._randomGenerator;
103101

104102
generator.ShouldNotBeNull();

src/Stravaig.ShortCode.Tests/Stravaig.ShortCode.Tests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
1212
<PackageReference Include="Shouldly" Version="4.0.3" />
1313
<PackageReference Include="Stravaig.Extensions.Logging.Diagnostics" Version="1.0.0" />
14+
<PackageReference Include="Stravaig.Jailbreak" Version="0.1.0" />
1415
</ItemGroup>
1516

1617
<ItemGroup>

src/Stravaig.ShortCode.Tests/__helpers/Jailbreak.cs

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

src/Stravaig.ShortCode/ShortCode.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@ public static class ShortCode
1010
private static IShortCodeGenerator _randomGenerator;
1111

1212
static ShortCode()
13+
{
14+
Init();
15+
}
16+
17+
private static void Init()
1318
{
1419
_defaultLength = 7;
1520
_encoder = new Encoder(NamedCharacterSpaces.LettersAndDigits);

0 commit comments

Comments
 (0)