Skip to content

Commit 2e6a57d

Browse files
ErikMogensenErikMogensen
authored
Removed the class TestControlBase and added the class TestControlHelper (#728)
* Removed TestControlBase and added TextControlHelper * internal -> public
1 parent 94e0ed2 commit 2e6a57d

File tree

8 files changed

+395
-424
lines changed

8 files changed

+395
-424
lines changed

‎src/ServiceBusExplorer/Controls/TestControlBase.cs

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

‎src/ServiceBusExplorer/Controls/TestEventHubControl.cs

Lines changed: 53 additions & 53 deletions
Large diffs are not rendered by default.

‎src/ServiceBusExplorer/Controls/TestQueueControl.cs

Lines changed: 129 additions & 127 deletions
Large diffs are not rendered by default.

‎src/ServiceBusExplorer/Controls/TestRelayControl.cs

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949

5050
namespace ServiceBusExplorer.Controls
5151
{
52-
public partial class TestRelayControl : TestControlBase
52+
public partial class TestRelayControl : UserControl
5353
{
5454
#region Private Constants
5555
//***************************
@@ -105,6 +105,7 @@ public partial class TestRelayControl : TestControlBase
105105
private double senderMaximumTime;
106106
private double senderAverageTime;
107107
private double senderTotalTime;
108+
TestControlHelper controlHelper;
108109
#endregion
109110

110111
#region Public Constructors
@@ -114,9 +115,8 @@ public TestRelayControl(MainForm mainForm,
114115
Action startLog,
115116
RelayDescription relayDescription,
116117
ServiceBusHelper serviceBusHelper)
117-
: base(mainForm, writeToLog, stopLog, startLog, serviceBusHelper)
118-
119118
{
119+
controlHelper = new TestControlHelper(mainForm, writeToLog, stopLog, startLog, serviceBusHelper);
120120
this.relayDescription = relayDescription;
121121
InitializeComponent();
122122
InitializeControls();
@@ -230,10 +230,10 @@ private void InitializeControls()
230230
headersDataGridView.ColumnHeadersDefaultCellStyle.BackColor = Color.FromArgb(215, 228, 242);
231231
headersDataGridView.ColumnHeadersDefaultCellStyle.ForeColor = SystemColors.ControlText;
232232

233-
isReadyToStoreMessageText = true;
233+
controlHelper.IsReadyToStoreMessageText = true;
234234

235-
LanguageDetector.SetFormattedMessage(serviceBusHelper,
236-
mainForm.MessageText ?? string.Empty,
235+
LanguageDetector.SetFormattedMessage(controlHelper.ServiceBusHelper,
236+
controlHelper.MainForm.MessageText ?? string.Empty,
237237
txtMessageText);
238238

239239
// Set Tooltips
@@ -254,13 +254,13 @@ private bool ValidateParameters()
254254
{
255255
if (!int.TryParse(txtMessageCount.Text, out var temp) || temp < 0)
256256
{
257-
writeToLog(MessageCountMustBeANumber);
257+
controlHelper.WriteToLog(MessageCountMustBeANumber);
258258
return false;
259259
}
260260
messageCount = temp;
261261
if (!int.TryParse(txtSendTaskCount.Text, out temp) || temp <= 0)
262262
{
263-
writeToLog(SendTaskCountMustBeANumber);
263+
controlHelper.WriteToLog(SendTaskCountMustBeANumber);
264264
return false;
265265
}
266266
senderTaskCount = temp;
@@ -285,11 +285,11 @@ private async void btnStart_Click(object sender, EventArgs e)
285285
}
286286

287287
if (ValidateParameters() &&
288-
serviceBusHelper != null)
288+
controlHelper.ServiceBusHelper != null)
289289
{
290-
if (startLog != null)
290+
if (controlHelper.StartLog != null)
291291
{
292-
startLog();
292+
controlHelper.StartLog();
293293
}
294294
btnStart.Enabled = false;
295295
Cursor.Current = Cursors.WaitCursor;
@@ -403,7 +403,7 @@ void closeFactoriesAndChannelsAndHandleException(Exception exception)
403403

404404
if (oneWay)
405405
{
406-
outputChannelFactory = new ChannelFactory<IOutputChannel>(binding, serviceBusHelper.GetRelayUri(relayDescription).AbsoluteUri);
406+
outputChannelFactory = new ChannelFactory<IOutputChannel>(binding, controlHelper.ServiceBusHelper.GetRelayUri(relayDescription).AbsoluteUri);
407407
outputChannelFactory.Endpoint.Contract.SessionMode = SessionMode.Allowed;
408408
if (ServiceBusBindingHelper.GetRelayClientAuthenticationType(binding) == RelayClientAuthenticationType.RelayAccessToken)
409409
{
@@ -415,11 +415,11 @@ void closeFactoriesAndChannelsAndHandleException(Exception exception)
415415
{
416416
if (binding is WebHttpRelayBinding)
417417
{
418-
requestChannelFactory = new WebChannelFactory<IRequestChannel>(binding, serviceBusHelper.GetRelayUri(relayDescription));
418+
requestChannelFactory = new WebChannelFactory<IRequestChannel>(binding, controlHelper.ServiceBusHelper.GetRelayUri(relayDescription));
419419
}
420420
else
421421
{
422-
requestChannelFactory = new ChannelFactory<IRequestChannel>(binding, serviceBusHelper.GetRelayUri(relayDescription).AbsoluteUri);
422+
requestChannelFactory = new ChannelFactory<IRequestChannel>(binding, controlHelper.ServiceBusHelper.GetRelayUri(relayDescription).AbsoluteUri);
423423
}
424424

425425
requestChannelFactory.Endpoint.Contract.SessionMode = SessionMode.Allowed;
@@ -444,7 +444,7 @@ void closeFactoriesAndChannelsAndHandleException(Exception exception)
444444
stopwatch.Start();
445445
if (outputChannel != null)
446446
{
447-
RetryHelper.RetryAction(() => outputChannel.Send(requestMessage), writeToLog);
447+
RetryHelper.RetryAction(() => outputChannel.Send(requestMessage), controlHelper.WriteToLog);
448448
}
449449
}
450450
finally
@@ -491,7 +491,7 @@ void closeFactoriesAndChannelsAndHandleException(Exception exception)
491491
traceMessage = builder.ToString();
492492
if (!string.IsNullOrWhiteSpace(traceMessage))
493493
{
494-
writeToLog(traceMessage.Substring(0, traceMessage.Length - 1));
494+
controlHelper.WriteToLog(traceMessage.Substring(0, traceMessage.Length - 1));
495495
}
496496
}
497497
}
@@ -505,7 +505,7 @@ void closeFactoriesAndChannelsAndHandleException(Exception exception)
505505
{
506506
responseMessage =
507507
RetryHelper.RetryFunc(
508-
() => requestChannel.Request(requestMessage), writeToLog);
508+
() => requestChannel.Request(requestMessage), controlHelper.WriteToLog);
509509
}
510510
}
511511
finally
@@ -583,7 +583,7 @@ void closeFactoriesAndChannelsAndHandleException(Exception exception)
583583
traceMessage = builder.ToString();
584584
if (!string.IsNullOrWhiteSpace(traceMessage))
585585
{
586-
writeToLog(traceMessage.Substring(0, traceMessage.Length - 1));
586+
controlHelper.WriteToLog(traceMessage.Substring(0, traceMessage.Length - 1));
587587
}
588588
}
589589
}
@@ -654,7 +654,7 @@ void closeFactoriesAndChannelsAndHandleException(Exception exception)
654654
traceMessage = builder.ToString();
655655
if (!string.IsNullOrWhiteSpace(traceMessage))
656656
{
657-
writeToLog(traceMessage.Substring(0, traceMessage.Length - 1));
657+
controlHelper.WriteToLog(traceMessage.Substring(0, traceMessage.Length - 1));
658658
}
659659
};
660660

