adjust test cases

Test/Case/Controller/Component/AutoLoginComponentTest.php

@@ -1,6 +1,6 @@
 <?php
 
-App::import('Component', 'Tools.AutoLogin');
+App::uses('AutoLoginComponent', 'Tools.Controller/Component');
 App::uses('Controller', 'Controller');
 
 /**

Test/Case/Controller/Component/CalendarComponentTest.php

@@ -1,6 +1,6 @@
 <?php
 
-App::import('Component', 'Tools.Calendar');
+App::uses('CalendarComponent', 'Tools.Controller/Component');
 App::uses('MyCakeTestCase', 'Tools.Lib');
 
 class CalendarComponentTest extends MyCakeTestCase {

Test/Case/Controller/Component/CommonComponentTest.php

@@ -1,6 +1,6 @@
 <?php
 
-App::import('Component', 'Tools.Common');
+App::uses('CommonComponent', 'Tools.Controller/Component');
 App::uses('Component', 'Controller');
 App::uses('AppController', 'Controller');
 

Test/Case/View/Helper/CaptchaHelperTest.php

@@ -1,7 +1,7 @@
 <?php
 
-App::import('Helper', 'Tools.Captcha');
-App::import('Helper', 'Html');
+App::uses('CaptchaHelper', 'Tools.View/Helper');
+App::uses('HtmlHelper', 'View/Helper');
 App::uses('View', 'View');
 App::uses('Controller', 'Controller');
 

Test/Case/View/Helper/CommonHelperTest.php

@@ -1,6 +1,6 @@
 <?php
 
-App::import('Helper', 'Tools.Common');
+App::uses('CommonHelper', 'Tools.View/Helper');
 App::uses('View', 'View');
 App::uses('MyCakeTestCase', 'Tools.Lib');
 

Test/Case/View/Helper/DatetimeHelperTest.php

@@ -1,6 +1,6 @@
 <?php
 
-App::import('Helper', 'Tools.Datetime');
+App::uses('DatetimeHelper', 'Tools.View/Helper');
 App::uses('MyCakeTestCase', 'Tools.Lib');
 App::uses('View', 'View');
 

Test/Case/View/Helper/FlattrHelperTest.php

@@ -1,7 +1,7 @@
 <?php
 
-App::import('Helper', 'Tools.Flattr');
-App::import('Helper', 'Html');
+App::uses('FlattrHelper', 'Tools.View/Helper');
+App::uses('HtmlHelper', 'View/Helper');
 App::uses('MyCakeTestCase', 'Tools.Lib');
 App::uses('View', 'View');
 

Test/Case/View/Helper/FormExtHelperTest.php

@@ -1,6 +1,6 @@
 <?php
 
-App::import('Helper', 'Tools.FormExt');
+App::uses('FormExtHelper', 'Tools.View/Helper');
 App::uses('MyCakeTestCase', 'Tools.Lib');
 App::uses('View', 'View');
 

Test/Case/View/Helper/FormatHelperTest.php

@@ -1,8 +1,8 @@
 <?php
 
-App::import('Helper', 'Tools.Format');
+App::uses('FormatHelper', 'Tools.View/Helper');
 App::uses('MyCakeTestCase', 'Tools.Lib');
-App::import('Helper', 'Html');
+App::uses('HtmlHelper', 'View/Helper');
 App::uses('View', 'View');
 
 /**

Test/Case/View/Helper/IcalHelperTest.php

@@ -1,6 +1,6 @@
 <?php
 
-App::import('Helper', 'Tools.Ical');
+App::uses('IcalHelper', 'Tools.View/Helper');
 App::uses('MyCakeTestCase', 'Tools.Lib');
 App::uses('String', 'Utility');
 App::uses('View', 'View');

Test/Case/View/Helper/NumericHelperTest.php

@@ -1,6 +1,6 @@
 <?php
 
-App::import('Helper', 'Tools.Numeric');
+App::uses('NumericHelper', 'Tools.View/Helper');
 App::uses('MyCakeTestCase', 'Tools.Lib');
 App::uses('View', 'View');
 /**

Test/Case/View/Helper/QrCodeHelperTest.php

@@ -8,8 +8,8 @@ if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) {
 define('QR_TEST_STRING', 'Some Text to Translate');
 define('QR_TEST_STRING_UTF', 'Some äöü Test String with $ and @ etc');
 
-App::import('Helper', 'Html');
-App::import('Helper', 'Tools.QrCode');
+App::uses('HtmlHelper', 'View/Helper');
+App::uses('QrCodeHelper', 'Tools.View/Helper');
 App::uses('View', 'View');
 App::uses('MyCakeTestCase', 'Tools.Lib');
 

Test/Case/View/Helper/TextExtHelperTest.php

@@ -1,6 +1,6 @@
 <?php
 
-App::import('Helper', 'Tools.TextExt');
+App::uses('TextExtHelper', 'Tools.View/Helper');
 App::uses('MyCakeTestCase', 'Tools.Lib');
 
 class TextExtHelperTest extends MyCakeTestCase {