Skip to content

Commit

Permalink
Removed the class TestControlBase and added the class TestControlHelp…
Browse files Browse the repository at this point in the history 
…er (#728)

* Removed TestControlBase and added TextControlHelper

* internal -> public
  • Loading branch information
@ErikMogensen
ErikMogensen authored Jul 30, 2023
1 parent 94e0ed2 commit 2e6a57d
Show file tree
Hide file tree
Showing 8 changed files with 395 additions and 424 deletions.
83 changes: 0 additions & 83 deletions src/ServiceBusExplorer/Controls/TestControlBase.cs
View file

This file was deleted.

106 changes: 53 additions & 53 deletions src/ServiceBusExplorer/Controls/TestEventHubControl.cs
View file

Large diffs are not rendered by default.

256 changes: 129 additions & 127 deletions src/ServiceBusExplorer/Controls/TestQueueControl.cs
View file

Large diffs are not rendered by default.

70 changes: 35 additions & 35 deletions src/ServiceBusExplorer/Controls/TestRelayControl.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@

namespace ServiceBusExplorer.Controls
{
public partial class TestRelayControl : TestControlBase
public partial class TestRelayControl : UserControl
{
#region Private Constants
//***************************
Expand Down Expand Up @@ -105,6 +105,7 @@ public partial class TestRelayControl : TestControlBase
private double senderMaximumTime;
private double senderAverageTime;
private double senderTotalTime;
TestControlHelper controlHelper;
#endregion

#region Public Constructors
Expand All @@ -114,9 +115,8 @@ public TestRelayControl(MainForm mainForm,
Action startLog,
RelayDescription relayDescription,
ServiceBusHelper serviceBusHelper)
: base(mainForm, writeToLog, stopLog, startLog, serviceBusHelper)

{
controlHelper = new TestControlHelper(mainForm, writeToLog, stopLog, startLog, serviceBusHelper);
this.relayDescription = relayDescription;
InitializeComponent();
InitializeControls();
Expand Down Expand Up @@ -230,10 +230,10 @@ private void InitializeControls()
headersDataGridView.ColumnHeadersDefaultCellStyle.BackColor = Color.FromArgb(215, 228, 242);
headersDataGridView.ColumnHeadersDefaultCellStyle.ForeColor = SystemColors.ControlText;

isReadyToStoreMessageText = true;
controlHelper.IsReadyToStoreMessageText = true;

LanguageDetector.SetFormattedMessage(serviceBusHelper,
mainForm.MessageText ?? string.Empty,
LanguageDetector.SetFormattedMessage(controlHelper.ServiceBusHelper,
controlHelper.MainForm.MessageText ?? string.Empty,
txtMessageText);

// Set Tooltips
Expand All @@ -254,13 +254,13 @@ private bool ValidateParameters()
{
if (!int.TryParse(txtMessageCount.Text, out var temp) || temp < 0)
{
writeToLog(MessageCountMustBeANumber);
controlHelper.WriteToLog(MessageCountMustBeANumber);
return false;
}
messageCount = temp;
if (!int.TryParse(txtSendTaskCount.Text, out temp) || temp <= 0)
{
writeToLog(SendTaskCountMustBeANumber);
controlHelper.WriteToLog(SendTaskCountMustBeANumber);
return false;
}
senderTaskCount = temp;
Expand All @@ -285,11 +285,11 @@ private async void btnStart_Click(object sender, EventArgs e)
}

if (ValidateParameters() &&
serviceBusHelper != null)
controlHelper.ServiceBusHelper != null)
{
if (startLog != null)
if (controlHelper.StartLog != null)
{
startLog();
controlHelper.StartLog();
}
btnStart.Enabled = false;
Cursor.Current = Cursors.WaitCursor;
Expand Down Expand Up @@ -403,7 +403,7 @@ void closeFactoriesAndChannelsAndHandleException(Exception exception)

if (oneWay)
{
outputChannelFactory = new ChannelFactory<IOutputChannel>(binding, serviceBusHelper.GetRelayUri(relayDescription).AbsoluteUri);
outputChannelFactory = new ChannelFactory<IOutputChannel>(binding, controlHelper.ServiceBusHelper.GetRelayUri(relayDescription).AbsoluteUri);
outputChannelFactory.Endpoint.Contract.SessionMode = SessionMode.Allowed;
if (ServiceBusBindingHelper.GetRelayClientAuthenticationType(binding) == RelayClientAuthenticationType.RelayAccessToken)
{
Expand All @@ -415,11 +415,11 @@ void closeFactoriesAndChannelsAndHandleException(Exception exception)
{
if (binding is WebHttpRelayBinding)
{
requestChannelFactory = new WebChannelFactory<IRequestChannel>(binding, serviceBusHelper.GetRelayUri(relayDescription));
requestChannelFactory = new WebChannelFactory<IRequestChannel>(binding, controlHelper.ServiceBusHelper.GetRelayUri(relayDescription));
}
else
{
requestChannelFactory = new ChannelFactory<IRequestChannel>(binding, serviceBusHelper.GetRelayUri(relayDescription).AbsoluteUri);
requestChannelFactory = new ChannelFactory<IRequestChannel>(binding, controlHelper.ServiceBusHelper.GetRelayUri(relayDescription).AbsoluteUri);
}

requestChannelFactory.Endpoint.Contract.SessionMode = SessionMode.Allowed;
Expand All @@ -444,7 +444,7 @@ void closeFactoriesAndChannelsAndHandleException(Exception exception)
stopwatch.Start();
if (outputChannel != null)
{
RetryHelper.RetryAction(() => outputChannel.Send(requestMessage), writeToLog);
RetryHelper.RetryAction(() => outputChannel.Send(requestMessage), controlHelper.WriteToLog);
}
}
finally
Expand Down Expand Up @@ -491,7 +491,7 @@ void closeFactoriesAndChannelsAndHandleException(Exception exception)
traceMessage = builder.ToString();
if (!string.IsNullOrWhiteSpace(traceMessage))
{
writeToLog(traceMessage.Substring(0, traceMessage.Length - 1));
controlHelper.WriteToLog(traceMessage.Substring(0, traceMessage.Length - 1));
}
}
}
Expand All @@ -505,7 +505,7 @@ void closeFactoriesAndChannelsAndHandleException(Exception exception)
{
responseMessage =
RetryHelper.RetryFunc(
() => requestChannel.Request(requestMessage), writeToLog);
() => requestChannel.Request(requestMessage), controlHelper.WriteToLog);
}
}
finally
Expand Down Expand Up @@ -583,7 +583,7 @@ void closeFactoriesAndChannelsAndHandleException(Exception exception)
traceMessage = builder.ToString();
if (!string.IsNullOrWhiteSpace(traceMessage))
{
writeToLog(traceMessage.Substring(0, traceMessage.Length - 1));
controlHelper.WriteToLog(traceMessage.Substring(0, traceMessage.Length - 1));
}
}
}
Expand Down Expand Up @@ -654,7 +654,7 @@ void closeFactoriesAndChannelsAndHandleException(Exception exception)
traceMessage = builder.ToString();
if (!string.IsNullOrWhiteSpace(traceMessage))
{
writeToLog(traceMessage.Substring(0, traceMessage.Length - 1));
controlHelper.WriteToLog(traceMessage.Substring(0, traceMessage.Length - 1));
}
};

