[PHP-CVS] cvs: phpruntests /src/testrun rtPhpTestRun.php
zoe Thu Jul 2 09:24:14 2009 UTC
Modified files:
/phpruntests/src/testrunrtPhpTestRun.php
Log:
check for help and h on command line
http://cvs.php.net/viewvc.cgi/phpruntests/src/testrun/rtPhpTestRun.php?r1=1.18r2=1.19diff_format=u
Index: phpruntests/src/testrun/rtPhpTestRun.php
diff -u phpruntests/src/testrun/rtPhpTestRun.php:1.18
phpruntests/src/testrun/rtPhpTestRun.php:1.19
--- phpruntests/src/testrun/rtPhpTestRun.php:1.18 Thu Jul 2 09:22:11 2009
+++ phpruntests/src/testrun/rtPhpTestRun.phpThu Jul 2 09:24:14 2009
@@ -32,7 +32,7 @@
$runConfiguration-configure();
//Check help message
-if($runConfiguration-hasCommandLineOption('help')) {
+if($runConfiguration-hasCommandLineOption('help') ||
$runConfiguration-hasCommandLineOption('h')) {
echo rtText::get('help');
exit;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src/testrun rtPhpTestRun.php
zoe Thu Jul 2 09:22:12 2009 UTC
Modified files:
/phpruntests/src/testrunrtPhpTestRun.php
Log:
check help option
http://cvs.php.net/viewvc.cgi/phpruntests/src/testrun/rtPhpTestRun.php?r1=1.17r2=1.18diff_format=u
Index: phpruntests/src/testrun/rtPhpTestRun.php
diff -u phpruntests/src/testrun/rtPhpTestRun.php:1.17
phpruntests/src/testrun/rtPhpTestRun.php:1.18
--- phpruntests/src/testrun/rtPhpTestRun.php:1.17 Tue Jun 30 15:39:51 2009
+++ phpruntests/src/testrun/rtPhpTestRun.phpThu Jul 2 09:22:11 2009
@@ -30,6 +30,12 @@
$runConfiguration =
rtRuntestsConfiguration::getInstance($this-commandLineArguments);
$runConfiguration-getUserEnvironment();
$runConfiguration-configure();
+
+//Check help message
+if($runConfiguration-hasCommandLineOption('help')) {
+echo rtText::get('help');
+exit;
+}
//Check the preconditions
$preConditionList = rtPreConditionList::getInstance();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src/testrun rtPhpTestRun.php
zoe Tue Jun 30 13:35:42 2009 UTC
Modified files:
/phpruntests/src/testrunrtPhpTestRun.php
Log:
changes in line with rtTestStatus - missed before
http://cvs.php.net/viewvc.cgi/phpruntests/src/testrun/rtPhpTestRun.php?r1=1.15r2=1.16diff_format=u
Index: phpruntests/src/testrun/rtPhpTestRun.php
diff -u phpruntests/src/testrun/rtPhpTestRun.php:1.15
phpruntests/src/testrun/rtPhpTestRun.php:1.16
--- phpruntests/src/testrun/rtPhpTestRun.php:1.15 Mon Jun 29 01:34:54 2009
+++ phpruntests/src/testrun/rtPhpTestRun.phpTue Jun 30 13:35:42 2009
@@ -121,13 +121,13 @@
//Read the test file
$testFile = new rtPhpTestFile();
$testFile-doRead($testName);
-$testFile-normaliseLineEndings($testName);
+$testFile-normaliseLineEndings();
+
$testStatus = new rtTestStatus($testFile-getTestName());
if ($testFile-arePreconditionsMet()) {
-
$testCase = new rtPhpTest($testFile-getContents(),
$testFile-getTestName(), $testFile-getSectionHeadings(), $runConfiguration,
$testStatus);
//Setup and set the local environment for the test case
@@ -137,7 +137,9 @@
$results-processResults($testCase, $runConfiguration);
} else {
-$results = new rtTestResults(null,
$testFile-getExitMessage(), $testFile-getTestName());
+$testStatus-setTrue('bork');
+$testStatus-setMessage('bork',
$testFile-getExitMessage());
+$results = new rtTestResults(null, $testStatus);
}
$testOutputWriter =
rtTestOutputWriter::getInstance(array($results), 'list');
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src/testrun rtPhpTestRun.php
zoe Sat Jun 27 13:53:54 2009 UTC
Modified files:
/phpruntests/src/testrunrtPhpTestRun.php
Log:
remove comments from outputwriter
http://cvs.php.net/viewvc.cgi/phpruntests/src/testrun/rtPhpTestRun.php?r1=1.12r2=1.13diff_format=u
Index: phpruntests/src/testrun/rtPhpTestRun.php
diff -u phpruntests/src/testrun/rtPhpTestRun.php:1.12
phpruntests/src/testrun/rtPhpTestRun.php:1.13
--- phpruntests/src/testrun/rtPhpTestRun.php:1.12 Fri Jun 26 00:07:24 2009
+++ phpruntests/src/testrun/rtPhpTestRun.phpSat Jun 27 13:53:54 2009
@@ -73,7 +73,7 @@
foreach ($subDirectories as $subDirectory) {
$testGroup = new rtPhpTestGroup($runConfiguration,
$subDirectory);
$testGroup-runGroup($runConfiguration);
- // $testGroup-writeGroup();
+ $testGroup-writeGroup();
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src/testrun rtPhpTestRun.php
zoe Tue Jun 2 19:52:53 2009 UTC
Modified files:
/phpruntests/src/testrunrtPhpTestRun.php
Log:
Replacing status array with status object
http://cvs.php.net/viewvc.cgi/phpruntests/src/testrun/rtPhpTestRun.php?r1=1.9r2=1.10diff_format=u
Index: phpruntests/src/testrun/rtPhpTestRun.php
diff -u phpruntests/src/testrun/rtPhpTestRun.php:1.9
phpruntests/src/testrun/rtPhpTestRun.php:1.10
--- phpruntests/src/testrun/rtPhpTestRun.php:1.9Mon May 25 12:46:57 2009
+++ phpruntests/src/testrun/rtPhpTestRun.phpTue Jun 2 19:52:53 2009
@@ -88,10 +88,13 @@
$testFile = new rtPhpTestFile();
$testFile-doRead($testName);
$testFile-normaliseLineEndings($testName);
+
+$testStatus = new rtTestStatus();
+$testStatus-setTestName($testFile-getTestName());
if ($testFile-arePreconditionsMet()) {
-$testCase = new rtPhpTest($testFile-getContents(),
$testFile-getTestName(), $testFile-getSectionHeadings(), $runConfiguration);
+$testCase = new rtPhpTest($testFile-getContents(),
$testFile-getTestName(), $testFile-getSectionHeadings(), $runConfiguration,
$testStatus);
//Setup and set the local environment for the test case
$testCase-executeTest($runConfiguration);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src/testrun rtPhpTestRun.php
zoe Wed May 13 11:42:15 2009 UTC
Modified files:
/phpruntests/src/testrunrtPhpTestRun.php
Log:
Moving precondition check in line with Stefans changes
http://cvs.php.net/viewvc.cgi/phpruntests/src/testrun/rtPhpTestRun.php?r1=1.4r2=1.5diff_format=u
Index: phpruntests/src/testrun/rtPhpTestRun.php
diff -u phpruntests/src/testrun/rtPhpTestRun.php:1.4
phpruntests/src/testrun/rtPhpTestRun.php:1.5
--- phpruntests/src/testrun/rtPhpTestRun.php:1.4Fri Apr 24 08:52:21 2009
+++ phpruntests/src/testrun/rtPhpTestRun.phpWed May 13 11:42:15 2009
@@ -20,6 +20,12 @@
$runConfiguration =
rtRuntestsConfiguration::getInstance($this-commandLineArguments);
$runConfiguration-configure();
+//Check the preconditions
+$preConditionList = rtPreConditionList::getInstance();
+
+// $preConditionList-check($this-commandLine,
$this-environmentVariables);
+$preConditionList-check($this);
+
if ($runConfiguration-getSetting('TestDirectories') != null) {
foreach ($runConfiguration-getSetting('TestDirectories') as
$testDirectory) {
@@ -76,7 +82,7 @@
if ($testFile-arePreconditionsMet()) {
$testCase = new rtPhpTest($testFile-getContents(),
$testFile-getTestName(), $testFile-getSectionHeadings(), $runConfiguration);
-
+
//Setup and set the local environment for the test case
$testCase-executeTest($runConfiguration);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src/testrun rtPhpTestRun.php
zoe Wed May 13 13:39:49 2009 UTC
Modified files:
/phpruntests/src/testrunrtPhpTestRun.php
Log:
fix typo
http://cvs.php.net/viewvc.cgi/phpruntests/src/testrun/rtPhpTestRun.php?r1=1.5r2=1.6diff_format=u
Index: phpruntests/src/testrun/rtPhpTestRun.php
diff -u phpruntests/src/testrun/rtPhpTestRun.php:1.5
phpruntests/src/testrun/rtPhpTestRun.php:1.6
--- phpruntests/src/testrun/rtPhpTestRun.php:1.5Wed May 13 11:42:15 2009
+++ phpruntests/src/testrun/rtPhpTestRun.phpWed May 13 13:39:49 2009
@@ -24,7 +24,7 @@
$preConditionList = rtPreConditionList::getInstance();
// $preConditionList-check($this-commandLine,
$this-environmentVariables);
-$preConditionList-check($this);
+$preConditionList-check($runConfiguration);
if ($runConfiguration-getSetting('TestDirectories') != null) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src/testrun rtPhpTestRun.php
zoe Sun Apr 19 16:30:34 2009 UTC
Modified files:
/phpruntests/src/testrunrtPhpTestRun.php
Log:
fixing missing line endings for BORKed tests
http://cvs.php.net/viewvc.cgi/phpruntests/src/testrun/rtPhpTestRun.php?r1=1.1.1.1r2=1.2diff_format=u
Index: phpruntests/src/testrun/rtPhpTestRun.php
diff -u phpruntests/src/testrun/rtPhpTestRun.php:1.1.1.1
phpruntests/src/testrun/rtPhpTestRun.php:1.2
--- phpruntests/src/testrun/rtPhpTestRun.php:1.1.1.1Wed Apr 15 16:30:19 2009
+++ phpruntests/src/testrun/rtPhpTestRun.phpSun Apr 19 16:30:34 2009
@@ -84,11 +84,12 @@
$results-processResults($testCase, $runConfiguration);
-$testOutputWriter =
rtTestOutputWriter::getInstance(array($results), 'list');
-$testOutputWriter-write();
+
} else {
-echo BORK .$testFile-getExitMessage();
+$results = new rtTestResults(null, $testFile-getExitMessage(),
$testFile-getTestName());
}
+ $testOutputWriter = rtTestOutputWriter::getInstance(array($results),
'list');
+$testOutputWriter-write();
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
