Changeset 237

Show
Ignore:
Timestamp:
02/06/07 18:34:34 (2 years ago)
Author:
mikey
Message:

added test for removing the path

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/main/php/net/stubbles/star/StarFile.php

    r226 r237  
    8585        $pathinfo   = pathinfo($this->name); 
    8686        $pathinfo['basename'] = substr($pathinfo['basename'], 0, ((strlen($pathinfo['extension']) + 1) * -1)); 
    87         $this->name = $pathinfo['dirname'] . '/' . $pathinfo['basename'] . '.' . $extension; 
     87        $this->name = $pathinfo['dirname'] . DIRECTORY_SEPARATOR . $pathinfo['basename'] . '.' . $extension; 
    8888    } 
    8989     

  • trunk/src/test/php/net/stubbles/star/StarFileTestCase.php

    r124 r237  
    2222     */ 
    2323    protected $starFile; 
     24    /** 
     25     * the filename 
     26     * 
     27     * @var  string 
     28     */ 
     29    protected $filename; 
     30    /** 
     31     * the directory name 
     32     *  
     33     * @var  string 
     34     */ 
     35    protected $dirname; 
    2436     
    2537    /** 
    …… 
    2840    public function setUp() 
    2941    { 
    30         $this->starFile = new StarFile('foo/bar.baz'); 
     42        $this->dirname  = dirname(__FILE__); 
     43        $this->filename = $this->dirname . DIRECTORY_SEPARATOR . 'foo' . DIRECTORY_SEPARATOR . 'bar.baz'; 
     44        $this->starFile = new StarFile($this->filename, $this->dirname); 
    3145    } 
    3246     
    …… 
    3650    public function testValues() 
    3751    { 
    38         $this->assertEqual($this->starFile->getName(), 'foo/bar.baz'); 
     52        $this->assertEqual($this->starFile->getName(), $this->filename); 
    3953        $this->assertEqual($this->starFile->getBaseName(), 'bar.baz'); 
    4054        $this->assertEqual($this->starFile->getExtension(), 'baz'); 
    41         $this->assertEqual($this->starFile->getPath(), 'foo'); 
     55        $this->assertEqual($this->starFile->getPath(), $this->dirname . DIRECTORY_SEPARATOR . 'foo'); 
     56        $this->assertEqual($this->starFile->getPathWithBaseRemoved(), 'foo'); 
    4257    } 
    4358     
    …… 
    4964        $this->starFile->setExtension('baz'); 
    5065        $this->assertEqual($this->starFile->getExtension(), 'baz'); 
    51         $this->assertEqual($this->starFile->getName(), 'foo/bar.baz'); 
     66        $this->assertEqual($this->starFile->getName(), $this->filename); 
     67        $this->assertEqual($this->starFile->getPathWithBaseRemoved(), 'foo'); 
    5268         
    5369        $this->starFile->setExtension('foo'); 
    5470        $this->assertEqual($this->starFile->getExtension(), 'foo'); 
    55         $this->assertEqual($this->starFile->getName(), 'foo/bar.foo'); 
     71        $this->assertEqual($this->starFile->getName(), substr($this->filename, 0, -3) . 'foo'); 
     72        $this->assertEqual($this->starFile->getPathWithBaseRemoved(), 'foo'); 
    5673         
    5774        $this->starFile->setExtension('bar'); 
    5875        $this->assertEqual($this->starFile->getExtension(), 'bar'); 
    59         $this->assertEqual($this->starFile->getName(), 'foo/bar.bar'); 
     76        $this->assertEqual($this->starFile->getName(), substr($this->filename, 0, -3) . 'bar'); 
     77        $this->assertEqual($this->starFile->getPathWithBaseRemoved(), 'foo'); 
    6078         
    6179        $this->starFile->setExtension('baz'); 
    6280        $this->assertEqual($this->starFile->getExtension(), 'baz'); 
    63         $this->assertEqual($this->starFile->getName(), 'foo/bar.baz'); 
    64          
     81        $this->assertEqual($this->starFile->getName(), $this->filename); 
     82        $this->assertEqual($this->starFile->getPathWithBaseRemoved(), 'foo'); 
    6583    } 
    6684}