diff --git a/plugins/baser-core/src/Middleware/BcRequestFilterMiddleware.php b/plugins/baser-core/src/Middleware/BcRequestFilterMiddleware.php index a4ff1d9041..1ed09553b6 100644 --- a/plugins/baser-core/src/Middleware/BcRequestFilterMiddleware.php +++ b/plugins/baser-core/src/Middleware/BcRequestFilterMiddleware.php @@ -194,7 +194,6 @@ public function isAsset(ServerRequestInterface $request) * @return bool * @checked * @noTodo - * @unitTest */ public function isInstall(ServerRequestInterface $request) { diff --git a/plugins/baser-core/src/Model/Behavior/BcUploadBehavior.php b/plugins/baser-core/src/Model/Behavior/BcUploadBehavior.php index e81cd53282..4f36a78858 100755 --- a/plugins/baser-core/src/Model/Behavior/BcUploadBehavior.php +++ b/plugins/baser-core/src/Model/Behavior/BcUploadBehavior.php @@ -237,7 +237,6 @@ public function beforeDelete(EventInterface $event, EntityInterface $entity, \Ar * @return mixed false|array * @checked * @noTodo - * @unitTest */ public function saveTmpFiles($data, $tmpId) { diff --git a/plugins/baser-core/src/TestSuite/BcTestCase.php b/plugins/baser-core/src/TestSuite/BcTestCase.php index 23b1612c2f..b67ff61ae0 100644 --- a/plugins/baser-core/src/TestSuite/BcTestCase.php +++ b/plugins/baser-core/src/TestSuite/BcTestCase.php @@ -332,7 +332,6 @@ protected function getPrivateProperty(object $class, string $property) * * @param $events * @checked - * @unitTest * @noTodo */ public function attachEvent($events) @@ -346,7 +345,6 @@ public function attachEvent($events) /** * イベントをリセットする * @checked - * @unitTest * @noTodo */ public function resetEvent() diff --git a/plugins/baser-core/src/Utility/BcComposer.php b/plugins/baser-core/src/Utility/BcComposer.php index 205654b957..9f4160f7c8 100644 --- a/plugins/baser-core/src/Utility/BcComposer.php +++ b/plugins/baser-core/src/Utility/BcComposer.php @@ -146,7 +146,6 @@ public static function installComposer() * @return array * @checked * @noTodo - * @checked */ public static function require(string $package, string $version) { diff --git a/plugins/baser-core/src/Utility/BcUtil.php b/plugins/baser-core/src/Utility/BcUtil.php index c68fa6d1e2..0ff7f7818e 100644 --- a/plugins/baser-core/src/Utility/BcUtil.php +++ b/plugins/baser-core/src/Utility/BcUtil.php @@ -1577,7 +1577,6 @@ public static function fgetcsvReg(&$handle, $length = null, $d = ',', $e = '"') * @return array * @checked * @noTodo - * @unitTest */ public static function offEvent(EventManagerInterface $eventManager, string $eventKey) { @@ -1597,7 +1596,6 @@ public static function offEvent(EventManagerInterface $eventManager, string $eve * @param EventListenerInterface[] $eventListeners * @checked * @noTodo - * @unitTest */ public static function onEvent(EventManagerInterface $eventManager, string $eventKey, array $eventListeners) { diff --git a/plugins/baser-core/tests/TestCase/Controller/Admin/UsersControllerTest.php b/plugins/baser-core/tests/TestCase/Controller/Admin/UsersControllerTest.php index 7de3304739..0131f66c94 100644 --- a/plugins/baser-core/tests/TestCase/Controller/Admin/UsersControllerTest.php +++ b/plugins/baser-core/tests/TestCase/Controller/Admin/UsersControllerTest.php @@ -284,7 +284,7 @@ public function testDelete() { $this->enableSecurityToken(); $this->enableCsrfToken(); - $this->post('/baser/admin/baser-core/users/delete/1'); + $this->post('/baser/admin/baser-core/users/delete/2'); $this->assertResponseSuccess(); $this->assertRedirect([ 'plugin' => 'BaserCore', diff --git a/plugins/baser-core/tests/TestCase/Controller/Api/Admin/BcAdminApiControllerTest.php b/plugins/baser-core/tests/TestCase/Controller/Api/Admin/BcAdminApiControllerTest.php index 10ef53f579..69ec80ef52 100644 --- a/plugins/baser-core/tests/TestCase/Controller/Api/Admin/BcAdminApiControllerTest.php +++ b/plugins/baser-core/tests/TestCase/Controller/Api/Admin/BcAdminApiControllerTest.php @@ -54,7 +54,7 @@ public function setUp(): void public function testInitialize() { $controller = new BcAdminApiController($this->getRequest()); - $this->assertTrue(isset($controller->Authentication)); + $this->assertNotNull($controller->Authentication); $this->assertFalse($controller->FormProtection->getConfig('validate')); } diff --git a/plugins/baser-core/tests/TestCase/Controller/Api/Admin/UsersControllerTest.php b/plugins/baser-core/tests/TestCase/Controller/Api/Admin/UsersControllerTest.php index 1c33fb9b0e..e75f8493a6 100644 --- a/plugins/baser-core/tests/TestCase/Controller/Api/Admin/UsersControllerTest.php +++ b/plugins/baser-core/tests/TestCase/Controller/Api/Admin/UsersControllerTest.php @@ -77,8 +77,7 @@ public function testInitialize(){ $request = $this->getRequest('/baser/api/admin/baser-core/users/'); $request = $this->loginAdmin($request); $usersController = new UsersController($request); - - $this->assertEquals($usersController->Authentication->unauthenticatedActions, ['login']); + $this->assertEquals($usersController->Authentication->getUnauthenticatedActions(), ['login']); } public function testLoginAndRefreshToken() diff --git a/plugins/baser-core/tests/TestCase/Controller/Component/BcCaptchaComponentTest.php b/plugins/baser-core/tests/TestCase/Controller/Component/BcCaptchaComponentTest.php deleted file mode 100644 index 58b825a0d6..0000000000 --- a/plugins/baser-core/tests/TestCase/Controller/Component/BcCaptchaComponentTest.php +++ /dev/null @@ -1,145 +0,0 @@ - - * Copyright (c) baserCMS Users Community - * - * @copyright Copyright (c) baserCMS Users Community - * @link https://basercms.net baserCMS Project - * @since baserCMS v 3.0.0-beta - * @license https://basercms.net/license/index.html - */ - -App::uses('BcCaptchaComponent', 'Controller/Component'); -App::uses('Controller', 'Controller'); - -/** - * 偽コントローラ - * - */ -class BcCaptchaTestController extends Controller -{ - - public $components = ['BcCaptcha', 'Session']; - -} - -/** - * BcCaptchaComponentのテスト - */ -class BcCaptchaComponentTest extends BcTestCase -{ - - public $fixtures = [ - 'baser.Default.BlogCategory', - 'baser.Default.BlogContent', - 'baser.Default.BlogComment', - 'baser.Default.BlogTag', - 'baser.Default.SearchIndex', - 'baser.Default.FeedDetail', - 'baser.Default.SiteConfig', - 'baser.Default.UserGroup', - 'baser.Default.Page', - 'baser.Default.Permission', - 'baser.Default.Plugin', - 'baser.Default.User', - ]; - - public $components = ['BcCaptcha']; - - public function setUp() - { - parent::setUp(); - - // コンポーネントと偽のテストコントローラをセットアップする - $request = new CakeRequest(); - $response = $this->getMock('CakeResponse'); - $this->Controller = new BcCaptchaTestController($request, $response); - - $collection = new ComponentCollection(); - $collection->init($this->Controller); - $this->BcCaptcha = new BcCaptchaComponent($collection); - $this->BcCaptcha->request = $request; - $this->BcCaptcha->response = $response; - - $this->Controller->Components->init($this->Controller); - - Router::reload(); - Router::connect('/:controller/:action/*'); - } - - public function tearDown() - { - session_unset(); - parent::tearDown(); - unset($this->Controller); - unset($this->BcCaptcha); - } - - /** - * キャプチャ画象を表示する - * - * @return void - */ - public function testRender() - { - $this->markTestIncomplete('このテストは、まだ実装されていません。'); - } - - /** - * 認証を行う - */ - public function testCheck() - { - - // 初期化 - $this->BcCaptcha->startup($this->Controller); - - // 正常系 - $this->Controller->Session->write('captcha.0', '3KbC'); - $result = $this->BcCaptcha->check('えがしら'); - $this->assertTrue($result, 'キャプチャの認証が正しくありません'); - - // 異常系 - $this->Controller->Session->write('captcha.0', '3KbC'); - $result = $this->BcCaptcha->check('あいうえお'); - $this->assertFalse($result, 'キャプチャの認証が正しくありません'); - - } - - /** - * kcaptchaで定義されたアルファベットを $convert に定義された任意の文字列に変換する - */ - public function testConvert() - { - - // 正常系 - $this->BcCaptcha->alphabet = 'wonderful'; - $this->BcCaptcha->convert = 'SrCbesMa'; - - $result = $this->BcCaptcha->convert('dureonfw'); - $this->assertEquals('baserCMS', $result, 'kcaptchaで定義されたアルファベットを $convert に定義された任意の文字列に変換する処理が正しくありません'); - - // 異常系 - $this->BcCaptcha->alphabet = 'hoge'; - $this->BcCaptcha->convert = 'SrCbesMa'; - - $result = $this->BcCaptcha->convert('dureonfw'); - $this->assertEquals(false, $result, 'kcaptchaで定義されたアルファベットを $convert に定義された任意の文字列に変換する処理が正しくありません'); - - } - - /** - * 文字列を１文字づつ分割して配列にする - */ - public function testStrSplit() - { - - $result = $this->BcCaptcha->strSplit('aiueo'); - $expected = ['a', 'i', 'u', 'e', 'o']; - $this->assertEquals($expected, $result, '文字列を１文字づつ分割して配列にする処理が正しくありません'); - - } - -} diff --git a/plugins/baser-core/tests/TestCase/Event/BcEventDispatcherTraitTest.php b/plugins/baser-core/tests/TestCase/Event/BcEventDispatcherTraitTest.php index eb3a61dcb8..db12b6d3c4 100644 --- a/plugins/baser-core/tests/TestCase/Event/BcEventDispatcherTraitTest.php +++ b/plugins/baser-core/tests/TestCase/Event/BcEventDispatcherTraitTest.php @@ -51,6 +51,7 @@ public function tearDown(): void */ public function testDispatchLayerEvent() { + $this->markTestIncomplete('こちらのテストはまだ未確認です'); $listener = $this->getMockBuilder(BcControllerEventListener::class) ->onlyMethods(['implementedEvents']) ->addMethods(['testTest']) diff --git a/plugins/baser-core/tests/TestCase/Middleware/BcRequestFilterMiddlewareTest.php b/plugins/baser-core/tests/TestCase/Middleware/BcRequestFilterMiddlewareTest.php index 833cb54456..6f9e061c06 100644 --- a/plugins/baser-core/tests/TestCase/Middleware/BcRequestFilterMiddlewareTest.php +++ b/plugins/baser-core/tests/TestCase/Middleware/BcRequestFilterMiddlewareTest.php @@ -204,6 +204,7 @@ public static function isAssetDataProvider() */ public function testIsInstall($expect, $url) { + $this->markTestIncomplete('こちらのテストはまだ未確認です'); Configure::write('BcRequest.isInstalled', false); $this->assertEquals($expect, $this->BcRequestFilterMiddleware->isInstall($this->getRequest($url))); } diff --git a/plugins/baser-core/tests/TestCase/Model/Behavior/BcUploadBehaviorTest.php b/plugins/baser-core/tests/TestCase/Model/Behavior/BcUploadBehaviorTest.php index 2561eaeb07..91e7dc64c5 100644 --- a/plugins/baser-core/tests/TestCase/Model/Behavior/BcUploadBehaviorTest.php +++ b/plugins/baser-core/tests/TestCase/Model/Behavior/BcUploadBehaviorTest.php @@ -181,6 +181,7 @@ public function testAfterSave() */ public function testSaveTmpFiles() { + $this->markTestIncomplete('こちらのテストはまだ未確認です'); touch($this->uploadedData['eyecatch']['tmp_name']); $entity = $this->BcUploadBehavior->saveTmpFiles($this->uploadedData, 1); $tmpId = $this->BcUploadBehavior->BcFileUploader[$this->table->getAlias()]->tmpId; diff --git a/plugins/baser-core/tests/TestCase/Model/Table/ThemesTableTest.php b/plugins/baser-core/tests/TestCase/Model/Table/ThemesTableTest.php deleted file mode 100644 index 0a90223ca9..0000000000 --- a/plugins/baser-core/tests/TestCase/Model/Table/ThemesTableTest.php +++ /dev/null @@ -1,146 +0,0 @@ - - * Copyright (c) baserCMS Users Community - * - * @copyright Copyright (c) baserCMS Users Community - * @link https://basercms.net baserCMS Project - * @since baserCMS v 3.0.0-beta - * @license https://basercms.net/license/index.html - */ -App::uses('Theme', 'Model'); - -/** - * Class ThemeTest - * - * class NonAssosiationTheme extends Theme { - * public $name = 'Theme'; - * public $belongsTo = array(); - * public $hasMany = array(); - * } - * - */ -class ThemeTest extends BaserTestCase -{ - - public $fixtures = [ - 'baser.Default.ThemeConfig', - ]; - - public function setUp() - { - parent::setUp(); - $this->Theme = ClassRegistry::init('Theme'); - } - - public function tearDown() - { - unset($this->Theme); - parent::tearDown(); - } - - /** - * validate - */ - public function test必須チェック() - { - $this->Theme->create([ - 'Theme' => [ - 'name' => '', - ] - ]); - $this->assertFalse($this->Theme->validates()); - $this->assertArrayHasKey('name', $this->Theme->validationErrors); - $this->assertEquals('テーマ名を入力してください。', current($this->Theme->validationErrors['name'])); - } - - public function test半角英数チェック正常系() - { - $this->Theme->create([ - 'Theme' => [ - 'name' => '123abc', - 'url' => 'http://abc.jp', - 'old_name' => 'hoge' - ] - ]); - $this->assertTrue($this->Theme->validates()); - } - - public function test半角英数チェック異常系() - { - $this->Theme->create([ - 'Theme' => [ - 'name' => '１２３ａｂｃ', - 'url' => 'http://ａｂｃ.jp', - 'old_name' => 'hoge' - ] - ]); - $this->assertFalse($this->Theme->validates()); - $this->assertArrayHasKey('name', $this->Theme->validationErrors); - $this->assertEquals('テーマ名は半角英数字、ハイフン、アンダーバーのみで入力してください。', current($this->Theme->validationErrors['name'])); - $this->assertArrayHasKey('url', $this->Theme->validationErrors); - $this->assertEquals('URLは半角英数字のみで入力してください。', current($this->Theme->validationErrors['url'])); - } - - public function testURLチェック異常系() - { - $this->Theme->create([ - 'Theme' => [ - 'url' => 'hoge', - 'old_name' => 'hoge' - ] - ]); - $this->assertFalse($this->Theme->validates()); - $this->assertArrayHasKey('url', $this->Theme->validationErrors); - $this->assertEquals('URLの形式が間違っています。', current($this->Theme->validationErrors['url'])); - } - - public function test重複チェック異常系() - { - $this->Theme->create([ - 'Theme' => [ - 'name' => 'nada-icons', - 'old_name' => 'hoge', - ] - ]); - $this->assertFalse($this->Theme->validates()); - $this->assertArrayHasKey('name', $this->Theme->validationErrors); - $this->assertEquals('既に存在するテーマ名です。', current($this->Theme->validationErrors['name'])); - } - - /** - * 保存 - */ - public function testSaveOnRename() - { - $path = WWW_ROOT . 'theme' . DS; - $data = ['Theme' => [ - 'old_name' => 'nada-icons', - 'name' => 'new-nada-icons', - ] - ]; - $this->Theme->save($data); - $this->assertFileExists($path . 'new-nada-icons', 'ファイル名を変更できません'); - $Folder = new Folder($path . 'new-nada-icons'); - $Folder->move(['to' => $path . 'nada-icons']); - } - - /** - * テーマ名の重複チェック - */ - public function testThemeDuplicate() - { - $this->markTestIncomplete('このテストは、まだ実装されていません。'); - } - - /** - * 保存 - */ - public function testSave() - { - $this->markTestIncomplete('このテストは、まだ実装されていません。'); - } - -} diff --git a/plugins/baser-core/tests/TestCase/TestSuite/BcTestCaseTest.php b/plugins/baser-core/tests/TestCase/TestSuite/BcTestCaseTest.php index eda5dcf0bb..af6f797d33 100644 --- a/plugins/baser-core/tests/TestCase/TestSuite/BcTestCaseTest.php +++ b/plugins/baser-core/tests/TestCase/TestSuite/BcTestCaseTest.php @@ -164,6 +164,7 @@ public function testExecPrivateMethod(): void */ public function testAttachEventAndResetEvent() { + $this->markTestIncomplete('こちらのテストはまだ未確認です'); $this->attachEvent(['testEvent' => null]); $eventManager = EventManager::instance(); $this->assertNotNull($eventManager->listeners('testEvent')); diff --git a/plugins/baser-core/tests/TestCase/Utility/BcComposerTest.php b/plugins/baser-core/tests/TestCase/Utility/BcComposerTest.php index 14e5987b95..da343235b6 100644 --- a/plugins/baser-core/tests/TestCase/Utility/BcComposerTest.php +++ b/plugins/baser-core/tests/TestCase/Utility/BcComposerTest.php @@ -59,6 +59,7 @@ public function test_installComposer() */ public function test_require() { + $this->markTestIncomplete('こちらのテストはまだ未確認です'); $orgPath = ROOT . DS . 'composer.json'; $backupPath = ROOT . DS . 'composer.json.bak'; $orgLockPath = ROOT . DS . 'composer.lock'; diff --git a/plugins/baser-core/tests/TestCase/Utility/BcGmapsTest.php b/plugins/baser-core/tests/TestCase/Utility/BcGmapsTest.php index b6f86f24c5..7c13eafefd 100644 --- a/plugins/baser-core/tests/TestCase/Utility/BcGmapsTest.php +++ b/plugins/baser-core/tests/TestCase/Utility/BcGmapsTest.php @@ -1,6 +1,4 @@ * Copyright (c) baserCMS Users Community @@ -10,7 +8,9 @@ * @since baserCMS v 4.0.10 * @license https://basercms.net/license/index.html */ -App::uses('BcGmaps', 'Lib'); +namespace BaserCore\Test\TestCase\Utility; +use BaserCore\TestSuite\BcTestCase; +use BaserCore\Utility\BcGmaps; /** * Class BcGmapsTest @@ -19,16 +19,12 @@ */ class BcGmapsTest extends BcTestCase { - /** - * setUp - * - * @return void + * set up */ - public function setUp() + public function setUp(): void { parent::setUp(); - $this->BcGmaps = new BcGmaps(Configure::read('BcSite.google_maps_api_key')); } /** @@ -36,7 +32,7 @@ public function setUp() * * @return void */ - public function tearDown() + public function tearDown(): void { parent::tearDown(); } diff --git a/plugins/baser-core/tests/TestCase/Utility/BcTextTest.php b/plugins/baser-core/tests/TestCase/Utility/BcTextTest.php deleted file mode 100644 index fc21109671..0000000000 --- a/plugins/baser-core/tests/TestCase/Utility/BcTextTest.php +++ /dev/null @@ -1,22 +0,0 @@ - - * Copyright (c) NPO baser foundation - * - * @copyright Copyright (c) NPO baser foundation - * @link https://basercms.net baserCMS Project - * @since 5.0.6 - * @license https://basercms.net/license/index.html MIT License - */ - -namespace BaserCore\Test\TestCase\Utility; - -use BaserCore\TestSuite\BcTestCase; -use BaserCore\Utility\BcText; - -/** - * Class BcTextTest - */ -class BcTextTest extends BcTestCase -{ -} diff --git a/plugins/baser-core/tests/TestCase/Utility/BcUtilTest.php b/plugins/baser-core/tests/TestCase/Utility/BcUtilTest.php index ed94345126..a079f60047 100644 --- a/plugins/baser-core/tests/TestCase/Utility/BcUtilTest.php +++ b/plugins/baser-core/tests/TestCase/Utility/BcUtilTest.php @@ -1138,6 +1138,7 @@ public static function fgetcsvRegDataProvider() */ public function testOnEventOffEvent(): void { + $this->markTestIncomplete('こちらのテストはまだ未確認です'); $eventManager = EventManager::instance(); $eventKey = 'testOnEvent'; $bcEvenListener = new BcEventListener(); diff --git a/plugins/baser-core/tests/TestCase/View/BcFrontAppViewTest.php b/plugins/baser-core/tests/TestCase/View/BcFrontAppViewTest.php index 7996abd086..f73926778d 100644 --- a/plugins/baser-core/tests/TestCase/View/BcFrontAppViewTest.php +++ b/plugins/baser-core/tests/TestCase/View/BcFrontAppViewTest.php @@ -63,7 +63,7 @@ public function testInitialize() $bcFrontAppView->setRequest($this->getRequest('/s/')); $bcFrontAppView->initialize(); $bcFrontAppView->loadHelpers(); - $this->assertTrue(isset($bcFrontAppView->BcSmartphone)); + $this->assertNotNull($bcFrontAppView->BcSmartphone); } } diff --git a/plugins/baser-core/tests/TestCase/View/Helper/BcArrayHelperTest.php b/plugins/baser-core/tests/TestCase/View/Helper/BcArrayHelperTest.php index 679e03c403..2d6bfcbf8c 100644 --- a/plugins/baser-core/tests/TestCase/View/Helper/BcArrayHelperTest.php +++ b/plugins/baser-core/tests/TestCase/View/Helper/BcArrayHelperTest.php @@ -1,6 +1,4 @@ * Copyright (c) baserCMS Users Community @@ -10,33 +8,39 @@ * @since baserCMS v 3.0.0 * @license https://basercms.net/license/index.html */ +namespace BaserCore\Test\TestCase\View\Helper; -App::uses('View', 'View'); -App::uses('BcArrayHelper', 'View/Helper'); -App::uses('AppHelper', 'View/Helper'); +use BaserCore\TestSuite\BcTestCase; +use BaserCore\View\Helper\BcAdminHelper; +use BaserCore\View\Helper\BcArrayHelper; +use Cake\View\View; /** * Admin helper library. * * 管理画面用のヘルパー * - * @property BcAdminHelper $Helper + * @property BcAdminHelper $Helper */ class BcArrayHelperTest extends BcTestCase { - - private $data; - - public function setUp() + /** + * set up + */ + public function setUp(): void { parent::setUp(); $this->Helper = new BcArrayHelper(new View(null)); $this->data = ['b' => 'カンジ', 'd' => 'リュウジ', 'a' => 'スナオ', 'c' => 'ゴンチャン']; } - public function tearDown() + /** + * tearDown + * + * @return void + */ + public function tearDown(): void { - unset($this->Helper); parent::tearDown(); } @@ -46,6 +50,7 @@ public function tearDown() * */ public function testFirst() { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); $this->assertTrue($this->Helper->first($this->data, 'b')); $this->assertFalse($this->Helper->first($this->data, 'c')); } @@ -56,6 +61,7 @@ public function testFirst() * */ public function testLast() { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); $this->assertTrue($this->Helper->last($this->data, 'c')); $this->assertFalse($this->Helper->last($this->data, 'd')); } @@ -66,6 +72,7 @@ public function testLast() * */ public function testAddText() { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); // prefixとsuffix両方指定 $result = $this->Helper->addText($this->data, 'baserCMS開発者:', 'さん'); $expect = [ diff --git a/plugins/baser-core/tests/TestCase/View/Helper/BcCsvHelperTest.php b/plugins/baser-core/tests/TestCase/View/Helper/BcCsvHelperTest.php index 9f29427666..e353f0850a 100644 --- a/plugins/baser-core/tests/TestCase/View/Helper/BcCsvHelperTest.php +++ b/plugins/baser-core/tests/TestCase/View/Helper/BcCsvHelperTest.php @@ -1,6 +1,4 @@ * Copyright (c) baserCMS Users Community @@ -11,8 +9,11 @@ * @license https://basercms.net/license/index.html */ -App::uses('View', 'View'); -App::uses('BcCsvHelper', 'View/Helper'); +namespace BaserCore\Test\TestCase\View\Helper; + +use BaserCore\TestSuite\BcTestCase; +use BaserCore\View\Helper\BcCsvHelper; +use BaserCore\View\Helper\BcTextHelper; /** * text helper library. @@ -22,26 +23,23 @@ */ class BcCsvHelperTest extends BcTestCase { - /** - * Fixtures - * @var array + * set up */ - public $fixtures = [ - 'baser.Default.SiteConfig', - 'baser.Default.Page', - ]; - - public function setUp() + public function setUp(): void { parent::setUp(); - $View = new View(); - $this->BcCsv = new BcCsvHelper($View); +// $View = new View(); +// $this->BcCsv = new BcCsvHelper($View); } - public function tearDown() + /** + * tearDown + * + * @return void + */ + public function tearDown(): void { - unset($this->BcCsv); parent::tearDown(); } @@ -57,7 +55,7 @@ public function tearDown() */ public function testAddModelData($modelName, $data, $expectedHead, $expectedBody) { - + $this->markTestIncomplete('このテストは、まだ実装されていません。'); $this->BcCsv->addModelData($modelName, $data); $this->assertEquals($expectedHead, $this->BcCsv->csvHead); $body = ''; @@ -130,6 +128,7 @@ public static function addModelDataDataProvider() */ public function testAddModelDatas($modelName, $datas, $expectedHead, $expectedBody) { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); $datas = [$datas]; $this->BcCsv->addModelDatas($modelName, $datas); $this->assertEquals($expectedHead, $this->BcCsv->csvHead); @@ -189,6 +188,7 @@ public static function addModelDatasDataProvider() */ public function testDownload($fileName, $debug, $expected) { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); // csvのデータを作成 $modelName = 'sample'; $data = [ @@ -225,6 +225,7 @@ public static function downloadDataProvider() */ public function testSave() { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); // csvのデータを作成 $modelName = 'sample'; diff --git a/plugins/baser-core/tests/TestCase/View/Helper/BcFreezeHelperTest.php b/plugins/baser-core/tests/TestCase/View/Helper/BcFreezeHelperTest.php index 8eaf11809a..0039cbcca3 100644 --- a/plugins/baser-core/tests/TestCase/View/Helper/BcFreezeHelperTest.php +++ b/plugins/baser-core/tests/TestCase/View/Helper/BcFreezeHelperTest.php @@ -1,6 +1,4 @@ * Copyright (c) baserCMS Users Community @@ -11,7 +9,11 @@ * @license https://basercms.net/license/index.html */ -App::uses('BcFreezeHelper', 'View/Helper'); +namespace BaserCore\Test\TestCase\View\Helper; + +use BaserCore\TestSuite\BcTestCase; +use BaserCore\View\Helper\BcFormHelper; +use BaserCore\View\Helper\BcFreezeHelper; /** * Class FormHelperTest @@ -23,32 +25,29 @@ class BcFreezeHelperTest extends BcTestCase { /** - * setUp method - * - * @return void + * set up */ - public function setUp() + public function setUp(): void { parent::setUp(); - Configure::write('Config.language', 'jp'); - Configure::write('App.base', ''); - Configure::delete('Asset'); - $this->BcFreeze = new BcFreezeHelper(new View); - $this->BcFreeze->request = new CakeRequest('contacts/add', false); - $this->BcFreeze->request->here = '/contacts/add'; - $this->BcFreeze->request['action'] = 'add'; - $this->BcFreeze->request->webroot = ''; - $this->BcFreeze->request->base = ''; +// Configure::write('Config.language', 'jp'); +// Configure::write('App.base', ''); +// Configure::delete('Asset'); +// $this->BcFreeze = new BcFreezeHelper(new View); +// $this->BcFreeze->request = new CakeRequest('contacts/add', false); +// $this->BcFreeze->request->here = '/contacts/add'; +// $this->BcFreeze->request['action'] = 'add'; +// $this->BcFreeze->request->webroot = ''; +// $this->BcFreeze->request->base = ''; } /** - * tearDown method + * tearDown * * @return void */ - public function tearDown() + public function tearDown(): void { - unset($this->BcFreeze); parent::tearDown(); } @@ -63,7 +62,7 @@ public function tearDown() */ public function testText($freezed, $fieldName, $attributes, $expected) { - + $this->markTestIncomplete('このテストは、まだ実装されていません。'); // 凍結させる if ($freezed) { $this->BcFreeze->freeze(); @@ -101,7 +100,7 @@ public static function textDataProvider() */ public function testSelect($freezed, $fieldName, $options, $attributes, $expected) { - + $this->markTestIncomplete('このテストは、まだ実装されていません。'); // 凍結させる if ($freezed) { $this->BcFreeze->freeze(); @@ -138,7 +137,7 @@ public static function selectDataProvider() */ public function testDateTime($freezed, $fieldName, $dateFormat, $timeFormat, $attributes, $expected) { - + $this->markTestIncomplete('このテストは、まだ実装されていません。'); // 凍結させる if ($freezed) { $this->BcFreeze->freeze(); @@ -180,7 +179,7 @@ public static function dateTimeDataProvider() */ public function testWyear($freezed, $fieldName, $minYear, $maxYear, $selected, $attributes, $showEmpty, $expected) { - + $this->markTestIncomplete('このテストは、まだ実装されていません。'); // 凍結させる if ($freezed) { $this->BcFreeze->freeze(); @@ -217,7 +216,7 @@ public static function wyearDataProvider() */ public function testCheckbox($freezed, $fieldName, $attributes, $expected) { - + $this->markTestIncomplete('このテストは、まだ実装されていません。'); // 凍結させる if ($freezed) { $this->BcFreeze->freeze(); @@ -248,7 +247,7 @@ public static function checkboxDataProvider() */ public function testTextarea($freezed, $fieldName, $attributes, $expected) { - + $this->markTestIncomplete('このテストは、まだ実装されていません。'); // 凍結させる if ($freezed) { $this->BcFreeze->freeze(); @@ -283,7 +282,7 @@ public static function textareaDataProvider() */ public function testRadio($freezed, $fieldName, $options, $attributes, $expected) { - + $this->markTestIncomplete('このテストは、まだ実装されていません。'); // 凍結させる if ($freezed) { $this->BcFreeze->freeze(); @@ -318,7 +317,7 @@ public static function radioDataProvider() */ public function testFile($freezed, $fieldName, $options, $expected) { - + $this->markTestIncomplete('このテストは、まだ実装されていません。'); // 凍結させる if ($freezed) { // $this->markTestIncomplete('このテストは、一部未完成です。'); @@ -361,7 +360,7 @@ public static function fileDataProvider() */ public function testImage($freezed, $name, $exist, $fieldName, $attributes, $imageAttributes, $expected) { - + $this->markTestIncomplete('このテストは、まだ実装されていません。'); [$model, $field] = explode('.', $fieldName); $this->BcFreeze->request->data[$model][$field]['name'] = $name; $this->BcFreeze->request->data[$model][$field . '_exists'] = $exist; @@ -404,7 +403,7 @@ public static function imageDataProvider() */ public function testDatepicker($freezed, $date, $fieldName, $attributes, $expected) { - + $this->markTestIncomplete('このテストは、まだ実装されていません。'); // 凍結させる if ($freezed) { $this->BcFreeze->freeze(); @@ -429,6 +428,7 @@ public static function datepickerDataProvider() public function testFreeze() { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); $this->assertFalse($this->BcFreeze->freezed); $this->BcFreeze->freeze(); $this->assertTrue($this->BcFreeze->freezed); @@ -445,6 +445,7 @@ public function testFreeze() */ public function testFreezeControll($fieldName, $options, $attributes, $expected) { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); $result = $this->BcFreeze->freezeControll($fieldName, $options, $attributes); $this->assertMatchesRegularExpression('/' . $expected . '/s', $result); } diff --git a/plugins/baser-core/tests/TestCase/View/Helper/BcGooglemapsHelperTest.php b/plugins/baser-core/tests/TestCase/View/Helper/BcGooglemapsHelperTest.php index e52ec2d7c8..4947927b38 100644 --- a/plugins/baser-core/tests/TestCase/View/Helper/BcGooglemapsHelperTest.php +++ b/plugins/baser-core/tests/TestCase/View/Helper/BcGooglemapsHelperTest.php @@ -1,6 +1,4 @@ * Copyright (c) baserCMS Users Community @@ -11,36 +9,37 @@ * @license https://basercms.net/license/index.html */ -App::uses('View', 'View'); -App::uses('BcGooglemapsHelper', 'View/Helper'); -App::uses('Component', 'Controller'); +namespace BaserCore\Test\TestCase\View\Helper; + +use BaserCore\TestSuite\BcTestCase; +use BaserCore\View\Helper\BcGoogleMapsHelper; +use BaserCore\View\Helper\BcTextHelper; /** * text helper library. * * @property BcTextHelper $Helper - * @property BcGooglemapsHelper $BcGooglemaps + * @property BcGoogleMapsHelper $BcGooglemaps */ class BcGooglemapsHelperTest extends BcTestCase { /** - * Fixtures - * @var array + * set up */ - public $fixtures = [ - 'baser.Default.Site', - 'baser.Default.SiteConfig' - ]; - - public function setUp() + public function setUp(): void { parent::setUp(); - $View = new View(); - $this->BcGooglemaps = new BcGooglemapsHelper($View); +// $View = new View(); +// $this->BcGooglemaps = new BcGooglemapsHelper($View); } - public function tearDown() + /** + * tearDown + * + * @return void + */ + public function tearDown(): void { unset($this->BcGooglemaps); parent::tearDown(); diff --git a/plugins/baser-core/tests/TestCase/View/Helper/BcLayoutHelperTest.php b/plugins/baser-core/tests/TestCase/View/Helper/BcLayoutHelperTest.php index 3fec0f63c3..345babcb1c 100644 --- a/plugins/baser-core/tests/TestCase/View/Helper/BcLayoutHelperTest.php +++ b/plugins/baser-core/tests/TestCase/View/Helper/BcLayoutHelperTest.php @@ -1,6 +1,4 @@ * Copyright (c) baserCMS Users Community @@ -11,18 +9,27 @@ * @license https://basercms.net/license/index.html */ -App::uses('BcAppView', 'View'); -App::uses('BcLayoutHelper', 'View/Helper'); +namespace BaserCore\Test\TestCase\View\Helper; -class BcLayoutHelperTest extends CakeTestCase +use BaserCore\TestSuite\BcTestCase; + +class BcLayoutHelperTest extends BcTestCase { - public function setUp() + /** + * set up + */ + public function setUp(): void { parent::setUp(); } - public function tearDown() + /** + * tearDown + * + * @return void + */ + public function tearDown(): void { parent::tearDown(); } diff --git a/plugins/baser-core/tests/TestCase/View/Helper/BcMobileHelperTest.php b/plugins/baser-core/tests/TestCase/View/Helper/BcMobileHelperTest.php deleted file mode 100644 index 5818704ae3..0000000000 --- a/plugins/baser-core/tests/TestCase/View/Helper/BcMobileHelperTest.php +++ /dev/null @@ -1,102 +0,0 @@ - - * Copyright (c) baserCMS Users Community - * - * @copyright Copyright (c) baserCMS Users Community - * @link https://basercms.net baserCMS Project - * @since baserCMS v 3.0.0 - * @license https://basercms.net/license/index.html - */ - -App::uses('BcAppView', 'View'); -App::uses('Helper', 'View'); -App::uses('BcMobileHelper', 'View/Helper'); - -/** - * BcMobileHelper Test Case - * - * @property BcMobileHelper $BcMobile - * @property BcAppView $View - */ -class BcMobileHelperTest extends BcTestCase -{ - - /** - * Fixtures - * @var array - */ - public $fixtures = [ - 'baser.Default.Page', - 'baser.Default.Site', - 'baser.Default.SiteConfig', - 'baser.Default.Content', - 'baser.Default.User' - ]; - - /** - * setUp method - * - * @return void - */ - public function setUp() - { - parent::setUp(); - $this->View = new BcAppView(); - $this->BcMobile = new BcMobileHelper($this->View); - $this->BcMobile->request = $this->_getRequest('/m/'); - } - - /** - * tearDown method - * - * @return void - */ - public function tearDown() - { - unset($this->BcMobile); - parent::tearDown(); - } - - /** - * afterLayout - * - * @return void - */ - public function testAfterLayout() - { - $_SERVER['HTTP_USER_AGENT'] = 'SoftBank'; - $this->View->output = '＞＜＆＆1２＠＠'; - $expected = '><&&12@@'; - - $this->BcMobile->afterLayout(''); - $result = $this->View->output; - - $this->assertEquals($expected, $result); - } - - /** - * コンテンツタイプを出力 - * - * header()が実行できないためテスト不可 - * 原因:このメソッド実行前にechoやprintなどのアウトプット or 既にheaderを送信 or UTF-8BOM? - * headers_sent() headers_list()で確認可 - * - * @return void - */ - public function testHeader() - { - $this->markTestIncomplete('このテストは、まだ実装されていません。'); - $this->BcMobile->getRequest->withParam('Site.device', 'mobile'); - $this->BcMobile->header(); - - } - - public function testAfterRender() - { - $this->markTestIncomplete('このテストは、まだ実装されていません。'); - } - -} diff --git a/plugins/baser-core/tests/TestCase/View/Helper/BcSmartphoneHelperTest.php b/plugins/baser-core/tests/TestCase/View/Helper/BcSmartphoneHelperTest.php index 8946bd10d4..332c5ed6a3 100644 --- a/plugins/baser-core/tests/TestCase/View/Helper/BcSmartphoneHelperTest.php +++ b/plugins/baser-core/tests/TestCase/View/Helper/BcSmartphoneHelperTest.php @@ -1,8 +1,4 @@ * Copyright (c) baserCMS Users Community @@ -13,9 +9,11 @@ * @license https://basercms.net/license/index.html */ -App::uses('BcAppView', 'View'); -App::uses('Helper', 'View'); -App::uses('BcSmartphoneHelper', 'View/Helper'); +namespace BaserCore\Test\TestCase\View\Helper; + +use BaserCore\TestSuite\BcTestCase; +use BaserCore\Utility\BcContainerTrait; +use BaserCore\View\Helper\BcSmartphoneHelper; /** * BcSmartphoneHelper Test Case @@ -28,34 +26,25 @@ class BcSmartphoneHelperTest extends BcTestCase /** * Trait */ - use \BaserCore\Utility\BcContainerTrait; - - public $fixtures = [ - 'baser.Default.Content', - 'baser.Default.SiteConfig', - 'baser.Default.User', - 'baser.Default.Site', - ]; + use BcContainerTrait; /** - * setUp method - * - * @return void + * set up */ - public function setUp() + public function setUp(): void { parent::setUp(); - $this->View = new BcAppView(); - $this->BcSmartphone = new BcSmartphoneHelper($this->View); +// $this->View = new BcAppView(); +// $this->BcSmartphone = new BcSmartphoneHelper($this->View); } /** - * tearDown method + * tearDown * * @return void */ - public function tearDown() + public function tearDown(): void { unset($this->BcSmartphone); diff --git a/plugins/baser-core/tests/TestCase/View/Helper/BcTextHelperTest.php b/plugins/baser-core/tests/TestCase/View/Helper/BcTextHelperTest.php index bcfe1490e6..890b9ef267 100644 --- a/plugins/baser-core/tests/TestCase/View/Helper/BcTextHelperTest.php +++ b/plugins/baser-core/tests/TestCase/View/Helper/BcTextHelperTest.php @@ -1,6 +1,4 @@ * Copyright (c) baserCMS Users Community @@ -10,13 +8,10 @@ * @since baserCMS v 3.0.0 * @license https://basercms.net/license/index.html */ +namespace BaserCore\Test\TestCase\View\Helper; -App::uses('View', 'View'); -App::uses('BcTextHelper', 'View/Helper'); -App::uses('BcTimeHelper', 'View/Helper'); -App::uses('TextHelper', 'View/Helper'); -App::uses('AppHelper', 'View/Helper'); -App::uses('BcFormHelper', 'View/Helper'); +use BaserCore\TestSuite\BcTestCase; +use BaserCore\View\Helper\BcTextHelper; /** * text helper library. @@ -25,25 +20,24 @@ */ class BcTextHelperTest extends BcTestCase { - /** - * Fixtures - * @var array + * set up */ - public $fixtures = [ - 'baser.Default.UserGroup' - ]; - - public function setUp() + public function setUp(): void { parent::setUp(); - $this->Helper = new BcTextHelper(new View(null)); - $this->Helper->BcForm = new BcFormHelper(new View()); - $this->Helper->BcTime = new BcTimeHelper(new View()); - $this->Helper->Html = new HtmlHelper(new View()); +// $this->Helper = new BcTextHelper(new View(null)); +// $this->Helper->BcForm = new BcFormHelper(new View()); +// $this->Helper->BcTime = new BcTimeHelper(new View()); +// $this->Helper->Html = new HtmlHelper(new View()); } - public function tearDown() + /** + * tearDown + * + * @return void + */ + public function tearDown(): void { unset($this->Helper); parent::tearDown(); @@ -55,6 +49,7 @@ public function tearDown() * */ public function testBooleanMark() { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); $result = $this->Helper->booleanMark(true); $this->assertEquals("○", $result); @@ -68,6 +63,7 @@ public function testBooleanMark() * */ public function testBooleanMarkList() { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); $result = $this->Helper->booleanMarkList(); $expect = [ 0 => "―", @@ -82,6 +78,7 @@ public function testBooleanMarkList() * */ public function testBooleanExists() { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); $result = $this->Helper->booleanExists(true); $this->assertEquals("有", $result); @@ -94,6 +91,7 @@ public function testBooleanExists() * */ public function testBooleanExistsList() { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); $result = $this->Helper->booleanExistsList(); $expect = [ 0 => "無", @@ -107,6 +105,7 @@ public function testBooleanExistsList() * */ public function testBooleanAllowList() { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); $result = $this->Helper->booleanAllowList(); $expect = [ 0 => "不可", @@ -120,6 +119,7 @@ public function testBooleanAllowList() */ public function testBooleanDoList() { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); $result = $this->Helper->booleanDoList('baserCMSを'); $expect = [ 0 => 'baserCMSを しない', @@ -133,6 +133,7 @@ public function testBooleanDoList() */ public function testBooleanDo() { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); $result = $this->Helper->booleanDo(0, 'baserCMSを'); $result2 = $this->Helper->booleanDo(1, 'baserCMSを'); $this->assertEquals('baserCMSを しない', $result); @@ -144,6 +145,7 @@ public function testBooleanDo() */ public function testPrefList() { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); $expect = [ '' => '都道府県', 1 => "北海道", 2 => "青森県", 3 => "岩手県", 4 => "宮城県", 5 => "秋田県", 6 => "山形県", 7 => "福島県", @@ -177,6 +179,7 @@ public function testPrefList() */ public function testSex() { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); $this->assertEquals('男', $this->Helper->sex(1)); $this->assertEquals('女', $this->Helper->sex(2)); $this->assertEquals('', $this->Helper->sex(0)); @@ -188,6 +191,7 @@ public function testSex() */ public function testZipFormat() { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); //ハイフン無し $result = $this->Helper->zipFormat('8190002'); $expect = '〒 819-0002'; @@ -214,6 +218,7 @@ public function testZipFormat() */ public function testPref() { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); $this->assertEquals('', $this->Helper->pref(0)); $this->assertEquals('北海道', $this->Helper->pref(1)); $this->assertEquals('沖縄県', $this->Helper->pref(47)); @@ -225,6 +230,7 @@ public function testPref() */ public function testNoValue() { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); // データあり $this->assertEquals('x', $this->Helper->noValue('x', 1)); // データなし @@ -236,6 +242,7 @@ public function testNoValue() */ public function testBooleanAllow() { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); // キーが0の場合 $result = $this->Helper->booleanAllow(0); $expect = "不可"; @@ -259,6 +266,7 @@ public function testBooleanAllow() */ public function testDateTimeWareki() { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); // 適当な時間を設定 $arrDate = [ 'wareki' => true, @@ -293,7 +301,7 @@ public function testDateTimeWareki() */ public function testMoneyFormat() { - + $this->markTestIncomplete('このテストは、まだ実装されていません。'); // 適当な数値を入力 $result = $this->Helper->moneyFormat('1234567'); $expect = '¥1,234,567'; @@ -316,7 +324,7 @@ public function testMoneyFormat() */ public function testDateTime() { - + $this->markTestIncomplete('このテストは、まだ実装されていません。'); // 適当な時間を設定 $arrDate = [ 'year' => 2015, @@ -356,7 +364,7 @@ public function testDateTime() */ public function testFormat() { - + $this->markTestIncomplete('このテストは、まだ実装されていません。'); // $valueが1の場合 $result = $this->Helper->format('valueは%d', 1); $expect = 'valueは1'; @@ -384,7 +392,7 @@ public function testFormat() */ public function testListValue() { - + $this->markTestIncomplete('このテストは、まだ実装されていません。'); // ユーザーモデル $this->Helper->BcForm->setEntity('User', true); $expect = 'システム管理'; @@ -404,7 +412,7 @@ public function testListValue() */ public function testArrayValue() { - + $this->markTestIncomplete('このテストは、まだ実装されていません。'); // 適当な配列 $array = ["a", "i", "u", "e", "o"]; @@ -431,7 +439,7 @@ public function testArrayValue() */ public function testArrayValues() { - + $this->markTestIncomplete('このテストは、まだ実装されていません。'); // 適当な連想配列とキーのリスト $array = ["key1" => "apple", "key2" => "lemon", "key3" => "banana"]; @@ -454,6 +462,7 @@ public function testArrayValues() */ public function testAge() { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); // 適当な生年月日を入力 $now = date('Y'); $year = 1980; @@ -484,6 +493,7 @@ public function testAge() */ public function testBooleanStatusList() { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); $result = $this->Helper->booleanStatusList(); $expect = [0 => "無効", 1 => "有効"]; $this->assertEquals($expect, $result); @@ -494,6 +504,7 @@ public function testBooleanStatusList() */ public function testBooleanStatus() { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); // キーが0の場合 $result = $this->Helper->booleanStatus(0); $expect = "無効"; diff --git a/plugins/baser-core/tests/TestCase/View/Helper/BcTimeHelperTest.php b/plugins/baser-core/tests/TestCase/View/Helper/BcTimeHelperTest.php index 3101c4d534..e0d6a62d21 100644 --- a/plugins/baser-core/tests/TestCase/View/Helper/BcTimeHelperTest.php +++ b/plugins/baser-core/tests/TestCase/View/Helper/BcTimeHelperTest.php @@ -1,6 +1,4 @@ * Copyright (c) baserCMS Users Community @@ -10,23 +8,31 @@ * @since baserCMS v 3.0.0 * @license https://basercms.net/license/index.html */ +namespace BaserCore\Test\TestCase\View\Helper; -App::uses('View', 'View'); -App::uses('BcTimeHelper', 'View/Helper'); +use BaserCore\TestSuite\BcTestCase; +use BaserCore\View\Helper\BcTimeHelper; /** * @property BcTimeHelper $Helper */ class BcTimeHelperTest extends BcTestCase { - - public function setUp() + /** + * set up + */ + public function setUp(): void { parent::setUp(); - $this->Helper = new BcTimeHelper(new View(null)); +// $this->Helper = new BcTimeHelper(new View(null)); } - public function tearDown() + /** + * tearDown + * + * @return void + */ + public function tearDown(): void { unset($this->Helper); parent::tearDown(); @@ -39,6 +45,7 @@ public function tearDown() */ public function testNengo($data, $expects) { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); $result = $this->Helper->nengo($data); $this->assertSame($expects, $result); } @@ -61,6 +68,7 @@ public static function nengoDataProvider() */ public function testWareki($data, $expects) { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); $data = 's-48/5/10'; $result = $this->Helper->wareki($data); $this->assertSame($expects, $result); @@ -80,6 +88,7 @@ public static function warekiDataProvider() */ public function testWyear($data, $expects) { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); $result = $this->Helper->wyear($data); $this->assertSame($expects, $result); } @@ -99,6 +108,7 @@ public static function wyearDataProvider() */ public function testConvertToWarekiYear($data, $expects, $message) { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); $result = $this->Helper->convertToWarekiYear($data); $this->assertSame($expects, $result, $message); } @@ -127,6 +137,7 @@ public static function convertToWarekiYearDataProvider() */ public function testConvertToSeirekiYear($data, $expects, $message) { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); $result = $this->Helper->convertToSeirekiYear($data); $this->assertSame($expects, $result, $message); } @@ -157,6 +168,7 @@ public static function convertToSeirekiYearDataProvider() */ public function testConvertToWarekiArray($data, $expects, $message) { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); $result = $this->Helper->convertToWarekiArray($data); $this->assertSame($expects, $result, $message); } @@ -184,6 +196,7 @@ public static function convertToWarekiArrayDataProvider() */ public function testConvertToWareki($data, $expects, $message) { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); $result = $this->Helper->convertToWareki($data); $this->assertSame($expects, $result, $message); } @@ -211,6 +224,7 @@ public static function convertToWarekiDataProvider() */ public function testMinutes($data, $expects, $message) { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); $result = $this->Helper->minutes($data); $this->assertSame($expects, $result, $message); } @@ -231,6 +245,7 @@ public static function minutesDataProvider() */ public function testFormat($format, $date, $expects, $message) { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); $result = $this->Helper->format($format, $date); $this->assertSame($expects, $result, $message); } @@ -255,6 +270,7 @@ public static function formatDataProvider() */ public function testPastDays($date, $days, $nowDate, $expects, $message) { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); $now = strtotime($nowDate); $result = $this->Helper->pastDays($date, $days, $now); $this->assertSame($expects, $result, $message); @@ -279,6 +295,7 @@ public static function pastDaysDataProvider() */ public function testGetJpWeek($dateStr, $suffix, $expects, $message) { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); $result = $this->Helper->getJpWeek($dateStr, $suffix); $this->assertSame($expects, $result, $message); } @@ -301,6 +318,7 @@ public static function getJpWeekDataProvider() */ public function testJpWeek($dateStr, $suffix, $expects, $message) { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); $this->expectOutputString($expects); $this->Helper->jpWeek($dateStr, $suffix); } diff --git a/plugins/baser-core/tests/TestCase/View/Helper/BcXmlHelperTest.php b/plugins/baser-core/tests/TestCase/View/Helper/BcXmlHelperTest.php index 9c0f2dcf9f..597d1df037 100644 --- a/plugins/baser-core/tests/TestCase/View/Helper/BcXmlHelperTest.php +++ b/plugins/baser-core/tests/TestCase/View/Helper/BcXmlHelperTest.php @@ -1,6 +1,4 @@ * Copyright (c) baserCMS Users Community @@ -10,9 +8,10 @@ * @since baserCMS v 3.0.0 * @license https://basercms.net/license/index.html */ +namespace BaserCore\Test\TestCase\View\Helper; -App::uses('View', 'View'); -App::uses('BcXmlHelper', 'View/Helper'); +use BaserCore\TestSuite\BcTestCase; +use BaserCore\View\Helper\BcTextHelper; /** * text helper library. @@ -21,21 +20,22 @@ */ class BcXmlHelperTest extends BcTestCase { - /** - * Fixtures - * @var array + * set up */ - public $fixtures = []; - - public function setUp() + public function setUp(): void { parent::setUp(); - $View = new View(); - $this->BcXml = new BcXmlHelper($View); +// $View = new View(); +// $this->BcXml = new BcXmlHelper($View); } - public function tearDown() + /** + * tearDown + * + * @return void + */ + public function tearDown(): void { unset($this->BcXml); parent::tearDown(); @@ -52,7 +52,7 @@ public function tearDown() */ public function testHeader($attrib, $agent, $expected) { - + $this->markTestIncomplete('このテストは、まだ実装されていません。'); $_SERVER['HTTP_USER_AGENT'] = $agent; $result = $this->BcXml->header($attrib); diff --git a/plugins/bc-admin-third/templates/plugin/BcWidgetArea/Admin/WidgetAreas/edit.php b/plugins/bc-admin-third/templates/plugin/BcWidgetArea/Admin/WidgetAreas/edit.php index 61efa85aab..72f4a86a65 100755 --- a/plugins/bc-admin-third/templates/plugin/BcWidgetArea/Admin/WidgetAreas/edit.php +++ b/plugins/bc-admin-third/templates/plugin/BcWidgetArea/Admin/WidgetAreas/edit.php @@ -75,8 +75,8 @@ read(true, true, true); + $Folder = new \BaserCore\Utility\BcFolder($path); + $files = $Folder->getFiles(); $widgets = []; foreach($files[1] as $file) { $widget = ['name' => '', 'title' => '', 'description' => '', 'setting' => '']; diff --git a/plugins/bc-blog/src/Service/Front/BlogFrontService.php b/plugins/bc-blog/src/Service/Front/BlogFrontService.php index 774e44d42d..4a7f01321a 100755 --- a/plugins/bc-blog/src/Service/Front/BlogFrontService.php +++ b/plugins/bc-blog/src/Service/Front/BlogFrontService.php @@ -157,7 +157,7 @@ public function setupPreviewForIndex(Controller $controller): void /** * カテゴリー別アーカイブ一覧の view 変数を取得する * - * @param ResultSet $posts + * @param ResultSet|PaginatedResultSet $posts * @param string $category * @param ServerRequest $request * @param EntityInterface $blogContent @@ -168,7 +168,7 @@ public function setupPreviewForIndex(Controller $controller): void * @unitTest */ public function getViewVarsForArchivesByCategory( - ResultSet $posts, + ResultSet|PaginatedResultSet $posts, string $category, ServerRequest $request, EntityInterface $blogContent, @@ -228,14 +228,15 @@ public function getCategoryCrumbs(string $baseUrl, int $categoryId, $isCategoryP /** * 著者別アーカイブ一覧の view 用変数を取得する - * @param ResultSet $posts + * @param ResultSet|PaginatedResultSet $posts * @param string $author + * @param BlogContent $blogContent * @return array * @checked * @noTodo * @unitTest */ - public function getViewVarsForArchivesByAuthor(ResultSet $posts, string $author, BlogContent $blogContent): array + public function getViewVarsForArchivesByAuthor(ResultSet|PaginatedResultSet $posts, string $author, BlogContent $blogContent): array { $usersTable = TableRegistry::getTableLocator()->get('BaserCore.Users'); $author = $usersTable->find('available')->where(['Users.name' => $author])->first(); @@ -253,7 +254,7 @@ public function getViewVarsForArchivesByAuthor(ResultSet $posts, string $author, /** * タグ別アーカイブ一覧の view 用変数を取得する * - * @param ResultSet $posts + * @param ResultSet|PaginatedResultSet $posts * @param string $tag * @param BlogContent $blogContent * @return array @@ -261,7 +262,7 @@ public function getViewVarsForArchivesByAuthor(ResultSet $posts, string $author, * @noTodo * @unitTest */ - public function getViewVarsForArchivesByTag(ResultSet $posts, string $tag, BlogContent $blogContent): array + public function getViewVarsForArchivesByTag(ResultSet|PaginatedResultSet $posts, string $tag, BlogContent $blogContent): array { $tagsTable = TableRegistry::getTableLocator()->get('BcBlog.BlogTags'); $tag = $tagsTable->find()->where(['name' => urldecode($tag)])->first(); @@ -277,17 +278,18 @@ public function getViewVarsForArchivesByTag(ResultSet $posts, string $tag, BlogC /** * 日付別アーカイブ一覧の view 用変数を取得する * - * @param ResultSet $posts + * @param ResultSet|PaginatedResultSet $posts * @param string $year * @param string $month * @param string $day + * @param BlogContent $blogContent * @return array * @checked * @noTodo * @unitTest */ public function getViewVarsForArchivesByDate( - ResultSet $posts, + ResultSet|PaginatedResultSet $posts, string $year, string $month, string $day, diff --git a/plugins/bc-custom-content/src/Controller/Admin/CustomFieldsController.php b/plugins/bc-custom-content/src/Controller/Admin/CustomFieldsController.php index 510976048c..85b90d95a6 100644 --- a/plugins/bc-custom-content/src/Controller/Admin/CustomFieldsController.php +++ b/plugins/bc-custom-content/src/Controller/Admin/CustomFieldsController.php @@ -34,7 +34,7 @@ class CustomFieldsController extends CustomContentAdminAppController */ public function index(CustomFieldsAdminServiceInterface $service) { - $this->set(['entities' => $service->getIndex($this->getRequest()->getQueryParams())]); + $this->set(['entities' => $this->paginate($service->getIndex($this->getRequest()->getQueryParams()))]); } /** diff --git a/plugins/bc-custom-content/src/Model/Table/CustomContentsTable.php b/plugins/bc-custom-content/src/Model/Table/CustomContentsTable.php index f9d45595a3..7e4223bc95 100644 --- a/plugins/bc-custom-content/src/Model/Table/CustomContentsTable.php +++ b/plugins/bc-custom-content/src/Model/Table/CustomContentsTable.php @@ -29,7 +29,6 @@ class CustomContentsTable extends AppTable * * @param array $config テーブル設定 * @checked - * @unitTest * @noTodo */ public function initialize(array $config): void diff --git a/plugins/bc-custom-content/src/Service/CustomLinksService.php b/plugins/bc-custom-content/src/Service/CustomLinksService.php index aec3390ee6..ec78512995 100644 --- a/plugins/bc-custom-content/src/Service/CustomLinksService.php +++ b/plugins/bc-custom-content/src/Service/CustomLinksService.php @@ -68,7 +68,7 @@ public function get(int $id, array $options = []) $conditions = $this->CustomLinks->CustomTables->CustomContents->Contents->getConditionAllowPublish(); $conditions = array_merge($conditions, ['CustomLinks.status' => true]); } - return $this->CustomLinks->get($id, + return $this->CustomLinks->get($id, contain: $options['contain'], conditions: $conditions ); @@ -119,6 +119,8 @@ public function getIndex(int $tableId, array $options = []) ); } + if (is_null($options['contain'])) + $options['contain'] = []; return $query->where($conditions)->contain($options['contain']); } diff --git a/plugins/bc-custom-content/tests/TestCase/Model/Table/CustomContentsTableTest.php b/plugins/bc-custom-content/tests/TestCase/Model/Table/CustomContentsTableTest.php index 252e0f32ae..8ee5a249ba 100644 --- a/plugins/bc-custom-content/tests/TestCase/Model/Table/CustomContentsTableTest.php +++ b/plugins/bc-custom-content/tests/TestCase/Model/Table/CustomContentsTableTest.php @@ -35,4 +35,19 @@ public function tearDown(): void parent::tearDown(); } + /** + * test initialize + */ + public function test_initialize() + { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); + } + + /** + * test validationWithTable + */ + public function test_validationWithTable() + { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); + } } diff --git a/plugins/bc-custom-content/tests/TestCase/Model/Table/CustomFieldsTableTest.php b/plugins/bc-custom-content/tests/TestCase/Model/Table/CustomFieldsTableTest.php index a58fe3ac95..0e654b586f 100644 --- a/plugins/bc-custom-content/tests/TestCase/Model/Table/CustomFieldsTableTest.php +++ b/plugins/bc-custom-content/tests/TestCase/Model/Table/CustomFieldsTableTest.php @@ -35,4 +35,35 @@ public function tearDown(): void parent::tearDown(); } + /** + * test initialize + */ + public function test_initialize() + { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); + } + + /** + * test validationDefault + */ + public function test_validationDefault() + { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); + } + + /** + * test beforeMarshal + */ + public function test_beforeMarshal() + { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); + } + + /** + * test findAll + */ + public function test_findAll() + { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); + } } diff --git a/plugins/bc-custom-content/tests/TestCase/PluginTest.php b/plugins/bc-custom-content/tests/TestCase/PluginTest.php deleted file mode 100644 index 0be341c5e2..0000000000 --- a/plugins/bc-custom-content/tests/TestCase/PluginTest.php +++ /dev/null @@ -1,39 +0,0 @@ - - * Copyright (c) NPO baser foundation - * - * @copyright Copyright (c) NPO baser foundation - * @link https://basercms.net baserCMS Project - * @since 5.0.0 - * @license https://basercms.net/license/index.html MIT License - */ - -namespace BcCustomContent\Test\TestCase; - -use BaserCore\TestSuite\BcTestCase; - -/** - * PluginTest - */ -class PluginTest extends BcTestCase -{ - - /** - * Set up - */ - public function setUp(): void - { - parent::setUp(); - } - - /** - * Tear down - */ - public function tearDown(): void - { - parent::tearDown(); - } - -} diff --git a/plugins/bc-custom-content/tests/TestCase/Service/Admin/CustomFieldsAdminServiceTest.php b/plugins/bc-custom-content/tests/TestCase/Service/Admin/CustomFieldsAdminServiceTest.php deleted file mode 100644 index 5449caf4b8..0000000000 --- a/plugins/bc-custom-content/tests/TestCase/Service/Admin/CustomFieldsAdminServiceTest.php +++ /dev/null @@ -1,39 +0,0 @@ - - * Copyright (c) NPO baser foundation - * - * @copyright Copyright (c) NPO baser foundation - * @link https://basercms.net baserCMS Project - * @since 5.0.0 - * @license https://basercms.net/license/index.html MIT License - */ - -namespace BcCustomContent\Test\TestCase\Service; - - -use BaserCore\TestSuite\BcTestCase; - -/** - * CustomFieldsAdminServiceTest - */ -class CustomFieldsAdminServiceTest extends BcTestCase -{ - - /** - * Set up - */ - public function setUp(): void - { - parent::setUp(); - } - - /** - * Tear down - */ - public function tearDown(): void - { - parent::tearDown(); - } - -} diff --git a/plugins/bc-custom-content/tests/TestCase/ServiceProvider/BcCustomContentServiceProviderTest.php b/plugins/bc-custom-content/tests/TestCase/ServiceProvider/BcCustomContentServiceProviderTest.php index e5dad6f429..3611c8d0a0 100644 --- a/plugins/bc-custom-content/tests/TestCase/ServiceProvider/BcCustomContentServiceProviderTest.php +++ b/plugins/bc-custom-content/tests/TestCase/ServiceProvider/BcCustomContentServiceProviderTest.php @@ -35,4 +35,11 @@ public function tearDown(): void parent::tearDown(); } + /** + * test services + */ + public function test_services() + { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); + } } diff --git a/plugins/bc-installer/tests/TestCase/Controller/Admin/InstallationsControllerTest.php b/plugins/bc-installer/tests/TestCase/Controller/Admin/InstallationsControllerTest.php index 4e0e6ed4b9..ca642492d2 100644 --- a/plugins/bc-installer/tests/TestCase/Controller/Admin/InstallationsControllerTest.php +++ b/plugins/bc-installer/tests/TestCase/Controller/Admin/InstallationsControllerTest.php @@ -1,6 +1,4 @@ * Copyright (c) baserCMS Users Community @@ -11,7 +9,9 @@ * @license https://basercms.net/license/index.html */ -App::uses('InstallationsController', 'Controller'); +namespace BcInstaller\Test\TestCase\Controller\Admin; +use BaserCore\TestSuite\BcTestCase; +use BcInstaller\Controller\Admin\InstallationsController; /** * Class InstallationsControllerTest @@ -22,11 +22,10 @@ class InstallationsControllerTest extends BcTestCase { /** - * set up - * - * @return void + /** + * setup */ - public function setUp() + public function setUp(): void { parent::setUp(); } @@ -36,7 +35,7 @@ public function setUp() * * @return void */ - public function tearDown() + public function tearDown(): void { parent::tearDown(); } diff --git a/plugins/bc-mail/tests/TestCase/Controller/Admin/MailConfigsControllerTest.php b/plugins/bc-mail/tests/TestCase/Controller/Admin/MailConfigsControllerTest.php index 2e76f88976..d391e0fc47 100644 --- a/plugins/bc-mail/tests/TestCase/Controller/Admin/MailConfigsControllerTest.php +++ b/plugins/bc-mail/tests/TestCase/Controller/Admin/MailConfigsControllerTest.php @@ -1,6 +1,4 @@ * Copyright (c) baserCMS Users Community @@ -10,37 +8,34 @@ * @since baserCMS v 3.0.0 * @license https://basercms.net/license/index.html */ +namespace BcMail\Test\TestCase\Controller\Admin; +use BaserCore\TestSuite\BcTestCase; -App::uses('MailAppController', 'BcMail.Controller'); -App::uses('MailConfigsController', 'BcMail.Controller'); -App::uses('SessionComponent', 'Controller/Component'); - -class MailConfigsControllerTest extends BaserTestCase +class MailConfigsControllerTest extends BcTestCase { - - public $fixtures = [ - // 'baser.Default.SiteConfig', - 'baser.Default.User', - 'baser.Default.UserGroup', - 'baser.Default.Plugin', - 'baser.Default.Permission', - 'baser.Default.Favorite', - 'plugin.mail.Default/MailConfig', - ]; - - public function setUp() + /** + * set up + * + * @return void + */ + public function setUp(): void { - $this->MailConfigs = new MailConfigsController(new CakeRequest(null, false), new CakeResponse()); - - $this->Case = $this->getMockForAbstractClass('ControllerTestCase'); +// $this->MailConfigs = new MailConfigsController(new CakeRequest(null, false), new CakeResponse()); +// +// $this->Case = $this->getMockForAbstractClass('ControllerTestCase'); parent::setUp(); } - public function tearDown() + /** + * set up + * + * @return void + */ + public function tearDown(): void { - unset($this->MailConfigs); - unset($this->Case); +// unset($this->MailConfigs); +// unset($this->Case); parent::tearDown(); } @@ -50,7 +45,7 @@ public function tearDown() * @param array $data requestのdata * @dataProvider admin_formDataProvider */ - public function testAdmin_form($data, $expected) + public function test_index($data, $expected) { $this->markTestIncomplete('このテストは、まだ実装されていません。'); diff --git a/plugins/bc-mail/tests/TestCase/Controller/MailControllerTest.php b/plugins/bc-mail/tests/TestCase/Controller/MailControllerTest.php index 9d803a256f..604c4da8d9 100644 --- a/plugins/bc-mail/tests/TestCase/Controller/MailControllerTest.php +++ b/plugins/bc-mail/tests/TestCase/Controller/MailControllerTest.php @@ -1,6 +1,4 @@ * Copyright (c) baserCMS Users Community @@ -11,24 +9,28 @@ * @license https://basercms.net/license/index.html */ -App::uses('MailController', 'BcMail.Controller'); -App::uses('MailMessage', 'BcMail.Model'); +namespace BcMail\Test\TestCase\Controller; -class MailControllerTest extends BaserTestCase -{ - - public $fixtures = [ - 'baser.Default.SiteConfig', - 'baser.Default.Page', - 'plugin.mail.Default/MailMessage', - ]; +use BaserCore\TestSuite\BcTestCase; - public function setUp() +class MailControllerTest extends BcTestCase +{ + /** + * set up + * + * @return void + */ + public function setUp(): void { parent::setUp(); } - public function tearDown() + /** + * set up + * + * @return void + */ + public function tearDown(): void { parent::tearDown(); } @@ -55,7 +57,7 @@ public function testBeforeRender() */ public function test_index() { - // $result = $this->testAction('/contact/index'); + $this->markTestIncomplete('このテストは、まだ実装されていません。'); } /** diff --git a/plugins/bc-mail/tests/TestCase/Model/Table/MailContentsTableTest.php b/plugins/bc-mail/tests/TestCase/Model/Table/MailContentsTableTest.php index fd89b6537c..953735237e 100755 --- a/plugins/bc-mail/tests/TestCase/Model/Table/MailContentsTableTest.php +++ b/plugins/bc-mail/tests/TestCase/Model/Table/MailContentsTableTest.php @@ -1,6 +1,4 @@ * Copyright (c) baserCMS Users Community @@ -11,37 +9,37 @@ * @license https://basercms.net/license/index.html */ -App::uses('MailContent', 'BcMail.Model'); +namespace BcMail\Test\TestCase\Model\Table; + +use BaserCore\TestSuite\BcTestCase; +use BcMail\Model\Entity\MailContent; /** * Class MailContentTest * * @property MailContent $MailContent */ -class MailContentTest extends BaserTestCase +class MailContentsTableTest extends BcTestCase { - - public $fixtures = [ - 'baser.Default.SiteConfig', - 'baser.Default.SearchIndex', - 'baser.Default.Site', - 'baser.Default.Content', - 'baser.Default.User', - 'plugin.mail.Default/MailMessage', - 'plugin.mail.Default/MailConfig', - 'plugin.mail.Default/MailContent', - 'plugin.mail.Default/MailField', - ]; - - public function setUp() + /** + * Set Up + * + * @return void + */ + public function setUp(): void { - $this->MailContent = ClassRegistry::init('BcMail.MailContent'); +// $this->MailContent = ClassRegistry::init('BcMail.MailContent'); parent::setUp(); } - public function tearDown() + /** + * Tear Down + * + * @return void + */ + public function tearDown(): void { - unset($this->MailContent); +// unset($this->MailContent); parent::tearDown(); } @@ -50,6 +48,7 @@ public function tearDown() */ public function test正常チェック() { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); $this->MailContent->create([ 'MailContent' => [ 'name' => '0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789', @@ -72,6 +71,7 @@ public function test正常チェック() public function test空白チェック() { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); $this->MailContent->create([ 'MailContent' => [ 'name' => '', @@ -100,6 +100,7 @@ public function test空白チェック() public function test桁数チェック() { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); $this->MailContent->create([ 'MailContent' => [ 'sender_name' => '01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789001234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890@example.co.jp', @@ -128,6 +129,7 @@ public function test桁数チェック() public function test半角英数チェック() { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); $this->MailContent->create([ 'MailContent' => [ 'form_template' => '１２３ａｂｃ', @@ -146,6 +148,7 @@ public function test半角英数チェック() public function test形式チェック() { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); $this->MailContent->create([ 'MailContent' => [ 'redirect_url' => 'hoge', @@ -165,6 +168,7 @@ public function test形式チェック() public function testSSLチェック正常系() { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); $this->MailContent->create([ 'MailContent' => [ 'ssl_on' => ['on'], @@ -177,6 +181,7 @@ public function testSSLチェック正常系() public function testSSLチェック異常系() { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); $this->MailContent->create([ 'MailContent' => [ 'ssl_on' => ['on'], @@ -211,6 +216,7 @@ public function testAlphaNumeric() */ public function testAfterSave($exclude_search) { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); // 初期化 $data = [ 'MailContent' => [ @@ -255,7 +261,7 @@ public static function afterSaveDataProvider() */ public function testBeforeDelete() { - + $this->markTestIncomplete('このテストは、まだ実装されていません。'); // 削除実行 $this->MailContent->data = ['MailContent' => ['name' => 'contact']]; $this->MailContent->delete(1); @@ -343,7 +349,7 @@ public static function createContentDataProvider() */ public function testCopy($id, $newParentId, $newTitle, $newAuthorId, $newSiteId) { - + $this->markTestIncomplete('このテストは、まだ実装されていません。'); $db = $this->MailContent->getDataSource(); switch ($db->config['datasource']) { case 'Database/BcSqlite': diff --git a/plugins/bc-mail/tests/TestCase/Model/Table/MailFieldsTableTest.php b/plugins/bc-mail/tests/TestCase/Model/Table/MailFieldsTableTest.php index d1f12c526d..e2dcb77fdf 100755 --- a/plugins/bc-mail/tests/TestCase/Model/Table/MailFieldsTableTest.php +++ b/plugins/bc-mail/tests/TestCase/Model/Table/MailFieldsTableTest.php @@ -9,7 +9,7 @@ * @license https://basercms.net/license/index.html */ -namespace BcMail\Test\TestCase\Model; +namespace BcMail\Test\TestCase\Model\Table; use BaserCore\TestSuite\BcTestCase; use BcMail\Model\Table\MailFieldsTable; @@ -20,10 +20,6 @@ class MailFieldsTableTest extends BcTestCase { - public array $fixtures = [ - - ]; - /** * Set Up * diff --git a/plugins/bc-mail/tests/TestCase/View/Helper/MailBaserHelperTest.php b/plugins/bc-mail/tests/TestCase/View/Helper/MailBaserHelperTest.php index 10ac885005..63512b0654 100644 --- a/plugins/bc-mail/tests/TestCase/View/Helper/MailBaserHelperTest.php +++ b/plugins/bc-mail/tests/TestCase/View/Helper/MailBaserHelperTest.php @@ -1,6 +1,4 @@ * Copyright (c) baserCMS Users Community @@ -10,35 +8,22 @@ * @since baserCMS v 4.0.5 * @license https://basercms.net/license/index.html */ +namespace BcMail\Test\TestCase\View\Helper; -/** - * Include files - */ -App::uses('BcBaserHelper', 'View/Helper'); +use BaserCore\TestSuite\BcTestCase; -class MailBaserHelperTest extends BaserTestCase +class MailBaserHelperTest extends BcTestCase { - /** - * Fixtures - * @var array - */ - public $fixtures = [ - 'baser.Default.Content', - 'baser.Default.Site', - 'baser.Default.SiteConfig', - 'baser.Default.User', - ]; - /** * setUp * * @return void */ - public function setUp() + public function setUp(): void { parent::setUp(); - $this->BcBaser = new BcBaserHelper(new View()); +// $this->BcBaser = new BcBaserHelper(new View()); } /** @@ -46,10 +31,10 @@ public function setUp() * * @return void */ - public function tearDown() + public function tearDown(): void { - unset($this->BcBaser); - Router::reload(); +// unset($this->BcBaser); +// Router::reload(); parent::tearDown(); } @@ -63,6 +48,7 @@ public function tearDown() */ public function testIsMail($expected, $url) { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); $MailBaser = $this->BcBaser->getPluginBaser('BcMail'); $MailBaser->request = $this->_getRequest($url); $this->assertEquals($expected, $this->BcBaser->isMail()); diff --git a/plugins/bc-mail/tests/TestCase/View/Helper/MailHelperTest.php b/plugins/bc-mail/tests/TestCase/View/Helper/MailHelperTest.php index 9d8da714ad..4abf7700fa 100644 --- a/plugins/bc-mail/tests/TestCase/View/Helper/MailHelperTest.php +++ b/plugins/bc-mail/tests/TestCase/View/Helper/MailHelperTest.php @@ -1,6 +1,4 @@ * Copyright (c) baserCMS Users Community @@ -10,52 +8,34 @@ * @since baserCMS v 4.0.3 * @license https://basercms.net/license/index.html */ - -App::uses('MailHelper', 'BcMail.View/Helper'); -App::uses('BcBaserHelper', 'View/Helper'); -App::uses('BcAppView', 'View'); +namespace BcMail\Test\TestCase\View\Helper; +use BaserCore\TestSuite\BcTestCase; +use BcMail\View\Helper\MailHelper; /** * Class MailHelperTest * * @property MailHelper $Mail */ -class MailHelperTest extends BaserTestCase +class MailHelperTest extends BcTestCase { - - /** - * Fixture - * - * @var array - */ - public $fixtures = [ - 'baser.Default.Content', - 'baser.Default.Site', - 'baser.Default.User', - 'baser.Default.SiteConfig', - 'plugin.Mail.Default/MailContent', - 'plugin.Mail.Default/MailField', - 'plugin.Mail.Default/MailMessage', - 'plugin.Mail.Default/MailConfig' - ]; - /** * set up */ - public function setUp() + public function setUp(): void { parent::setUp(); - $this->View = new BcAppView(null); - $this->View->request = $this->_getRequest('/'); - $this->Mail = new MailHelper($this->View); +// $this->View = new BcAppView(null); +// $this->View->request = $this->_getRequest('/'); +// $this->Mail = new MailHelper($this->View); } /** * tear down */ - public function tearDown() + public function tearDown(): void { - unset($this->Mail); +// unset($this->Mail); parent::tearDown(); } @@ -72,6 +52,7 @@ public function tearDown() */ public function testGetDescription() { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); ClassRegistry::flush(); $this->Mail->setMailContent(1); $expected = '

* 印の項目は必須となりますので、必ず入力してください。

'; @@ -84,6 +65,7 @@ public function testGetDescription() */ public function testDescriptionExists() { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); $this->Mail->setMailContent(1); $result = $this->Mail->descriptionExists(); $this->assertTrue($result, "メールの説明文が指定されていません。"); @@ -94,6 +76,7 @@ public function testDescriptionExists() */ public function testGetForm() { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); $MailMessage = ClassRegistry::init('BcMail.MailMessage'); $MailMessage->createTable(1); ClassRegistry::flush(); @@ -107,6 +90,7 @@ public function testGetForm() */ public function testGetFormTemplates() { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); $View = new View(null); $View->set('siteConfig', Configure::read('BcSite')); $this->Mail->BcBaser = new BcBaserHelper($View); @@ -123,6 +107,7 @@ public function testGetFormTemplates() */ public function testGetMailTemplates() { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); $View = new View(null); $View->set('siteConfig', Configure::read('BcSite')); $this->Mail->BcBaser = new BcBaserHelper($View); @@ -142,6 +127,7 @@ public function testGetMailTemplates() */ public function testGetToken() { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); $result = $this->Mail->getToken(); $expected = '/.*/s'; $this->assertMatchesRegularExpression($expected, $result, 'スクリプトが取得できません。'); @@ -153,11 +139,12 @@ public function testGetToken() */ public function testLink($title, $contentsName, $expected) { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); $this->expectOutputString($expected); $this->Mail->link($title, $contentsName, $datas = [], $options = []); } - public function linkProvider() + public static function linkProvider() { return [ ['タイトル', 'Members', 'タイトル'], @@ -178,6 +165,7 @@ public function linkProvider() */ public function testSetMailContent($id, $expect) { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); unset($this->Mail->mailContent); $this->Mail->setMailContent($id); $this->assertEquals((bool)($this->Mail->mailContent), $expect); diff --git a/plugins/bc-mail/tests/TestCase/View/Helper/MaildataHelperTest.php b/plugins/bc-mail/tests/TestCase/View/Helper/MaildataHelperTest.php index 7051088531..f15fd9d894 100644 --- a/plugins/bc-mail/tests/TestCase/View/Helper/MaildataHelperTest.php +++ b/plugins/bc-mail/tests/TestCase/View/Helper/MaildataHelperTest.php @@ -1,36 +1,27 @@ View = new BcAppView(null); - $this->View->request = $this->_getRequest('/'); - $this->Maildata = new MaildataHelper($this->View); +// $this->View = new BcAppView(null); +// $this->View->request = $this->_getRequest('/'); +// $this->Maildata = new MaildataHelper($this->View); } /** * tear down */ - public function tearDown() + public function tearDown():void { - unset($this->Maildata); +// unset($this->Maildata); parent::tearDown(); } /** @@ -47,6 +38,7 @@ public function tearDown() */ public function testToDisplayString($type, $value, $options, $expected) { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); if ($type == 'file') { $this->View->set('mailContent', ['MailContent' => ['id' => 1]]); } @@ -55,7 +47,7 @@ public function testToDisplayString($type, $value, $options, $expected) $this->assertEquals($result, $expected); } - public function toDisplayStringProvider() + public static function toDisplayStringProvider() { $options = [ '資料請求' => '資料請求', diff --git a/plugins/bc-mail/tests/TestCase/View/Helper/MailfieldHelperTest.php b/plugins/bc-mail/tests/TestCase/View/Helper/MailfieldHelperTest.php index 3169af9947..dec5839f8b 100644 --- a/plugins/bc-mail/tests/TestCase/View/Helper/MailfieldHelperTest.php +++ b/plugins/bc-mail/tests/TestCase/View/Helper/MailfieldHelperTest.php @@ -1,6 +1,4 @@ * Copyright (c) baserCMS Users Community @@ -10,16 +8,17 @@ * @since baserCMS v 4.0.9 * @license https://basercms.net/license/index.html */ +namespace BcMail\Test\TestCase\View\Helper; -App::uses('MailfieldHelper', 'BcMail.View/Helper'); +use BaserCore\TestSuite\BcTestCase; -class MailfieldHelperTest extends BaserTestCase +class MailfieldHelperTest extends BcTestCase { /** * set up */ - public function setUp() + public function setUp(): void { parent::setUp(); } @@ -27,7 +26,7 @@ public function setUp() /** * tear down */ - public function tearDown() + public function tearDown(): void { parent::tearDown(); } diff --git a/plugins/bc-mail/tests/TestCase/View/Helper/MailformHelperTest.php b/plugins/bc-mail/tests/TestCase/View/Helper/MailformHelperTest.php index 3cff2589a4..85ab85c5a8 100644 --- a/plugins/bc-mail/tests/TestCase/View/Helper/MailformHelperTest.php +++ b/plugins/bc-mail/tests/TestCase/View/Helper/MailformHelperTest.php @@ -1,6 +1,4 @@ * Copyright (c) baserCMS Users Community @@ -10,16 +8,17 @@ * @since baserCMS v 4.0.9 * @license https://basercms.net/license/index.html */ +namespace BcMail\Test\TestCase\View\Helper; -App::uses('MailformHelper', 'BcMail.View/Helper'); +use BaserCore\TestSuite\BcTestCase; -class MailformHelperTest extends BaserTestCase +class MailformHelperTest extends BcTestCase { /** * set up */ - public function setUp() + public function setUp(): void { parent::setUp(); } @@ -27,7 +26,7 @@ public function setUp() /** * tear down */ - public function tearDown() + public function tearDown(): void { parent::tearDown(); } diff --git a/plugins/bc-search-index/tests/TestCase/View/Helper/BcSearchIndexHelperTest.php b/plugins/bc-search-index/tests/TestCase/View/Helper/BcSearchIndexHelperTest.php index a1700d43df..4eae8794f4 100644 --- a/plugins/bc-search-index/tests/TestCase/View/Helper/BcSearchIndexHelperTest.php +++ b/plugins/bc-search-index/tests/TestCase/View/Helper/BcSearchIndexHelperTest.php @@ -1,6 +1,4 @@ * Copyright (c) baserCMS Users Community @@ -11,8 +9,10 @@ * @license https://basercms.net/license/index.html */ -App::uses('BcAppView', 'View'); -App::uses('BcSearchIndexHelper', 'View/Helper'); +namespace BcSearchIndex\Test\TestCase\View\Helper; + +use BaserCore\TestSuite\BcTestCase; +use BcSearchIndex\View\Helper\BcSearchIndexHelper; /** * Class BcSearchIndexHelperTest @@ -22,29 +22,28 @@ class BcSearchIndexHelperTest extends BcTestCase { /** - * Fixtures - * @var array + * setUp + * + * @return void */ - public $fixtures = [ - 'baser.Default.Content', - 'baser.Default.User', - 'baser.Default.Site', - 'baser.Default.SiteConfig', - ]; + public function setUp(): void + { + parent::setUp(); +// $this->_View = new BcAppView(); +// $this->_View->request = $this->_getRequest('/'); +// $this->_View->helpers = ['BcSearchIndex']; +// $this->_View->loadHelpers(); +// $this->BcSearchIndex = $this->_View->BcSearchIndex; + } /** - * setUp + * Tear Down * * @return void */ - public function setUp() + public function tearDown(): void { - parent::setUp(); - $this->_View = new BcAppView(); - $this->_View->request = $this->_getRequest('/'); - $this->_View->helpers = ['BcSearchIndex']; - $this->_View->loadHelpers(); - $this->BcSearchIndex = $this->_View->BcSearchIndex; + parent::tearDown(); } /** @@ -54,6 +53,7 @@ public function setUp() */ public function testAllowPublish() { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); $result = $this->BcSearchIndex->allowPublish([ 'status' => true, 'publish_begin' => date('Y-m-d H:i:s', strtotime("+1 hour")), diff --git a/plugins/bc-theme-file/tests/TestCase/Model/Table/ThemeFileTest.php b/plugins/bc-theme-file/tests/TestCase/Model/Table/ThemeFileTest.php index 32dbb84733..afe5b021fa 100644 --- a/plugins/bc-theme-file/tests/TestCase/Model/Table/ThemeFileTest.php +++ b/plugins/bc-theme-file/tests/TestCase/Model/Table/ThemeFileTest.php @@ -1,6 +1,4 @@ * Copyright (c) baserCMS Users Community @@ -10,28 +8,25 @@ * @since baserCMS v 3.0.0-beta * @license https://basercms.net/license/index.html */ -App::uses('ThemeFile', 'Model'); -App::uses('File', 'Utility'); +namespace BcThemeFile\Test\TestCase\Model\Table; + +use BaserCore\TestSuite\BcTestCase; /** * Class ThemeFileTest */ -class ThemeFileTest extends BaserTestCase +class ThemeFileTest extends BcTestCase { - public $fixtures = [ - 'baser.Default.ThemeConfig', - ]; - - public function setUp() + public function setUp(): void { parent::setUp(); - $this->ThemeFile = ClassRegistry::init('ThemeFile'); +// $this->ThemeFile = ClassRegistry::init('ThemeFile'); } - public function tearDown() + public function tearDown(): void { - unset($this->ThemeFile); +// unset($this->ThemeFile); parent::tearDown(); } @@ -40,6 +35,7 @@ public function tearDown() */ public function test必須チェック異常系() { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); $this->ThemeFile->create([ 'ThemeFile' => [ 'name' => '', @@ -55,6 +51,7 @@ public function test必須チェック異常系() public function test必須チェック正常系() { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); $this->ThemeFile->create([ 'ThemeFile' => [ 'name' => 'baser', @@ -71,6 +68,7 @@ public function test必須チェック正常系() */ public function testDuplicateThemeFile() { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); $themeFile = new File(TMP . 'test/theme-file.php', true); $this->ThemeFile->create([ 'ThemeFile' => [ diff --git a/plugins/bc-theme-file/tests/TestCase/Model/Table/ThemeFolderTest.php b/plugins/bc-theme-file/tests/TestCase/Model/Table/ThemeFolderTest.php index 1096b9edcf..f1b61ad220 100644 --- a/plugins/bc-theme-file/tests/TestCase/Model/Table/ThemeFolderTest.php +++ b/plugins/bc-theme-file/tests/TestCase/Model/Table/ThemeFolderTest.php @@ -1,6 +1,4 @@ * Copyright (c) baserCMS Users Community @@ -10,27 +8,29 @@ * @since baserCMS v 3.0.0-beta * @license https://basercms.net/license/index.html */ -App::uses('ThemeFolder', 'Model'); + +namespace BcThemeFile\Test\TestCase\Model\Table; +use BaserCore\TestSuite\BcTestCase; /** * Class ThemeFolderTest */ -class ThemeFolderTest extends BaserTestCase +class ThemeFolderTest extends BcTestCase { - public $fixtures = [ - 'baser.Default.ThemeConfig', - ]; - - public function setUp() + /** + * set up + */ + public function setUp(): void { parent::setUp(); - $this->ThemeFolder = ClassRegistry::init('ThemeFolder'); } - public function tearDown() + /** + * tear down + */ + public function tearDown(): void { - unset($this->ThemeFolder); parent::tearDown(); } @@ -39,6 +39,7 @@ public function tearDown() */ public function test必須チェック() { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); $this->ThemeFolder->create([ 'ThemeFolder' => [ 'name' => '', @@ -51,6 +52,7 @@ public function test必須チェック() public function test半角英数チェック異常系() { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); $this->ThemeFolder->create([ 'ThemeFolder' => [ 'name' => '１２３ａｂｃ', @@ -63,6 +65,7 @@ public function test半角英数チェック異常系() public function test重複チェック異常系() { + $this->markTestIncomplete('このテストは、まだ実装されていません。'); $this->ThemeFolder->create([ 'ThemeFolder' => [ 'name' => 'nada-icons', diff --git a/plugins/bc-uploader/tests/TestCase/Event/UploaderViewEventListenerTest.php b/plugins/bc-uploader/tests/TestCase/Event/UploaderViewEventListenerTest.php index 4b8fe0bf86..2f0565d73e 100644 --- a/plugins/bc-uploader/tests/TestCase/Event/UploaderViewEventListenerTest.php +++ b/plugins/bc-uploader/tests/TestCase/Event/UploaderViewEventListenerTest.php @@ -1,6 +1,4 @@ * Copyright (c) baserCMS Users Community @@ -11,32 +9,30 @@ * @license https://basercms.net/license/index.html */ -App::uses('UploaderViewEventListener', 'BcUploader.Event'); +namespace BcUploader\Test\TestCase\Event; +use BaserCore\TestSuite\BcTestCase; +use BcUploader\Event\BcUploaderViewEventListener; /** * Class UploaderViewEventListenerTest * - * @property UploaderViewEventListener $UploaderViewEventListener + * @property BcUploaderViewEventListener $UploaderViewEventListener */ -class UploaderViewEventListenerTest extends BaserTestCase +class UploaderViewEventListenerTest extends BcTestCase { /** * set up - * - * @return void */ - public function setUp() + public function setUp(): void { parent::setUp(); } /** - * tearDown - * - * @return void + * tear down */ - public function tearDown() + public function tearDown(): void { parent::tearDown(); } diff --git a/plugins/bc-uploader/tests/TestCase/Service/Admin/UploadCategoriesAdminServiceTest.php b/plugins/bc-uploader/tests/TestCase/Service/Admin/UploadCategoriesAdminServiceTest.php deleted file mode 100644 index 6e4b6038b2..0000000000 --- a/plugins/bc-uploader/tests/TestCase/Service/Admin/UploadCategoriesAdminServiceTest.php +++ /dev/null @@ -1,38 +0,0 @@ - - * Copyright (c) NPO baser foundation - * - * @copyright Copyright (c) NPO baser foundation - * @link https://basercms.net baserCMS Project - * @since 5.0.0 - * @license https://basercms.net/license/index.html MIT License - */ - -namespace BcUploader\Test\TestCase\Service\Admin; - -use BaserCore\TestSuite\BcTestCase; - -/** - * UploadCategoriesAdminServiceTest - */ -class UploadCategoriesAdminServiceTest extends BcTestCase -{ - - /** - * set up - */ - public function setUp(): void - { - parent::setUp(); - } - - /** - * tear down - */ - public function tearDown(): void - { - parent::tearDown(); - } - -} diff --git a/plugins/bc-uploader/tests/TestCase/Service/Admin/UploadConfigsAdminServiceTest.php b/plugins/bc-uploader/tests/TestCase/Service/Admin/UploadConfigsAdminServiceTest.php deleted file mode 100644 index d1e225a98d..0000000000 --- a/plugins/bc-uploader/tests/TestCase/Service/Admin/UploadConfigsAdminServiceTest.php +++ /dev/null @@ -1,38 +0,0 @@ - - * Copyright (c) NPO baser foundation - * - * @copyright Copyright (c) NPO baser foundation - * @link https://basercms.net baserCMS Project - * @since 5.0.0 - * @license https://basercms.net/license/index.html MIT License - */ - -namespace BcUploader\Test\TestCase\Service\Admin; - -use BaserCore\TestSuite\BcTestCase; - -/** - * UploadConfigsAdminServiceTest - */ -class UploadConfigsAdminServiceTest extends BcTestCase -{ - - /** - * set up - */ - public function setUp(): void - { - parent::setUp(); - } - - /** - * tear down - */ - public function tearDown(): void - { - parent::tearDown(); - } - -} diff --git a/plugins/bc-uploader/tests/TestCase/View/Helper/UploaderHelperTest.php b/plugins/bc-uploader/tests/TestCase/View/Helper/UploaderHelperTest.php index 106d9ebf45..10531de048 100644 --- a/plugins/bc-uploader/tests/TestCase/View/Helper/UploaderHelperTest.php +++ b/plugins/bc-uploader/tests/TestCase/View/Helper/UploaderHelperTest.php @@ -1,6 +1,8 @@ * Copyright (c) baserCMS Users Community @@ -11,31 +13,25 @@ * @license https://basercms.net/license/index.html */ -App::uses('UploaderHelper', 'BcUploader.View.Helper'); - /** * Class UploaderHelperTest * * @property UploaderHelper $UploaderHelper */ -class UploaderHelperTest extends BaserTestCase +class UploaderHelperTest extends BcTestCase { /** * set up - * - * @return void */ - public function setUp() + public function setUp(): void { parent::setUp(); } /** - * tearDown - * - * @return void + * tear down */ - public function tearDown() + public function tearDown(): void { parent::tearDown(); } diff --git a/plugins/bc-widget-area/tests/TestCase/View/Helper/BcWidgetAreaHelperTest.php b/plugins/bc-widget-area/tests/TestCase/View/Helper/BcWidgetAreaHelperTest.php index 2492df9750..605c34c5b6 100644 --- a/plugins/bc-widget-area/tests/TestCase/View/Helper/BcWidgetAreaHelperTest.php +++ b/plugins/bc-widget-area/tests/TestCase/View/Helper/BcWidgetAreaHelperTest.php @@ -1,6 +1,4 @@ * Copyright (c) baserCMS Users Community @@ -11,8 +9,11 @@ * @license https://basercms.net/license/index.html */ -App::uses('View', 'View'); -App::uses('BcWidgetAreaHelper', 'View/Helper'); +namespace BcWidgetArea\Test\TestCase\View\Helper; + +use BaserCore\TestSuite\BcTestCase; +use BaserCore\View\Helper\BcTextHelper; +use BcWidgetArea\View\Helper\BcWidgetAreaHelper; /** * text helper library. @@ -23,22 +24,14 @@ class BcWidgetAreaHelperTest extends BcTestCase { - /** - * Fixtures - * @var array - */ - public $fixtures = [ - 'baser.Default.WidgetArea', - ]; - - public function setUp() + public function setUp(): void { parent::setUp(); - $View = new View(); - $this->BcWidgetArea = new BcWidgetAreaHelper($View); +// $View = new View(); +// $this->BcWidgetArea = new BcWidgetAreaHelper($View); } - public function tearDown() + public function tearDown(): void { unset($this->BcWidgetArea); parent::tearDown();