@@ -705,10 +705,10 @@ void closeFactoriesAndChannelsAndHandleException(Exception exception)
705705

706706
private TokenProvider CreateTokenProvider()
707707
{
708-
if (!string.IsNullOrWhiteSpace(serviceBusHelper.SharedAccessKeyName) &&
709-
!string.IsNullOrWhiteSpace(serviceBusHelper.SharedAccessKey))
708+
if (!string.IsNullOrWhiteSpace(controlHelper.ServiceBusHelper.SharedAccessKeyName) &&
709+
!string.IsNullOrWhiteSpace(controlHelper.ServiceBusHelper.SharedAccessKey))
710710
{
711-
return TokenProvider.CreateSharedAccessSignatureTokenProvider(serviceBusHelper.SharedAccessKeyName, serviceBusHelper.SharedAccessKey);
711+
return TokenProvider.CreateSharedAccessSignatureTokenProvider(controlHelper.ServiceBusHelper.SharedAccessKeyName, controlHelper.ServiceBusHelper.SharedAccessKey);
712712
}
713713

714714
return null;
@@ -720,10 +720,10 @@ private void HandleException(Exception ex)
720720
{
721721
return;
722722
}
723-
writeToLog(string.Format(CultureInfo.CurrentCulture, ExceptionFormat, ex.Message));
723+
controlHelper.WriteToLog(string.Format(CultureInfo.CurrentCulture, TestControlHelper.ExceptionFormat, ex.Message));
724724
if (ex.InnerException != null && !string.IsNullOrWhiteSpace(ex.InnerException.Message))
725725
{
726-
writeToLog(string.Format(CultureInfo.CurrentCulture, InnerExceptionFormat, ex.InnerException.Message));
726+
controlHelper.WriteToLog(string.Format(CultureInfo.CurrentCulture, TestControlHelper.InnerExceptionFormat, ex.InnerException.Message));
727727
}
728728
}
729729

