Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PSGEN-281-Update_tests_for_module_skeleton_generator_v6 #9

Open
wants to merge 7 commits into
base: v6
Choose a base branch
from
+123 −109
Open

PSGEN-281-Update_tests_for_module_skeleton_generator_v6 #9

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0f16b0d
PSGEN-281: Fix module generator controller tests
mantas-kemesius Mar 26, 2018
785a044
PSGEN-281: Update HelperTest to v6, also small changes in Helper and …
mantas-kemesius Mar 27, 2018
c4b8012
PSGEN-281: Update all core classes tests
mantas-kemesius Mar 27, 2018
0f7df88
PSGEN-281: add small fixes
mantas-kemesius Mar 27, 2018
770bf95
Update README.md
mantas-kemesius Mar 27, 2018
8176abf
PSGEN-281: small fixes in tests
mantas-kemesius Mar 27, 2018
f6db37e
Merge branch 'PSGEN-281-Update_tests_for_module_skeleton_generator_v6…
mantas-kemesius Mar 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
PSGEN-281: Fix module generator controller tests
@mantas-kemesius
mantas-kemesius committed Mar 26, 2018
commit 0f16b0d0f81950569899e406889ac461882a457b
35 changes: 13 additions & 22 deletions tests/unit/modules/controllers/admin/Admin_oxpsModuleGeneratorTest.php
View file
Original file line number Diff line number Diff line change
@@ -65,7 +65,7 @@ public function setUp()
parent::setUp();

$this->SUT = $this->getMock(
'Admin_oxpsModuleGenerator',
Admin_oxpsModuleGenerator::class,
array('_Admin_oxpsModuleGenerator_init_parent', '_Admin_oxpsModuleGenerator_render_parent')
);

@@ -112,7 +112,7 @@ public function testInit()

$oModule = $this->SUT->getModule();

$this->assertInstanceOf('oxpsModuleGeneratorOxModule', $oModule);
$this->assertInstanceOf(OxModule::class, $oModule);
$this->assertSame('test', $oModule->getVendorPrefix());
$this->assertSame(
array(
@@ -464,7 +464,7 @@ public function testGenerateModule_extendedClassesSet_generateModuleSkeletonWith
{
// Config mock
$this->setRequestParameter('modulegenerator_module_name', 'Extended');
$this->setRequestParameter('modulegenerator_extend_classes', 'oxArticle' . PHP_EOL . 'oxList');
$this->setRequestParameter('modulegenerator_extend_classes', 'oxArticle');

$this->SUT->init();
$this->SUT->generateModule();
@@ -480,7 +480,6 @@ public function testGenerateModule_extendedClassesSet_generateModuleSkeletonWith
$this->assertFileExists($this->_getTestPath('modules/test/Extended/Core/ExtendedModule.php'));
$this->assertFileExists($this->_getTestPath('modules/test/Extended/Application/translations/de/testExtended_de_lang.php'));
$this->assertFileExists($this->_getTestPath('modules/test/Extended/Application/Model/Article.php'));
$this->assertFileExists($this->_getTestPath('modules/test/Extended/Core/ListModel.php'));

// Check metadata content
include($this->_getTestPath('modules/test/Extended/metadata.php'));
@@ -490,21 +489,16 @@ public function testGenerateModule_extendedClassesSet_generateModuleSkeletonWith
$this->assertSame(
array(
'OxidEsales\Eshop\Application\Model\Article' => 'Test\Extended\Application\Model\Article',
'OxidEsales\Eshop\Core\Model\ListModel' => 'Test\Extended\Core\ListModel',
),
$aModule['extend']
);
}

// Get mock classes so generated classes has something to extend
$this->getMockBuilder(\Test\Extended\Core\ListModel_parent::class)->getMock();
$this->getMockBuilder(\Test\Extended\Application\Model\Article_parent::class)->getMock();
// Check extended class content
$this->assertFalse(class_exists('\Test\Extended\Core\ListModel'));
$this->assertFalse(class_exists('\Test\Extended\Application\Model\Article'));
include($this->_getTestPath('modules/test/Extended/Core/ListModel.php'));
include($this->_getTestPath('modules/test/Extended/Application/Model/Article.php'));
$this->assertTrue(class_exists('Test\Extended\Core\ListModel'));
$this->assertTrue(class_exists('Test\Extended\Application\Model\Article'));
}

@@ -576,11 +570,10 @@ public function testGenerateModule_controllersSet_generateModuleSkeletonWithCont
}

