Commit 03706aa6 authored by Brickner_cp's avatar Brickner_cp

All unit tests pass.

parent 84f72395
...@@ -90,7 +90,12 @@ namespace PcapDotNet.Core.Test ...@@ -90,7 +90,12 @@ namespace PcapDotNet.Core.Test
Packet packet = new Packet(new byte[14], timestamp, DataLinkKind.Ethernet); Packet packet = new Packet(new byte[14], timestamp, DataLinkKind.Ethernet);
// Compare packet to wireshark // Compare packet to wireshark
ComparePacketsToWireshark(new[]{packet}); ComparePacketsToWireshark(new[] { packet });
// BUG: Limited timestamp due to Wireshark bug: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4766
// Now check different dates.
//packet = new Packet(new byte[14], new DateTime(2004,08,25,10,36,41, DateTimeKind.Utc).ToLocalTime(), DataLinkKind.Ethernet);
//ComparePacketsToWireshark(new[] { packet });
} }
private enum PacketType private enum PacketType
...@@ -107,8 +112,10 @@ namespace PcapDotNet.Core.Test ...@@ -107,8 +112,10 @@ namespace PcapDotNet.Core.Test
private static Packet CreateRandomPacket(Random random) private static Packet CreateRandomPacket(Random random)
{ {
// BUG: Limited timestamp due to Wireshark bug: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4766
DateTime packetTimestamp = DateTime packetTimestamp =
random.NextDateTime(PacketTimestamp.MinimumPacketTimestamp, PacketTimestamp.MaximumPacketTimestamp).ToUniversalTime().ToLocalTime(); random.NextDateTime(new DateTime(2010,1,1), new DateTime(2010,12,31)).ToUniversalTime().ToLocalTime();
//random.NextDateTime(PacketTimestamp.MinimumPacketTimestamp, PacketTimestamp.MaximumPacketTimestamp).ToUniversalTime().ToLocalTime();
EthernetLayer ethernetLayer = random.NextEthernetLayer(); EthernetLayer ethernetLayer = random.NextEthernetLayer();
IpV4Layer ipV4Layer = random.NextIpV4Layer(); IpV4Layer ipV4Layer = random.NextIpV4Layer();
...@@ -950,23 +957,17 @@ namespace PcapDotNet.Core.Test ...@@ -950,23 +957,17 @@ namespace PcapDotNet.Core.Test
else if (field.Show().StartsWith("Address family: ")) else if (field.Show().StartsWith("Address family: "))
{ {
++currentEntry; ++currentEntry;
if (currentEntry == greDatagram.Routing.Count) if (currentEntry != greDatagram.Routing.Count)
field.AssertValue((ushort)0);
else
field.AssertValue((ushort)greDatagram.Routing[currentEntry].AddressFamily); field.AssertValue((ushort)greDatagram.Routing[currentEntry].AddressFamily);
} }
else if (field.Show().StartsWith("SRE offset: ")) else if (field.Show().StartsWith("SRE offset: "))
{ {
if (currentEntry == greDatagram.Routing.Count) if (currentEntry != greDatagram.Routing.Count)
field.AssertValue((byte)0);
else
field.AssertValue(greDatagram.Routing[currentEntry].PayloadOffset); field.AssertValue(greDatagram.Routing[currentEntry].PayloadOffset);
} }
else if (field.Show().StartsWith("SRE length: ")) else if (field.Show().StartsWith("SRE length: "))
{ {
if (currentEntry == greDatagram.Routing.Count) if (currentEntry != greDatagram.Routing.Count)
field.AssertValue((byte)0);
else
field.AssertValue(greDatagram.Routing[currentEntry].PayloadLength); field.AssertValue(greDatagram.Routing[currentEntry].PayloadLength);
} }
else else
......
...@@ -132,9 +132,9 @@ namespace PcapDotNet.Core.Test ...@@ -132,9 +132,9 @@ namespace PcapDotNet.Core.Test
element.AssertShow("0x" + expectedValue.ToString("x" + 2 * sizeof(ulong))); element.AssertShow("0x" + expectedValue.ToString("x" + 2 * sizeof(ulong)));
} }
public static void AssertValue(this XElement element, string expectedValue) public static void AssertValue(this XElement element, string expectedValue, string message = null)
{ {
Assert.AreEqual(element.Value(), expectedValue, element.Name()); Assert.AreEqual(element.Value(), expectedValue, message ?? element.Name());
} }
public static void AssertValue(this XElement element, IEnumerable<byte> expectedValue) public static void AssertValue(this XElement element, IEnumerable<byte> expectedValue)
...@@ -147,9 +147,9 @@ namespace PcapDotNet.Core.Test ...@@ -147,9 +147,9 @@ namespace PcapDotNet.Core.Test
element.AssertValue(expectedValue.ToString("x2")); element.AssertValue(expectedValue.ToString("x2"));
} }
public static void AssertValue(this XElement element, ushort expectedValue) public static void AssertValue(this XElement element, ushort expectedValue, string message = null)
{ {
element.AssertValue(expectedValue.ToString("x4")); element.AssertValue(expectedValue.ToString("x4"), message);
} }
public static void AssertValue(this XElement element, uint expectedValue) public static void AssertValue(this XElement element, uint expectedValue)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment