Update tests

src/TestSuite/TestCase.php

@@ -11,20 +11,4 @@ abstract class TestCase extends CakeTestCase {
 
 	use ToolsTestTrait;
 
-	/**
-	 * Opposite wrapper method of assertWithinRange().
-	 *
-	 * @param float $result
-	 * @param float $expected
-	 * @param float $margin
-	 * @param string $message
-	 * @return void
-	 */
-	protected static function assertNotWithinRange($expected, $result, $margin, $message = '') {
-		$upper = $result + $margin;
-		$lower = $result - $margin;
-
-		return static::assertTrue((($expected > $upper) || ($expected < $lower)), $message);
-	}
-
 }

tests/TestCase/BootstrapTest.php

@@ -5,7 +5,7 @@ use Cake\Routing\Router;
 use Cake\Controller\Controller;
 use Cake\Network\Request;
 use Cake\Network\Response;
-use Cake\TestSuite\TestCase;
+use Tools\TestSuite\TestCase;
 use Tools\View\RssView;
 
 /**

tests/TestCase/Controller/Component/AuthUserComponentTest.php

@@ -6,7 +6,7 @@ use Tools\Controller\Component\AuthUserComponent;
 use Cake\Controller\Controller;
 use Cake\Core\Configure;
 use Cake\Network\Session;
-use Cake\TestSuite\TestCase;
+use Tools\TestSuite\TestCase;
 use Cake\Network\Request;
 
 /**

tests/TestCase/Controller/Component/CommonComponentTest.php

@@ -9,7 +9,7 @@ use Cake\Core\Configure;
 use Cake\Network\Request;
 use Cake\Network\Session;
 use Cake\Routing\DispatcherFactory;
-use Cake\TestSuite\TestCase;
+use Tools\TestSuite\TestCase;
 
 /**
  */

tests/TestCase/Controller/Component/FlashComponentTest.php

@@ -8,7 +8,7 @@ use Cake\Core\Configure;
 use Cake\Network\Request;
 use Cake\Network\Session;
 use Cake\Routing\DispatcherFactory;
-use Cake\TestSuite\TestCase;
+use Tools\TestSuite\TestCase;
 use Cake\Event\Event;
 
 /**

tests/TestCase/Controller/Component/SessionComponentTest.php

@@ -8,7 +8,7 @@ use Cake\Core\Configure;
 use Cake\Network\Request;
 use Cake\Network\Session;
 use Cake\Routing\DispatcherFactory;
-use Cake\TestSuite\TestCase;
+use Tools\TestSuite\TestCase;
 
 /**
  * SessionComponentTest class

tests/TestCase/Controller/ControllerTest.php

@@ -7,7 +7,7 @@ use Cake\Controller\Component\CommonComponent;
 use Cake\Core\Configure;
 use Cake\Network\Request;
 use Cake\Network\Session;
-use Cake\TestSuite\TestCase;
+use Tools\TestSuite\TestCase;
 use Tools\Controller\Controller;
 
 /**

tests/TestCase/HtmlDom/HtmlDomTest.php

@@ -3,7 +3,7 @@
 namespace Tools\TestCase\HtmlDom;
 
 use Tools\HtmlDom\HtmlDom;
-use Cake\TestSuite\TestCase;
+use Tools\TestSuite\TestCase;
 use Cake\Core\Configure;
 
 class HtmlDomTest extends TestCase {

tests/TestCase/Model/Behavior/BitmaskedBehaviorTest.php

@@ -6,7 +6,7 @@ use Cake\Database\Query;
 use Cake\Event\Event;
 use TestApp\Model\Entity\BitmaskedComment;
 use Cake\ORM\TableRegistry;
-use Cake\TestSuite\TestCase;
+use Tools\TestSuite\TestCase;
 use Cake\Core\Configure;
 use Tools\Model\Behavior\BitmaskedBehavior;
 

tests/TestCase/Model/Behavior/JsonableBehaviorTest.php

@@ -3,7 +3,7 @@
 namespace Tools\Test\TestCase\Model\Behavior;
 
 use Cake\ORM\TableRegistry;
-use Cake\TestSuite\TestCase;
+use Tools\TestSuite\TestCase;
 use Cake\Core\Configure;
 use Tools\Model\Behavior\JsonableBehavior;
 

tests/TestCase/Model/Behavior/PasswordableBehaviorTest.php

@@ -2,7 +2,7 @@
 
 namespace Tools\Model\Behavior;
 
-use Cake\TestSuite\TestCase;
+use Tools\TestSuite\TestCase;
 use Cake\ORM\Behavior;
 use Cake\ORM\Entity;
 use Cake\ORM\Query;

tests/TestCase/Model/Behavior/SluggedBehaviorTest.php

@@ -8,7 +8,7 @@ use Cake\Event\Event;
 use Cake\ORM\Entity;
 use Cake\ORM\Table;
 use Cake\ORM\TableRegistry;
-use Cake\TestSuite\TestCase;
+use Tools\TestSuite\TestCase;
 use Cake\Core\Configure;
 
 /**

tests/TestCase/Utility/LanguageTest.php

@@ -2,7 +2,7 @@
 namespace Tools\TestCase\Utility;
 
 use Tools\Utility\Language;
-use Cake\TestSuite\TestCase;
+use Tools\TestSuite\TestCase;
 
 class LanguageTest extends TestCase {
 

tests/TestCase/Utility/MimeTest.php

@@ -2,7 +2,7 @@
 namespace Tools\TestCase\Utility;
 
 use Tools\Utility\Mime;
-use Cake\TestSuite\TestCase;
+use Tools\TestSuite\TestCase;
 use Cake\Network\Response;
 use Cake\Core\Plugin;
 

tests/TestCase/Utility/NumberTest.php

@@ -3,7 +3,7 @@
 namespace Tools\TestCase\Utility;
 
 use Tools\Utility\Number;
-use Cake\TestSuite\TestCase;
+use Tools\TestSuite\TestCase;
 use Cake\Core\Configure;
 use Cake\I18n\I18n;
 

tests/TestCase/Utility/TextTest.php

@@ -2,7 +2,7 @@
 namespace Tools\TestCase\Utility;
 
 use Tools\Utility\Text;
-use Cake\TestSuite\TestCase;
+use Tools\TestSuite\TestCase;
 
 /**
  */

