changes to test framework for using restful-unit

Author: Raaghu

composer.json

@@ -27,6 +27,7 @@
 	},
 	"require-dev" : {
 		"phpunit/phpunit" : "~4.8",
+		"php-platform/restful-unit" : "~0.1",
 		"guzzlehttp/guzzle" : "~3.8",
 		"php-platform/mock-config" : "~0.1"
 	},

composer.lock

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<phpunit colors="true" bootstrap="tests/autoload.php" >
+<phpunit colors="true" bootstrap="vendor/php-platform/restful-unit/resources/autoload.php" >
     <php>
         <const name="APP_DOMAIN" value="http://localhost"/>
         <const name="APP_PATH" value="restful"/>

phpunit.xml

@@ -4,8 +4,9 @@
 
 use PhpPlatform\RESTFul\HTTPResponse;
 use PhpPlatform\Errors\Exceptions\Application\BadInputException;
+use PhpPlatform\Tests\RESTFul\TestBase;
 
-class TestHTTPResponse extends TestServerSide{
+class TestHTTPResponse extends TestBase{
 
 	function testConstruct(){
 		$isException = false;

tests/RESTFul/ServerSide/TestHTTPResponse.php

@@ -9,19 +9,10 @@
 abstract class TestBase extends \PHPUnit_Framework_TestCase {
 
 	private static $errorLogDir = null;
-	private static $coverage = null;
 
 	static function setUpBeforeClass(){
 		parent::setUpBeforeClass();
 
-		// generate coverage for tests run in php-cli process
-		if(defined('COVERAGE_DIR')){
-			$filter = new \PHP_CodeCoverage_Filter();
-			$filter->addDirectoryToWhitelist(dirname(__FILE__).'/../../src');
-			self::$coverage = new \PHP_CodeCoverage(null,$filter);
-			self::$coverage->start('testRESTful');
-		}
-		
 		// create a temporary error log directory
 		$errorLogDir = sys_get_temp_dir().'/php-platform/restful/errors/'.microtime(true);
 		mkdir($errorLogDir,0777,true);
@@ -53,13 +44,15 @@ function setUp(){
 	}
 
 	function tearDown(){
-		// display error log if any
-		$errorlogFile = self::$errorLogDir.'/'. $this->getName();
-		if(file_exists($errorlogFile)){
-			echo PHP_EOL.file_get_contents($errorlogFile).PHP_EOL;
-			unlink($errorlogFile);
-		}
-	}
+	    parent::tearDown();
+		// display error log if any on error
+	    $errorlogFile = self::$errorLogDir.'/'. md5($this->getName());
+	    if(file_exists($errorlogFile)){
+	        if($this->hasFailed()){
+	            echo PHP_EOL.file_get_contents($errorlogFile).PHP_EOL;
+	        }
+	        unlink($errorlogFile);
+	    }}
 
 	function clearErrorLog(){
 		$errorlogFile = self::$errorLogDir.'/'. $this->getName();
@@ -81,13 +74,6 @@ function assertContainsAndClearLog($message){
 	static function tearDownAfterClass(){
 		// delete error log directory
 		rmdir(self::$errorLogDir);
-		
-		if(defined('COVERAGE_DIR')){
-			self::$coverage->stop();
-			$writer = new \PHP_CodeCoverage_Report_PHP();
-			$coverageFileName = md5(microtime()).'.php';
-			$writer->process(self::$coverage, COVERAGE_DIR.'/'.$coverageFileName);
-		}
 	}
 
 }