Changeset 307 for trunk/test

Show
Ignore:
Timestamp:
11/15/07 13:17:47 (9 months ago)
Author:
hans
Message:

Refs #188 - Adding work-in-progress (still-broken!) namespace support.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/test/classes/example/tasks/TaskdefTestSimpleTask.php

    r144 r307  
    2121 */ 
    2222  
    23 require_once 'phing/Task.php'; 
     23 
    2424 
    2525class TaskdefTestSimpleTask extends Task { 

  • trunk/test/classes/example/types/TypedefTestType.php

    r123 r307  
    2121 */ 
    2222  
    23 require_once 'phing/types/DataType.php'; 
     23 
    2424 
    2525class TypedefTestType extends DataType { 

  • trunk/test/classes/phing/BuildFileTest.php

    r227 r307  
    2222  
    2323require_once 'PHPUnit2/Framework/TestCase.php'; 
    24 require_once 'phing/BuildListener.php'; 
    25 require_once 'phing/system/io/PhingFile.php'; 
     24 
     25 
    2626 
    2727/** 
    …… 
    176176        $this->project = new Project(); 
    177177        $this->project->init(); 
    178         $f = new PhingFile($filename); 
     178        $f = new File($filename); 
    179179        $this->project->setUserProperty( "phing.file" , $f->getAbsolutePath() ); 
    180180        $this->project->addBuildListener(new PhingTestListener($this)); 
    181         ProjectConfigurator::configureProject($this->project, new PhingFile($filename)); 
     181        ProjectConfigurator::configureProject($this->project, new File($filename)); 
    182182    } 
    183183     

  • trunk/test/classes/phing/IntrospectionHelperTest.php

    r123 r307  
    2121 
    2222require_once 'PHPUnit2/Framework/TestCase.php'; 
    23 include_once 'phing/tasks/system/condition/OsCondition.php'; 
     23 
    2424 
    2525/** 

  • trunk/test/classes/phing/filters/LineContainsTest.php

    r123 r307  
    2121 */ 
    2222 
    23 require_once 'phing/BuildFileTest.php';  
    24 include_once 'phing/util/FileUtils.php'; 
     23  
     24 
    2525 
    2626/** 

  • trunk/test/classes/phing/system/FileOutputStreamTest.php

    r227 r307  
    2323 
    2424require_once 'PHPUnit2/Framework/TestCase.php'; 
    25 include_once 'phing/system/io/FileOutputStream.php'; 
     25 
    2626 
    2727/** 
    …… 
    3939     
    4040    public function setUp() { 
    41                 $this->tmpFile = new PhingFile("tmp/" . get_class($this) . ".txt"); 
     41                $this->tmpFile = new File("tmp/" . get_class($this) . ".txt"); 
    4242        $this->outStream = new FileOutputStream($this->tmpFile); 
    4343    } 

  • trunk/test/classes/phing/tasks/PropertyTaskTest.php

    r123 r307  
    2121 */ 
    2222  
    23 require_once 'phing/BuildFileTest.php'; 
     23 
    2424 
    2525/** 

  • trunk/test/classes/phing/tasks/TypedefTaskTest.php

    r227 r307  
    2020 */ 
    2121  
    22 require_once 'phing/BuildFileTest.php'; 
     22 
    2323 
    2424/** 

  • trunk/test/classes/phing/tasks/condition/ContainsConditionTest.php

    r123 r307  
    2222 
    2323require_once 'PHPUnit2/Framework/TestCase.php'; 
    24 include_once 'phing/tasks/system/condition/ContainsCondition.php'; 
     24 
    2525 
    2626/** 

  • trunk/test/classes/phing/tasks/condition/EqualsConditionTest.php

    r123 r307  
    2222 
    2323require_once 'PHPUnit2/Framework/TestCase.php'; 
    24 include_once 'phing/tasks/system/condition/EqualsCondition.php'; 
     24 
    2525 
    2626/** 

  • trunk/test/classes/phing/types/AbstractFileSetTest.php

    r123 r307  
    2121 */ 
    2222  
    23 require_once 'phing/BuildFileTest.php'; 
     23 
    2424require_once 'PHPUnit2/Framework/TestCase.php'; 
    25 include_once 'phing/types/FileSet.php'; 
     25 
    2626 
    2727/** 
    …… 
    9797         
    9898        try { 
    99             $f->setIncludesfile(new PhingFile("/a")); 
     99            $f->setIncludesfile(new File("/a")); 
    100100            $this->fail("Can set includesfile in " 
    101101                 . $f->getDataTypeName() 
    …… 
    117117  
    118118        try { 
    119             $f->setExcludesfile(new PhingFile("/a")); 
     119            $f->setExcludesfile(new File("/a")); 
    120120            $this->fail("Can set excludesfile in " 
    121121                 . $f->getDataTypeName() 

  • trunk/test/classes/phing/types/CommandlineTest.php

    r123 r307  
    2323 
    2424require_once 'PHPUnit2/Framework/TestCase.php'; 
    25 include_once 'phing/types/Commandline.php'; 
     25 
    2626 
    2727 

  • trunk/test/classes/phing/types/FileSetTest.php

    r123 r307  
    2121 */ 
    2222  
    23 require_once 'phing/types/AbstractFileSetTest.php'; 
    24 include_once 'phing/types/FileSet.php'; 
     23 
     24 
    2525 
    2626/** 

  • trunk/test/classes/phing/types/MapperTest.php

    r123 r307  
    2222 
    2323require_once 'PHPUnit2/Framework/TestCase.php'; 
    24 include_once 'phing/BuildFileTest.php'; 
    25 include_once 'phing/types/Mapper.php'; 
    26 include_once 'phing/Project.php'; 
    27 include_once 'phing/types/Reference.php'; 
     24 
     25 
     26 
     27 
    2828 
    2929/** 

  • trunk/test/run-tests.php

    r123 r307  
    1313 
    1414// STARTUP PHING 
    15 require_once 'phing/Phing.php'; 
     15 
    1616 
    1717Phing::startup(); 
    …… 
    2828 
    2929$coreSuite = new PHPUnit2_Framework_TestSuite("Phing Core"); 
    30 include_once 'phing/IntrospectionHelperTest.php'; 
     30 
    3131$coreSuite->addTestSuite(new ReflectionClass('IntrospectionHelperTest')); 
    3232 
    …… 
    3838$typesSuite = new PHPUnit2_Framework_TestSuite("Phing Types"); 
    3939 
    40 include_once 'phing/types/MapperTest.php'; 
     40 
    4141$typesSuite->addTestSuite(new ReflectionClass('MapperTest')); 
    4242 
    43 include_once 'phing/filters/LineContainsTest.php'; 
     43 
    4444$typesSuite->addTestSuite(new ReflectionClass('LineContainsTest')); 
    4545 
    46 include_once 'phing/types/CommandlineTest.php'; 
     46 
    4747$typesSuite->addTestSuite(new ReflectionClass('CommandlineTest')); 
    4848 
    49 include_once 'phing/types/FileSetTest.php'; 
     49 
    5050$typesSuite->addTestSuite(new ReflectionClass('FileSetTest')); 
    5151 
    …… 
    5656$tasksSuite = new PHPUnit2_Framework_TestSuite("Phing Tasks"); 
    5757 
    58 include_once 'phing/tasks/TypedefTaskTest.php'; 
     58 
    5959$tasksSuite->addTestSuite(new ReflectionClass('TypedefTaskTest')); 
    6060 
    6161 
    6262// Conditions 
    63 include_once 'phing/tasks/condition/ContainsConditionTest.php'; 
    64 include_once 'phing/tasks/condition/EqualsConditionTest.php'; 
     63 
     64 
    6565$tasksSuite->addTestSuite(new ReflectionClass('ContainsConditionTest')); 
    6666$tasksSuite->addTestSuite(new ReflectionClass('EqualsConditionTest')); 
    6767 
    68 include_once 'phing/tasks/PropertyTaskTest.php'; 
     68 
    6969$tasksSuite->addTestSuite(new ReflectionClass('PropertyTaskTest')); 
    7070