Changeset 140

Show
Ignore:
Timestamp:
02/04/07 12:06:18 (2 years ago)
Author:
mrook
Message:

Move PHPUnit2 tasks to generic phpunit directory (preparing for PHPUnit3 support integration)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/classes/phing/tasks/defaults.properties

    r128 r140  
    6363svnexport=phing.tasks.ext.svn.SvnExportTask 
    6464svnupdate=phing.tasks.ext.svn.SvnUpdateTask 
    65 phpunit2=phing.tasks.ext.phpunit2.PHPUnit2Task 
    66 phpunit2report=phing.tasks.ext.phpunit2.PHPUnit2ReportTask 
    67 phpunit=phing.tasks.ext.phpunit2.PHPUnit2Task 
    68 phpunitreport=phing.tasks.ext.phpunit2.PHPUnit2ReportTask 
     65phpunit2=phing.tasks.ext.phpunit.PHPUnit2Task 
     66phpunit2report=phing.tasks.ext.phpunit.PHPUnit2ReportTask 
     67phpunit=phing.tasks.ext.phpunit.PHPUnit2Task 
     68phpunitreport=phing.tasks.ext.phpunit.PHPUnit2ReportTask 
    6969coverage-setup=phing.tasks.ext.coverage.CoverageSetupTask 
    7070coverage-merger=phing.tasks.ext.coverage.CoverageMergerTask 

  • trunk/classes/phing/tasks/ext/coverage/CoverageReportTask.php

    r116 r140  
    2424require_once 'phing/system/io/Writer.php'; 
    2525require_once 'phing/system/util/Properties.php'; 
    26 require_once 'phing/tasks/ext/phpunit2/PHPUnit2Util.php'; 
     26require_once 'phing/tasks/ext/phpunit/PHPUnit2Util.php'; 
    2727require_once 'phing/tasks/ext/coverage/CoverageReportTransformer.php'; 
    2828 

  • trunk/classes/phing/tasks/ext/phpunit/FormatterElement.php

    r81 r140  
    2020 */ 
    2121 
    22 require_once 'phing/tasks/ext/phpunit2/XMLPHPUnit2ResultFormatter.php'; 
    23 require_once 'phing/tasks/ext/phpunit2/PlainPHPUnit2ResultFormatter.php'; 
     22require_once 'phing/tasks/ext/phpunit/XMLPHPUnit2ResultFormatter.php'; 
     23require_once 'phing/tasks/ext/phpunit/PlainPHPUnit2ResultFormatter.php'; 
    2424require_once 'phing/system/io/PhingFile.php'; 
    2525 

  • trunk/classes/phing/tasks/ext/phpunit/PHPUnit2Task.php

    r81 r140  
    6363 
    6464                // other dependencies that should only be loaded when class is actually used. 
    65                 require_once 'phing/tasks/ext/phpunit2/PHPUnit2TestRunner.php'; 
    66                 require_once 'phing/tasks/ext/phpunit2/BatchTest.php'; 
    67                 require_once 'phing/tasks/ext/phpunit2/FormatterElement.php'; 
    68                 require_once 'phing/tasks/ext/phpunit2/SummaryPHPUnit2ResultFormatter.php'; 
     65                require_once 'phing/tasks/ext/phpunit/PHPUnit2TestRunner.php'; 
     66                require_once 'phing/tasks/ext/phpunit/BatchTest.php'; 
     67                require_once 'phing/tasks/ext/phpunit/FormatterElement.php'; 
     68                require_once 'phing/tasks/ext/phpunit/SummaryPHPUnit2ResultFormatter.php'; 
    6969 
    7070                // add some defaults to the PHPUnit2 Filter 

  • trunk/classes/phing/tasks/ext/phpunit/PlainPHPUnit2ResultFormatter.php

    r81 r140  
    2323require_once 'PHPUnit2/Util/Filter.php'; 
    2424 
    25 require_once 'phing/tasks/ext/phpunit2/PHPUnit2ResultFormatter.php'; 
     25require_once 'phing/tasks/ext/phpunit/PHPUnit2ResultFormatter.php'; 
    2626 
    2727/** 

  • trunk/classes/phing/tasks/ext/phpunit/SummaryPHPUnit2ResultFormatter.php

    r81 r140  
    2222require_once 'PHPUnit2/Framework/Test.php'; 
    2323 
    24 require_once 'phing/tasks/ext/phpunit2/PHPUnit2ResultFormatter.php'; 
     24require_once 'phing/tasks/ext/phpunit/PHPUnit2ResultFormatter.php'; 
    2525 
    2626/** 

  • trunk/classes/phing/tasks/ext/phpunit/XMLPHPUnit2ResultFormatter.php

    r81 r140  
    2525require_once 'PHPUnit2/Util/Log/XML.php'; 
    2626 
    27 require_once 'phing/tasks/ext/phpunit2/PHPUnit2ResultFormatter.php'; 
     27require_once 'phing/tasks/ext/phpunit/PHPUnit2ResultFormatter.php'; 
    2828 
    2929/**