From 37cdefa0833c0207c0e2fca7e7ace7074d0c2a68 Mon Sep 17 00:00:00 2001
From: SolarRose <SolarRose@yandex.ru>
Date: Fri, 28 Oct 2016 02:18:31 +0300
Subject: [PATCH 1/6] + ping provider

---
 .../PingReporter/IPingReporterProvider.cs     |  8 +++
 .../Reporter/PingReporter/PingProvider.cs     | 65 +++++++++++++++++++
 .../Reporter/PingReporter/PingResult.cs       | 12 ++++
 Shtirlitz.Library/Shtirlitz.Library.csproj    | 14 ++--
 Shtirlitz.Library/packages.config             |  2 +-
 .../Common/PingResultCompareer.cs             | 22 +++++++
 .../Intergration/TestPingProvider.cs          | 39 +++++++++++
 Shtirlitz.Tests/Shtirlitz.Tests.csproj        |  7 ++
 Shtirlitz.Tests/packages.config               |  1 +
 9 files changed, 164 insertions(+), 6 deletions(-)
 create mode 100644 Shtirlitz.Library/Reporter/PingReporter/IPingReporterProvider.cs
 create mode 100644 Shtirlitz.Library/Reporter/PingReporter/PingProvider.cs
 create mode 100644 Shtirlitz.Library/Reporter/PingReporter/PingResult.cs
 create mode 100644 Shtirlitz.Tests/Reporter/PingReporter/Common/PingResultCompareer.cs
 create mode 100644 Shtirlitz.Tests/Reporter/PingReporter/Intergration/TestPingProvider.cs

