diff --git a/FormDin5/lib/widget/FormDin5/helpers/FormDinHelper.class.php b/FormDin5/lib/widget/FormDin5/helpers/FormDinHelper.class.php index 8d70d95c..4a7642f1 100644 --- a/FormDin5/lib/widget/FormDin5/helpers/FormDinHelper.class.php +++ b/FormDin5/lib/widget/FormDin5/helpers/FormDinHelper.class.php @@ -62,7 +62,7 @@ class FormDinHelper { - const FORMDIN_VERSION = '5.1.0'; + const FORMDIN_VERSION = '5.1.1'; const ADIANTI_MIN_FORMDIN = '7.5.1'; const GRID_SIMPLE = 'GRID_SIMPLE'; const GRID_SCREEN_PAGINATION = 'GRID_SCREEN_PAGINATION'; @@ -408,5 +408,4 @@ public static function sizeWidthInPercent($value) FormDinHelper::validateSizeWidthAndHeight($value); return $value; } - -} +} \ No newline at end of file diff --git a/FormDin5/tests/lib/widget/FormDin5/helpers/FormDinHelperTest.php b/FormDin5/tests/lib/widget/FormDin5/helpers/FormDinHelperTest.php index 51bb46df..b2340bdb 100644 --- a/FormDin5/tests/lib/widget/FormDin5/helpers/FormDinHelperTest.php +++ b/FormDin5/tests/lib/widget/FormDin5/helpers/FormDinHelperTest.php @@ -50,9 +50,11 @@ class FormDinHelperTest extends TestCase { - + public $formDinVersion = '5.1.1'; + public $adiantiVersion = '7.5.1b2'; + public function testVersion() { - $expected = '5.1.0'; + $expected = $this->formDinVersion; $result = FormDinHelper::version(); $this->assertEquals( $expected , $result); } @@ -71,32 +73,42 @@ public function testVersionMinimum_equal() { $result = FormDinHelper::versionMinimum('5.0.0'); $this->assertEquals( $expected , $result); } - //----------------------------------------------------------------------------------- - public function testAdiantiVersion() { - $expected = '7.5.1b.2'; - $result = FormDinHelper::getAdiantiFrameWorkVersion(); - $this->assertEquals( $expected , $result); + /** + * @doesNotPerformAssertions + */ + public function testAdianti_verifyFormDinMinimumVersion_ok() { + FormDinHelper::verifyFormDinMinimumVersion($this->formDinVersion); + } + public function testAdianti_verifyFormDinMinimumVersion_Exception() { + $this->expectException(DomainException::class); + FormDinHelper::verifyFormDinMinimumVersion('99.99.99'); } /** * @doesNotPerformAssertions */ - public function testAdianti_setAdminMinimumVersionFrameWork_ok() { - FormDinHelper::setAdminMinimumVersionFrameWork('7.3.0'); - } - public function testAdianti_setAdminMinimumVersionFrameWork_Exception() { + public function testAdianti_verifyMinimumVersionAdiantiFrameWorkToFormDin_ok() { + FormDinHelper::verifyMinimumVersionAdiantiFrameWorkToFormDin($this->formDinVersion); + } + public function testAdianti_verifyMinimumVersionAdiantiFrameWorkToFormDin_Exception() { $this->expectException(DomainException::class); - FormDinHelper::setAdminMinimumVersionFrameWork('99.99.99'); + FormDinHelper::verifyMinimumVersionAdiantiFrameWorkToFormDin('99.99.99'); } /** * @doesNotPerformAssertions */ - public function testAdianti_setAdminSystemMinimumVersion_ok() { - FormDinHelper::setAdminSystemMinimumVersion('7.3.0'); - } - public function testAdianti_setAdminSystemMinimumVersion_Exception() { + public function testAdianti_verifyMinimumVersionAdiantiFrameWorkToSystem_ok() { + FormDinHelper::verifyMinimumVersionAdiantiFrameWorkToSystem('7.3.0'); + } + public function testAdianti_verifyMinimumVersionAdiantiFrameWorkToSystem_Exception() { $this->expectException(DomainException::class); - FormDinHelper::setAdminSystemMinimumVersion('99.99.99'); - } + FormDinHelper::verifyMinimumVersionAdiantiFrameWorkToSystem('99.99.99'); + } + //----------------------------------------------------------------------------------- + public function testAdiantiVersion() { + $expected = $this->adiantiVersion; + $result = FormDinHelper::getAdiantiFrameWorkVersion(); + $this->assertEquals( $expected , $result); + } //----------------------------------------------------------------------------------- //----------------------------------------------------------------------------------- public function testSetPropertyVo_noSet(){ diff --git a/appexemplo_v1.0/app/lib/widget/FormDin5/helpers/FormDinHelper.class.php b/appexemplo_v1.0/app/lib/widget/FormDin5/helpers/FormDinHelper.class.php index 8d70d95c..4a7642f1 100644 --- a/appexemplo_v1.0/app/lib/widget/FormDin5/helpers/FormDinHelper.class.php +++ b/appexemplo_v1.0/app/lib/widget/FormDin5/helpers/FormDinHelper.class.php @@ -62,7 +62,7 @@ class FormDinHelper { - const FORMDIN_VERSION = '5.1.0'; + const FORMDIN_VERSION = '5.1.1'; const ADIANTI_MIN_FORMDIN = '7.5.1'; const GRID_SIMPLE = 'GRID_SIMPLE'; const GRID_SCREEN_PAGINATION = 'GRID_SCREEN_PAGINATION'; @@ -408,5 +408,4 @@ public static function sizeWidthInPercent($value) FormDinHelper::validateSizeWidthAndHeight($value); return $value; } - -} +} \ No newline at end of file diff --git a/appexemplo_v1.0/app/tests/lib/widget/FormDin5/helpers/FormDinHelperTest.php b/appexemplo_v1.0/app/tests/lib/widget/FormDin5/helpers/FormDinHelperTest.php index 577f6ea9..b2340bdb 100644 --- a/appexemplo_v1.0/app/tests/lib/widget/FormDin5/helpers/FormDinHelperTest.php +++ b/appexemplo_v1.0/app/tests/lib/widget/FormDin5/helpers/FormDinHelperTest.php @@ -50,9 +50,11 @@ class FormDinHelperTest extends TestCase { - + public $formDinVersion = '5.1.1'; + public $adiantiVersion = '7.5.1b2'; + public function testVersion() { - $expected = '5.1.0'; + $expected = $this->formDinVersion; $result = FormDinHelper::version(); $this->assertEquals( $expected , $result); } @@ -75,7 +77,7 @@ public function testVersionMinimum_equal() { * @doesNotPerformAssertions */ public function testAdianti_verifyFormDinMinimumVersion_ok() { - FormDinHelper::verifyFormDinMinimumVersion('5.1.0'); + FormDinHelper::verifyFormDinMinimumVersion($this->formDinVersion); } public function testAdianti_verifyFormDinMinimumVersion_Exception() { $this->expectException(DomainException::class); @@ -85,7 +87,7 @@ public function testAdianti_verifyFormDinMinimumVersion_Exception() { * @doesNotPerformAssertions */ public function testAdianti_verifyMinimumVersionAdiantiFrameWorkToFormDin_ok() { - FormDinHelper::verifyMinimumVersionAdiantiFrameWorkToFormDin('5.1.0'); + FormDinHelper::verifyMinimumVersionAdiantiFrameWorkToFormDin($this->formDinVersion); } public function testAdianti_verifyMinimumVersionAdiantiFrameWorkToFormDin_Exception() { $this->expectException(DomainException::class); @@ -103,7 +105,7 @@ public function testAdianti_verifyMinimumVersionAdiantiFrameWorkToSystem_Excepti } //----------------------------------------------------------------------------------- public function testAdiantiVersion() { - $expected = '7.5.1b.2'; + $expected = $this->adiantiVersion; $result = FormDinHelper::getAdiantiFrameWorkVersion(); $this->assertEquals( $expected , $result); }