From f0b9f59bcc7cce1ac6d83a13379fa39b6d59c397 Mon Sep 17 00:00:00 2001
From: Marc Philip Scholten <marc@pedigital.de>
Date: Mon, 16 Dec 2013 19:45:37 +0100
Subject: [PATCH 1/2] Added test for Net_SSH2::_format_log()

---
 tests/Net/SSH2Test.php | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 tests/Net/SSH2Test.php

diff --git a/tests/Net/SSH2Test.php b/tests/Net/SSH2Test.php
new file mode 100644
index 00000000..92af099f
--- /dev/null
+++ b/tests/Net/SSH2Test.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * @author     Marc Scholten <marc@pedigital.de>
+ * @copyright  MMXIII Marc Scholten
+ * @license    http://www.opensource.org/licenses/mit-license.html  MIT License
+ */
+
+class Net_SSH2Test extends PhpseclibTestCase
+{
+    public function formatLogDataProvider()
+    {
+        return array(
+            array(
+                array('hello world'),
+                array('<--'),
+                "<--\r\n00000000  68:65:6c:6c:6f:20:77:6f:72:6c:64                 hello world\r\n\r\n"
+            ),
+            array(
+                array('hello', 'world'),
+                array('<--', '<--'),
+                "<--\r\n00000000  68:65:6c:6c:6f                                   hello\r\n\r\n" .
+                "<--\r\n00000000  77:6f:72:6c:64                                   world\r\n\r\n"
+            ),
+        );
+    }
+
+    /**
+     * @dataProvider formatLogDataProvider
+     */
+    public function testFormatLog(array $message_log, array $message_number_log, $expected)
+    {
+        $ssh = $this->getMockBuilder('Net_SSH1')
+            ->disableOriginalConstructor()
+            ->setMethods(null)
+            ->getMock();
+
+        $result = $ssh->_format_log($message_log, $message_number_log);
+
+        $this->assertEquals($expected, $result);
+    }
+}

From 46a1a0c1c2eda95322f5eaacd1da9a78817ef565 Mon Sep 17 00:00:00 2001
From: Marc Philip Scholten <marc@pedigital.de>
Date: Tue, 17 Dec 2013 20:09:26 +0100
Subject: [PATCH 2/2] Fixed typo and fixed bug with destructor being called in
 test on ssh object

---
 tests/Net/SSH2Test.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/Net/SSH2Test.php b/tests/Net/SSH2Test.php
index 92af099f..954fb8b2 100644
--- a/tests/Net/SSH2Test.php
+++ b/tests/Net/SSH2Test.php
@@ -29,9 +29,9 @@ class Net_SSH2Test extends PhpseclibTestCase
      */
     public function testFormatLog(array $message_log, array $message_number_log, $expected)
     {
-        $ssh = $this->getMockBuilder('Net_SSH1')
+        $ssh = $this->getMockBuilder('Net_SSH2')
             ->disableOriginalConstructor()
-            ->setMethods(null)
+            ->setMethods(array('__destruct'))
             ->getMock();
 
         $result = $ssh->_format_log($message_log, $message_number_log);