test: refactor deprecated tests

4 files changed, 6 insertions, 8 deletions

diff --git a/tests/unit/NewContentContainerTest.php b/tests/unit/NewContentContainerTest.php
index 7773a88..8250fd1 100644
--- a/tests/unit/NewContentContainerTest.php
+++ b/tests/unit/NewContentContainerTest.php
@@ -4,7 +4,6 @@ namespace OCA\OJSXC;
 
 use OCA\OJSXC\Db\Message;
 use OCA\OJSXC\Db\Stanza;
-//use PHPUnit_Framework_TestCase;
 use PHPUnit\Framework\TestCase;
 
 class NewContentContainerTest extends TestCase
diff --git a/tests/unit/http/XMPPResponseTest.php b/tests/unit/http/XMPPResponseTest.php
index a1fb2e4..a0c00ac 100644
--- a/tests/unit/http/XMPPResponseTest.php
+++ b/tests/unit/http/XMPPResponseTest.php
@@ -5,7 +5,6 @@ namespace OCA\OJSXC\Http {
 	use OCA\OJSXC\Db\Message;
 	use OCA\OJSXC\Db\Stanza;
 	use PHPUnit\Framework\TestCase;
-	use PHPUnit_Framework_TestCase;
 
 	class XMPPResponseTest extends TestCase
 	{
diff --git a/tests/unit/stanzahandlers/IQTest.php b/tests/unit/stanzahandlers/IQTest.php
index e948237..37c10e4 100644
--- a/tests/unit/stanzahandlers/IQTest.php
+++ b/tests/unit/stanzahandlers/IQTest.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace OCA\OJSXC\StanzaHandlers;
+namespace OCA\OJSXC\Tests\Unit\StanzaHandlers;
 
 use OCA\OJSXC\Db\IQRoster;
 use OCA\OJSXC\Exceptions\TerminateException;
 use OCA\OJSXC\IUserProvider;
+use OCA\OJSXC\StanzaHandlers\IQ;
 use OCA\OJSXC\User;
 use OCP\IConfig;
 use PHPUnit\Framework\TestCase;
 use OCP\IUserManager;
 use PHPUnit_Framework_MockObject_MockObject;
-use PHPUnit_Framework_TestCase;
 
 class IQTest extends TestCase
 {
@@ -50,9 +50,10 @@ class IQTest extends TestCase
 	{
 		$this->host = 'localhost';
 		$this->userId = 'john';
-		$this->userManager = $this->getMockBuilder('OCP\IUserManager')->disableOriginalConstructor()->getMock();
-		$this->config = $this->getMockBuilder('OCP\IConfig')->disableOriginalConstructor()->getMock();
-		$this->userProvider = $this->getMockBuilder('OCA\OJSXC\IUserProvider')->disableOriginalConstructor()->getMock();
+		$this->userManager = $this->getMockBuilder(IUserManager::class)->getMock();
+		$this->config = $this->getMockBuilder(IConfig::class)->getMock();
+		$this->userProvider = $this->getMockBuilder(IUserProvider::class)->getMock();
+
 		$this->iq = new IQ($this->userId, $this->host, $this->userManager, $this->config, $this->userProvider);
 	}
 
diff --git a/tests/unit/stanzahandlers/MessageTest.php b/tests/unit/stanzahandlers/MessageTest.php
index 768f794..4191180 100644
--- a/tests/unit/stanzahandlers/MessageTest.php
+++ b/tests/unit/stanzahandlers/MessageTest.php
@@ -7,7 +7,6 @@ use PHPUnit\Framework\TestCase;
 use OCA\OJSXC\Db\MessageMapper;
 use OCA\OJSXC\IUserProvider;
 use OCP\ILogger;
-use PHPUnit_Framework_TestCase;
 use PHPUnit_Framework_MockObject_MockObject;
 
 class MessageTest extends TestCase