pleonex/NitroDebugger
1
Fork 0
mirror of https://github.com/pleonex/NitroDebugger.git synced 2025-06-19 05:35:32 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactoring

Browse Source
This commit is contained in:
Benito Palacios Sánchez 2014-12-10 23:43:53 +01:00
parent 421cadfc7c
commit dfdf5ebdb1
2 changed files with 49 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
NitroDebugger.UnitTests/GdbClientTests.cs
View File

@ -129,49 +129,29 @@ namespace UnitTests
this.serverStream.Write(packetBin, 0, packetBin.Length);
}
private void Read()
{
Thread.Sleep(50);
byte[] buffer = new byte[10 * 1024];
this.serverStream.Read(buffer, 0, buffer.Length);
}
[Test]
public void AskHaltedReason()
{
this.SendPacket("S", "02");
StopSignal reason = this.client.AskHaltedReason();
this.Read();
Assert.IsTrue(reason.HasFlag(StopSignal.HostBreak));
}
[Test]
public void CommandError()
public void CommandUnknownReplyPacket()
{
// Send as many times as the maximum counter of Presentation layer
for (int i = 0; i < 10; i++)
this.SendPacket("@", "");
StopSignal reason = this.client.AskHaltedReason();
this.Read();
Assert.IsFalse(this.client.IsConnected);
Assert.AreEqual(StopSignal.Unknown, reason);
}
[Test]
public void CommandInvalidReply()
public void CommandUnexepectedReply()
{
this.SendPacket("OK", "");
StopSignal reason = this.client.AskHaltedReason();
this.Read();
Assert.IsFalse(this.client.IsConnected);
Assert.AreEqual(StopSignal.Unknown, reason);
}
[Test]
public void ConnectionClosedRaiseHandle()
public void CommandConnectionLostRaiseHandle()
{
this.serverClient.Close();
this.client.LostConnection += new LostConnectionEventHandle(LostConnection);
@ -185,7 +165,7 @@ namespace UnitTests
}
[Test]
public void ConnectionClosedDoesNotRaiseHandle()
public void CommandConnectionLostDoesNotRaiseHandle()
{
this.serverClient.Close();
Assert.DoesNotThrow(() => this.client.AskHaltedReason());
@ -196,42 +176,54 @@ namespace UnitTests
{
this.SendPacket("S", "02");
bool stopped = this.client.StopExecution();
this.Read();
Assert.IsTrue(stopped);
}
[Test]
public void InterruptError()
public void InterruptInvalidSignal()
{
this.SendPacket("S", "03");
bool stopped = this.client.StopExecution();
Assert.IsFalse(stopped);
}
[Test]
public void InterruptUnknownReplyPacket()
{
// Send as many times as the maximum counter of Presentation layer
for (int i = 0; i < 10; i++)
this.SendPacket("@", "");
bool stopped = this.client.StopExecution();
this.Read();
bool stopped = this.client.StopExecution();
Assert.IsFalse(this.client.IsConnected);
Assert.IsFalse(stopped);
}
[Test]
public void InterruptInvalidReply()
public void InterruptUnexepectedReply()
{
this.SendPacket("OK", "");
bool stopped = this.client.StopExecution();
this.Read();
Assert.IsFalse(this.client.IsConnected);
Assert.IsFalse(stopped);
}
[Test]
public void InterruptConnectionLost()
public void InterruptConnectionLostRaiseHandle()
{
this.serverClient.Close();
this.client.LostConnection += new LostConnectionEventHandle(LostConnection);
bool stopped = this.client.StopExecution();
Assert.IsFalse(stopped);
}
[Test]
public void AskHaltedReason()
{
this.SendPacket("S", "02");
StopSignal reason = this.client.AskHaltedReason();
Assert.IsTrue(reason.HasFlag(StopSignal.HostBreak));
}
}
}

35
NitroDebugger/RSP/GdbClient.cs
View File

@ -112,18 +112,20 @@ namespace NitroDebugger.RSP
private ReplyPacket SafeInterruption()
{
ReplyPacket response = null;
bool error = false;
try {
response = this.presentation.SendInterrupt();
} catch (SocketException) {
OnLostConnection(EventArgs.Empty);
error = true;
} catch (ProtocolViolationException) {
this.Disconnect();
OnLostConnection(EventArgs.Empty);
error = true;
}
if (response != null && !(response is StopSignalReply)) {
this.Disconnect();
OnLostConnection(EventArgs.Empty);
if (response != null && !(response is StopSignalReply))
error = true;
if (error) {
NetworkError();
response = null;
}
@ -133,19 +135,22 @@ namespace NitroDebugger.RSP
private ReplyPacket SafeSending(CommandPacket command, params Type[] validReplyTypes)
{
ReplyPacket response = null;
bool error = false;
try {
this.presentation.SendCommand(command);
response = this.presentation.ReceiveReply();
} catch (SocketException) {
OnLostConnection(EventArgs.Empty);
error = true;
} catch (ProtocolViolationException) {
this.Disconnect();
OnLostConnection(EventArgs.Empty);
error = true;
}
if (response != null && !ValidateType(response, validReplyTypes)) {
this.Disconnect();
OnLostConnection(EventArgs.Empty);
if (response != null && !ValidateType(response, validReplyTypes))
error = true;
if (error) {
NetworkError();
response = null;
}
@ -156,6 +161,12 @@ namespace NitroDebugger.RSP
{
return validReplyTypes.Contains(reply.GetType());
}
private void NetworkError()
{
this.Disconnect();
OnLostConnection(EventArgs.Empty);
}
}
}