Changeset 126

Show
Ignore:
Timestamp:
11/13/07 00:11:31 (10 months ago)
Author:
mikey
Message:

added unit test for converters.PrimitiveValueConverter?

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/PRE_NAMESPACES/XJConf/converters/PrimitiveValueConverter.php

    r124 r126  
    11<?php 
     2/** 
     3 * Converter to convert a value to a primitive type 
     4 * 
     5 * @author      Stephan Schmidt <stephan.schmidt@schlund.de> 
     6 * @author      Frank Kleine <mikey@xjconf.net> 
     7 * @package     XJConf 
     8 * @subpackage  converters 
     9 */ 
    210XJConfLoader::load('converters.ValueConverter', 
    311                   'converters.PrimitiveValueConverter', 
    …… 
    715 * Converter to convert a value to a primitive type 
    816 * 
    9  * @author Stephan Schmidt <stephan.schmidt@schlund.de> 
     17 * @package     XJConf 
     18 * @subpackage  converters 
    1019 */ 
    1120class PrimitiveValueConverter implements ValueConverter 
    1221{ 
    13  
    1422    /** 
    15      * Type of the primitive 
     23     * type of the primitive 
    1624     * 
    1725     * @var  string 
    …… 
    3543     * @throws  ValueConversionException 
    3644     */ 
    37     public function convertValue(Tag $tag, Definition $def) { 
     45    public function convertValue(Tag $tag, Definition $def) 
     46    { 
    3847        $value = $tag->getData(); 
    39          
    4048        switch ($this->type) { 
    4149            case 'boolean': 
    4250            case 'bool': 
    43                 if ('false' === $value) { 
     51                if ('false' === $value || '0' === $value) { 
    4452                    return false; 
    4553                } 
    …… 
    5664                return (string) $value; 
    5765        } 
     66         
    5867        return null; 
    5968    } 

  • branches/PRE_NAMESPACES/tests/definitions/DefinitionsTestSuite.php

    r105 r126  
    55 * @author  Frank Kleine <mikey@xjconf.net> 
    66 */ 
    7 require_once dirname(__FILE__) . '/../../simpletest/unit_tester.php'; 
    8 require_once dirname(__FILE__) . '/../../simpletest/mock_objects.php'; 
    97/** 
    10  * Test for AttributeDefinition. 
     8 * Test suite for all definitions. 
    119 * 
    1210 * @package     XJConf 
    …… 
    2018    public function __construct() 
    2119    { 
     20        $dir = dirname(__FILE__); 
    2221        $this->TestSuite('All definition tests'); 
    23         $this->addTestFile(dirname(__FILE__) . '/AttributeDefinitionTestCase.php'); 
    24         $this->addTestFile(dirname(__FILE__) . '/CDataDefinitionTestCase.php'); 
    25         $this->addTestFile(dirname(__FILE__) . '/ConstructorDefinitionTestCase.php'); 
    26         $this->addTestFile(dirname(__FILE__) . '/FactoryMethodDefinitionTestCase.php'); 
    27         $this->addTestFile(dirname(__FILE__) . '/NamespaceDefinitionTestCase.php'); 
     22        $this->addTestFile($dir . '/AttributeDefinitionTestCase.php'); 
     23        $this->addTestFile($dir . '/CDataDefinitionTestCase.php'); 
     24        $this->addTestFile($dir . '/ConstructorDefinitionTestCase.php'); 
     25        $this->addTestFile($dir . '/FactoryMethodDefinitionTestCase.php'); 
     26        $this->addTestFile($dir . '/NamespaceDefinitionTestCase.php'); 
    2827    } 
    2928} 

  • branches/PRE_NAMESPACES/tests/run.php

    r68 r126  
    55 * @author  Frank Kleine <mikey@xjconf.net> 
    66 */ 
     7require_once dirname(__FILE__) . '/../simpletest/unit_tester.php'; 
     8require_once dirname(__FILE__) . '/../simpletest/mock_objects.php'; 
    79require_once dirname(__FILE__) . '/../simpletest/reporter.php'; 
    810require_once dirname(__FILE__) . '/../XJConf/XJConfLoader.php'; 
    9 require_once 'definitions/DefinitionsTestSuite.php'; 
    1011/** 
    1112 * Test runner for XJConf. 
    …… 
    1819    public function main() 
    1920    { 
    20         $test = new DefinitionsTestSuite(); 
     21        $dir       = dirname(__FILE__); 
     22        $testSuite = new TestSuite('All tests.'); 
     23        $testSuite->addTestFile($dir . '/converters/ConvertersTestSuite.php'); 
     24        $testSuite->addTestFile($dir . '/definitions/DefinitionsTestSuite.php'); 
    2125        if (PHP_SAPI == 'cli') { 
    2226            $reporter = new TextReporter(); 
    …… 
    2428            $reporter = new HtmlReporter(); 
    2529        } 
    26         $test->run($reporter); 
     30        $testSuite->run($reporter); 
    2731    } 
    2832}