[PHP-CVS] cvs: phpruntests /tests/configuration/preconditions rtIsTestFileSpecifiedTest.php

[Stefan Priebsch]

spriebsch               Tue May 12 23:20:28 2009 UTC

  Modified files:              
    /phpruntests/tests/configuration/preconditions      
                                                        
rtIsTestFileSpecifiedTest.php 
  Log:
  Fixed test to work with refactored rtRuntestsConfiguration.
  
  
http://cvs.php.net/viewvc.cgi/phpruntests/tests/configuration/preconditions/rtIsTestFileSpecifiedTest.php?r1=1.3&r2=1.4&diff_format=u
Index: 
phpruntests/tests/configuration/preconditions/rtIsTestFileSpecifiedTest.php
diff -u 
phpruntests/tests/configuration/preconditions/rtIsTestFileSpecifiedTest.php:1.3 
phpruntests/tests/configuration/preconditions/rtIsTestFileSpecifiedTest.php:1.4
--- 
phpruntests/tests/configuration/preconditions/rtIsTestFileSpecifiedTest.php:1.3 
    Fri Apr 24 09:42:01 2009
+++ phpruntests/tests/configuration/preconditions/rtIsTestFileSpecifiedTest.php 
Tue May 12 23:20:28 2009
@@ -1,69 +1,81 @@
 <?php
+/**
+ * rtIsTestFileSpecifiedTest
+ *
+ * @category  Testing
+ * @package   RUNTESTS
+ * @author    Zoe Slattery <z...@php.net>
+ * @author    Stefan Priebsch <sprieb...@php.net>
+ * @copyright 2009 The PHP Group
+ * @license   http://www.php.net/license/3_01.txt PHP License 3.01
+ * @link      http://qa.php.net/
+ */
 
 require_once 'PHPUnit/Framework.php';
 require_once dirname(__FILE__) . '../../../../src/rtAutoload.php';
 
+/**
+ * Tests for rtIsTestFileSpecifiedTest precondition.
+ *
+ * @category  Testing
+ * @package   RUNTESTS
+ * @author    Zoe Slattery <z...@php.net>
+ * @author    Stefan Priebsch <sprieb...@php.net>
+ * @copyright 2009 The PHP Group
+ * @license   http://www.php.net/license/3_01.txt PHP License 3.01
+ * @link      http://qa.php.net/
+ */
 class rtIsTestFileSpecifiedTest extends PHPUnit_Framework_TestCase
 {
-    public function testClOptionR()
+    protected function setUp()
+    {
+        $this->preCondition = new rtIsTestFileSpecified();
+    }
+
+    protected function tearDown()
     {
-        $env = rtEnvironmentVariables::getInstance();
-        $clo = new rtCommandLineOptions();
-        $clo->parse(array('run-tests.php', '-r', 'some-file'));
+        unset($this->preCondition);
+    }
 
-        $pre = new rtIsTestFileSpecified();
+    public function testClOptionR()
+    {
+        $runtestsConfiguration = 
rtRuntestsConfiguration::getInstance(array('run-tests.php', '-r', 'some-file'));
 
-        $this->assertTrue($pre->check($clo, $env));
+        $this->assertTrue($this->preCondition->check($runtestsConfiguration));
     }
 
     public function testCLOptionL()
     {
-        $env = rtEnvironmentVariables::getInstance();
-        $clo = new rtCommandLineOptions();
-        $clo->parse(array('run-tests.php', '-l', 'some-file'));
-
-        $pre = new rtIsTestFileSpecified();
+        $runtestsConfiguration = 
rtRuntestsConfiguration::getInstance(array('run-tests.php', '-l', 'some-file'));
 
-        $this->assertTrue($pre->check($clo, $env));
+        $this->assertTrue($this->preCondition->check($runtestsConfiguration));
     }
 
     public function testCLOptionFileName()
     {
-        $env = rtEnvironmentVariables::getInstance();
-        $clo = new rtCommandLineOptions();
-        $clo->parse(array('run-tests.php', 'some-test-file'));
-
-        $pre = new rtIsTestFileSpecified();
+        $runtestsConfiguration = 
rtRuntestsConfiguration::getInstance(array('run-tests.php', 'some-test-file'));
 
-        $this->assertTrue($pre->check($clo, $env));
+        $this->assertTrue($this->preCondition->check($runtestsConfiguration));
     }
 
     public function testEnvVar()
     {
-        $env = rtEnvironmentVariables::getInstance();
-        $clo = new rtCommandLineOptions();
-        $env->setvariable('TEST_PHP_USER', 'some-file');
+        $runtestsConfiguration = rtRuntestsConfiguration::getInstance(array());
+        $runtestsConfiguration->setEnvironmentVariable('TEST_PHP_USER', 
'some-file');
 
-        $pre = new rtIsTestFileSpecified();
-
-        $this->assertTrue($pre->check($clo, $env));
+        $this->assertTrue($this->preCondition->check($runtestsConfiguration));
     }
 
     public function testNotSpecified()
     {
-        $env = rtEnvironmentVariables::getInstance();
-        $clo = new rtCommandLineOptions();
-
-        $pre = new rtIsTestFileSpecified();
+        $runtestsConfiguration = rtRuntestsConfiguration::getInstance(array());
 
-        $this->assertFalse($pre->check($clo, $env));
+        $this->assertFalse($this->preCondition->check($runtestsConfiguration));
     }
 
-    public function testGetText()
+    public function testGetMessage()
     {
-        $pre = new rtIsTestFileSpecified();
-
-        $this->assertEquals($pre->getMessage('missingTestFile'), 
rtText::get('missingTestFile'));
+        
$this->assertEquals($this->preCondition->getMessage('missingTestFile'), 
rtText::get('missingTestFile'));
     }
 }
 ?>



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php