Use getMockBuilder() instead of getMock()

Erebot · Sep 17, 2016 · 9258325 · 9258325
1 parent 51844c9
commit 9258325
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 55 deletions.
diff --git a/tests/src/eventMatchingTest.php b/tests/src/eventMatchingTest.php
@@ -32,47 +32,19 @@ public function dummyCallback(
     public function setUp()
     {
         $sxml = new SimpleXMLElement('<foo/>');
-        $this->_mainConfig = $this->getMock(
-            '\\Erebot\\Interfaces\\Config\\Main',
-            array(), array(), '',
-            FALSE, FALSE, FALSE
-        );
-        $networkConfig = $this->getMock(
-            '\\Erebot\\Interfaces\\Config\\Network',
-            array(),
-            array($this->_mainConfig, $sxml),
-            '',
-            FALSE,
-            FALSE,
-            FALSE
-        );
-        $serverConfig = $this->getMock(
-            '\\Erebot\\Interfaces\\Config\\Server',
-            array(),
-            array($networkConfig, $sxml),
-            '',
-            FALSE,
-            FALSE,
-            FALSE
-        );
-        $bot = $this->getMock(
-            '\\Erebot\\Interfaces\\Core',
-            array(),
-            array($this->_mainConfig),
-            '',
-            FALSE,
-            FALSE,
-            FALSE
-        );
-        $this->_connection = $this->getMock(
-            '\\Erebot\\Interfaces\\Connection',
-            array(),
-            array($bot, $serverConfig),
-            '',
-            FALSE,
-            FALSE,
-            FALSE
-        );
+        $this->_mainConfig = $this->getMockBuilder('\\Erebot\\Interfaces\\Config\\Main')->getMock();
+        $networkConfig = $this->getMockBuilder('\\Erebot\\Interfaces\\Config\\Network')
+            ->setConstructorArgs(array($this->_mainConfig, $sxml))
+            ->getMock();
+        $serverConfig = $this->getMockBuilder('\\Erebot\\Interfaces\\Config\\Server')
+            ->setConstructorArgs(array($networkConfig, $sxml))
+            ->getMock();
+        $bot = $this->getMockBuilder('\\Erebot\\Interfaces\\Core')
+            ->setConstructorArgs(array($this->_mainConfig))
+            ->getMock();
+        $this->_connection = $this->getMockBuilder('\\Erebot\\Interfaces\\Connection')
+            ->setConstructorArgs(array($bot, $serverConfig))
+            ->getMock();
         $this->_cb = \Erebot\CallableWrapper::wrap(array($this, 'dummyCallback'));
     }
 

diff --git a/tests/src/eventsTest.php b/tests/src/eventsTest.php
@@ -22,11 +22,19 @@ class   EventsTest
     public function setUp()
     {
         $sxml = new SimpleXMLElement('<foo/>');
-        $this->_mainConfig = $this->getMock('\\Erebot\\Interfaces\\Config\\Main', array(), array(), '', FALSE, FALSE, FALSE);
-        $this->_networkConfig = $this->getMock('\\Erebot\\Interfaces\\Config\\Network', array(), array($this->_mainConfig, $sxml), '', FALSE, FALSE, FALSE);
-        $this->_serverConfig = $this->getMock('\\Erebot\\Interfaces\\Config\\Server', array(), array($this->_networkConfig, $sxml), '', FALSE, FALSE, FALSE);
-        $this->_bot = $this->getMock('\\Erebot\\Interfaces\\Core', array(), array($this->_mainConfig), '', FALSE, FALSE, FALSE);
-        $this->_connection = $this->getMock('\\Erebot\\Interfaces\\Connection', array(), array($this->_bot, $this->_serverConfig), '', FALSE, FALSE, FALSE);
+        $this->_mainConfig = $this->getMockBuilder('\\Erebot\\Interfaces\\Config\\Main')->getMock();
+        $this->_networkConfig = $this->getMockBuilder('\\Erebot\\Interfaces\\Config\\Network')
+            ->setConstructorArgs(array($this->_mainConfig, $sxml))
+            ->getMock();
+        $this->_serverConfig = $this->getMockBuilder('\\Erebot\\Interfaces\\Config\\Server')
+            ->setConstructorArgs(array($this->_networkConfig, $sxml))
+            ->getMock();
+        $this->_bot = $this->getMockBuilder('\\Erebot\\Interfaces\\Core')
+            ->setConstructorArgs(array($this->_mainConfig))
+            ->getMock();
+        $this->_connection = $this->getMockBuilder('\\Erebot\\Interfaces\\IrcConnection')
+            ->setConstructorArgs(array($this->_bot, $this->_serverConfig))
+            ->getMock();
     }
 
     public function tearDown()

diff --git a/tests/src/identdTest.php b/tests/src/identdTest.php
@@ -57,8 +57,10 @@ abstract class  AbstractIdentdTest
     public function setUp()
     {
         parent::setUp();
-        $this->_mainConfig = $this->getMock('\\Erebot\\Interfaces\\Config\\Main', array(), array(), '', FALSE, FALSE);
-        $this->_bot = $this->getMock('\\Erebot\\Interfaces\\Core', array(), array($this->_mainConfig), '', FALSE, FALSE);
+        $this->_mainConfig = $this->getMockBuilder('\\Erebot\\Interfaces\\Config\\Main')->getMock();
+        $this->_bot = $this->getMockBuilder('\\Erebot\\Interfaces\\Core')
+            ->setConstructorArgs(array($this->_mainConfig))
+            ->getMock();
 
         // Create two connected stream-oriented TCP sockets.
         // We can't use stream_socket_pair() as it doesn't exist on Windows

diff --git a/tests/src/ircParserTest.php b/tests/src/ircParserTest.php
@@ -22,13 +22,24 @@ class   IrcParserTest
     public function setUp()
     {
         $sxml = new SimpleXMLElement('<foo/>');
-        $this->_mainConfig = $this->getMock('\\Erebot\\Interfaces\\Config\\Main', array(), array(), '', FALSE, FALSE);
-        $this->_networkConfig = $this->getMock('\\Erebot\\Interfaces\\Config\\Network', array(), array($this->_mainConfig, $sxml), '', FALSE, FALSE);
-        $this->_serverConfig = $this->getMock('\\Erebot\\Interfaces\\Config\\Server', array(), array($this->_networkConfig, $sxml), '', FALSE, FALSE);
-        $this->_bot = $this->getMock('\\Erebot\\Interfaces\\Core', array(), array($this->_mainConfig), '', FALSE, FALSE);
-        $this->_connection = $this->getMock('\\Erebot\\Interfaces\\IrcConnection', array(), array($this->_bot, $this->_serverConfig), '', FALSE, FALSE);
-        $this->_event = $this->getMock('\\Erebot\\Interfaces\\Event\\Base\\Generic', array(), array(), '', FALSE, FALSE);
-        $this->_parser = $this->getMock('\\Erebot\\IrcParser', array('makeEvent'), array($this->_connection));
+        $this->_mainConfig = $this->getMockBuilder('\\Erebot\\Interfaces\\Config\\Main')->getMock();
+        $this->_networkConfig = $this->getMockBuilder('\\Erebot\\Interfaces\\Config\\Network')
+            ->setConstructorArgs(array($this->_mainConfig, $sxml))
+            ->getMock();
+        $this->_serverConfig = $this->getMockBuilder('\\Erebot\\Interfaces\\Config\\Server')
+            ->setConstructorArgs(array($this->_networkConfig, $sxml))
+            ->getMock();
+        $this->_bot = $this->getMockBuilder('\\Erebot\\Interfaces\\Core')
+            ->setConstructorArgs(array($this->_mainConfig))
+            ->getMock();
+        $this->_connection = $this->getMockBuilder('\\Erebot\\Interfaces\\IrcConnection')
+            ->setConstructorArgs(array($this->_bot, $this->_serverConfig))
+            ->getMock();
+        $this->_event = $this->getMockBuilder('\\Erebot\\Interfaces\\Event\\Base\\Generic')->getMock();
+        $this->_parser = $this->getMockBuilder('\\Erebot\\IrcParser')
+            ->setMethods(array('makeEvent'))
+            ->setConstructorArgs(array($this->_connection))
+            ->getMock();
     }
 
     /**