diff --git a/Shtirlitz.Library/Reporter/PingReporter/IPingReporterProvider.cs b/Shtirlitz.Library/Reporter/PingReporter/IPingReporterProvider.cs
new file mode 100644
index 0000000..38af5d3
--- /dev/null
+++ b/Shtirlitz.Library/Reporter/PingReporter/IPingReporterProvider.cs
@@ -0,0 +1,8 @@
+namespace Shtirlitz.Reporter.PingReporter
+{
+    public interface IPingReporterProvider
+    {
+        bool Next();
+        PingResult Current { get; }
+    }
+}
\ No newline at end of file
diff --git a/Shtirlitz.Library/Reporter/PingReporter/PingProvider.cs b/Shtirlitz.Library/Reporter/PingReporter/PingProvider.cs
new file mode 100644
index 0000000..81bae2a
--- /dev/null
+++ b/Shtirlitz.Library/Reporter/PingReporter/PingProvider.cs
@@ -0,0 +1,65 @@
+using System.Net.NetworkInformation;
+
+namespace Shtirlitz.Reporter.PingReporter
+{
+    public class PingProvider : IPingReporterProvider
+    {
+        public PingResult Current { get; private set; }
+
+        public PingProvider(string host, int count)
+        {
+            _host = host;
+            _count = count;
+        }
+
+        public bool Next()
+        {
+            var result = false;
+
+            if (_count > 0)
+            {
+                result = SendPing(result);
+                _count--;
+            }
+
+            return result;
+        }
+
+        private bool SendPing(bool result)
+        {
+            using (var ping = new Ping())
+            {
+                var pingResult = ping.Send(_host);
+                _send++;
+                if (pingResult != null)
+                {
+                    if (pingResult.Status == IPStatus.Success)
+                        _receive++;
+
+                    Current = new PingResult
+                    {
+                        Host = _host,
+                        Send = _send,
+                        Receive = _receive,
+                        Lost = _lost,
+                        RoundtripTime = pingResult.RoundtripTime
+                    };
+
+                    result = true;
+                }
+                else
+                {
+                    _lost++;
+                }
+            }
+            return result;
+        }
+
+        private readonly string _host;
+        private int _count;
+
+        private int _send;
+        private int _receive;
+        private int _lost;
+    }
+}
\ No newline at end of file
diff --git a/Shtirlitz.Library/Reporter/PingReporter/PingResult.cs b/Shtirlitz.Library/Reporter/PingReporter/PingResult.cs
new file mode 100644
index 0000000..7f425f6
--- /dev/null
+++ b/Shtirlitz.Library/Reporter/PingReporter/PingResult.cs
@@ -0,0 +1,12 @@
+
+namespace Shtirlitz.Reporter.PingReporter
+{
+    public class PingResult
+    {
+        public string Host { get; set; }
+        public int Send { get; set; }
+        public int Receive { get; set; }
+        public int Lost { get; set; }
+        public long RoundtripTime { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/Shtirlitz.Library/Shtirlitz.Library.csproj b/Shtirlitz.Library/Shtirlitz.Library.csproj
index a876bfe..a59d075 100644
--- a/Shtirlitz.Library/Shtirlitz.Library.csproj
+++ b/Shtirlitz.Library/Shtirlitz.Library.csproj
@@ -33,8 +33,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ionic.Zip">
-      <HintPath>$(SolutionDir)packages\DotNetZip.1.9.1.8\lib\net20\Ionic.Zip.dll</HintPath>
+    <Reference Include="DotNetZip, Version=1.10.1.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
+      <HintPath>..\packages\DotNetZip.1.10.1\lib\net20\DotNetZip.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -44,6 +45,9 @@
   <ItemGroup>
     <Compile Include="Archiver\DotNetZipArchiver.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Reporter\PingReporter\IPingReporterProvider.cs" />
+    <Compile Include="Reporter\PingReporter\PingProvider.cs" />
+    <Compile Include="Reporter\PingReporter\PingResult.cs" />
     <Compile Include="Reporter\ThreadsDumpReporter\ThreadDump.cs" />
     <Compile Include="Reporter\ThreadsDumpReporter\ThreadsDumpReporter.cs" />
     <Compile Include="Reporter\TimeReporter\CurrentTimeProvider.cs" />
@@ -53,15 +57,15 @@
     <Compile Include="Sender\ArchiveRemover.cs" />
     <Compile Include="Sender\ClipboardCopier.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Shtirlitz\Shtirlitz.csproj">
       <Project>{813AEDD8-7C91-41F0-A060-F000530168F6}</Project>
       <Name>Shtirlitz</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/Shtirlitz.Library/packages.config b/Shtirlitz.Library/packages.config
index 914759b..d905e5f 100644
--- a/Shtirlitz.Library/packages.config
+++ b/Shtirlitz.Library/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="DotNetZip" version="1.9.1.8" targetFramework="net40-Client" />
+  <package id="DotNetZip" version="1.10.1" targetFramework="net40-client" />
 </packages>
\ No newline at end of file
diff --git a/Shtirlitz.Tests/Reporter/PingReporter/Common/PingResultCompareer.cs b/Shtirlitz.Tests/Reporter/PingReporter/Common/PingResultCompareer.cs
new file mode 100644
index 0000000..6a56c60
--- /dev/null
+++ b/Shtirlitz.Tests/Reporter/PingReporter/Common/PingResultCompareer.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using Shtirlitz.Reporter.PingReporter;
+
+namespace Shtirlitz.Tests.Reporter.PingReporter.Common
+{
+    public class PingResultCompareer : IComparer<PingResult>
+    {
+        public int Compare(PingResult x, PingResult y)
+        {
+            var result = string.Compare(x.Host, y.Host, StringComparison.Ordinal);
+            if (result == 0)
+                result = x.Send.CompareTo(y.Send);
+            if (result == 0)
+                result = x.Receive.CompareTo(y.Receive);
+            if (result == 0)
+                result = x.Lost.CompareTo(y.Lost);
+
+            return result;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Shtirlitz.Tests/Reporter/PingReporter/Intergration/TestPingProvider.cs b/Shtirlitz.Tests/Reporter/PingReporter/Intergration/TestPingProvider.cs
new file mode 100644
index 0000000..62189f9
--- /dev/null
+++ b/Shtirlitz.Tests/Reporter/PingReporter/Intergration/TestPingProvider.cs
@@ -0,0 +1,39 @@
+using NUnit.Framework;
+using Shtirlitz.Reporter.PingReporter;
+using Shtirlitz.Tests.Reporter.PingReporter.Common;
+
+namespace Shtirlitz.Tests.Reporter.PingReporter.Intergration
+{
+    [TestFixture]
+    public class TestPingProvider : AssertionHelper
+    {
+        [Test]
+        public void TestPingSelf()
+        {
+            var expected = new PingResult
+            {
+                Host = "localhost",
+                Send = 1,
+                Receive = 1
+            };
+
+            IPingReporterProvider ping = new PingProvider("localhost", 2);
+            ping.Next();
+            var actual = ping.Current;
+
+            Expect(actual, EqualTo(expected).Using(new PingResultCompareer()));
+        }
+
+        [Test]
+        public void TestNext()
+        {
+            const bool expected = false;
+
+            IPingReporterProvider ping = new PingProvider("localhost", 1);
+            ping.Next();
+            var actual = ping.Next();
+
+            Expect(actual, EqualTo(expected));
+        }
+    }
+}
\ No newline at end of file
diff --git a/Shtirlitz.Tests/Shtirlitz.Tests.csproj b/Shtirlitz.Tests/Shtirlitz.Tests.csproj
index fa65e0f..920a8f6 100644
--- a/Shtirlitz.Tests/Shtirlitz.Tests.csproj
+++ b/Shtirlitz.Tests/Shtirlitz.Tests.csproj
@@ -34,6 +34,10 @@
     <Reference Include="Moq">
       <HintPath>..\packages\Moq.4.2.1312.1622\lib\net40\Moq.dll</HintPath>
     </Reference>
+    <Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.5.0\lib\net40\nunit.framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="xunit">
@@ -46,6 +50,8 @@
     <Compile Include="Dummies\DummyReporter.cs" />
     <Compile Include="Dummies\DummySender.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Reporter\PingReporter\Common\PingResultCompareer.cs" />
+    <Compile Include="Reporter\PingReporter\Intergration\TestPingProvider.cs" />
     <Compile Include="ShtirlitzBaseTestClass.cs" />
     <Compile Include="ShtirlitzTests.cs" />
     <Compile Include="StageRunnerTests.cs" />
@@ -66,6 +72,7 @@
       <Name>Shtirlitz</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Shtirlitz.Tests/packages.config b/Shtirlitz.Tests/packages.config
index be1e40e..44df7f4 100644
--- a/Shtirlitz.Tests/packages.config
+++ b/Shtirlitz.Tests/packages.config
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Moq" version="4.2.1312.1622" targetFramework="net40" />
+  <package id="NUnit" version="3.5.0" targetFramework="net40" />
   <package id="xunit" version="1.9.2" targetFramework="net40" />
 </packages>
\ No newline at end of file

From 20831a67d2242bfcac974156c923beac140565f3 Mon Sep 17 00:00:00 2001
From: SolarRose <SolarRose@yandex.ru>
Date: Fri, 28 Oct 2016 03:28:18 +0300
Subject: [PATCH 2/6] + ping provider

---
 Shtirlitz.Library/Reporter/PingReporter/PingProvider.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Shtirlitz.Library/Reporter/PingReporter/PingProvider.cs b/Shtirlitz.Library/Reporter/PingReporter/PingProvider.cs
index 81bae2a..017ffc1 100644
--- a/Shtirlitz.Library/Reporter/PingReporter/PingProvider.cs
+++ b/Shtirlitz.Library/Reporter/PingReporter/PingProvider.cs
@@ -18,15 +18,17 @@ public bool Next()
 
             if (_count > 0)
             {
-                result = SendPing(result);
+                result = SendPing();
                 _count--;
             }
 
             return result;
         }
 
-        private bool SendPing(bool result)
+        private bool SendPing()
         {
+            var result = false;
+
             using (var ping = new Ping())
             {
                 var pingResult = ping.Send(_host);

From 17f2ed326d34973f18bb1230d38c9d8c574dd39c Mon Sep 17 00:00:00 2001
From: SolarRose <SolarRose@yandex.ru>
Date: Fri, 28 Oct 2016 03:29:00 +0300
Subject: [PATCH 3/6] + trace provider

---
 .../Reporter/PingReporter/TraceProvider.cs    | 146 ++++++++++++++++++
 Shtirlitz.Library/Shtirlitz.Library.csproj    |   1 +
 .../Intergration/TestTraceProvider.cs         |  52 +++++++
 Shtirlitz.Tests/Shtirlitz.Tests.csproj        |   1 +
 4 files changed, 200 insertions(+)
 create mode 100644 Shtirlitz.Library/Reporter/PingReporter/TraceProvider.cs
 create mode 100644 Shtirlitz.Tests/Reporter/PingReporter/Intergration/TestTraceProvider.cs

diff --git a/Shtirlitz.Library/Reporter/PingReporter/TraceProvider.cs b/Shtirlitz.Library/Reporter/PingReporter/TraceProvider.cs
new file mode 100644
index 0000000..c056c5b
--- /dev/null
+++ b/Shtirlitz.Library/Reporter/PingReporter/TraceProvider.cs
@@ -0,0 +1,146 @@
+using System.Collections.Generic;
+using System.Net;
+using System.Net.NetworkInformation;
+
+namespace Shtirlitz.Reporter.PingReporter
+{
+    public class TraceProvider : IPingReporterProvider
+    {
+        public PingResult Current { get; private set; }
+
+        public TraceProvider(string host, int jumps, int timeout, int count)
+        {
+            _host = host;
+            _jumps = jumps;
+            _timeout = timeout;
+            _count = count;
+
+            _finalIp = GetFinalIp();
+            _stat = new Dictionary<IPAddress, PingResult>();
+            _lost = new Dictionary<int, int>();
+        }
+
+        public bool Next()
+        {
+            var result = false;
+
+            if (_finalIp != null
+                && _count > 0)
+            {
+                var isfinal = SendPing();
+
+                _currJumps++;
+                if (_currJumps == _jumps
+                    || isfinal)
+                {
+                    _currJumps = 0;
+                    _count--;
+                }
+
+                result = true;
+            }
+
+            return result;
+        }
+
+        private readonly string _host;
+        private readonly int _jumps;
+        private readonly int _timeout;
+        private readonly IPAddress _finalIp;
+        private readonly Dictionary<IPAddress, PingResult> _stat;
+        private readonly Dictionary<int, int> _lost;
+        private int _count;
+
+        private int _currJumps;
+
+        private bool SendPing()
+        {
+            var result = false;
+
+            ResetCurrent();
+            using (var ping = new Ping())
+            {
+                var pingResult = ping.Send(_host, _timeout, new byte[0], new PingOptions() {Ttl = _currJumps + 1});
+                if (pingResult?.Status == IPStatus.Success)
+                {
+                    var curr = UpdateStat(pingResult);
+                    UpdateCurrent(curr);
+
+                    result = Equals(pingResult.Address, _finalIp);
+                }
+                else
+                {
+                    UpdateLost();
+                }
+            }
+
+            return result;
+        }
+
+        private PingResult UpdateStat(PingReply pingResult)
+        {
+            PingResult curr;
+            if (!_stat.TryGetValue(pingResult.Address, out curr))
+            {
+                curr = new PingResult
+                {
+                    Host = pingResult.Address.ToString(),
+                    Send = 1,
+                    Receive = 1,
+                    RoundtripTime = pingResult.RoundtripTime
+                };
+
+                _stat[pingResult.Address] = curr;
+            }
+            else
+            {
+                curr.Send++;
+                curr.Receive++;
+            }
+            return curr;
+        }
+
+        private void UpdateLost()
+        {
+            int lost;
+            if (_lost.TryGetValue(_currJumps, out lost))
+                _lost[_currJumps] = lost + 1;
+            else
+                _lost[_currJumps] = 1;
+        }
+
+        private void ResetCurrent()
+        {
+            int lost;
+            if (_lost.TryGetValue(_currJumps, out lost))
+                Current = new PingResult { Host = _currJumps.ToString(), Send = lost + 1, Lost = lost + 1 };
+            else
+                Current = new PingResult { Host = _currJumps.ToString(), Send = 1, Lost = 1 };
+        }
+
+        private void UpdateCurrent(PingResult source)
+        {
+            Current = new PingResult
+            {
+                Host = source.Host,
+                Send = source.Send,
+                Receive = source.Receive,
+                Lost = source.Lost,
+                RoundtripTime = source.RoundtripTime
+            };
+        }
+
+        private IPAddress GetFinalIp()
+        {
+            IPAddress result = null;
+
+            using (var ping = new Ping())
+            {
+                var pingResult = ping.Send(_host, _timeout);
+                if (pingResult?.Status == IPStatus.Success)
+                    result = pingResult.Address;
+            }
+            return result;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Shtirlitz.Library/Shtirlitz.Library.csproj b/Shtirlitz.Library/Shtirlitz.Library.csproj
index a59d075..3be407c 100644
--- a/Shtirlitz.Library/Shtirlitz.Library.csproj
+++ b/Shtirlitz.Library/Shtirlitz.Library.csproj
@@ -48,6 +48,7 @@
     <Compile Include="Reporter\PingReporter\IPingReporterProvider.cs" />
     <Compile Include="Reporter\PingReporter\PingProvider.cs" />
     <Compile Include="Reporter\PingReporter\PingResult.cs" />
+    <Compile Include="Reporter\PingReporter\TraceProvider.cs" />
     <Compile Include="Reporter\ThreadsDumpReporter\ThreadDump.cs" />
     <Compile Include="Reporter\ThreadsDumpReporter\ThreadsDumpReporter.cs" />
     <Compile Include="Reporter\TimeReporter\CurrentTimeProvider.cs" />
diff --git a/Shtirlitz.Tests/Reporter/PingReporter/Intergration/TestTraceProvider.cs b/Shtirlitz.Tests/Reporter/PingReporter/Intergration/TestTraceProvider.cs
new file mode 100644
index 0000000..148c1d2
--- /dev/null
+++ b/Shtirlitz.Tests/Reporter/PingReporter/Intergration/TestTraceProvider.cs
@@ -0,0 +1,52 @@
+using NUnit.Framework;
+using Shtirlitz.Reporter.PingReporter;
+using Shtirlitz.Tests.Reporter.PingReporter.Common;
+
+namespace Shtirlitz.Tests.Reporter.PingReporter.Intergration
+{
+    [TestFixture]
+    public class TestTraceProvider : AssertionHelper
+    {
+        [Test]
+        public void TestTraceSelf()
+        {
+            var expected = new PingResult
+            {
+                Host = "::1",
+                Send = 2,
+                Receive = 2
+            };
+
+            IPingReporterProvider tracer = new TraceProvider("localhost", 1, 1000, 2);
+            tracer.Next();
+            tracer.Next();
+            var actual = tracer.Current;
+
+            Expect(actual, EqualTo(expected).Using(new PingResultCompareer()));
+        }
+
+        [Test]
+        public void TestFinalTrace()
+        {
+            const bool expected = false;
+
+            IPingReporterProvider tracer = new TraceProvider("localhost", 30, 1000, 1);
+            tracer.Next();
+            var actual = tracer.Next();
+
+            Expect(actual, EqualTo(expected));
+        }
+
+        [Test]
+        public void TestNext()
+        {
+            const bool expected = false;
+
+            IPingReporterProvider ping = new TraceProvider("localhost", 1, 1000, 1);
+            ping.Next();
+            var actual = ping.Next();
+
+            Expect(actual, EqualTo(expected));
+        }
+    }
+}
\ No newline at end of file
diff --git a/Shtirlitz.Tests/Shtirlitz.Tests.csproj b/Shtirlitz.Tests/Shtirlitz.Tests.csproj
index 920a8f6..354c93b 100644
--- a/Shtirlitz.Tests/Shtirlitz.Tests.csproj
+++ b/Shtirlitz.Tests/Shtirlitz.Tests.csproj
@@ -52,6 +52,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Reporter\PingReporter\Common\PingResultCompareer.cs" />
     <Compile Include="Reporter\PingReporter\Intergration\TestPingProvider.cs" />
+    <Compile Include="Reporter\PingReporter\Intergration\TestTraceProvider.cs" />
     <Compile Include="ShtirlitzBaseTestClass.cs" />
     <Compile Include="ShtirlitzTests.cs" />
     <Compile Include="StageRunnerTests.cs" />

From 08d5c663fa45e7842b8fc037849b9cb6bba4a4a2 Mon Sep 17 00:00:00 2001
From: SolarRose <SolarRose@yandex.ru>
Date: Fri, 28 Oct 2016 04:21:45 +0300
Subject: [PATCH 4/6] + ping reporter

---
 .../Reporter/PingReporter/PingReporter.cs     | 33 +++++++++
 Shtirlitz.Library/Shtirlitz.Library.csproj    |  1 +
 .../Intergration/TestPingReporter.cs          | 72 +++++++++++++++++++
 Shtirlitz.Tests/Shtirlitz.Tests.csproj        |  1 +
 4 files changed, 107 insertions(+)
 create mode 100644 Shtirlitz.Library/Reporter/PingReporter/PingReporter.cs
 create mode 100644 Shtirlitz.Tests/Reporter/PingReporter/Intergration/TestPingReporter.cs

diff --git a/Shtirlitz.Library/Reporter/PingReporter/PingReporter.cs b/Shtirlitz.Library/Reporter/PingReporter/PingReporter.cs
new file mode 100644
index 0000000..aedb3e5
--- /dev/null
+++ b/Shtirlitz.Library/Reporter/PingReporter/PingReporter.cs
@@ -0,0 +1,33 @@
+using System.IO;
+using System.Threading;
+using Shtirlitz.Common;
+
+namespace Shtirlitz.Reporter.PingReporter
+{
+    public class PingReport : IReporter
+    {
+        public double Weight { get; }
+        public string Name => "Ping/Trace reporter";
+
+        public PingReport(IPingReporterProvider provider)
+        {
+            _provider = provider;
+        }
+
+        public void Report(string rootPath, CancellationToken cancellationToken, SimpleProgressCallback progressCallback = null)
+        {
+            while (_provider.Next())
+            {
+                if (cancellationToken.IsCancellationRequested)
+                    break;
+
+                var message = $"Host {_provider.Current.Host} Send {_provider.Current.Send} Receive {_provider.Current.Receive} Lost {_provider.Current.Lost}\r\n";
+                File.AppendAllText(rootPath, message);
+
+                progressCallback?.Invoke(Weight);
+            }
+        }
+
+        private readonly IPingReporterProvider _provider;
+    }
+}
\ No newline at end of file
diff --git a/Shtirlitz.Library/Shtirlitz.Library.csproj b/Shtirlitz.Library/Shtirlitz.Library.csproj
index 3be407c..0b07c41 100644
--- a/Shtirlitz.Library/Shtirlitz.Library.csproj
+++ b/Shtirlitz.Library/Shtirlitz.Library.csproj
@@ -47,6 +47,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Reporter\PingReporter\IPingReporterProvider.cs" />
     <Compile Include="Reporter\PingReporter\PingProvider.cs" />
+    <Compile Include="Reporter\PingReporter\PingReporter.cs" />
     <Compile Include="Reporter\PingReporter\PingResult.cs" />
     <Compile Include="Reporter\PingReporter\TraceProvider.cs" />
     <Compile Include="Reporter\ThreadsDumpReporter\ThreadDump.cs" />
diff --git a/Shtirlitz.Tests/Reporter/PingReporter/Intergration/TestPingReporter.cs b/Shtirlitz.Tests/Reporter/PingReporter/Intergration/TestPingReporter.cs
new file mode 100644
index 0000000..ade8e82
--- /dev/null
+++ b/Shtirlitz.Tests/Reporter/PingReporter/Intergration/TestPingReporter.cs
@@ -0,0 +1,72 @@
+using System.IO;
+using System.Threading;
+using Moq;
+using NUnit.Framework;
+using Shtirlitz.Reporter;
+using Shtirlitz.Reporter.PingReporter;
+
+namespace Shtirlitz.Tests.Reporter.PingReporter.Intergration
+{
+    [TestFixture]
+    public class TestPingReporter : AssertionHelper
+    {
+        [Test]
+        public void TestReport()
+        {
+            const string expected = "Host ::1 Send 1 Receive 1 Lost 0\r\n";
+
+            var count = 1;
+            var provider = new Mock<IPingReporterProvider>();
+            provider.Setup(p => p.Next()).Returns(() => count-- > 0);
+            provider.Setup(p => p.Current).Returns(() => new PingResult {Host = "::1", Send = 1, Receive = 1});
+
+            var filename = Path.GetTempFileName();
+
+            IReporter report = new PingReport(provider.Object);
+            report.Report(filename, CancellationToken.None);
+
+            var actual = File.ReadAllText(filename);
+
+            Expect(actual, EqualTo(expected));
+        }
+
+        [Test]
+        public void TestCancel()
+        {
+            var provider = new Mock<IPingReporterProvider>();
+            provider.Setup(p => p.Next()).Returns(() => true);
+            provider.Setup(p => p.Current).Returns(() => new PingResult { Host = "::1", Send = 1, Receive = 1 });
+
+            var filename = Path.GetTempFileName();
+            var stopSignal = new CancellationTokenSource();
+            var stopThread = new Thread(new ThreadStart(() =>
+            {
+                IReporter report = new PingReport(provider.Object);
+                report.Report(filename, stopSignal.Token);
+            }));
+            stopThread.IsBackground = true;
+            stopThread.Start();
+
+            stopSignal.Cancel();
+
+            Expect(() => stopThread.IsAlive, False.After(1000));
+        }
+
+        [Test]
+        public void TestCallback()
+        {
+            var count = 1;
+            var provider = new Mock<IPingReporterProvider>();
+            provider.Setup(p => p.Next()).Returns(() => count-- > 0);
+            provider.Setup(p => p.Current).Returns(() => new PingResult { Host = "::1", Send = 1, Receive = 1 });
+
+            var filename = Path.GetTempFileName();
+
+            var actual = false;
+            IReporter report = new PingReport(provider.Object);
+            report.Report(filename, CancellationToken.None, progress => actual = true);
+
+            Expect(actual, True);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Shtirlitz.Tests/Shtirlitz.Tests.csproj b/Shtirlitz.Tests/Shtirlitz.Tests.csproj
index 354c93b..d2b5ee1 100644
--- a/Shtirlitz.Tests/Shtirlitz.Tests.csproj
+++ b/Shtirlitz.Tests/Shtirlitz.Tests.csproj
@@ -52,6 +52,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Reporter\PingReporter\Common\PingResultCompareer.cs" />
     <Compile Include="Reporter\PingReporter\Intergration\TestPingProvider.cs" />
+    <Compile Include="Reporter\PingReporter\Intergration\TestPingReporter.cs" />
     <Compile Include="Reporter\PingReporter\Intergration\TestTraceProvider.cs" />
     <Compile Include="ShtirlitzBaseTestClass.cs" />
     <Compile Include="ShtirlitzTests.cs" />

From 7c773ed5cc3ea2ef162c2665d2981bc6b74623fe Mon Sep 17 00:00:00 2001
From: SolarRose <SolarRose@yandex.ru>
Date: Fri, 28 Oct 2016 04:33:16 +0300
Subject: [PATCH 5/6] + Weight

---
 .../PingReporter/IPingReporterProvider.cs      |  1 +
 .../Reporter/PingReporter/PingProvider.cs      | 18 +++++++++++++++---
 .../Reporter/PingReporter/PingReporter.cs      |  2 +-
 .../Reporter/PingReporter/TraceProvider.cs     | 18 +++++++++++++++---
 .../Intergration/TestPingProvider.cs           | 12 ++++++++++++
 .../Intergration/TestTraceProvider.cs          | 12 ++++++++++++
 6 files changed, 56 insertions(+), 7 deletions(-)

diff --git a/Shtirlitz.Library/Reporter/PingReporter/IPingReporterProvider.cs b/Shtirlitz.Library/Reporter/PingReporter/IPingReporterProvider.cs
index 38af5d3..279e274 100644
--- a/Shtirlitz.Library/Reporter/PingReporter/IPingReporterProvider.cs
+++ b/Shtirlitz.Library/Reporter/PingReporter/IPingReporterProvider.cs
@@ -4,5 +4,6 @@ public interface IPingReporterProvider
     {
         bool Next();
         PingResult Current { get; }
+        double Weight { get; }
     }
 }
\ No newline at end of file
diff --git a/Shtirlitz.Library/Reporter/PingReporter/PingProvider.cs b/Shtirlitz.Library/Reporter/PingReporter/PingProvider.cs
index 017ffc1..c3727d4 100644
--- a/Shtirlitz.Library/Reporter/PingReporter/PingProvider.cs
+++ b/Shtirlitz.Library/Reporter/PingReporter/PingProvider.cs
@@ -5,21 +5,32 @@ namespace Shtirlitz.Reporter.PingReporter
     public class PingProvider : IPingReporterProvider
     {
         public PingResult Current { get; private set; }
+        public double Weight
+        {
+            get
+            {
+                var result = 1;
+                if (_count > 0)
+                    result = 100 * _currCount / _count;
+                return result;
+            }
+        }
 
         public PingProvider(string host, int count)
         {
             _host = host;
             _count = count;
+            _currCount = count;
         }
 
         public bool Next()
         {
             var result = false;
 
-            if (_count > 0)
+            if (_currCount > 0)
             {
                 result = SendPing();
-                _count--;
+                _currCount--;
             }
 
             return result;
@@ -58,7 +69,8 @@ private bool SendPing()
         }
 
         private readonly string _host;
-        private int _count;
+        private readonly int _count;
+        private int _currCount;
 
         private int _send;
         private int _receive;
diff --git a/Shtirlitz.Library/Reporter/PingReporter/PingReporter.cs b/Shtirlitz.Library/Reporter/PingReporter/PingReporter.cs
index aedb3e5..e5003de 100644
--- a/Shtirlitz.Library/Reporter/PingReporter/PingReporter.cs
+++ b/Shtirlitz.Library/Reporter/PingReporter/PingReporter.cs
@@ -6,7 +6,7 @@ namespace Shtirlitz.Reporter.PingReporter
 {
     public class PingReport : IReporter
     {
-        public double Weight { get; }
+        public double Weight => _provider.Weight;
         public string Name => "Ping/Trace reporter";
 
         public PingReport(IPingReporterProvider provider)
diff --git a/Shtirlitz.Library/Reporter/PingReporter/TraceProvider.cs b/Shtirlitz.Library/Reporter/PingReporter/TraceProvider.cs
index c056c5b..cffe891 100644
--- a/Shtirlitz.Library/Reporter/PingReporter/TraceProvider.cs
+++ b/Shtirlitz.Library/Reporter/PingReporter/TraceProvider.cs
@@ -7,6 +7,16 @@ namespace Shtirlitz.Reporter.PingReporter
     public class TraceProvider : IPingReporterProvider
     {
         public PingResult Current { get; private set; }
+        public double Weight
+        {
+            get
+            {
+                var result = 1;
+                if (_count > 0)
+                    result = 100 * _currCount / _count;
+                return result;
+            }
+        }
 
         public TraceProvider(string host, int jumps, int timeout, int count)
         {
@@ -14,6 +24,7 @@ public TraceProvider(string host, int jumps, int timeout, int count)
             _jumps = jumps;
             _timeout = timeout;
             _count = count;
+            _currCount = count;
 
             _finalIp = GetFinalIp();
             _stat = new Dictionary<IPAddress, PingResult>();
@@ -25,7 +36,7 @@ public bool Next()
             var result = false;
 
             if (_finalIp != null
-                && _count > 0)
+                && _currCount > 0)
             {
                 var isfinal = SendPing();
 
@@ -34,7 +45,7 @@ public bool Next()
                     || isfinal)
                 {
                     _currJumps = 0;
-                    _count--;
+                    _currCount--;
                 }
 
                 result = true;
@@ -49,7 +60,8 @@ public bool Next()
         private readonly IPAddress _finalIp;
         private readonly Dictionary<IPAddress, PingResult> _stat;
         private readonly Dictionary<int, int> _lost;
-        private int _count;
+        private readonly int _count;
+        private int _currCount;
 
         private int _currJumps;
 
diff --git a/Shtirlitz.Tests/Reporter/PingReporter/Intergration/TestPingProvider.cs b/Shtirlitz.Tests/Reporter/PingReporter/Intergration/TestPingProvider.cs
index 62189f9..4fa856b 100644
--- a/Shtirlitz.Tests/Reporter/PingReporter/Intergration/TestPingProvider.cs
+++ b/Shtirlitz.Tests/Reporter/PingReporter/Intergration/TestPingProvider.cs
@@ -35,5 +35,17 @@ public void TestNext()
 
             Expect(actual, EqualTo(expected));
         }
+
+        [Test]
+        public void TestWeight()
+        {
+            const double expected = 50;
+
+            IPingReporterProvider ping = new PingProvider("localhost", 2);
+            ping.Next();
+            var actual = ping.Weight;
+
+            Expect(actual, EqualTo(expected));
+        }
     }
 }
\ No newline at end of file
diff --git a/Shtirlitz.Tests/Reporter/PingReporter/Intergration/TestTraceProvider.cs b/Shtirlitz.Tests/Reporter/PingReporter/Intergration/TestTraceProvider.cs
index 148c1d2..5f9ec89 100644
--- a/Shtirlitz.Tests/Reporter/PingReporter/Intergration/TestTraceProvider.cs
+++ b/Shtirlitz.Tests/Reporter/PingReporter/Intergration/TestTraceProvider.cs
@@ -48,5 +48,17 @@ public void TestNext()
 
             Expect(actual, EqualTo(expected));
         }
+
+        [Test]
+        public void TestWeight()
+        {
+            const double expected = 50;
+
+            IPingReporterProvider ping = new TraceProvider("localhost", 1, 1000, 2);
+            ping.Next();
+            var actual = ping.Weight;
+
+            Expect(actual, EqualTo(expected));
+        }
     }
 }
\ No newline at end of file

From 650f2f6cc517508daa02698421b63edefb4497a2 Mon Sep 17 00:00:00 2001
From: SolarRose <SolarRose@yandex.ru>
Date: Fri, 28 Oct 2016 04:44:26 +0300
Subject: [PATCH 6/6] + final test

---
 .../Reporter/PingReporter/TraceProvider.cs    | 23 +++-------------
 .../Intergration/TestTraceToYaRu.cs           | 27 +++++++++++++++++++
 Shtirlitz.Tests/Shtirlitz.Tests.csproj        |  1 +
 3 files changed, 32 insertions(+), 19 deletions(-)
 create mode 100644 Shtirlitz.Tests/Reporter/PingReporter/Intergration/TestTraceToYaRu.cs

diff --git a/Shtirlitz.Library/Reporter/PingReporter/TraceProvider.cs b/Shtirlitz.Library/Reporter/PingReporter/TraceProvider.cs
index cffe891..401d933 100644
--- a/Shtirlitz.Library/Reporter/PingReporter/TraceProvider.cs
+++ b/Shtirlitz.Library/Reporter/PingReporter/TraceProvider.cs
@@ -26,7 +26,6 @@ public TraceProvider(string host, int jumps, int timeout, int count)
             _count = count;
             _currCount = count;
 
-            _finalIp = GetFinalIp();
             _stat = new Dictionary<IPAddress, PingResult>();
             _lost = new Dictionary<int, int>();
         }
@@ -35,8 +34,7 @@ public bool Next()
         {
             var result = false;
 
-            if (_finalIp != null
-                && _currCount > 0)
+            if (_currCount > 0)
             {
                 var isfinal = SendPing();
 
@@ -57,7 +55,6 @@ public bool Next()
         private readonly string _host;
         private readonly int _jumps;
         private readonly int _timeout;
-        private readonly IPAddress _finalIp;
         private readonly Dictionary<IPAddress, PingResult> _stat;
         private readonly Dictionary<int, int> _lost;
         private readonly int _count;
@@ -73,12 +70,13 @@ private bool SendPing()
             using (var ping = new Ping())
             {
                 var pingResult = ping.Send(_host, _timeout, new byte[0], new PingOptions() {Ttl = _currJumps + 1});
-                if (pingResult?.Status == IPStatus.Success)
+                if (pingResult?.Status == IPStatus.Success
+                    || pingResult?.Status == IPStatus.TtlExpired)
                 {
                     var curr = UpdateStat(pingResult);
                     UpdateCurrent(curr);
 
-                    result = Equals(pingResult.Address, _finalIp);
+                    result = pingResult.Status == IPStatus.Success;
                 }
                 else
                 {
@@ -141,18 +139,5 @@ private void UpdateCurrent(PingResult source)
                 RoundtripTime = source.RoundtripTime
             };
         }
-
-        private IPAddress GetFinalIp()
-        {
-            IPAddress result = null;
-
-            using (var ping = new Ping())
-            {
-                var pingResult = ping.Send(_host, _timeout);
-                if (pingResult?.Status == IPStatus.Success)
-                    result = pingResult.Address;
-            }
-            return result;
-        }
     }
 }
\ No newline at end of file
diff --git a/Shtirlitz.Tests/Reporter/PingReporter/Intergration/TestTraceToYaRu.cs b/Shtirlitz.Tests/Reporter/PingReporter/Intergration/TestTraceToYaRu.cs
new file mode 100644
index 0000000..73eff58
--- /dev/null
+++ b/Shtirlitz.Tests/Reporter/PingReporter/Intergration/TestTraceToYaRu.cs
@@ -0,0 +1,27 @@
+using System.IO;
+using System.Threading;
+using NUnit.Framework;
+using Shtirlitz.Reporter;
+using Shtirlitz.Reporter.PingReporter;
+
+namespace Shtirlitz.Tests.Reporter.PingReporter.Intergration
+{
+    [TestFixture]
+    public class TestTraceToYaRu : AssertionHelper
+    {
+        [Test]
+        public void TestTrace()
+        {
+            var filename = Path.GetTempFileName();
+
+            var provider = new TraceProvider("ya.ru", 30, 1000, 2);
+
+            IReporter report = new PingReport(provider);
+            report.Report(filename, CancellationToken.None);
+
+            var actual = File.ReadAllText(filename);
+
+            Expect(actual, Not.Null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Shtirlitz.Tests/Shtirlitz.Tests.csproj b/Shtirlitz.Tests/Shtirlitz.Tests.csproj
index d2b5ee1..d2b7532 100644
--- a/Shtirlitz.Tests/Shtirlitz.Tests.csproj
+++ b/Shtirlitz.Tests/Shtirlitz.Tests.csproj
@@ -54,6 +54,7 @@
     <Compile Include="Reporter\PingReporter\Intergration\TestPingProvider.cs" />
     <Compile Include="Reporter\PingReporter\Intergration\TestPingReporter.cs" />
     <Compile Include="Reporter\PingReporter\Intergration\TestTraceProvider.cs" />
+    <Compile Include="Reporter\PingReporter\Intergration\TestTraceToYaRu.cs" />
     <Compile Include="ShtirlitzBaseTestClass.cs" />
     <Compile Include="ShtirlitzTests.cs" />
     <Compile Include="StageRunnerTests.cs" />