Changeset 1663

Show
Ignore:
Timestamp:
06/30/08 21:14:06 (2 months ago)
Author:
mikey
Message:

verify encoding behaviour (ticket #87, comment 6)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/projects/dist/pages/conf/index.xml

    r1232 r1663  
    1 <?xml version="1.0" encoding="iso-8859-1"?> 
     1<?xml version="1.0" encoding="utf-8"?> 
    22<xj:configuration 
    33    xmlns:xj="http://xjconf.net/XJConf" 
    …… 
    66    <properties> 
    77      <property name="skin">default</property> 
     8      <property name="title">Übersicht</property> 
    89    </properties> 
    910    <xmlElement type="org::stubbles::examples::pageelements::TestXMLPageElement" name="Test" /> 

  • trunk/projects/dist/pages/index.xml

    r1158 r1663  
    1 <?xml version="1.0" encoding="iso-8859-1"?> 
     1<?xml version="1.0" encoding="utf-8"?> 
    22<xj:configuration 
    33    xmlns:xj="http://xjconf.net/XJConf" 
    44    xmlns="http://stubbles.net/websites"> 
    55  <page> 
    6     <includeFile source="index.html" parts="content" /> 
     6    <properties> 
     7      <property name="skin">default</property> 
     8      <property name="title">Übersicht</property> 
     9    </properties> 
     10    <includeFile source="contentFile.txt" parts="content" name="index"/> 
    711  </page> 
    812</xj:configuration> 

  • trunk/src/test/php/net/stubbles/integration/stubPageXJConfFactoryTestCase.php

    r1463 r1663  
    1717{ 
    1818    /** 
    19      * assure that creating the variant map works correct 
     19     * assure that creating the page instance works correct 
    2020     * 
    2121     * @test 
    2222     */ 
    23     public function pageXJConfFactory() 
     23    public function xmlPageXJConfFactory() 
    2424    { 
    2525        $pageFactory = new stubPageXJConfFactory(); 
    …… 
    2727        $this->assertTrue($pageFactory->hasPage('index')); 
    2828        $this->assertFalse($pageFactory->hasPage('doesNotExist')); 
    29         $page        = $pageFactory->getPage('index'); 
     29        $page = $pageFactory->getPage('index'); 
    3030        $this->assertEquals('default', $page->getProperty('skin')); 
     31        $this->assertEquals(utf8_encode('Übersicht'), $page->getProperty('title')); 
    3132        $elements = $page->getElements(); 
    3233        $this->assertType('TestXMLPageElement', $elements['Test']); 
    …… 
    4041        $this->assertTrue($pageFactory->hasPage('index')); 
    4142        $this->assertFalse($pageFactory->hasPage('doesNotExist')); 
    42         $page        = $pageFactory->getPage('index'); 
     43        $page = $pageFactory->getPage('index'); 
    4344        $this->assertEquals('default', $page->getProperty('skin')); 
    4445        $elements = $page->getElements(); 
    …… 
    4849        $this->assertType('CurrentTimeXMLPageElement', $elements['uncached']); 
    4950    } 
     51 
     52    /** 
     53     * assure that creating the page instance works correct 
     54     * 
     55     * @test 
     56     */ 
     57    public function memphisPageXJConfFactory() 
     58    { 
     59        stubRegistry::setConfig(stubMemphisTemplate::REGISTRY_KEY_DIR, TEST_SRC_PATH . DIRECTORY_SEPARATOR . 'resources'); 
     60        if (class_exists('stubMemphisIncludeFilePageElement', false) === true) { 
     61            stubMemphisIncludeFilePageElement::__static(); 
     62        } 
     63         
     64        $pageFactory = new stubPageXJConfFactory(); 
     65        $this->assertTrue($pageFactory->hasPage('index')); 
     66        $this->assertFalse($pageFactory->hasPage('doesNotExist')); 
     67        try { 
     68        $page = $pageFactory->getPage('index'); 
     69        } catch (Exception $e) { 
     70            echo (string) $e; 
     71        } 
     72        $this->assertEquals('default', $page->getProperty('skin')); 
     73        $this->assertEquals(utf8_encode('Übersicht'), $page->getProperty('title')); 
     74        $elements = $page->getElements(); 
     75        $this->assertType('stubMemphisIncludeFilePageElement', $elements['index']); 
     76         
     77        // cached 
     78        $pageFactory = new stubPageXJConfFactory(); 
     79        $this->assertTrue($pageFactory->hasPage('index')); 
     80        $this->assertFalse($pageFactory->hasPage('doesNotExist')); 
     81        $page = $pageFactory->getPage('index'); 
     82        $this->assertEquals('default', $page->getProperty('skin')); 
     83        $elements = $page->getElements(); 
     84        $this->assertType('stubMemphisIncludeFilePageElement', $elements['index']); 
     85    } 
    5086} 
    5187?>