Merge branch 'onphp-master' into metaPropertyBug

* onphp-master:
  update doc/ChangeLog for #46
  * view test tune
  * view test initialization fix
  + add simple view render test

Conflicts:
	doc/ChangeLog

Author: dovg

doc/ChangeLog

@@ -3,6 +3,10 @@
 	* meta/types/ObjectType.class.php, test/misc/DAOTest.class.php: changed logic
 	for getObjectId method of lazy encapsulant; test for lazy logic added
 
+2011-11-29	Igor V. Gulyaev
+
+	* test/main/ViewTest.class.php: added View test
+
 2011-11-21	Evgeny V. Kokovikhin
 
 	* core/DB/PostgresDialect.class.php, test/main/PostgresDialectTest.class.php:

test/main/ViewTest.class.php

@@ -0,0 +1,38 @@
+<?php
+/***************************************************************************
+ *   Copyright (C) 2011 by Igor V. Gulyaev                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU Lesser General Public License as        *
+ *   published by the Free Software Foundation; either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ ***************************************************************************/
+
+	final class ViewTest extends TestCase
+	{
+		protected static $resolver;
+
+		public static function setUpBeforeClass()
+		{
+			self::$resolver = new PhpViewResolver(ONPHP_TEST_PATH.'main/data/views/', EXT_TPL);
+		}
+
+		public static function tearDownAfterClass()
+		{
+			self::$resolver = NULL;
+		}
+
+		public function testToString()
+		{
+			$renderView = self::$resolver->resolveViewName('testView');
+			$toStringView = self::$resolver->resolveViewName('testViewToString');
+
+			$model = Model::create();
+
+			$this->assertTrue(
+				$toStringView->toString($model) == $renderView->toString($model)
+			);
+		}
+	}
+?>

test/main/data/views/testPartView.tpl.html

@@ -0,0 +1 @@
+PartView

test/main/data/views/testView.tpl.html

@@ -0,0 +1,3 @@
+TestView Begin <?php
+	$partViewer->view('testPartView')
+?> TestViewEnd

test/main/data/views/testViewToString.tpl.html

@@ -0,0 +1 @@
+TestView Begin <?=$partViewer->toString('testPartView')?> TestViewEnd