Skip to content

Commit 4d1341b

Browse files
committed
Minor code tidy.
1 parent 993165f commit 4d1341b

File tree

1 file changed

+17
-36
lines changed

1 file changed

+17
-36
lines changed

src/Umbraco.Cms.Integrations.Crm.Hubspot.Tests/Controllers/FormsControllerTests.cs

Lines changed: 17 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,18 @@
1-
using System;
2-
using System.Collections.Generic;
1+
using Moq;
2+
using Moq.Protected;
3+
using NUnit.Framework;
4+
using NUnit.Framework.Internal;
5+
using System;
36
using System.IO;
4-
using System.Linq;
57
using System.Net;
68
using System.Net.Http;
7-
using System.Text;
89
using System.Threading;
910
using System.Threading.Tasks;
10-
using System.Web;
11-
using Microsoft.AspNet.SignalR.Hubs;
12-
using Moq;
13-
using Moq.Protected;
14-
using Newtonsoft.Json;
15-
using NUnit.Framework;
16-
using NUnit.Framework.Internal;
1711
using Umbraco.Cms.Integrations.Crm.Hubspot.Configuration;
1812
using Umbraco.Cms.Integrations.Crm.Hubspot.Controllers;
1913
using Umbraco.Cms.Integrations.Crm.Hubspot.Models;
20-
using Umbraco.Cms.Integrations.Crm.Hubspot.Models.Dtos;
2114
using Umbraco.Cms.Integrations.Crm.Hubspot.Services;
2215
using Umbraco.Core.Composing;
23-
using Umbraco.Core.Configuration;
24-
using Umbraco.Core.Configuration.UmbracoSettings;
25-
using Umbraco.Core.Logging;
26-
using Umbraco.Web;
27-
using Umbraco.Web.Routing;
28-
using Umbraco.Web.Security;
2916
using ILogger = Umbraco.Core.Logging.ILogger;
3017

3118
namespace Umbraco.Cms.Integrations.Crm.Hubspot.Tests.Controllers
@@ -39,18 +26,6 @@ public class FormsControllerTests
3926
""correlationId"": ""73f4a25b-7b0a-4537-a490-e5c226619d59""
4027
}";
4128

42-
private readonly string ExpiredOAuthToken = @"{
43-
""status"": ""error"",
44-
""message"": ""This oauth-token is expired! expiresAt: 1643194402611, now: 1643972072320"",
45-
""correlationId"": ""1ae46a55-f5b9-4f68-811a-695a12aaa4f5"",
46-
""category"": ""EXPIRED_AUTHENTICATION"",
47-
""errors"": [
48-
{
49-
""message"": ""The OAuth token used to make this call expired 9 day(s) ago.""
50-
}
51-
]
52-
}";
53-
5429
private HubspotSettings MockedAppSettingsApiSetup;
5530

5631
private HubspotSettings MockedAppSettingsOAuthSetup;
@@ -81,8 +56,10 @@ public void Init()
8156
[Test]
8257
public void CheckApiConfiguration_WithApiConfig_ShouldReturnValidConfigurationResponseObjectWithType()
8358
{
84-
var sut = new FormsController(Mock.Of<ITokenService>(), Mock.Of<ILogger>());
85-
sut.Options = MockedAppSettingsApiSetup;
59+
var sut = new FormsController(Mock.Of<ITokenService>(), Mock.Of<ILogger>())
60+
{
61+
Options = MockedAppSettingsApiSetup
62+
};
8663

8764
var result = sut.CheckConfiguration();
8865

@@ -93,8 +70,10 @@ public void CheckApiConfiguration_WithApiConfig_ShouldReturnValidConfigurationRe
9370
[Test]
9471
public void CheckOAuthConfiguration_WithOAuthConfigAndNoApiConfig_ShouldReturnValidConfigurationResponseObjectWithType()
9572
{
96-
var sut = new FormsController(Mock.Of<ITokenService>(), Mock.Of<ILogger>());
97-
sut.Options = MockedAppSettingsOAuthSetup;
73+
var sut = new FormsController(Mock.Of<ITokenService>(), Mock.Of<ILogger>())
74+
{
75+
Options = MockedAppSettingsOAuthSetup
76+
};
9877

9978
var result = sut.CheckConfiguration();
10079

@@ -109,8 +88,10 @@ public void CheckOAuthConfiguration_WithOAuthConfigAndNoApiConfig_ShouldReturnVa
10988
[Test]
11089
public async Task GetAll_WithoutApiKey_ShouldReturnInvalidResponseObjectWithLoggedInfo()
11190
{
112-
var sut = new FormsController(Mock.Of<ITokenService>(), MockedLogger.Object);
113-
sut.Options = MockedAppSettingsNoSetup;
91+
var sut = new FormsController(Mock.Of<ITokenService>(), MockedLogger.Object)
92+
{
93+
Options = MockedAppSettingsNoSetup
94+
};
11495

11596
var result = await sut.GetAll();
11697

0 commit comments

Comments
 (0)