Skip to content

Commit 9a4c0f2

Browse files
cdmdotnetcdmdotnet
committed
New Tests.
Disabled settings file watching reloads as that appears to be problematic in Azure functions causing deadlocks.
1 parent 96cda7e commit 9a4c0f2

File tree

23 files changed

+120
-48
lines changed

23 files changed

+120
-48
lines changed

‎Framework/Azure/Cqrs.Azure.Functions.Isolated/CqrsIsolatedFunctionHost.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ protected static void PrepareConfigurationManager(ConfigurationBuilder configBui
108108
IConfigurationRoot config = (configBuilder ?? new ConfigurationBuilder())
109109
.SetBasePath(actualRoot)
110110
.AddCommandLine(Environment.GetCommandLineArgs())
111-
.AddJsonFile("cqrs.settings.json", optional: true, reloadOnChange: true)
111+
.AddJsonFile("cqrs.settings.json", optional: true, reloadOnChange: false)
112112
.AddEnvironmentVariables()
113113
.Build();
114114
configurationManager = new CloudConfigurationManager(config);
@@ -158,7 +158,7 @@ protected virtual void PrepareHost()
158158
config
159159
.SetBasePath(actualRoot)
160160
.AddCommandLine(Environment.GetCommandLineArgs())
161-
.AddJsonFile("cqrs.settings.json", optional: true, reloadOnChange: true)
161+
.AddJsonFile("cqrs.settings.json", optional: true, reloadOnChange: false)
162162
.AddEnvironmentVariables();
163163
#endif
164164
/*

‎Framework/Azure/Cqrs.Azure.Functions/Content/Startup.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public override void ConfigureAppConfiguration(IFunctionsConfigurationBuilder bu
2525
builder.ConfigurationBuilder
2626
.SetBasePath(context.ApplicationRootPath)
2727
.AddCommandLine(Environment.GetCommandLineArgs())
28-
.AddJsonFile("cqrs.settings.json", optional: true, reloadOnChange: true)
28+
.AddJsonFile("cqrs.settings.json", optional: true, reloadOnChange: false)
2929
.AddEnvironmentVariables();
3030
#endif
3131

‎Framework/Azure/Cqrs.Azure.Functions/Startup.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public override void ConfigureAppConfiguration(IFunctionsConfigurationBuilder bu
4848
builder.ConfigurationBuilder
4949
.SetBasePath(context.ApplicationRootPath)
5050
.AddCommandLine(Environment.GetCommandLineArgs())
51-
.AddJsonFile("cqrs.settings.json", optional: true, reloadOnChange: true)
51+
.AddJsonFile("cqrs.settings.json", optional: true, reloadOnChange: false)
5252
.AddEnvironmentVariables();
5353
#endif
5454
}

‎Framework/Azure/Tests/Cqrs.Azure.ConfigurationManager.Tests.Unit/CloudConfigurationManagerTests.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public void GetSetting_TestKey_ReturnsExpectedValue()
1212
{
1313
// Arrange
1414
IConfigurationRoot config = new ConfigurationBuilder()
15-
.AddJsonFile("test-settings.json", optional: true, reloadOnChange: true)
15+
.AddJsonFile("test-settings.json", optional: true, reloadOnChange: false)
1616
.AddEnvironmentVariables()
1717
.Build();
1818
IConfigurationManager configurationManager = new CloudConfigurationManager(config);
@@ -29,7 +29,7 @@ public void GetSetting_TestBooleanKeys_ReturnsExpectedValue()
2929
{
3030
// Arrange
3131
IConfigurationRoot config = new ConfigurationBuilder()
32-
.AddJsonFile("test-settings.json", optional: true, reloadOnChange: true)
32+
.AddJsonFile("test-settings.json", optional: true, reloadOnChange: false)
3333
.AddEnvironmentVariables()
3434
.Build();
3535
IConfigurationManager configurationManager = new CloudConfigurationManager(config);
@@ -52,7 +52,7 @@ public void GetSetting_MissingTestKey_ReturnsNull()
5252
{
5353
// Arrange
5454
IConfigurationRoot config = new ConfigurationBuilder()
55-
.AddJsonFile("test-settings.json", optional: true, reloadOnChange: true)
55+
.AddJsonFile("test-settings.json", optional: true, reloadOnChange: false)
5656
.AddEnvironmentVariables()
5757
.Build();
5858
IConfigurationManager configurationManager = new CloudConfigurationManager(config);
@@ -69,7 +69,7 @@ public void GetSetting_RandomTest_ReturnsExpectedValue()
6969
{
7070
// Arrange
7171
IConfigurationRoot config = new ConfigurationBuilder()
72-
.AddJsonFile("test-settings.json", optional: true, reloadOnChange: true)
72+
.AddJsonFile("test-settings.json", optional: true, reloadOnChange: false)
7373
.AddEnvironmentVariables()
7474
.Build();
7575

@@ -87,7 +87,7 @@ public void GetConnectionString_AppInSightsKey_ReturnsExpectedFullyQualifiedValu
8787
{
8888
// Arrange
8989
IConfigurationRoot config = new ConfigurationBuilder()
90-
.AddJsonFile("test-settings.json", optional: true, reloadOnChange: true)
90+
.AddJsonFile("test-settings.json", optional: true, reloadOnChange: false)
9191
.AddEnvironmentVariables()
9292
.Build();
9393
IConfigurationManager configurationManager = new CloudConfigurationManager(config);

‎Framework/Azure/Tests/Cqrs.Azure.KeyVault.Tests.Integration/KeyVaultSecretFactoryTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public void GetSecret_KnownTestSecret_KnownValue()
3737
configurationManager = new CloudConfigurationManager();
3838
#else
3939
IConfigurationRoot config = new ConfigurationBuilder()
40-
.AddJsonFile("cqrs.json", optional: true, reloadOnChange: true)
40+
.AddJsonFile("cqrs.json", optional: true, reloadOnChange: false)
4141
.AddEnvironmentVariables()
4242
.Build();
4343

@@ -63,7 +63,7 @@ public async Task GetSecretAsync_KnownTestSecret_KnownValue()
6363
configurationManager = new CloudConfigurationManager();
6464
#else
6565
IConfigurationRoot config = new ConfigurationBuilder()
66-
.AddJsonFile("cqrs.json", optional: true, reloadOnChange: true)
66+
.AddJsonFile("cqrs.json", optional: true, reloadOnChange: false)
6767
.AddEnvironmentVariables()
6868
.Build();
6969

‎Framework/Azure/Tests/Cqrs.Azure.ServiceBus.Tests.Integration/MessageSerialiserTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public void SerialiseEvent_TestEventWithEncryption_ExpectedSerialisedData()
5252
configurationManager = new Configuration.ConfigurationManager();
5353
#else
5454
IConfigurationRoot config = new ConfigurationBuilder()
55-
.AddJsonFile("cqrs.json", optional: true, reloadOnChange: true)
55+
.AddJsonFile("cqrs.json", optional: true, reloadOnChange: false)
5656
.AddEnvironmentVariables()
5757
.Build();
5858

@@ -85,7 +85,7 @@ public void DeserialiseEvent_TestEventDataWithEncryptedValues_ExpectedEvent()
8585
configurationManager = new Configuration.ConfigurationManager();
8686
#else
8787
IConfigurationRoot config = new ConfigurationBuilder()
88-
.AddJsonFile("cqrs.json", optional: true, reloadOnChange: true)
88+
.AddJsonFile("cqrs.json", optional: true, reloadOnChange: false)
8989
.AddEnvironmentVariables()
9090
.Build();
9191

‎Framework/Azure/Tests/Cqrs.Azure.ServiceBus.Tests.Integration/RoundTripTests.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ async Task
7272
configurationManager = new Configuration.ConfigurationManager();
7373
#else
7474
IConfigurationRoot config = new ConfigurationBuilder()
75-
.AddJsonFile("cqrs.json", optional: true, reloadOnChange: true)
75+
.AddJsonFile("cqrs.json", optional: true, reloadOnChange: false)
7676
.AddEnvironmentVariables()
7777
.Build();
7878

@@ -136,7 +136,7 @@ async Task
136136
configurationManager = new Configuration.ConfigurationManager();
137137
#else
138138
IConfigurationRoot config = new ConfigurationBuilder()
139-
.AddJsonFile("cqrs.json", optional: true, reloadOnChange: true)
139+
.AddJsonFile("cqrs.json", optional: true, reloadOnChange: false)
140140
.AddEnvironmentVariables()
141141
.Build();
142142

@@ -199,7 +199,7 @@ async Task
199199
configurationManager = new Configuration.ConfigurationManager();
200200
#else
201201
IConfigurationRoot config = new ConfigurationBuilder()
202-
.AddJsonFile("cqrs.json", optional: true, reloadOnChange: true)
202+
.AddJsonFile("cqrs.json", optional: true, reloadOnChange: false)
203203
.AddEnvironmentVariables()
204204
.Build();
205205
@@ -235,7 +235,7 @@ async Task
235235
{
236236
DefaultMessageTimeToLive = new TimeSpan(0, 25, 0),
237237
EnableBatchedOperations = true,
238-
EnableDeadLetteringOnFilterEvaluationExceptions = true
238+
EnableDeadLetteringOnFilterEvaluationExceptions = false
239239
}
240240
);
241241
@@ -308,7 +308,7 @@ async Task
308308
configurationManager = new Configuration.ConfigurationManager();
309309
#else
310310
IConfigurationRoot config = new ConfigurationBuilder()
311-
.AddJsonFile("cqrs.json", optional: true, reloadOnChange: true)
311+
.AddJsonFile("cqrs.json", optional: true, reloadOnChange: false)
312312
.AddEnvironmentVariables()
313313
.Build();
314314

‎Framework/Azure/Tests/Cqrs.Azure.ServiceBus.Tests.Unit/AzureServiceBusTests.cs‎

Lines changed: 78 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,28 +8,32 @@
88

99
using System;
1010
using System.Collections.Generic;
11+
using System.Threading.Tasks;
1112

1213
using Chinchilla.Logging;
1314
using Chinchilla.Logging.Azure.Configuration;
1415
using Chinchilla.Logging.Configuration;
16+
using Chinchilla.StateManagement.Threaded;
1517
using Cqrs.Authentication;
1618
using Cqrs.Bus;
1719
using Cqrs.Configuration;
20+
using Cqrs.Events;
1821

19-
using NUnit.Framework;
2022
using TestClass = NUnit.Framework.TestFixtureAttribute;
2123
using TestMethod = NUnit.Framework.TestAttribute;
2224
using TestInitialize = NUnit.Framework.SetUpAttribute;
2325
using TestCleanup = NUnit.Framework.TearDownAttribute;
2426
using TestContext = System.Object;
27+
using NUnit.Framework;
2528

2629
#if NET472
30+
using Microsoft.ServiceBus.Messaging;
2731
using Manager = Microsoft.ServiceBus.NamespaceManager;
2832
#else
2933
using Cqrs.Azure.ConfigurationManager;
3034
using Microsoft.Extensions.Configuration;
3135
using Manager = Azure.Messaging.ServiceBus.Administration.ServiceBusAdministrationClient;
32-
using System.Threading.Tasks;
36+
using BrokeredMessage = Azure.Messaging.ServiceBus.ServiceBusMessage;
3337
#endif
3438

3539
namespace Cqrs.Azure.ServiceBus.Tests.Unit
@@ -40,18 +44,17 @@ namespace Cqrs.Azure.ServiceBus.Tests.Unit
4044
[TestClass]
4145
public class AzureServiceBusTests
4246
{
43-
/// <summary>
44-
/// </summary>
47+
/// <summary />
4548
[TestMethod]
46-
public void Constructor_NothingSpecial_SafeContainerName()
49+
public async Task Constructor_NothingSpecial_SafeContainerName()
4750
{
4851
// Arrange
4952
IConfigurationManager configurationManager;
5053
#if NET472_OR_GREATER
5154
configurationManager = new Configuration.ConfigurationManager();
5255
#else
5356
IConfigurationRoot config = new ConfigurationBuilder()
54-
.AddJsonFile("cqrs.json", optional: true, reloadOnChange: true)
57+
.AddJsonFile("cqrs.json", optional: true, reloadOnChange: false)
5558
.AddEnvironmentVariables()
5659
.Build();
5760

@@ -77,6 +80,48 @@ public void Constructor_NothingSpecial_SafeContainerName()
7780
#endif
7881

7982
Assert.IsTrue(logger.FoundContainers.Contains(expectedValue));
83+
84+
await Task.CompletedTask;
85+
}
86+
87+
/// <summary />
88+
[TestMethod]
89+
public async Task CreateBrokeredMessageAsync_SagaEvent_HelpfulTypeCalculated()
90+
{
91+
// Arrange
92+
IConfigurationManager configurationManager;
93+
#if NET472_OR_GREATER
94+
configurationManager = new Configuration.ConfigurationManager();
95+
#else
96+
IConfigurationRoot config = new ConfigurationBuilder()
97+
.AddJsonFile("cqrs.json", optional: true, reloadOnChange: false)
98+
.AddEnvironmentVariables()
99+
.Build();
100+
101+
configurationManager = new CloudConfigurationManager(config);
102+
#endif
103+
DependencyResolver.ConfigurationManager = configurationManager;
104+
var logger = new MockLogger(new AzureLoggerSettingsConfiguration(
105+
#if NET472
106+
#else
107+
config
108+
#endif
109+
), new NullCorrelationIdHelper(), new NullTelemetryHelper());
110+
111+
var azureServiceBus = new MockAzureServiceBus(configurationManager, new MessageSerialiser<Guid>(), new DefaultAuthenticationTokenHelper(new ContextItemCollectionFactory()), new NullCorrelationIdHelper(), logger, null, null, new BuiltInHashAlgorithmFactory(), true);
112+
113+
// Act
114+
var result =
115+
#if NET472
116+
azureServiceBus._CreateBrokeredMessage
117+
#else
118+
await azureServiceBus._CreateBrokeredMessageAsync
119+
#endif
120+
(message => { return string.Empty; }, typeof(SagaEvent<Guid>), new SagaEvent<Guid>(new TestEvent()));
121+
122+
//Assert
123+
124+
await Task.CompletedTask;
80125
}
81126
}
82127

@@ -143,6 +188,33 @@ async Task InstantiatePublishingAsync
143188
await CheckPublicTopicExistsAsync(null, false);
144189
#endif
145190
}
191+
192+
public virtual
193+
#if NET472
194+
BrokeredMessage _CreateBrokeredMessage
195+
#else
196+
async Task<BrokeredMessage> _CreateBrokeredMessageAsync
197+
#endif
198+
<TMessage>(Func<TMessage, string> serialiserFunction, Type messageType, TMessage message
199+
#if NET472
200+
#else
201+
, TimeSpan? delay = null
202+
#endif
203+
)
204+
{
205+
return
206+
#if NET472
207+
base.CreateBrokeredMessage
208+
#else
209+
await base.CreateBrokeredMessageAsync
210+
#endif
211+
(serialiserFunction, messageType, message
212+
#if NET472
213+
#else
214+
, delay
215+
#endif
216+
);
217+
}
146218
}
147219
}
148220

‎Framework/Azure/Tests/Cqrs.Azure.ServiceBus.Tests.Unit/MessageSerialiserTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public void SerialiseEvent_TestEventWithEncryption_ExpectedSerialisedData()
5252
configurationManager = new Configuration.ConfigurationManager();
5353
#else
5454
IConfigurationRoot config = new ConfigurationBuilder()
55-
.AddJsonFile("cqrs.json", optional: true, reloadOnChange: true)
55+
.AddJsonFile("cqrs.json", optional: true, reloadOnChange: false)
5656
.AddEnvironmentVariables()
5757
.Build();
5858

@@ -82,7 +82,7 @@ public void DeserialiseEvent_TestEventDataWithEncryptedValues_ExpectedEvent()
8282
configurationManager = new Configuration.ConfigurationManager();
8383
#else
8484
IConfigurationRoot config = new ConfigurationBuilder()
85-
.AddJsonFile("cqrs.json", optional: true, reloadOnChange: true)
85+
.AddJsonFile("cqrs.json", optional: true, reloadOnChange: false)
8686
.AddEnvironmentVariables()
8787
.Build();
8888

@@ -114,7 +114,7 @@ public void SerialiseCommand_TestCommand_ExpectedSerialisedData()
114114
configurationManager = new Configuration.ConfigurationManager();
115115
#else
116116
IConfigurationRoot config = new ConfigurationBuilder()
117-
.AddJsonFile("cqrs.json", optional: true, reloadOnChange: true)
117+
.AddJsonFile("cqrs.json", optional: true, reloadOnChange: false)
118118
.AddEnvironmentVariables()
119119
.Build();
120120

@@ -144,7 +144,7 @@ public void DeserialiseCommand_TestCommandData_ExpectedCommand()
144144
configurationManager = new Configuration.ConfigurationManager();
145145
#else
146146
IConfigurationRoot config = new ConfigurationBuilder()
147-
.AddJsonFile("cqrs.json", optional: true, reloadOnChange: true)
147+
.AddJsonFile("cqrs.json", optional: true, reloadOnChange: false)
148148
.AddEnvironmentVariables()
149149
.Build();
150150

‎Framework/Azure/Tests/Cqrs.Azure.Storage.Test.Integration/BlobStorageDataStoreTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ async Task
6161
configurationManager = new Configuration.ConfigurationManager();
6262
#else
6363
IConfigurationRoot config = new ConfigurationBuilder()
64-
.AddJsonFile("cqrs.json", optional: true, reloadOnChange: true)
64+
.AddJsonFile("cqrs.json", optional: true, reloadOnChange: false)
6565
.AddEnvironmentVariables()
6666
.Build();
6767

0 commit comments

Comments
 (0)