Expand Down Expand Up @@ -705,10 +705,10 @@ void closeFactoriesAndChannelsAndHandleException(Exception exception)

private TokenProvider CreateTokenProvider()
{
if (!string.IsNullOrWhiteSpace(serviceBusHelper.SharedAccessKeyName) &&
!string.IsNullOrWhiteSpace(serviceBusHelper.SharedAccessKey))
if (!string.IsNullOrWhiteSpace(controlHelper.ServiceBusHelper.SharedAccessKeyName) &&
!string.IsNullOrWhiteSpace(controlHelper.ServiceBusHelper.SharedAccessKey))
{
return TokenProvider.CreateSharedAccessSignatureTokenProvider(serviceBusHelper.SharedAccessKeyName, serviceBusHelper.SharedAccessKey);
return TokenProvider.CreateSharedAccessSignatureTokenProvider(controlHelper.ServiceBusHelper.SharedAccessKeyName, controlHelper.ServiceBusHelper.SharedAccessKey);
}

return null;
Expand All @@ -720,10 +720,10 @@ private void HandleException(Exception ex)
{
return;
}
writeToLog(string.Format(CultureInfo.CurrentCulture, ExceptionFormat, ex.Message));
controlHelper.WriteToLog(string.Format(CultureInfo.CurrentCulture, TestControlHelper.ExceptionFormat, ex.Message));
if (ex.InnerException != null && !string.IsNullOrWhiteSpace(ex.InnerException.Message))
{
writeToLog(string.Format(CultureInfo.CurrentCulture, InnerExceptionFormat, ex.InnerException.Message));
controlHelper.WriteToLog(string.Format(CultureInfo.CurrentCulture, TestControlHelper.InnerExceptionFormat, ex.InnerException.Message));
}
}