tests/TestCase/Utility/TimeTest.php

@@ -2,7 +2,7 @@
 
 namespace Tools\TestCase\Utility;
 use Tools\Utility\Time;
-use Cake\TestSuite\TestCase;
+use Tools\TestSuite\TestCase;
 use Tools\Misc\ZodiacLib;
 use Cake\Core\Configure;
 

tests/TestCase/Utility/UtilityTest.php

@@ -1,7 +1,7 @@
 <?php
 namespace Tools\TestCase\Utility;
 use Tools\Utility\Utility;
-use Cake\TestSuite\TestCase;
+use Tools\TestSuite\TestCase;
 use Cake\Core\Plugin;
 use Cake\Core\Configure;
 

tests/TestCase/View/Helper/AuthUserHelperTest.php

@@ -3,7 +3,7 @@ namespace Tools\Test\TestCase\View\Helper;
 
 use Tools\View\Helper\AuthUserHelper;
 use Cake\Core\Configure;
-use Cake\TestSuite\TestCase;
+use Tools\TestSuite\TestCase;
 use Cake\View\View;
 
 /**

tests/TestCase/View/Helper/CookieHelperTest.php

@@ -3,7 +3,7 @@
 namespace Tools\TestCase\View\Helper;
 
 use Tools\View\Helper\CookieHelper;
-use Cake\TestSuite\TestCase;
+use Tools\TestSuite\TestCase;
 use Cake\View\View;
 use Cake\ORM\Entity;
 use Cake\ORM\Table;

tests/TestCase/View/Helper/JsHelperTest.php

@@ -3,7 +3,7 @@
 namespace Tools\TestCase\View\Helper;
 
 use Tools\View\Helper\JsHelper;
-use Cake\TestSuite\TestCase;
+use Tools\TestSuite\TestCase;
 use Cake\View\View;
 use Cake\ORM\TableRegistry;
 use Cake\Datasource\ConnectionManager;

tests/TestCase/View/Helper/NumberHelperTest.php

@@ -2,7 +2,7 @@
 namespace Tools\TestCase\View\Helper;
 
 use Tools\View\Helper\NumberHelper;
-use Cake\TestSuite\TestCase;
+use Tools\TestSuite\TestCase;
 use Cake\View\View;
 use Cake\Core\Configure;
 use Tools\Utility\Number;

tests/TestCase/View/Helper/ObsfuscateHelperTest.php

@@ -3,7 +3,7 @@
 namespace Tools\TestCase\View\Helper;
 
 use Tools\View\Helper\ObfuscateHelper;
-use Cake\TestSuite\TestCase;
+use Tools\TestSuite\TestCase;
 use Cake\View\View;
 use Cake\Core\Configure;
 

tests/TestCase/View/Helper/TimelineHelperTest.php

@@ -2,7 +2,7 @@
 namespace Tools\TestCase\View\Helper;
 
 use Tools\View\Helper\TimelineHelper;
-use Cake\TestSuite\TestCase;
+use Tools\TestSuite\TestCase;
 use Cake\View\View;
 use Cake\Core\Configure;
 

tests/TestCase/View/Helper/TreeHelperTest.php

@@ -3,7 +3,7 @@
 namespace Tools\TestCase\View\Helper;
 
 use Tools\View\Helper\TreeHelper;
-use Cake\TestSuite\TestCase;
+use Tools\TestSuite\TestCase;
 use Cake\View\View;
 use Cake\ORM\Entity;
 use Cake\ORM\Table;

tests/TestCase/View/RssViewTest.php

@@ -15,7 +15,7 @@ use Cake\Routing\Router;
 use Cake\Controller\Controller;
 use Cake\Network\Request;
 use Cake\Network\Response;
-use Cake\TestSuite\TestCase;
+use Tools\TestSuite\TestCase;
 use Tools\View\RssView;
 
 /**