panels are correctly rendered on pages

dilgerma · Oct 18, 2012 · bce75ee · bce75ee
1 parent 56ab855
commit bce75ee
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 18 deletions.
diff --git a/impl/render/MarkupContainerTagRenderer.php b/impl/render/MarkupContainerTagRenderer.php
@@ -12,17 +12,6 @@ public function MarkupContainerTagRenderer(ComponentStub $component){
         $this->TagRenderer($component);
     }
 
-    public function renderOpenTag()
-    {
-        return "";
-    }
-
-    public function renderCloseTag()
-    {
-        return "";
-    }
-
-
     public function renderBody(MarkupParser $markupParser)
     {
         $this->log->debug("rendering body ".$this->component->getId());

diff --git a/impl/render/TagRenderer.php b/impl/render/TagRenderer.php
@@ -65,7 +65,6 @@ public function render(MarkupParser $markupParser){
         $content = $this->renderOpenTag();
         $content.=$this->renderBody($markupParser);
         $content.=$this->renderCloseTag();
-        $this->log->debug("rendered tag for ".$this->component->getId()." ".$content);
         $this->streamWriter->renderToStream($markupParser,$content);
 
         return $markupParser->getTagForComponent($this->component)->htmlOuter();

diff --git a/log4pconfig.xml b/log4pconfig.xml
@@ -3,10 +3,10 @@
 
     <appender name="myConsoleAppender" class="LoggerAppenderConsole" />
 
-    <appender name="myFileAppender" class="LoggerAppenderFile">
-        <layout class="LoggerLayoutTTCC" />
-        <param name="file" value="logs/myLog.out" />
-    </appender>
+    <!--<appender name="myFileAppender" class="LoggerAppenderFile">-->
+        <!--<layout class="LoggerLayoutTTCC" />-->
+        <!--<param name="file" value="/logs/myLog.out" />-->
+    <!--</appender>-->
 
 
     <root>

diff --git a/tests/component/page/PageTestPanel.html b/tests/component/page/PageTestPanel.html
@@ -0,0 +1,3 @@
+<div>
+    <span pid="panel-test-id"/>
+</div>
diff --git a/tests/component/page/PageTestPanel.php b/tests/component/page/PageTestPanel.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Created by IntelliJ IDEA.
+ * User: martindilger
+ * Date: 18.10.12
+ * Time: 14:55
+ * To change this template use File | Settings | File Templates.
+ */
+class PageTestPanel extends Panel
+{
+    public function PageTestPanel($id,$model){
+        $this->Panel($id,$model);
+        $this->add(new Label("panel-test-id",new SimpleModel("Panel gets rendered")));
+    }
+}
diff --git a/tests/component/page/WebPageTest.html b/tests/component/page/WebPageTest.html
@@ -5,7 +5,7 @@
     <body>
         <div pid="webpage">
             <!--body-->
-            <div id="test-id" pid="test-id"/>
+            <span id="test-id" pid="test-id"></span>
             <span pid="test-id-2">hallo welt</span>
         </div>
     </body>

diff --git a/tests/component/page/WebPageTest.php b/tests/component/page/WebPageTest.php
@@ -2,6 +2,7 @@
 include_once __DIR__ . '/../../BaseTestCase.php';
 require_once __DIR__ . '/../../container/SimpleTestPanel.php';
 require_once __DIR__ . '/../../util/MarkupTester.php';
+require_once __DIR__."/PageTestPanel.php";
 /**
  * Created by IntelliJ IDEA.
  * User: dilgerma
@@ -62,9 +63,18 @@ public function testRenderWebPageWithDoubleContributions(){
         $markupTester->assertTagCount("script",1);
     }
 
+    public function testRenderPageWithPanel(){
+        $testWebPage = new TestWebPage("webpage", new SimpleModel(""));
+        $testWebPage->add(new PageTestPanel("test-id",new SimpleModel("")));
+
+        $markupParser = new MarkupParser(MarkupParser::getMarkupNameFromScript(__FILE__));
+        $testWebPage->render($markupParser);
+
+    }
+
 }
 
 class TestWebPage extends WebPage
 {
 
-}
+}