Expand Down Expand Up @@ -828,9 +828,9 @@ private void DrawTabControlTabs(TabControl tabControl, DrawItemEventArgs e, Imag

public async Task CancelActions()
{
if (stopLog != null)
if (controlHelper.StopLog != null)
{
await stopLog();
await controlHelper.StopLog();
}

if (managerCancellationTokenSource != null)
Expand Down Expand Up @@ -885,10 +885,10 @@ private void btnOpenFile_Click(object sender, EventArgs e)
return;
}

LanguageDetector.SetFormattedMessage(serviceBusHelper, text, txtMessageText);
if (mainForm != null)
LanguageDetector.SetFormattedMessage(controlHelper.ServiceBusHelper, text, txtMessageText);
if (controlHelper.MainForm != null)
{
mainForm.MessageText = text;
controlHelper.MainForm.MessageText = text;
}
}
}
Expand Down Expand Up @@ -1015,15 +1015,15 @@ private void InternalUpdateStatistics(long messageNumber, long elapsedMillisecon
senderAverageTime = senderMessageNumber > 0 ? senderTotalTime / senderMessageNumber : 0;
senderMessagesPerSecond = senderTotalTime > 0 ? senderMessageNumber * senderTaskCount / senderTotalTime : 0;

lblSenderLastTime.Text = string.Format(LabelFormat, elapsedSeconds);
lblSenderLastTime.Text = string.Format(TestControlHelper.LabelFormat, elapsedSeconds);
lblSenderLastTime.Refresh();
lblSenderAverageTime.Text = string.Format(LabelFormat, senderAverageTime);
lblSenderAverageTime.Text = string.Format(TestControlHelper.LabelFormat, senderAverageTime);
lblSenderAverageTime.Refresh();
lblSenderMaximumTime.Text = string.Format(LabelFormat, senderMaximumTime);
lblSenderMaximumTime.Text = string.Format(TestControlHelper.LabelFormat, senderMaximumTime);
lblSenderMaximumTime.Refresh();
lblSenderMinimumTime.Text = string.Format(LabelFormat, senderMinimumTime);
lblSenderMinimumTime.Text = string.Format(TestControlHelper.LabelFormat, senderMinimumTime);
lblSenderMinimumTime.Refresh();
lblSenderMessagesPerSecond.Text = string.Format(LabelFormat, senderMessagesPerSecond);
lblSenderMessagesPerSecond.Text = string.Format(TestControlHelper.LabelFormat, senderMessagesPerSecond);
lblSenderMessagesPerSecond.Refresh();
lblSenderMessageNumber.Text = senderMessageNumber.ToString(CultureInfo.InvariantCulture);
lblSenderMessageNumber.Refresh();
Expand Down Expand Up @@ -1199,7 +1199,7 @@ protected override void Dispose(bool disposing)

private void txtMessageText_TextChanged(object sender, FastColoredTextBoxNS.TextChangedEventArgs e)
{
base.OnMessageTextChanged(txtMessageText.Text);
controlHelper.OnMessageTextChanged(txtMessageText.Text);
}

private void grouperMessageFormat_CustomPaint(PaintEventArgs e)
Expand Down
Loading

0 comments on commit 2e6a57d

Please sign in to comment.