// Check controller class content
$this->assertFalse(class_exists('Test\Ctrl1\Application\Controller\Page'));
include($this->_getTestPath('modules/test/Ctrl1/Application/Controller/Page.php'));
require_once($this->_getTestPath('modules/test/Ctrl1/Application/Controller/Page.php'));
$this->assertTrue(class_exists('Test\Ctrl1\Application\Controller\Page'));
$oClass = new Test\Ctrl1\Application\Controller\Page();
$this->assertTrue(method_exists($oClass, Render::class));
$oClass = new \Test\Ctrl1\Application\Controller\Page();
$this->assertTrue(method_exists($oClass, 'render'));
}

public function testGenerateModule_sameControllersSetMultipleTimes_generateModuleSkeletonWithUniqueControllersClasses()
@@ -685,11 +678,10 @@ public function testGenerateModule_modelsSet_generateModuleSkeletonWithModelsCla
// Check metadata content
include($this->_getTestPath('modules/test/Special/metadata.php'));
$this->assertTrue(isset($aModule));

// Check model class content
$this->assertFalse(class_exists('\Test\Special\Application\Model\Offer'));
include($this->_getTestPath('modules/test/Special/Application/Model/Offer.php'));
$this->assertTrue(class_exists('\Test\Special\Application\Model\Offer'));
require_once($this->_getTestPath('modules/test/Special/Application/Model/Offer.php'));
$this->assertTrue(class_exists('Test\Special\Application\Model\Offer'));
$oClass = new \Test\Special\Application\Model\Offer();
$this->assertTrue(method_exists($oClass, '__construct'));
}
@@ -787,10 +779,9 @@ public function testGenerateModule_widgetsSet_generateModuleSkeletonWithWidgetsC
}

// Check widget class content
$this->assertFalse(class_exists('test\Wi\Application\Component\Widget\Bar'));
include($this->_getTestPath('modules/test/Wi/Application/Component/Widget/Bar.php'));
require_once($this->_getTestPath('modules/test/Wi/Application/Component/Widget/Bar.php'));
$this->assertTrue(class_exists('Test\Wi\Application\Component\Widget\Bar'));
$oClass = new Test\Wi\Application\Component\Widget\Bar();
$oClass = new \Test\Wi\Application\Component\Widget\Bar();
$this->assertTrue(method_exists($oClass, 'isCacheable'));
}

@@ -1193,7 +1184,7 @@ public function testGenerateModule_allOptionsSet_generateModuleSkeletonWithAllFe
'email' => 'test@example.com',
'extend' => array(
'OxidEsales\Eshop\Application\Model\Basket' => 'Test\AllThings\Application\Model\Basket',
'OxidEsales\Eshop\Core\Model\ListModel' => 'Test\AllThings\Core\ListModel',
'OxidEsales\Eshop\Core\Model\ListModel' => 'Test\AllThings\Core\Model\ListModel',
),
'controllers' => array(
'test_allthings_view' => 'Test\AllThings\Application\Controller\View',
@@ -1255,7 +1246,7 @@ public function testGenerateModule_allOptionsSet_generateModuleSkeletonWithAllFe
*/
protected function _getTestPath($sPathSuffix = '')
{
return Registry::getConfig()->getConfigParam('sCompileDir') . DIRECTORY_SEPARATOR .
return Registry::getConfig()->getConfigParam('sCompileDir') .
'test' . DIRECTORY_SEPARATOR . (string) $sPathSuffix;
}
}