@@ -828,9 +828,9 @@ private void DrawTabControlTabs(TabControl tabControl, DrawItemEventArgs e, Imag
828828

829829
public async Task CancelActions()
830830
{
831-
if (stopLog != null)
831+
if (controlHelper.StopLog != null)
832832
{
833-
await stopLog();
833+
await controlHelper.StopLog();
834834
}
835835

836836
if (managerCancellationTokenSource != null)
@@ -885,10 +885,10 @@ private void btnOpenFile_Click(object sender, EventArgs e)
885885
return;
886886
}
887887

888-
LanguageDetector.SetFormattedMessage(serviceBusHelper, text, txtMessageText);
889-
if (mainForm != null)
888+
LanguageDetector.SetFormattedMessage(controlHelper.ServiceBusHelper, text, txtMessageText);
889+
if (controlHelper.MainForm != null)
890890
{
891-
mainForm.MessageText = text;
891+
controlHelper.MainForm.MessageText = text;
892892
}
893893
}
894894
}
@@ -1015,15 +1015,15 @@ private void InternalUpdateStatistics(long messageNumber, long elapsedMillisecon
10151015
senderAverageTime = senderMessageNumber > 0 ? senderTotalTime / senderMessageNumber : 0;
10161016
senderMessagesPerSecond = senderTotalTime > 0 ? senderMessageNumber * senderTaskCount / senderTotalTime : 0;
10171017

1018-
lblSenderLastTime.Text = string.Format(LabelFormat, elapsedSeconds);
1018+
lblSenderLastTime.Text = string.Format(TestControlHelper.LabelFormat, elapsedSeconds);
10191019
lblSenderLastTime.Refresh();
1020-
lblSenderAverageTime.Text = string.Format(LabelFormat, senderAverageTime);
1020+
lblSenderAverageTime.Text = string.Format(TestControlHelper.LabelFormat, senderAverageTime);
10211021
lblSenderAverageTime.Refresh();
1022-
lblSenderMaximumTime.Text = string.Format(LabelFormat, senderMaximumTime);
1022+
lblSenderMaximumTime.Text = string.Format(TestControlHelper.LabelFormat, senderMaximumTime);
10231023
lblSenderMaximumTime.Refresh();
1024-
lblSenderMinimumTime.Text = string.Format(LabelFormat, senderMinimumTime);
1024+
lblSenderMinimumTime.Text = string.Format(TestControlHelper.LabelFormat, senderMinimumTime);
10251025
lblSenderMinimumTime.Refresh();
1026-
lblSenderMessagesPerSecond.Text = string.Format(LabelFormat, senderMessagesPerSecond);
1026+
lblSenderMessagesPerSecond.Text = string.Format(TestControlHelper.LabelFormat, senderMessagesPerSecond);
10271027
lblSenderMessagesPerSecond.Refresh();
10281028
lblSenderMessageNumber.Text = senderMessageNumber.ToString(CultureInfo.InvariantCulture);
10291029
lblSenderMessageNumber.Refresh();
@@ -1199,7 +1199,7 @@ protected override void Dispose(bool disposing)
11991199

12001200
private void txtMessageText_TextChanged(object sender, FastColoredTextBoxNS.TextChangedEventArgs e)
12011201
{
1202-
base.OnMessageTextChanged(txtMessageText.Text);
1202+
controlHelper.OnMessageTextChanged(txtMessageText.Text);
12031203
}
12041204

12051205
private void grouperMessageFormat_CustomPaint(PaintEventArgs e)

0 commit comments

Comments
 (0)